Merge pull request #11 from IATA-Cargo/update-schema

Fix schema
IATA-Cargo · Jul 15, 2019 · 551d102 · 551d102
2 parents 794d42d + e54557e
commit 551d102
Show file tree

Hide file tree

Showing 15 changed files with 110 additions and 35 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+# Enble versioning of Word documents
+*.docx diff=pandoc
diff --git a/CSC_adopted_March_2019/data-model/ONE Record data model v12.9.xlsx b/CSC_adopted_March_2019/data-model/ONE Record data model v12.9.xlsx
diff --git a/CSC_adopted_March_2019/json blank values/air-waybill.json b/CSC_adopted_March_2019/json blank values/air-waybill.json
@@ -23,7 +23,6 @@
       "Carrier": "xxxxxxxx",
       "Routing": "xxxxxxxx",
       "WaybillLine": "xxxxxxxx",
-      "WaybillLineTotals": "xxxxxxxx",
       "Handling": "xxxxxxxx",
       "CustomsInformation": "xxxxxxxx",
       "SecurityInformation": "xxxxxxxx",
@@ -111,4 +110,4 @@
       "TotalChargeAmount": "xxxxxxxx"
    }
 
-}
+}
diff --git a/CSC_adopted_March_2019/json blank values/item.json b/CSC_adopted_March_2019/json blank values/item.json
@@ -19,11 +19,10 @@
          "CountryCode": "xxxxxxxx",
          "CountryName": "xxxxxxxx"
       },
+      "Product": "xxxxxxxx",
       "TargetCountry": {
          "CountryCode": "xxxxxxxx",
          "CountryName": "xxxxxxxx"
-      },
-      "Product": [{
-      }]
+      }
    }
 }
diff --git a/CSC_adopted_March_2019/json blank values/piece.json b/CSC_adopted_March_2019/json blank values/piece.json
@@ -6,11 +6,10 @@
       {
       "FlagPieceLevelTracking": "xxxxxxxx",
       "UPID": "xxxxxxxx",
+      "PieceDetails": "xxxxxxxx",
       "OtherIdentifier": [{
          "Type": "xxxxxxxx",
          "Identifier": "xxxxxxxx"
-      }],
-      "PieceDetails": {
-      }
+      }]
    }
 }
diff --git a/CSC_adopted_March_2019/json blank values/rating.json b/CSC_adopted_March_2019/json blank values/rating.json
@@ -0,0 +1,20 @@
+{
+    "@context": {
+        "@vocab": "http://cargo.iata.org#"
+    },
+    "rating":
+      {
+      "RateClassCode": "xxxxxxxx",
+      "CommodityItemNumber": "xxxxxxxx",
+      "RatingTypeIndicator": "xxxxxxxx",
+      "RCP": "xxxxxxxx",
+      "LoadTypeCode": "xxxxxxxx",
+      "ULDRateClassType": "xxxxxxxx",
+      "RateClassBasis": "xxxxxxxx",
+      "RatingClassPercentage": "xxxxxxxx",
+      "RateReferenceCode": "xxxxxxxx",
+      "RateReferenceType": "xxxxxxxx",
+      "RateChargeAmount": "xxxxxxxx",
+      "SubTotalAmount": "xxxxxxxx"
+   }
+}
diff --git a/CSC_adopted_March_2019/json schema/air-waybill.json b/CSC_adopted_March_2019/json schema/air-waybill.json
@@ -12,7 +12,7 @@
       "Date": {
          "description": "Air Waybill date",
          "required": true,
-         "type": "datatime"
+         "type": "datetime"
       },
       "LoadTypeCode": {
          "description": "Bulk or containerized (BLK or ULD) indicator",
@@ -87,11 +87,6 @@
          "required": true,
          "type": "piece_grouping.json"
       },
-      "WaybillLineTotals": {
-         "description": "Waybill line totals",
-         "required": true,
-         "type": "piece_grouping_totals.json"
-      },
       "Handling": {
          "description": "Handling details",
          "type": "handling.json"
@@ -174,7 +169,7 @@
             },
             "DateTime": {
                "description": "Special service scheduled date and time",
-               "type": "datatime"
+               "type": "datetime"
             }
          },
          "ChargePayment": {
@@ -281,7 +276,7 @@
          },
          "Date": {
             "description": "Date of signature",
-            "type": "datatime"
+            "type": "datetime"
          },
          "Signature": {
             "description": "Signature (free text)",
@@ -303,7 +298,7 @@
          },
          "Date": {
             "description": "Date of signature",
-            "type": "datatime"
+            "type": "datetime"
          },
          "Signature": {
             "description": "Signature (free text)",
@@ -352,4 +347,4 @@
       }
    }
 
