Merge pull request #859 from w3c-ccg/681-scac-should-be-on-organizati…

…on-not-bill-of-lading fix: move scac from bl root to carrier
w3c-ccg · Aug 29, 2023 · 43b1a0c · 43b1a0c
2 parents 42b41c3 + cecbcf4
commit 43b1a0c
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 30 deletions.
diff --git a/docs/credentials-with-issuer-dependent-terms.json b/docs/credentials-with-issuer-dependent-terms.json
@@ -81,7 +81,7 @@
   },
   {
     "type": "MultiModalBillOfLadingCredential",
-    "count": 2
+    "count": 0
   },
   {
     "type": "MonthlyAdvanceManifestCredential",

diff --git a/docs/openapi/components/schemas/common/BillOfLading.yml b/docs/openapi/components/schemas/common/BillOfLading.yml
@@ -43,17 +43,6 @@ properties:
     $linkedData:
       term: relatedDocuments
       '@id': https://schema.org/Purchase
-  scac:
-    title: SCAC
-    description: >-
-      For maritime shipments, this code qualifies a Standard Alpha Carrier Code
-      (SCAC) as issued by the United Stated National Motor Traffic Association
-      Inc.
-    type: string
-    $linkedData:
-      term: scac
-      '@id': >-
-        https://service.unece.org/trade/uncefact/vocabulary/uncl1153/#Standard_Carrier_Alpha_Code_(SCAC)_number
   carrier:
     title: Carrier
     description: >-
@@ -88,6 +77,13 @@ properties:
         title: Description
         description: Description of the carrier.
         type: string
+      scac:
+        title: SCAC
+        description: >-
+          For maritime shipments, this code qualifies a Standard Alpha Carrier Code
+          (SCAC) as issued by the United Stated National Motor Traffic Association
+          Inc.
+        type: string
       email:
         title: Email Address
         description: carrier's primary email address.
@@ -475,10 +471,10 @@ example: |-
     "type": ["BillOfLading"],
     "billOfLadingNumber": "991205182A",
     "bookingNumber": "991205182",
-    "scac": "NISC",
     "carrier": {
       "type": ["Organization"],
       "name": "Carrior Goods And More",
+      "scac": "NISC",
       "email": "[email protected]",
       "phoneNumber": "+1-376-555-0509",
       "location": {

diff --git a/docs/openapi/components/schemas/common/MasterBillOfLading.yml b/docs/openapi/components/schemas/common/MasterBillOfLading.yml
@@ -54,17 +54,6 @@ properties:
     $linkedData:
       term: shippersReferences
       '@id': https://service.unece.org/trade/uncefact/vocabulary/uncl1153/#Consignment_identifier_freight_forwarder_assigned
-  scac:
-    title: SCAC
-    description: >-
-      For maritime shipments, this code qualifies a Standard Alpha Carrier Code
-      (SCAC) as issued by the United Stated National Motor Traffic Association
-      Inc.
-    type: string
-    $linkedData:
-      term: scac
-      '@id': >-
-        https://service.unece.org/trade/uncefact/vocabulary/uncl1153/#Standard_Carrier_Alpha_Code_(SCAC)_number
   carrier:
     title: Carrier
     description: A carrier party.

diff --git a/docs/openapi/components/schemas/common/Organization.yml b/docs/openapi/components/schemas/common/Organization.yml
@@ -120,6 +120,17 @@ properties:
     $linkedData:
       term: iataCarrierCode
       '@id': https://onerecord.iata.org/cargo/Company#airlineCode
+  scac:
+    title: SCAC
+    description: >-
+      For maritime shipments, this code qualifies a Standard Alpha Carrier Code
+      (SCAC) as issued by the United Stated National Motor Traffic Association
+      Inc.
+    type: string
+    $linkedData:
+      term: scac
+      '@id': >-
+        https://service.unece.org/trade/uncefact/vocabulary/uncl1153/#Standard_Carrier_Alpha_Code_(SCAC)_number
 additionalProperties: false
 required:
   - type

diff --git a/docs/openapi/components/schemas/common/Template.yml b/docs/openapi/components/schemas/common/Template.yml
@@ -160,11 +160,11 @@ example: |-
                     }
                 }
             ],
-            "scac": "NISC",
             "carrier": {
                 "type": [
                     "Organization"
                 ],
+                "scac": "NISC",
                 "email": "[email protected]",
                 "phoneNumber": "+1-898-555-0270"
             },

diff --git a/docs/openapi/components/schemas/credentials/BillOfLadingCredential.yml b/docs/openapi/components/schemas/credentials/BillOfLadingCredential.yml
@@ -107,14 +107,14 @@ example: |-
       ],
       "billOfLadingNumber": "991205182A",
       "bookingNumber": "991205182",
-      "scac": "NISC",
       "carrier": {
         "id": "did:key:z6MktHQo3fRRohk44dsbE76CuiTpBmyMWq2VVjvV6aBSeE3U",
         "type": [
           "Organization"
         ],
         "name": "Carrior Goods And More",
         "email": "[email protected]",
+        "scac": "NISC",
         "phoneNumber": "+1-477-555-9216",
         "location": {
           "type": [

diff --git a/docs/openapi/components/schemas/credentials/MultiModalBillOfLadingCredential.yml b/docs/openapi/components/schemas/credentials/MultiModalBillOfLadingCredential.yml
@@ -81,10 +81,6 @@ properties:
           (SCAC) as issued by the United Stated National Motor Traffic Association
           Inc.
         type: string
-        $linkedData:
-          term: scac
-          '@id': >-
-            https://service.unece.org/trade/uncefact/vocabulary/uncl1153/#Standard_Carrier_Alpha_Code_(SCAC)_number
       location:
         title: Location
         description: The location where, for example, an event is happening, an organization is located, or an action takes place.

diff --git a/docs/openapi/components/schemas/snippets/carrier.yml b/docs/openapi/components/schemas/snippets/carrier.yml
@@ -29,6 +29,13 @@ properties:
     title: Description
     description: Description of the carrier.
     type: string
+  scac:
+    title: SCAC
+    description: >-
+      For maritime shipments, this code qualifies a Standard Alpha Carrier Code
+      (SCAC) as issued by the United Stated National Motor Traffic Association
+      Inc.
+    type: string
   email:
     title: Email Address
     description: Carrier's primary email address.