deploy: fabc35e

w3c-ccg · Jul 11, 2023 · a84d177 · a84d177
1 parent d95f977
commit a84d177
Show file tree

Hide file tree

Showing 9 changed files with 1,904 additions and 272 deletions.
diff --git a/contexts/traceability-v1.jsonld b/contexts/traceability-v1.jsonld
@@ -1175,10 +1175,10 @@
           "@id": "https://w3id.org/traceability#Commodity"
         },
         "consignee": {
-          "@id": "https://schema.org/Organization"
+          "@id": "https://vocabulary.uncefact.org/consigneeParty"
         },
         "consignor": {
-          "@id": "https://schema.org/Organization"
+          "@id": "https://vocabulary.uncefact.org/consignorParty"
         },
         "deliveryDate": {
           "@id": "https://schema.org/arrivalTime"
@@ -1187,28 +1187,28 @@
           "@id": "https://schema.org/departureTime"
         },
         "injectionVolume": {
-          "@id": "https://schema.org/Quantity"
+          "@id": "https://w3id.org/traceability#QuantitativeValue"
         },
         "place": {
-          "@id": "https://schema.org/Place"
+          "@id": "https://schema.org/toLocation"
         },
         "portOfArrival": {
-          "@id": "https://schema.org/identifier"
+          "@id": "https://w3id.org/traceability#Place"
         },
         "portOfDestination": {
-          "@id": "https://schema.org/identifier"
+          "@id": "https://w3id.org/traceability#Place"
         },
         "portOfEntry": {
-          "@id": "https://schema.org/identifier"
+          "@id": "https://w3id.org/traceability#Place"
         },
         "scheduledDate": {
           "@id": "https://schema.org/departureTime"
         },
         "scheduledVolume": {
-          "@id": "https://schema.org/Quantity"
+          "@id": "https://w3id.org/traceability#QuantitativeValue"
         },
         "transporter": {
-          "@id": "https://schema.org/Organization"
+          "@id": "https://schema.org/agent"
         }
       },
       "@id": "https://w3id.org/traceability#DeliverySchedule"

