diff --git a/contexts/traceability-v1.jsonld b/contexts/traceability-v1.jsonld index 7b91797b9..ecf08c187 100644 --- a/contexts/traceability-v1.jsonld +++ b/contexts/traceability-v1.jsonld @@ -2834,6 +2834,10 @@ } } }, + "TraceabilityAPI": { + "@id": "https://w3id.org/traceability#TraceabilityAPI", + "@context": {} + }, "TradeLineItem": { "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#TradeLineItem", "@context": { diff --git a/openapi/components/schemas/common/AgActivity.yml b/openapi/components/schemas/common/AgActivity.yml index d264786ba..d29d7b4d9 100644 --- a/openapi/components/schemas/common/AgActivity.yml +++ b/openapi/components/schemas/common/AgActivity.yml @@ -101,8 +101,8 @@ example: |- "Organization" ], "name": "Jimbo's Awesome Farm", - "description": "Devolved transitional functionalities", - "email": "Chloe.Ondricka42@example.org", + "description": "Organic fruits & vegetables", + "email": "Chloe.Ondricka42@jimbofarm.org", "phoneNumber": "555-496-7149", "faxNumber": "555-209-6489" }, @@ -150,15 +150,15 @@ example: |- "type": [ "QuantitativeValue" ], - "unitCode": "hg/ha", - "value": "1087" + "unitCode": "boxes", + "value": "893" }, "weight": { "type": [ "QuantitativeValue" ], - "unitCode": "hg/ha", - "value": "324" + "unitCode": "lbs", + "value": "1784" }, "sku": "563279941950" }, @@ -187,68 +187,25 @@ example: |- "email": "Sven22@example.org", "phoneNumber": "555-267-4748" }, - "name": "Avocados", - "description": "Avocados, 4 pack boxes", + "name": "Tomatoes", + "description": "Tomatoes, Cartons", "sizeOrAmount": { "type": [ "QuantitativeValue" ], - "unitCode": "hg/ha", - "value": "4277" + "unitCode": "cartons", + "value": "348" }, "weight": { "type": [ "QuantitativeValue" ], - "unitCode": "hg/ha", - "value": "8182" + "unitCode": "lbs", + "value": "640" }, "sku": "164664203943" }, - "scientificName": "Persea americana", - "labelImageUrl": "https://img.example.org/033383401508/640/480/", - "labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", - "name": "Avocados", - "productImageUrl": "https://img.example.org/102934920857/937/903/", - "productImageHash": "8kb47j986hklhde4rfh78okjhgjo08765fgu7tfg4t864fy876rfser45thj87f3" - }, - { - "type": [ - "AgProduct" - ], - "upc": "033383401508", - "plu": "94225", - "gtin": "033383401508", - "product": { - "type": [ - "Product" - ], - "manufacturer": { - "type": [ - "Organization" - ], - "email": "Jimmy3@example.net", - "phoneNumber": "555-726-5475" - }, - "name": "Avocados", - "description": "Avocados, 4 pack boxes", - "sizeOrAmount": { - "type": [ - "QuantitativeValue" - ], - "unitCode": "hg/ha", - "value": "3457" - }, - "weight": { - "type": [ - "QuantitativeValue" - ], - "unitCode": "hg/ha", - "value": "6347" - }, - "sku": "489457864974" - }, - "scientificName": "Persea americana", + "scientificName": "Solanum lycopersicum", "labelImageUrl": "https://img.example.org/033383401508/640/480/", "labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "name": "Avocados", diff --git a/openapi/components/schemas/common/AgInspectionReport.yml b/openapi/components/schemas/common/AgInspectionReport.yml index 63625786d..97ce45efb 100644 --- a/openapi/components/schemas/common/AgInspectionReport.yml +++ b/openapi/components/schemas/common/AgInspectionReport.yml @@ -144,9 +144,9 @@ example: |- "type": [ "Organization" ], - "name": "Runolfsson Inc", - "description": "Stand-alone multimedia portal", - "email": "Marina96@example.net", + "name": "Glayson & Co. Inspections", + "description": "Agricultural cleanliness & grade assurance", + "email": "Marina96@glaysonco.net", "phoneNumber": "555-521-6143", "faxNumber": "555-150-7668" }, @@ -254,9 +254,9 @@ example: |- "type": [ "Organization" ], - "name": "Leannon and Sons", - "description": "Fundamental multi-tasking service-desk", - "email": "Hipolito58@example.org", + "name": "Ace Foodstuffs", + "description": "Ag goods shipping & distribution", + "email": "Hipolito58@acefoodstuffs.org", "phoneNumber": "555-895-1661", "faxNumber": "555-497-2527" }, @@ -269,18 +269,18 @@ example: |- ], "shipper": { "type": "Organization", - "name": "Xxinau Manufacturing Co. Ltd.", - "description": "Advanced Production - Delivered", - "email": "xxinau-sales@example.org", - "phoneNumber": "+86-555-865-8495" + "name": "Green Fields", + "description": "Growing & packaging for high quality produce", + "email": "sales@greenfields.org", + "phoneNumber": "+1-555-865-8495" }, "purchaser": { "type": "Organization", - "name": "Lueilwitz - Kuvalis", - "description": "Persistent dynamic definition", - "email": "Greg_Swift94@example.net", - "phoneNumber": "555-149-2244", - "faxNumber": "555-419-4835" + "name": "Ace Foodstuffs", + "description": "Ag goods shipping & distribution", + "email": "Hipolito58@acefoodstuffs.org", + "phoneNumber": "555-895-1661", + "faxNumber": "555-497-2527" }, "carrier": { "type": [ @@ -291,7 +291,7 @@ example: |- }, "broker": { "type": "Organization", - "name": "Koch LLC", + "name": "Cole United", "leiCode": "54321351219389121979" } }, @@ -333,39 +333,16 @@ example: |- "date": "2019-12-11T03:50:55Z", "property": { "type": [ - "MechanicalProperty" + "ChemicalProperty" ], - "identifier": "ISO 1352", - "name": "Torque-controlled fatigue testing", - "description": "ISO 1352:2011 specifies the conditions for performing torsional, constant-amplitude, nominally elastic stress fatigue tests on metallic specimens without deliberately introducing stress concentrations. The tests are carried out at ambient temperature (ideally at between 10 °C and 35 °C) in air by applying a pure couple to the specimen about its longitudinal axis." + "name": "Radon" }, "measurement": { "type": [ "MeasuredValue" ], - "value": "00.00", - "unitCode": "UNKNOWN" - } - }, - { - "type": [ - "Observation" - ], - "date": "2019-12-11T03:50:55Z", - "property": { - "type": [ - "MechanicalProperty" - ], - "identifier": "ISO 148", - "name": "Charpy Impact Strength Test", - "description": "ISO 148-1:2016 specifies the Charpy (V-notch and U-notch) pendulum impact test method for determining the energy absorbed in an impact test of metallic materials. This part of ISO 148 does not cover instrumented impact testing, which is specified in ISO 14556." - }, - "measurement": { - "type": [ - "MeasuredValue" - ], - "value": "9.931", - "unitCode": "B13" + "value": "58.340", + "unitCode": "P1" } } ], @@ -373,19 +350,19 @@ example: |- "status": "pass", "regulatoryAgency": { "type": "Organization", - "name": "Johnson - Lebsack", - "description": "Exclusive bottom-line firmware", - "email": "Briana55@example.org", + "name": "CDFA", + "description": "California Department of Food and Agriculture", + "email": "Briana55@cdfa.ca.gov.org", "phoneNumber": "555-467-2604", "faxNumber": "+1-555-486-3154" }, "delegateOf": { "type": "Entity", "entityType" : "Organization", - "name": "Brekke, Kertzmann and Yost", - "description": "Distributed mobile protocol", - "email": "Priscilla.Dooley@example.com", - "phoneNumber": "555-426-1175", - "faxNumber": "555-147-8251" + "name": "Glayson & Co. Inspections", + "description": "Agricultural cleanliness & grade assurance", + "email": "Marina96@glaysonco.net", + "phoneNumber": "555-521-6143", + "faxNumber": "555-150-7668" } } diff --git a/openapi/components/schemas/common/AgPackage.yml b/openapi/components/schemas/common/AgPackage.yml index 71359a929..a30c264f5 100644 --- a/openapi/components/schemas/common/AgPackage.yml +++ b/openapi/components/schemas/common/AgPackage.yml @@ -167,10 +167,10 @@ example: |- ], "manufacturer": { "type": [ - "Organization" + "Person" ], - "email": "Roderick_Ferry68@example.com", - "phoneNumber": "555-569-8176" + "email": "Jeremie_Bauch@example.org", + "phoneNumber": "555-749-6051" }, "name": "Avocados", "description": "Avocados, 4 pack boxes", @@ -178,17 +178,17 @@ example: |- "type": [ "QuantitativeValue" ], - "unitCode": "hg/ha", - "value": "6190" + "unitCode": "boxes", + "value": "893" }, "weight": { "type": [ "QuantitativeValue" ], - "unitCode": "hg/ha", - "value": "7530" + "unitCode": "lbs", + "value": "1784" }, - "sku": "961315671330" + "sku": "563279941950" }, "scientificName": "Persea americana", "labelImageUrl": "https://img.example.org/033383401508/640/480/", diff --git a/openapi/components/schemas/common/AgParcelDelivery.yml b/openapi/components/schemas/common/AgParcelDelivery.yml index efad147a9..421cd9e30 100644 --- a/openapi/components/schemas/common/AgParcelDelivery.yml +++ b/openapi/components/schemas/common/AgParcelDelivery.yml @@ -210,27 +210,27 @@ example: |- "type": [ "Organization" ], - "name": "Leannon and Sons", - "description": "Fundamental multi-tasking service-desk", - "email": "Hipolito58@example.org", - "phoneNumber": "+1-555-895-1661", - "faxNumber": "+1-555-497-2527" + "name": "Ace Foodstuffs", + "description": "Ag goods shipping & distribution", + "email": "Hipolito58@acefoodstuffs.org", + "phoneNumber": "555-895-1661", + "faxNumber": "555-497-2527" }, "AgPackage": [], "shipper": { "type": "Organization", - "name": "Xxinau Manufacturing Co. Ltd.", - "description": "Advanced Production - Delivered", - "email": "xxinau-sales@example.org", - "phoneNumber": "+86-555-865-8495" + "name": "Green Fields", + "description": "Growing & packaging for high quality produce", + "email": "sales@greenfields.org", + "phoneNumber": "+1-555-865-8495" }, "purchaser": { "type": "Organization", - "name": "Lueilwitz - Kuvalis", - "description": "Persistent dynamic definition", - "email": "Greg_Swift94@example.net", - "phoneNumber": "555-149-2244", - "faxNumber": "555-419-4835" + "name": "Ace Foodstuffs", + "description": "Ag goods shipping & distribution", + "email": "Hipolito58@acefoodstuffs.org", + "phoneNumber": "555-895-1661", + "faxNumber": "555-497-2527" }, "carrier": { "type": [ diff --git a/openapi/components/schemas/common/AgProduct.yml b/openapi/components/schemas/common/AgProduct.yml index 5face6a75..b59f08538 100644 --- a/openapi/components/schemas/common/AgProduct.yml +++ b/openapi/components/schemas/common/AgProduct.yml @@ -118,29 +118,33 @@ example: |- "type": "Person", "firstName": "Itzel", "lastName": "Leannon", - "email": "Camila_Braun51@example.net", + "email": "Camila_Braun51@jimbofarm.org", "phoneNumber": "555-900-1599", "worksFor": { "type": "Organization", - "name": "Koepp, Shanahan and Nienow", - "description": "Networked multi-state functionalities", - "email": "Israel61@example.net", - "phoneNumber": "555-937-1345", - "faxNumber": "555-327-9115" + "name": "Jimbo's Awesome Farm", + "description": "Organic fruits & vegetables", + "email": "Chloe.Ondricka42@jimbofarm.org", + "phoneNumber": "555-496-7149", + "faxNumber": "555-209-6489" }, "jobTitle": "District Quality Associate" }, "name": "Avocados", "description": "Avocados, 4 pack boxes", "sizeOrAmount": { - "type": "QuantitativeValue", - "unitCode": "hg/ha", - "value": "389" + "type": [ + "QuantitativeValue" + ], + "unitCode": "boxes", + "value": "893" }, "weight": { - "type": "QuantitativeValue", - "unitCode": "hg/ha", - "value": "7465" + "type": [ + "QuantitativeValue" + ], + "unitCode": "lbs", + "value": "1784" }, "sku": "71266019767" }, diff --git a/openapi/components/schemas/common/Phytosanitary.yml b/openapi/components/schemas/common/Phytosanitary.yml index 75b7c7c0d..66ac08ace 100644 --- a/openapi/components/schemas/common/Phytosanitary.yml +++ b/openapi/components/schemas/common/Phytosanitary.yml @@ -337,9 +337,9 @@ example: |- "type": [ "Organization" ], - "name": "Leannon and Sons", - "description": "Fundamental multi-tasking service-desk", - "email": "Hipolito58@example.org", + "name": "Ace Foodstuffs", + "description": "Ag goods shipping & distribution", + "email": "Hipolito58@acefoodstuffs.org", "phoneNumber": "555-895-1661", "faxNumber": "555-497-2527" }, @@ -352,18 +352,18 @@ example: |- ], "shipper": { "type": "Organization", - "name": "Xxinau Manufacturing Co. Ltd.", - "description": "Advanced Production - Delivered", - "email": "xxinau-sales@example.org", - "phoneNumber": "+86-555-865-8495" + "name": "Green Fields", + "description": "Growing & packaging for high quality produce", + "email": "sales@greenfields.org", + "phoneNumber": "+1-555-865-8495" }, "purchaser": { "type": "Organization", - "name": "Lueilwitz - Kuvalis", - "description": "Persistent dynamic definition", - "email": "Greg_Swift94@example.net", - "phoneNumber": "555-149-2244", - "faxNumber": "555-419-4835" + "name": "Ace Foodstuffs", + "description": "Ag goods shipping & distribution", + "email": "Hipolito58@acefoodstuffs.org", + "phoneNumber": "555-895-1661", + "faxNumber": "555-497-2527" }, "carrier": { "type": [ @@ -388,25 +388,6 @@ example: |- "inspectionDate": "2020-03-15", "inspectionType": "Food Safety", "observation": [ - { - "type": [ - "Observation" - ], - "date": "2019-12-11T03:50:55Z", - "property": { - "type": [ - "ChemicalProperty" - ], - "name": "Actinium" - }, - "measurement": { - "type": [ - "MeasuredValue" - ], - "value": "42.757", - "unitCode": "P1" - } - }, { "type": [ "Observation" @@ -451,9 +432,9 @@ example: |- "certificateNumber": "330893782475", "plantOrg": { "type": "Entity", - "name": "Morar - Nienow", - "description": "Operative contextually-based archive", - "email": "Irwin_OConnell83@example.com", + "name": "APHIS", + "description": "Animal and Plant Health Inspection Service", + "email": "Irwin_OConnell83@aphis.usda.gov", "phoneNumber": "555-588-8829", "faxNumber": "555-118-6444", "entityType": "Organization" diff --git a/openapi/components/schemas/common/TraceabilityAPI.yml b/openapi/components/schemas/common/TraceabilityAPI.yml new file mode 100644 index 000000000..3c10a1d2d --- /dev/null +++ b/openapi/components/schemas/common/TraceabilityAPI.yml @@ -0,0 +1,35 @@ +$linkedData: + term: TraceabilityAPI + '@id': https://w3id.org/traceability#TraceabilityAPI +title: Traceability API +description: An object which can be listed as a DID `service` to enable discovery for subsequent presentation exchange. +type: object +properties: + type: + oneOf: + - type: array + items: + type: string + enum: + - TraceabilityAPI + - type: string + const: + - TraceabilityAPI + serviceEndpoint: + description: |- + The serviceEndpoint definition implies the following endpoints: + - https://platform.example/organization/123/credentials/issue + - https://platform.example/organization/123/credentials/verify + - https://platform.example/organization/123/presentations/prove + - https://platform.example/organization/123/presentations/verify + - https://platform.example/organization/123/presentations/available + - https://platform.example/organization/123/presentations/submissions + type: string +required: + - serviceEndpoint +example: |- + { + "id": "did:web:platform.example:organization:123#traceability-api", + "type": "TraceabilityAPI", + "serviceEndpoint": "https://platform.example/organization/123" + } \ No newline at end of file diff --git a/openapi/components/schemas/common/UsdaSc6.yml b/openapi/components/schemas/common/UsdaSc6.yml index c9257e8e0..b30415aaa 100644 --- a/openapi/components/schemas/common/UsdaSc6.yml +++ b/openapi/components/schemas/common/UsdaSc6.yml @@ -182,11 +182,11 @@ example: |- "type": [ "Organization" ], - "name": "Stehr - Mertz", - "description": "Optional zero administration paradigm", - "email": "Spencer.McClure32@example.net", - "phoneNumber": "555-966-4160", - "faxNumber": "555-413-4249" + "name": "Glayson & Co. Inspections", + "description": "Agricultural cleanliness & grade assurance", + "email": "Marina96@glaysonco.net", + "phoneNumber": "555-521-6143", + "faxNumber": "555-150-7668" }, "jobTitle": "Lead Response Assistant" }, @@ -292,9 +292,9 @@ example: |- "type": [ "Organization" ], - "name": "Leannon and Sons", - "description": "Fundamental multi-tasking service-desk", - "email": "Hipolito58@example.org", + "name": "Ace Foodstuffs", + "description": "Ag goods shipping & distribution", + "email": "Hipolito58@acefoodstuffs.org", "phoneNumber": "555-895-1661", "faxNumber": "555-497-2527" }, @@ -307,18 +307,18 @@ example: |- ], "shipper": { "type": "Organization", - "name": "Xxinau Manufacturing Co. Ltd.", - "description": "Advanced Production - Delivered", - "email": "xxinau-sales@example.org", - "phoneNumber": "+86-555-865-8495" + "name": "Green Fields", + "description": "Growing & packaging for high quality produce", + "email": "sales@greenfields.org", + "phoneNumber": "+1-555-865-8495" }, "purchaser": { "type": "Organization", - "name": "Lueilwitz - Kuvalis", - "description": "Persistent dynamic definition", - "email": "Greg_Swift94@example.net", - "phoneNumber": "555-149-2244", - "faxNumber": "555-419-4835" + "name": "Ace Foodstuffs", + "description": "Ag goods shipping & distribution", + "email": "Hipolito58@acefoodstuffs.org", + "phoneNumber": "555-895-1661", + "faxNumber": "555-497-2527" }, "carrier": { "type": [ @@ -329,7 +329,7 @@ example: |- }, "broker": { "type": "Organization", - "name": "Koch LLC", + "name": "Cole United", "leiCode": "54321351219389121979" } }, diff --git a/openapi/components/schemas/common/ppq203.yml b/openapi/components/schemas/common/ppq203.yml index bec0674e1..27fdcb840 100644 --- a/openapi/components/schemas/common/ppq203.yml +++ b/openapi/components/schemas/common/ppq203.yml @@ -114,7 +114,7 @@ example: |- "type": [ "ChemicalProperty" ], - "name": "Cesium" + "name": "Radon" }, "measurement": { "type": [ @@ -131,16 +131,18 @@ example: |- "date": "2019-12-11T03:50:55Z", "property": { "type": [ - "ChemicalProperty" + "MechanicalProperty" ], - "name": "Helium" + "identifier": "ISO 1352", + "name": "Torque-controlled fatigue testing", + "description": "ISO 1352:2011 specifies the conditions for performing torsional, constant-amplitude, nominally elastic stress fatigue tests on metallic specimens without deliberately introducing stress concentrations. The tests are carried out at ambient temperature (ideally at between 10 °C and 35 °C) in air by applying a pure couple to the specimen about its longitudinal axis." }, "measurement": { "type": [ "MeasuredValue" ], - "value": "41.660", - "unitCode": "P1" + "value": "00.00", + "unitCode": "UNKNOWN" } } ] diff --git a/openapi/components/schemas/common/ppq587.yml b/openapi/components/schemas/common/ppq587.yml index e4f82e46d..3a11d7f0d 100644 --- a/openapi/components/schemas/common/ppq587.yml +++ b/openapi/components/schemas/common/ppq587.yml @@ -169,9 +169,9 @@ example: |- "type": [ "Organization" ], - "name": "Leannon and Sons", - "description": "Fundamental multi-tasking service-desk", - "email": "Hipolito58@example.org", + "name": "Ace Foodstuffs", + "description": "Ag goods shipping & distribution", + "email": "Hipolito58@acefoodstuffs.org", "phoneNumber": "555-895-1661", "faxNumber": "555-497-2527" }, @@ -184,18 +184,18 @@ example: |- ], "shipper": { "type": "Organization", - "name": "Xxinau Manufacturing Co. Ltd.", - "description": "Advanced Production - Delivered", - "email": "xxinau-sales@example.org", - "phoneNumber": "+86-555-865-8495" + "name": "Green Fields", + "description": "Growing & packaging for high quality produce", + "email": "sales@greenfields.org", + "phoneNumber": "+1-555-865-8495" }, "purchaser": { "type": "Organization", - "name": "Lueilwitz - Kuvalis", - "description": "Persistent dynamic definition", - "email": "Greg_Swift94@example.net", - "phoneNumber": "555-149-2244", - "faxNumber": "555-419-4835" + "name": "Ace Foodstuffs", + "description": "Ag goods shipping & distribution", + "email": "Hipolito58@acefoodstuffs.org", + "phoneNumber": "555-895-1661", + "faxNumber": "555-497-2527" }, "carrier": { "type": [ diff --git a/openapi/openapi.yml b/openapi/openapi.yml index 4761eb673..edc433c4f 100644 --- a/openapi/openapi.yml +++ b/openapi/openapi.yml @@ -1184,6 +1184,18 @@ paths: $ref: './components/schemas/common/Template.yml' + /schemas/common/TraceabilityAPI.yml: + get: + tags: + - common + responses: + '200': + content: + application/yml: + schema: + $ref: './components/schemas/common/TraceabilityAPI.yml' + + /schemas/common/TradeLineItem.yml: get: tags: diff --git a/sections/vocab.html b/sections/vocab.html index 68e966bc6..b926559eb 100644 --- a/sections/vocab.html +++ b/sections/vocab.html @@ -90,8 +90,8 @@
An object which can be listed as a DID `service` to enable discovery for subsequent presentation exchange.
+ + + +@id | +https://w3id.org/traceability#TraceabilityAPI | +
schema | +https://w3id.org/traceability/openapi/components/schemas/common/TraceabilityAPI.yml | +
+{ + "id": "did:web:platform.example:organization:123#traceability-api", + "type": "TraceabilityAPI", + "serviceEndpoint": "https://platform.example/organization/123" +} ++ + +
Line items on trade documents such as Commercial Invoices. A trade line item describes separately identifiable product and packaging characteristics.
@@ -10212,11 +10168,11 @@