From 9d0ebbb0aae212edfbe5a3a46413820921e2f18e Mon Sep 17 00:00:00 2001 From: Russell Hofvendahl Date: Wed, 17 May 2023 13:56:48 -0700 Subject: [PATCH 01/11] feat: create extended product as an addition to USDASpecialtyCrops237AForm --- .../schemas/common/ExtendedProduct.yml | 81 +++++++++++++++++++ .../common/USDASpecialtyCrops237AForm.yml | 16 ++++ 2 files changed, 97 insertions(+) create mode 100644 docs/openapi/components/schemas/common/ExtendedProduct.yml diff --git a/docs/openapi/components/schemas/common/ExtendedProduct.yml b/docs/openapi/components/schemas/common/ExtendedProduct.yml new file mode 100644 index 000000000..7b5d13cbb --- /dev/null +++ b/docs/openapi/components/schemas/common/ExtendedProduct.yml @@ -0,0 +1,81 @@ +$linkedData: + term: ExtendedProduct + '@id': https://w3id.org/traceability#ExtendedProduct +title: Extended Product +description: Extended product information. +type: object +properties: + type: + type: array + readOnly: true + const: + - ExtendedProduct + default: + - ExtendedProduct + items: + type: string + enum: + - ExtendedProduct + origination: + title: Origination + description: The place of origin. + $ref: ./Place.yml + $linkedData: + term: origination + '@id': https://service.unece.org/trade/uncefact/vocabulary/uncefact/#originLocation + supplier: + title: Supplier + description: The supplier for this product. + $ref: ./Organization.yml + $linkedData: + term: supplier + '@id': https://www.gs1.org/voc/manufacturer + htsCode: + title: HTS Code + description: The Harmonized Tariff Schedule (HTS) code. + type: string + $linkedData: + term: htsCode + '@id': https://vocabulary.uncefact.org/applicableRegulatoryProcedure + gtin: + title: GTIN + description: The Global Trade Item Number (GTIN). + type: string + $linkedData: + term: gtin + '@id': https://www.gs1.org/voc/gtin +additionalProperties: true +required: + - type +example: |- + { + "type": ["ExtendedProduct"], + "origination": { + "type": [ + "Place" + ], + "globalLocationNumber": "5449782976823", + "address": { + "type": [ + "PostalAddress" + ], + "name": "Miracle Produce", + "streetAddress": "853 Wisozk River", + "addressLocality": "New Noemyfort", + "addressRegion": "New Mexico", + "postalCode": "18047-2038", + "addressCountry": "Togo" + }, + "unLocode": "DKCPH" + }, + "supplier": { + "type" : ["Organization"], + "name": "Miracle Produce", + "description": "Organic fruits & vegetables", + "email": "contact@example.com", + "phoneNumber": "+1-460-555-2604", + "url": "miracle.example.com" + }, + "htsCode": "6603.20.3000", + "gtin": "614141007349" + } diff --git a/docs/openapi/components/schemas/common/USDASpecialtyCrops237AForm.yml b/docs/openapi/components/schemas/common/USDASpecialtyCrops237AForm.yml index 0ec23565b..dba8b0c5c 100644 --- a/docs/openapi/components/schemas/common/USDASpecialtyCrops237AForm.yml +++ b/docs/openapi/components/schemas/common/USDASpecialtyCrops237AForm.yml @@ -85,6 +85,22 @@ properties: $linkedData: term: auditProgramsRequested '@id': https://www.gs1.org/voc/certificationType + countByInspector: + title: Count by Inspector + description: Whether the count of the packages was counted by the inspector. + type: boolean + $linkedData: + term: countByInspector + '@id': https://schema.org/values + extendedProduct: + title: Extended Product + description: Extended product information. + type: array + items: + $ref: ./ExtendedProduct.yml + $linkedData: + term: extendedProduct + '@id': https://www.gs1.org/voc/certificationSubject additionalRemarks: title: Additional Remarks description: Any additional remarks regarding the application. From cb0c59f3b4bdd3addf672f48c596451212ebbf8d Mon Sep 17 00:00:00 2001 From: Russell Hofvendahl Date: Wed, 17 May 2023 13:57:47 -0700 Subject: [PATCH 02/11] chore: fill out examples for SC327A schema --- .../common/USDASpecialtyCrops237AForm.yml | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/docs/openapi/components/schemas/common/USDASpecialtyCrops237AForm.yml b/docs/openapi/components/schemas/common/USDASpecialtyCrops237AForm.yml index dba8b0c5c..7463c6574 100644 --- a/docs/openapi/components/schemas/common/USDASpecialtyCrops237AForm.yml +++ b/docs/openapi/components/schemas/common/USDASpecialtyCrops237AForm.yml @@ -205,5 +205,39 @@ example: |- "auditProgramsRequested": [ "Produce GAPs Harmonized Audit: Field Operations & Harvesting", "Plant Systems Audit" + ], + "countByInspector": true, + "extendedProduct": [ + { + "type": ["ExtendedProduct"], + "origination": { + "type": [ + "Place" + ], + "globalLocationNumber": "5449782976823", + "address": { + "type": [ + "PostalAddress" + ], + "name": "Miracle Produce", + "streetAddress": "853 Wisozk River", + "addressLocality": "New Noemyfort", + "addressRegion": "New Mexico", + "postalCode": "18047-2038", + "addressCountry": "Togo" + }, + "unLocode": "DKCPH" + }, + "supplier": { + "type" : ["Organization"], + "name": "Miracle Produce", + "description": "Organic fruits & vegetables", + "email": "contact@example.com", + "phoneNumber": "+1-460-555-2604", + "url": "miracle.example.com" + }, + "htsCode": "6603.20.3000", + "gtin": "614141007349" + } ] } From ad91917b9693b32f7a6d17e15442347263f75632 Mon Sep 17 00:00:00 2001 From: Russell Hofvendahl Date: Wed, 17 May 2023 14:00:10 -0700 Subject: [PATCH 03/11] feat: add additional fields to AgricultureProduct --- .../schemas/common/AgricultureProduct.yml | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/docs/openapi/components/schemas/common/AgricultureProduct.yml b/docs/openapi/components/schemas/common/AgricultureProduct.yml index 8b69e181d..1eadb0866 100644 --- a/docs/openapi/components/schemas/common/AgricultureProduct.yml +++ b/docs/openapi/components/schemas/common/AgricultureProduct.yml @@ -40,7 +40,7 @@ properties: type: string $linkedData: term: plu - '@id': https://w3id.org/traceability#plu + '@id': https://schema.org/identifier gtin: title: GTIN Code description: >- @@ -120,6 +120,27 @@ properties: $linkedData: term: productImageHash '@id': https://w3id.org/traceability#productImageHash + variety: + title: Variety + description: "Additional details regarding the product. For example, in this case of potatoes this might include: russet, white, yellow flesh, etc." + type: string + $linkedData: + term: variety + '@id': https://www.gs1.org/voc/additionalProductDescription + commodityDesignation: + title: Commodity Designation + description: "Additional product subcategories such as: frozen, fresh, sliced, canned, dried, dehydrated, etc." + type: string + $linkedData: + term: commodityDesignation + '@id': https://www.gs1.org/voc/additionalProductDescription + packType: + title: Pack Type + description: "Details like: volume filled, tray pack, 18/lb consumer units, 10/5 pound bags, etc." + type: string + $linkedData: + term: packType + '@id': AAAA additionalProperties: true required: - type @@ -164,5 +185,8 @@ example: |- "labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "name": "Avocados", "productImageUrl": "https://img.example.org/102934920857/937/903/", - "productImageHash": "8kb47j986hklhde4rfh78okjhgjo08765fgu7tfg4t864fy876rfser45thj87f3" + "productImageHash": "8kb47j986hklhde4rfh78okjhgjo08765fgu7tfg4t864fy876rfser45thj87f3", + "variety": "Firm", + "commodityDesignation": "Whole, fresh", + "packType": "4-pack boxes" } From 2d964ee464ca998cdecf0914d0b9036e6fbc7a22 Mon Sep 17 00:00:00 2001 From: Russell Hofvendahl Date: Wed, 17 May 2023 14:01:48 -0700 Subject: [PATCH 04/11] chore: re-sign credentials --- .../schemas/credentials/FoodGradeInspectionCredential.yml | 4 ++-- .../schemas/credentials/GAPInspectionCredential.yml | 4 ++-- .../schemas/credentials/PlantSystemsInspectionCredential.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/openapi/components/schemas/credentials/FoodGradeInspectionCredential.yml b/docs/openapi/components/schemas/credentials/FoodGradeInspectionCredential.yml index c534c1b52..f5175bbfb 100644 --- a/docs/openapi/components/schemas/credentials/FoodGradeInspectionCredential.yml +++ b/docs/openapi/components/schemas/credentials/FoodGradeInspectionCredential.yml @@ -569,9 +569,9 @@ example: |- }, "proof": { "type": "Ed25519Signature2018", - "created": "2023-04-04T21:38:53Z", + "created": "2023-04-20T05:50:42Z", "verificationMethod": "did:key:z6MktHQo3fRRohk44dsbE76CuiTpBmyMWq2VVjvV6aBSeE3U#z6MktHQo3fRRohk44dsbE76CuiTpBmyMWq2VVjvV6aBSeE3U", "proofPurpose": "assertionMethod", - "jws": "eyJhbGciOiJFZERTQSIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..NCrVGyaEDubvb5ReKCKiU6CK5KYKcOfgUE2wozM5o37ZNenrxbpReO2z-xME7VKvC25TDEeSnUCau3rZajsyCQ" + "jws": "eyJhbGciOiJFZERTQSIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..5DDErPMk272t1zoky2VfuBIPxoRp6q_SFyEZiCnpiwxd8cYNRKGyFkl8m5hccDgkfKQR39hVQk_IkdB46fWXBA" } } \ No newline at end of file diff --git a/docs/openapi/components/schemas/credentials/GAPInspectionCredential.yml b/docs/openapi/components/schemas/credentials/GAPInspectionCredential.yml index 220c29aad..9da83ac88 100644 --- a/docs/openapi/components/schemas/credentials/GAPInspectionCredential.yml +++ b/docs/openapi/components/schemas/credentials/GAPInspectionCredential.yml @@ -373,9 +373,9 @@ example: |- }, "proof": { "type": "Ed25519Signature2018", - "created": "2023-04-04T21:38:58Z", + "created": "2023-04-20T05:50:44Z", "verificationMethod": "did:key:z6MktHQo3fRRohk44dsbE76CuiTpBmyMWq2VVjvV6aBSeE3U#z6MktHQo3fRRohk44dsbE76CuiTpBmyMWq2VVjvV6aBSeE3U", "proofPurpose": "assertionMethod", - "jws": "eyJhbGciOiJFZERTQSIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..T9qRYE5iZPycFKUFV_kgb0uTw1RFabsDY2d4Q7_CaRkdatYuJqdDbA7dqD5Fkb0nzEaMOkODqUHkL5GBRkS6Cw" + "jws": "eyJhbGciOiJFZERTQSIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..sdUncbjXudycJCxDAJkA5XWCAN00H5R7hlMdYu3tGPrEDztfMRwlqgQYaZMzeTKoEDZ61AoT5MHEXYBc-iZBBQ" } } diff --git a/docs/openapi/components/schemas/credentials/PlantSystemsInspectionCredential.yml b/docs/openapi/components/schemas/credentials/PlantSystemsInspectionCredential.yml index 6bf1cd514..1c7231541 100644 --- a/docs/openapi/components/schemas/credentials/PlantSystemsInspectionCredential.yml +++ b/docs/openapi/components/schemas/credentials/PlantSystemsInspectionCredential.yml @@ -320,9 +320,9 @@ example: |- }, "proof": { "type": "Ed25519Signature2018", - "created": "2023-04-04T21:39:18Z", + "created": "2023-04-20T05:50:52Z", "verificationMethod": "did:key:z6MktHQo3fRRohk44dsbE76CuiTpBmyMWq2VVjvV6aBSeE3U#z6MktHQo3fRRohk44dsbE76CuiTpBmyMWq2VVjvV6aBSeE3U", "proofPurpose": "assertionMethod", - "jws": "eyJhbGciOiJFZERTQSIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..ATyNemG9pm48sOITEigC1ugotbW3JdZYk4ycA33vuDc5g8qISp7TGqEdlTJSpFx83SELujocaIWfSzRYfjUCCw" + "jws": "eyJhbGciOiJFZERTQSIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19.._8ApOATCRkgBSh4p5FksMAJDSGwCMlcHnoHfrxwkj8IFiBzC-wtgUWwmyYffW4R0YVIWYf5LnBDM_WDFglV0Ag" } } From c460abc0c1d01f324b5fc7f32d1746645046cb5c Mon Sep 17 00:00:00 2001 From: Russell Hofvendahl Date: Mon, 22 May 2023 11:05:29 -0700 Subject: [PATCH 05/11] fix: address term id issues --- .../components/schemas/common/AgricultureProduct.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/openapi/components/schemas/common/AgricultureProduct.yml b/docs/openapi/components/schemas/common/AgricultureProduct.yml index 1eadb0866..c56ad2451 100644 --- a/docs/openapi/components/schemas/common/AgricultureProduct.yml +++ b/docs/openapi/components/schemas/common/AgricultureProduct.yml @@ -40,7 +40,7 @@ properties: type: string $linkedData: term: plu - '@id': https://schema.org/identifier + '@id': https://www.ifpsglobal.com/PLU-Codes gtin: title: GTIN Code description: >- @@ -126,7 +126,7 @@ properties: type: string $linkedData: term: variety - '@id': https://www.gs1.org/voc/additionalProductDescription + '@id': https://www.gs1.org/voc/consumerProductVariant commodityDesignation: title: Commodity Designation description: "Additional product subcategories such as: frozen, fresh, sliced, canned, dried, dehydrated, etc." @@ -140,7 +140,7 @@ properties: type: string $linkedData: term: packType - '@id': AAAA + '@id': https://www.gs1.org/voc/packaging additionalProperties: true required: - type From 7f7cd5da9268c43759ebb33d679dc13dce825db0 Mon Sep 17 00:00:00 2001 From: Russell Hofvendahl Date: Mon, 22 May 2023 11:34:33 -0700 Subject: [PATCH 06/11] chore: update extendedproduct term ids --- docs/openapi/components/schemas/common/ExtendedProduct.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/openapi/components/schemas/common/ExtendedProduct.yml b/docs/openapi/components/schemas/common/ExtendedProduct.yml index 7b5d13cbb..66813be6b 100644 --- a/docs/openapi/components/schemas/common/ExtendedProduct.yml +++ b/docs/openapi/components/schemas/common/ExtendedProduct.yml @@ -36,7 +36,7 @@ properties: type: string $linkedData: term: htsCode - '@id': https://vocabulary.uncefact.org/applicableRegulatoryProcedure + '@id': https://service.unece.org/trade/uncefact/vocabulary/uncefact/#applicableTax gtin: title: GTIN description: The Global Trade Item Number (GTIN). From e35f8aefc84772d7e0601b307f197f701c84a930 Mon Sep 17 00:00:00 2001 From: Russell Hofvendahl Date: Mon, 2 Oct 2023 16:24:26 -0700 Subject: [PATCH 07/11] feat: fold ExtendedProduct into existing schemas --- .../schemas/common/AgricultureProduct.yml | 7 -- .../schemas/common/ExtendedProduct.yml | 81 ------------------- .../components/schemas/common/Product.yml | 18 +++-- .../common/USDASpecialtyCrops237AForm.yml | 9 --- 4 files changed, 13 insertions(+), 102 deletions(-) delete mode 100644 docs/openapi/components/schemas/common/ExtendedProduct.yml diff --git a/docs/openapi/components/schemas/common/AgricultureProduct.yml b/docs/openapi/components/schemas/common/AgricultureProduct.yml index bba525a5f..6b8ecbb84 100644 --- a/docs/openapi/components/schemas/common/AgricultureProduct.yml +++ b/docs/openapi/components/schemas/common/AgricultureProduct.yml @@ -30,13 +30,6 @@ properties: $linkedData: term: plu '@id': https://schema.org/identifier - countryOfOrigin: - title: Country of Origin - description: The country in which this product originated. - type: string - $linkedData: - term: countryOfOrigin - '@id': https://vocabulary.uncefact.org/originCountry product: title: Product description: Product details as specified in the Product schema. diff --git a/docs/openapi/components/schemas/common/ExtendedProduct.yml b/docs/openapi/components/schemas/common/ExtendedProduct.yml deleted file mode 100644 index 66813be6b..000000000 --- a/docs/openapi/components/schemas/common/ExtendedProduct.yml +++ /dev/null @@ -1,81 +0,0 @@ -$linkedData: - term: ExtendedProduct - '@id': https://w3id.org/traceability#ExtendedProduct -title: Extended Product -description: Extended product information. -type: object -properties: - type: - type: array - readOnly: true - const: - - ExtendedProduct - default: - - ExtendedProduct - items: - type: string - enum: - - ExtendedProduct - origination: - title: Origination - description: The place of origin. - $ref: ./Place.yml - $linkedData: - term: origination - '@id': https://service.unece.org/trade/uncefact/vocabulary/uncefact/#originLocation - supplier: - title: Supplier - description: The supplier for this product. - $ref: ./Organization.yml - $linkedData: - term: supplier - '@id': https://www.gs1.org/voc/manufacturer - htsCode: - title: HTS Code - description: The Harmonized Tariff Schedule (HTS) code. - type: string - $linkedData: - term: htsCode - '@id': https://service.unece.org/trade/uncefact/vocabulary/uncefact/#applicableTax - gtin: - title: GTIN - description: The Global Trade Item Number (GTIN). - type: string - $linkedData: - term: gtin - '@id': https://www.gs1.org/voc/gtin -additionalProperties: true -required: - - type -example: |- - { - "type": ["ExtendedProduct"], - "origination": { - "type": [ - "Place" - ], - "globalLocationNumber": "5449782976823", - "address": { - "type": [ - "PostalAddress" - ], - "name": "Miracle Produce", - "streetAddress": "853 Wisozk River", - "addressLocality": "New Noemyfort", - "addressRegion": "New Mexico", - "postalCode": "18047-2038", - "addressCountry": "Togo" - }, - "unLocode": "DKCPH" - }, - "supplier": { - "type" : ["Organization"], - "name": "Miracle Produce", - "description": "Organic fruits & vegetables", - "email": "contact@example.com", - "phoneNumber": "+1-460-555-2604", - "url": "miracle.example.com" - }, - "htsCode": "6603.20.3000", - "gtin": "614141007349" - } diff --git a/docs/openapi/components/schemas/common/Product.yml b/docs/openapi/components/schemas/common/Product.yml index a86737246..66a9336a8 100644 --- a/docs/openapi/components/schemas/common/Product.yml +++ b/docs/openapi/components/schemas/common/Product.yml @@ -39,13 +39,13 @@ properties: $linkedData: term: manufacturer '@id': https://schema.org/manufacturer - countryOfOrigin: - title: Country of Origin - description: The country in which this product originated. + placeOfOrigin: + title: Place of Origin + description: The place in which this product originated. type: string $linkedData: - term: countryOfOrigin - '@id': https://vocabulary.uncefact.org/originCountry + term: placeOfOrigin + '@id': https://vocabulary.uncefact.org/originLocation name: title: Name description: Name of the shipment item(s) @@ -164,6 +164,14 @@ properties: $linkedData: term: imageHash '@id': https://schema.org/sha256 + htsCode: + title: HTS Code + description: The Harmonized Tariff Schedule (HTS) code, if applicable. + type: string + $linkedData: + term: htsCode + '@id': https://service.unece.org/trade/uncefact/vocabulary/uncefact/#applicableTax + additionalProperties: false required: - type diff --git a/docs/openapi/components/schemas/common/USDASpecialtyCrops237AForm.yml b/docs/openapi/components/schemas/common/USDASpecialtyCrops237AForm.yml index 9927ed4ab..1f2c6f111 100644 --- a/docs/openapi/components/schemas/common/USDASpecialtyCrops237AForm.yml +++ b/docs/openapi/components/schemas/common/USDASpecialtyCrops237AForm.yml @@ -92,15 +92,6 @@ properties: $linkedData: term: countByInspector '@id': https://schema.org/values - extendedProduct: - title: Extended Product - description: Extended product information. - type: array - items: - $ref: ./ExtendedProduct.yml - $linkedData: - term: extendedProduct - '@id': https://www.gs1.org/voc/certificationSubject additionalRemarks: title: Additional Remarks description: Any additional remarks regarding the application. From 84ea6fdab00fe7c5f329addfeb79ce592f5bf5fc Mon Sep 17 00:00:00 2001 From: Russell Hofvendahl Date: Mon, 2 Oct 2023 16:27:06 -0700 Subject: [PATCH 08/11] feat: revert placeOfOrigin to countryOfOrigin --- docs/openapi/components/schemas/common/Product.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/openapi/components/schemas/common/Product.yml b/docs/openapi/components/schemas/common/Product.yml index 66a9336a8..4a9e3b680 100644 --- a/docs/openapi/components/schemas/common/Product.yml +++ b/docs/openapi/components/schemas/common/Product.yml @@ -39,13 +39,13 @@ properties: $linkedData: term: manufacturer '@id': https://schema.org/manufacturer - placeOfOrigin: - title: Place of Origin - description: The place in which this product originated. + countryOfOrigin: + title: Country of Origin + description: The country in which this product originated. type: string $linkedData: - term: placeOfOrigin - '@id': https://vocabulary.uncefact.org/originLocation + term: countryOfOrigin + '@id': https://vocabulary.uncefact.org/originCountry name: title: Name description: Name of the shipment item(s) From 29313d56250e14d2cc53f64ecc84424ddd1485fa Mon Sep 17 00:00:00 2001 From: Russell Hofvendahl Date: Mon, 2 Oct 2023 16:30:58 -0700 Subject: [PATCH 09/11] fix: update USDA 237a example --- .../common/USDASpecialtyCrops237AForm.yml | 35 +------------------ 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/docs/openapi/components/schemas/common/USDASpecialtyCrops237AForm.yml b/docs/openapi/components/schemas/common/USDASpecialtyCrops237AForm.yml index 1f2c6f111..2ef4bf560 100644 --- a/docs/openapi/components/schemas/common/USDASpecialtyCrops237AForm.yml +++ b/docs/openapi/components/schemas/common/USDASpecialtyCrops237AForm.yml @@ -192,38 +192,5 @@ example: |- "Produce GAPs Harmonized Audit: Field Operations & Harvesting", "Plant Systems Audit" ], - "countByInspector": true, - "extendedProduct": [ - { - "type": ["ExtendedProduct"], - "origination": { - "type": [ - "Place" - ], - "globalLocationNumber": "5449782976823", - "address": { - "type": [ - "PostalAddress" - ], - "name": "Miracle Produce", - "streetAddress": "853 Wisozk River", - "addressLocality": "New Noemyfort", - "addressRegion": "New Mexico", - "postalCode": "18047-2038", - "addressCountry": "Togo" - }, - "unLocode": "DKCPH" - }, - "supplier": { - "type" : ["Organization"], - "name": "Miracle Produce", - "description": "Organic fruits & vegetables", - "email": "contact@example.com", - "phoneNumber": "+1-460-555-2604", - "url": "miracle.example.com" - }, - "htsCode": "6603.20.3000", - "gtin": "614141007349" - } - ] + "countByInspector": true } From 058e52f21a953cf61992ba23485e50942cc6243f Mon Sep 17 00:00:00 2001 From: Russell Hofvendahl Date: Mon, 2 Oct 2023 16:35:13 -0700 Subject: [PATCH 10/11] chore: update openapi --- docs/openapi/openapi.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/docs/openapi/openapi.yml b/docs/openapi/openapi.yml index 5d6f6b5ac..156c1ae71 100644 --- a/docs/openapi/openapi.yml +++ b/docs/openapi/openapi.yml @@ -2060,7 +2060,7 @@ paths: $ref: './components/schemas/common/USMCACertifier.yml' - /schemas/common/USMCAProductSpecifier.yml: + /schemas/common/USMCAClaims.yml: get: tags: - common @@ -2069,7 +2069,19 @@ paths: content: application/yml: schema: - $ref: './components/schemas/common/USMCAProductSpecifier.yml' + $ref: './components/schemas/common/USMCAClaims.yml' + + + /schemas/common/USMCAProduct.yml: + get: + tags: + - common + responses: + '200': + content: + application/yml: + schema: + $ref: './components/schemas/common/USMCAProduct.yml' /schemas/common/UsdaSc6.yml: From 4d708d70a991d464eca52fb47c4e38ab4a99032e Mon Sep 17 00:00:00 2001 From: Russell Hofvendahl Date: Tue, 3 Oct 2023 10:09:19 -0700 Subject: [PATCH 11/11] chore: syntax tweaks --- docs/openapi/components/schemas/common/AgricultureProduct.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/openapi/components/schemas/common/AgricultureProduct.yml b/docs/openapi/components/schemas/common/AgricultureProduct.yml index 6b8ecbb84..b48fa8fe9 100644 --- a/docs/openapi/components/schemas/common/AgricultureProduct.yml +++ b/docs/openapi/components/schemas/common/AgricultureProduct.yml @@ -72,7 +72,7 @@ properties: '@id': https://w3id.org/traceability#labelImageHash name: title: Name - description: Name of the ag. product. + description: Name of the agricultural product. type: string $linkedData: term: name @@ -95,7 +95,7 @@ properties: '@id': https://w3id.org/traceability#productImageHash variety: title: Variety - description: "Additional details regarding the product. For example, in this case of potatoes this might include: russet, white, yellow flesh, etc." + description: "Additional details regarding the product. For example, in this case of potatoes, this might include: russet, white, yellow flesh, etc." type: string $linkedData: term: variety