diff --git a/credentials-with-issuer-dependent-terms.json b/credentials-with-issuer-dependent-terms.json
@@ -205,7 +205,7 @@
   },
   {
     "type": "DeliveryScheduleCredential",
-    "count": 6
+    "count": 8
   },
   {
     "type": "DeMinimisShipmentCredential",

diff --git a/openapi/components/schemas/common/DeliverySchedule.yml b/openapi/components/schemas/common/DeliverySchedule.yml
@@ -22,7 +22,7 @@ properties:
     $ref: ./Organization.yml
     $linkedData:
       term: transporter
-      '@id': https://schema.org/Organization
+      '@id': https://schema.org/agent
   batchNumber:
     title: Batch Number
     description: A tracking number for commodities
@@ -43,35 +43,37 @@ properties:
     $ref: ./Place.yml
     $linkedData:
       term: place
-      '@id': https://schema.org/Place
+      '@id': https://schema.org/fromLocation
   deliveryDestination:
     title: Delivery Destination
     description: The address to which the commodity is being shipped
     $ref: ./Place.yml
     $linkedData:
       term: place
-      '@id': https://schema.org/Place
+      '@id': https://schema.org/toLocation
   consignor:
     title: Consignor
     description: The organization that plans and organizes the transportation event
     $ref: ./Organization.yml
     $linkedData:
       term: consignor
-      '@id': https://schema.org/Organization
+      '@id': https://vocabulary.uncefact.org/consignorParty
   consignee:
     title: Consignee
     description: The organization that receives the transported commodities
     $ref: ./Organization.yml
     $linkedData:
       term: consignee
-      '@id': https://schema.org/Organization
+      '@id': https://vocabulary.uncefact.org/consigneeParty
   scheduledVolume:
     title: Scheduled Volume
     description: the planned volume of the commodities to be delivered
-    $ref: ./QuantitativeValue.yml
+    type: array
+    items:
+      $ref: ./QuantitativeValue.yml
     $linkedData:
       term: scheduledVolume
-      '@id': https://schema.org/Quantity
+      '@id': https://w3id.org/traceability#QuantitativeValue
   scheduledDate:
     title: Scheduled Date
     description: The planned date of natural gas delivery
@@ -82,10 +84,12 @@ properties:
   injectionVolume:
     title: Injection Volume
     description: Volume of the shipped commodities at the begining of the transportation event
-    $ref: ./QuantitativeValue.yml
+    type: array
+    items:
+      $ref: ./QuantitativeValue.yml
     $linkedData:
       term: injectionVolume
-      '@id': https://schema.org/Quantity
+      '@id': https://w3id.org/traceability#QuantitativeValue
   injectionDate:
     title: Injection Date
     description: The planned time for crude oil injection starts
@@ -101,33 +105,37 @@ properties:
       term: deliveryDate
       '@id': https://schema.org/arrivalTime
   portOfEntry:
-    title: Port of Entry Code
-    description: The code of the port where the commodity crosses the border. These codes are outlined in https://www.cbp.gov/sites/default/files/assets/documents/2020-Jan/ACE%20Appendix%20E%20Schedule%20D%20January%202020%20%281%29.pdf
-    type: string
+    title: Port of Entry
+    description: The port where the commodity crosses the border.
+    $ref: ./Place.yml
     $linkedData:
       term: portOfEntry
-      '@id': https://schema.org/identifier
+      '@id': https://w3id.org/traceability#Place
   portOfDestination:
-    title: Port of Destination Code
-    description: The code of the port of destination to which the product[s) were transferred. These codes are outlined in https://www.cbp.gov/sites/default/files/assets/documents/2020-Jan/ACE%20Appendix%20E%20Schedule%20D%20January%202020%20%281%29.pdf
-    type: string
+    title: Port of Destination
+    description: The port of destination to which the product[s) were transferred.
+    $ref: ./Place.yml
     $linkedData:
       term: portOfDestination
-      '@id': https://schema.org/identifier
+      '@id': https://w3id.org/traceability#Place
   portOfArrival:
-    title: Port of Arrival Code
-    description: The code of the port of arrival to which the product(s) were transferred. These codes are outlined in https://www.cbp.gov/sites/default/files/assets/documents/2020-Jan/ACE%20Appendix%20E%20Schedule%20D%20January%202020%20%281%29.pdf
-    type: string
+    title: Port of Arrival
+    description: The port of arrival to which the product(s) were transferred.
+    $ref: ./Place.yml
     $linkedData:
       term: portOfArrival
-      '@id': https://schema.org/identifier
+      '@id': https://w3id.org/traceability#Place
   countryOfDestination:
     title: Country of Destination
     description: Country to which the product(s) were transferred.
     type: string
     $linkedData:
       term: addressCountry
       '@id': https://schema.org/addressCountry
+  nominationMonth:
+    title: Nomination Month
+    description: the month which pipeline and terminal nominations is for
+    type: string
 additionalProperties: false
 required:
   - type
@@ -206,17 +214,59 @@ example: |-
       ],
       "name":"Example"
     },
-    "injectionVolume":{
+    "scheduledVolume":[
+      {
+        "type":[
+          "QuantitativeValue"
+        ],
+        "value":"900000",
+        "unitCode":"m3"
+      },
+      {
+        "type":[
+          "QuantitativeValue"
+        ],
+        "value":"5660820",
+        "unitCode":"bbl"
+      }
+    ],
+    "scheduledDate":"2022-05-01  10:13:00 PM",
+    "injectionVolume":[
+      {
+        "type":[
+          "QuantitativeValue"
+        ],
+        "value":"900000",
+        "unitCode":"m3"
+      },
+      {
+        "type":[
+          "QuantitativeValue"
+        ],
+        "value":"5660820",
+        "unitCode":"bbl"
+      }
+    ],
+    "injectionDate":"2022-05-01  10:13:00 PM",
+    "deliveryDate":"2022-05-01  10:13:00 PM",
+    "portOfEntry":{
+      "type":[
+        "Place"
+      ],
+      "usPortCode":"3501"
+    },
+    "portOfDestination":{
       "type":[
-        "QuantitativeValue"
+        "Place"
       ],
-      "value":"8806",
-      "unitCode":"M3"
+      "usPortCode":"3901"
     },
-    "injectionDate":"2022-05-01  10:13:00 PM",
-    "deliveryDate":"2022-05-01  10:13:00 PM",
-    "portOfEntry": "3501",
-    "portOfDestination": "3901",
-    "portOfArrival": "4105",
-    "countryOfDestination":"CA"
+    "portOfArrival":{
+      "type":[
+        "Place"
+      ],
+      "usPortCode":"4105"
+    },
+    "countryOfDestination":"USA",
+    "nominationMonth":"Jan-23"
   }