-}
+}
diff --git a/CSC_adopted_March_2019/json schema/booking.json b/CSC_adopted_March_2019/json schema/booking.json
@@ -12,7 +12,7 @@
       "Date": {
          "description": "Booking date",
          "required": true,
-         "type": "datatime"
+         "type": "datetime"
       },
       "AirWaybillNumber": {
          "description": "Air Waybill number",

diff --git a/CSC_adopted_March_2019/json schema/event.json b/CSC_adopted_March_2019/json schema/event.json
@@ -12,7 +12,7 @@
       "DateTime": {
          "description": "Date and time of the event",
          "required": true,
-         "type": "datatime"
+         "type": "datetime"
       },
       "EventCode": {
          "description": "Movement or milestone code. Refer CXML Code List 1.18, e.g. DEP, ARR, FOH, RCS",

diff --git a/CSC_adopted_March_2019/json schema/house-manifest.json b/CSC_adopted_March_2019/json schema/house-manifest.json
@@ -12,7 +12,7 @@
       "Date": {
          "description": "House Manifest date",
          "required": true,
-         "type": "datatime"
+         "type": "datetime"
       },
       "MasterAWBDetails": {
          "description": "Master Air Waybill details including Air Waybill number, Freight Forwarder, Origin, Flight number, Destination and Airline",

diff --git a/CSC_adopted_March_2019/json schema/house-waybill.json b/CSC_adopted_March_2019/json schema/house-waybill.json
@@ -12,7 +12,7 @@
       "Date": {
          "description": "Air Waybill date",
          "required": true,
-         "type": "datatime"
+         "type": "datetime"
       },
       "LoadTypeCode": {
          "description": "Bulk or containerized (BLK or ULD) indicator",
@@ -169,7 +169,7 @@
             },
             "DateTime": {
                "description": "Special service scheduled date and time",
-               "type": "datatime"
+               "type": "datetime"
             }
          },
          "ChargePayment": {
@@ -276,7 +276,7 @@
          },
          "Date": {
             "description": "Date of signature",
-            "type": "datatime"
+            "type": "datetime"
          },
          "Signature": {
             "description": "Signature (free text)",
@@ -298,7 +298,7 @@
          },
          "Date": {
             "description": "Date of signature",
-            "type": "datatime"
+            "type": "datetime"
          },
          "Signature": {
             "description": "Signature (free text)",

diff --git a/CSC_adopted_March_2019/json schema/item.json b/CSC_adopted_March_2019/json schema/item.json
@@ -29,11 +29,11 @@
          },
          "Date": {
             "description": "Production date",
-            "type": "datatime"
+            "type": "datetime"
          },
          "ProductExpiryDate": {
             "description": "Product expiry date - e.g. for perishables goods or goods with programmed obsolescence",
-            "type": "datatime"
+            "type": "datetime"
          }
       },
       "ProductionCountry": {
@@ -46,6 +46,10 @@
             "type": "text"
          }
       },
+      "Product": [{
+         "description": "Product details",
+         "type": "product.json"
+      }],
       "TargetCountry": {
          "CountryCode": {
             "description": "Target country ISO code. Refer ISO 3166-2",
@@ -55,8 +59,6 @@
             "description": "If CountryCode not provided, target country name",
             "type": "text"
          }
-      },
-      "Product": [{
-      }]
+      }
    }
-}
+}
diff --git a/CSC_adopted_March_2019/json schema/piece.json b/CSC_adopted_March_2019/json schema/piece.json
@@ -12,6 +12,11 @@
          "description": "Unique Piece Identifier (UPID) of the piece. Refer IATA Recommended Practice 1689",
          "type": "text"
       },
+      "PieceDetails": {
+         "description": "Details of the piece",
+         "required": true,
+         "type": "logistics_component.json"
+      },
       "OtherIdentifier": [{
          "Type": {
             "description": "Type of piece identifier e.g. Shipping Marks, Seal",
@@ -21,8 +26,6 @@
             "description": "Identifier detail",
             "type": "text"
          }
-      }],
-      "PieceDetails": {
-      }
+      }]
    }
 }
diff --git a/CSC_adopted_March_2019/json schema/rating.json b/CSC_adopted_March_2019/json schema/rating.json
@@ -0,0 +1,56 @@
+{
+	"@context": {
+    	"@vocab": "http://cargo.iata.org#"
+    },
+    "rating":
+      {
+      "RateClassCode": {
+         "description": "Rate category code. Refer  CXML Code List 1.4,  e.g. Q - Quantity Rate",
+         "type": "text"
+      },
+      "CommodityItemNumber": {
+         "description": "Commodity identifier on which the rate class code is applied",
+         "type": "text"
+      },
+      "RatingTypeIndicator": {
+         "description": "Transportation rating type - e.g. F for Face, P for Published, or A for Actual Rating detail",
+         "type": "text"
+      },
+      "RCP": {
+         "description": "City code of Rate Combination Point (RCP), the point over which sector rates are combined",
+         "type": "text"
+      },
+      "LoadTypeCode": {
+         "description": "Bulk or containerized (BLK or ULD) indicator",
+         "type": "text"
+      },
+      "ULDRateClassType": {
+         "description": "Unit Load Device rate class type e.g. 1P",
+         "type": "text"
+      },
+      "RateClassBasis": {
+         "description": "Basis on which the Rate Class Code is applicable",
+         "type": "text"
+      },
+      "RatingClassPercentage": {
+         "description": "Rating class percentage",
+         "type": "numeric"
+      },
+      "RateReferenceCode": {
+         "description": "Code to indicate the applicable rate",
+         "type": "text"
+      },
+      "RateReferenceType": {
+         "description": "Type of rate - e.g. contract, adhoc, etc.",
+         "type": "text"
+      },
+      "RateChargeAmount": {
+         "description": "Rate, charge, or discount amount",
+         "type": "value.json"
+      },
+      "SubTotalAmount": {
+         "description": "Subtotal of weight and valuation charges for the piece group",
+         "type": "value.json"
+      }
+   }
+}
diff --git a/CSC_adopted_March_2019/json schema/transport-segment.json b/CSC_adopted_March_2019/json schema/transport-segment.json
@@ -24,7 +24,7 @@
          "DateTime": {
             "description": "Date and time when the booking status is issued",
             "required": true,
-            "type": "datatime"
+            "type": "datetime"
          },
          "IssuedBy": {
             "description": "Airline issuing the booking status",