diff --git a/openapi/components/schemas/credentials/DeliveryScheduleCredential.yml b/openapi/components/schemas/credentials/DeliveryScheduleCredential.yml
@@ -165,25 +165,67 @@ example: |-
         ],
         "name": "Example"
       },
-      "injectionVolume": {
+      "scheduledVolume": [
+        {
+          "type": [
+            "QuantitativeValue"
+          ],
+          "value": "900000",
+          "unitCode": "m3"
+        },
+        {
+          "type": [
+            "QuantitativeValue"
+          ],
+          "value": "5660820",
+          "unitCode": "bbl"
+        }
+      ],
+      "scheduledDate": "2022-05-01  10:13:00 PM",
+      "injectionVolume": [
+        {
+          "type": [
+            "QuantitativeValue"
+          ],
+          "value": "900000",
+          "unitCode": "m3"
+        },
+        {
+          "type": [
+            "QuantitativeValue"
+          ],
+          "value": "5660820",
+          "unitCode": "bbl"
+        }
+      ],
+      "injectionDate": "2022-05-01  10:13:00 PM",
+      "deliveryDate": "2022-05-01  10:13:00 PM",
+      "portOfEntry": {
         "type": [
-          "QuantitativeValue"
+          "Place"
         ],
-        "value": "8806",
-        "unitCode": "M3"
+        "usPortCode": "3501"
       },
-      "injectionDate": "2022-05-01  10:13:00 PM",
-      "deliveryDate": "2022-05-01  10:13:00 PM",
-      "portOfEntry": "3501",
-      "portOfDestination": "3901",
-      "portOfArrival": "4105",
-      "countryOfDestination": "CA"
+      "portOfDestination": {
+        "type": [
+          "Place"
+        ],
+        "usPortCode": "3901"
+      },
+      "portOfArrival": {
+        "type": [
+          "Place"
+        ],
+        "usPortCode": "4105"
+      },
+      "countryOfDestination": "USA",
+      "nominationMonth": "Jan-23"
     },
     "proof": {
       "type": "Ed25519Signature2018",
-      "created": "2023-05-17T17:49:14Z",
+      "created": "2023-07-11T17:54:05Z",
       "verificationMethod": "did:key:z6MktHQo3fRRohk44dsbE76CuiTpBmyMWq2VVjvV6aBSeE3U#z6MktHQo3fRRohk44dsbE76CuiTpBmyMWq2VVjvV6aBSeE3U",
       "proofPurpose": "assertionMethod",
-      "jws": "eyJhbGciOiJFZERTQSIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..ahpPSo78oBMgozfyFNulHM5YVF2FVA9scuoExBCMh705GSwhzn2cVioPvnSB78nzjNlsAiAHkC_VVPByRq4YBw"
+      "jws": "eyJhbGciOiJFZERTQSIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..c1DnuMZ1TzuHs5Zj3udVqbuBuF46NTwbunoE03mttye1WatsumM6CUYAtF6T22q_i7sZGQ3F5A3vLUgGScyPCQ"
     }
   }
diff --git a/openapi/components/schemas/credentials/MultiModalBillOfLadingCredential.yml b/openapi/components/schemas/credentials/MultiModalBillOfLadingCredential.yml
@@ -1378,9 +1378,9 @@ example: |-
     },
     "proof": {
       "type": "Ed25519Signature2018",
-      "created": "2023-06-27T17:43:43Z",
+      "created": "2023-07-11T17:54:45Z",
       "verificationMethod": "did:key:z6MktHQo3fRRohk44dsbE76CuiTpBmyMWq2VVjvV6aBSeE3U#z6MktHQo3fRRohk44dsbE76CuiTpBmyMWq2VVjvV6aBSeE3U",
       "proofPurpose": "assertionMethod",
-      "jws": "eyJhbGciOiJFZERTQSIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..jhBtT0OADuTU9Njm6fnS4wWhoeX7ojJOEnACfOnHeRpe9dsLhpGmPF7BPlZnnAuX7dURROxjgmToVXKArwdfDA"
+      "jws": "eyJhbGciOiJFZERTQSIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..FlFqbJ0EkOTn4HJ-oxz8bzuA4xko75RNl6WEkACyIzr4vtaRJ1uG7xSa1jf0u9JsN66QCzsHgAFnoIwQqKhhDg"
     }
   }