Merge pull request #933 from mesur-io/feat/misc-ag-fixes

Misc ag fixes (AgPackage dates, GAPInspection harvestCompany)
w3c-ccg · Feb 20, 2024 · d9bf7f2 · d9bf7f2
2 parents eb8f1b2 + 2385774
commit d9bf7f2
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 20 deletions.
diff --git a/docs/openapi/components/schemas/common/AgricultureInspectionGeneric.yml b/docs/openapi/components/schemas/common/AgricultureInspectionGeneric.yml
@@ -239,7 +239,7 @@ example: |-
             "phoneNumber": "+1-383-555-4822"
           },
           "voicePickCode": "4642",
-          "date": "2021-03-14",
+          "harvestDate": "2021-03-14",
           "labelImageUrl": "https://img.example.org/640/480/",
           "labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
           "agricultureProduct": [

diff --git a/docs/openapi/components/schemas/common/AgriculturePackage.yml b/docs/openapi/components/schemas/common/AgriculturePackage.yml
@@ -54,14 +54,29 @@ properties:
     $linkedData:
       term: voicePickCode
       '@id': https://w3id.org/traceability#voicePickCode
-  date:
-    title: Packing, Harvest, or Best By Date
+  packingDate:
+    title: Packing Date
     description: >-
-      Human readable date describing the date the package was packed, harvested,
-      or is 'best by.'
+      Human readable date describing the date the package was packed.
     type: string
     $linkedData:
-      term: date
+      term: packingDate
+      '@id': https://schema.org/DateTime
+  harvestDate:
+    title: Harvest Date
+    description: >-
+      Human readable date describing the date the package was harvested.
+    type: string
+    $linkedData:
+      term: harvestDate
+      '@id': https://schema.org/DateTime
+  bestByDate:
+    title: Best By Date
+    description: >-
+      Human readable date describing the date the package is 'best by'.
+    type: string
+    $linkedData:
+      term: bestByDate
       '@id': https://schema.org/DateTime
   labelImageUrl:
     title: Label Image URL
@@ -108,7 +123,7 @@ example: |-
       "phoneNumber": "+1-632-555-6601"
     },
     "voicePickCode": "4642",
-    "date": "2021-03-14",
+    "harvestDate": "2021-03-14",
     "labelImageUrl": "https://img.example.org/640/480/",
     "labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
     "agricultureProduct": [
@@ -189,4 +204,4 @@ example: |-
         "labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
       }
     ]
-  }
+  }
diff --git a/docs/openapi/components/schemas/common/AgricultureParcelDelivery.yml b/docs/openapi/components/schemas/common/AgricultureParcelDelivery.yml
@@ -242,7 +242,7 @@ example: |-
           "phoneNumber": "+1-470-555-7721"
         },
         "voicePickCode": "4642",
-        "date": "2021-03-14",
+        "harvestDate": "2021-03-14",
         "labelImageUrl": "https://img.example.org/640/480/",
         "labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
         "agricultureProduct": [

diff --git a/docs/openapi/components/schemas/common/AgricultureProduct.yml b/docs/openapi/components/schemas/common/AgricultureProduct.yml
@@ -53,7 +53,7 @@ properties:
     type: string
     $linkedData:
       term: plantParts
-      '@id': https://schema.org/description
+    '@id': https://schema.org/description
   labelImageUrl:
     title: Label Image URL
     description: Image of the package label.

diff --git a/docs/openapi/components/schemas/common/FoodGradeInspection.yml b/docs/openapi/components/schemas/common/FoodGradeInspection.yml
@@ -237,7 +237,7 @@ example: |-
             "phoneNumber": "+1-130-555-2218"
           },
           "voicePickCode": "4642",
-          "date": "2021-03-14",
+          "harvestDate": "2021-03-14",
           "labelImageUrl": "https://img.example.org/640/480/",
           "labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
           "agricultureProduct": [

diff --git a/docs/openapi/components/schemas/common/GAPInspection.yml b/docs/openapi/components/schemas/common/GAPInspection.yml
@@ -54,7 +54,7 @@ properties:
   harvestCompany:
     title: Harvest Company
     description: The harvest company if a separate contracted company is used to harvest the crop.
-    type: string
+    $ref: ./Organization.yml
     $linkedData:
       term: harvestCompany
       '@id': https://vocabulary.uncefact.org/associatedParty

diff --git a/docs/openapi/components/schemas/common/USDAPPQ203ForeignSiteInspection.yml b/docs/openapi/components/schemas/common/USDAPPQ203ForeignSiteInspection.yml
@@ -217,7 +217,7 @@ example: |-
             "phoneNumber": "+1-224-555-4962"
           },
           "voicePickCode": "4642",
-          "date": "2021-03-14",
+          "harvestDate": "2021-03-14",
           "labelImageUrl": "https://img.example.org/640/480/",
           "labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
           "agricultureProduct": [
@@ -334,4 +334,4 @@ example: |-
         }
       }
     ]
-  }
+  }
diff --git a/docs/openapi/components/schemas/common/USDAPPQ309APestInterceptionRecord.yml b/docs/openapi/components/schemas/common/USDAPPQ309APestInterceptionRecord.yml
@@ -266,7 +266,7 @@ example: |-
         "phoneNumber": "+1-426-555-4205"
       },
       "voicePickCode": "4642",
-      "date": "2021-03-14",
+      "harvestDate": "2021-03-14",
       "labelImageUrl": "https://img.example.org/640/480/",
       "labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
       "agricultureProduct": [

diff --git a/docs/openapi/components/schemas/common/USDAPPQ368NoticeOfArrival.yml b/docs/openapi/components/schemas/common/USDAPPQ368NoticeOfArrival.yml
@@ -146,7 +146,7 @@ example: |-
             "phoneNumber": "+1-120-555-3811"
           },
           "voicePickCode": "4642",
-          "date": "2021-03-14",
+          "harvestDate": "2021-03-14",
           "labelImageUrl": "https://img.example.org/640/480/",
           "labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
           "agricultureProduct": [

diff --git a/docs/openapi/components/schemas/common/USDAPPQ429FumigationRecord.yml b/docs/openapi/components/schemas/common/USDAPPQ429FumigationRecord.yml
@@ -440,7 +440,7 @@ example: |-
             "phoneNumber": "+1-642-555-2793"
           },
           "voicePickCode": "4642",
-          "date": "2021-03-14",
+          "harvestDate": "2021-03-14",
           "labelImageUrl": "https://img.example.org/640/480/",
           "labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
           "agricultureProduct": [

diff --git a/docs/openapi/components/schemas/common/USDAPPQ505PlantDeclaration.yml b/docs/openapi/components/schemas/common/USDAPPQ505PlantDeclaration.yml
@@ -106,7 +106,7 @@ example: |-
             "phoneNumber": "+1-445-555-2091"
           },
           "voicePickCode": "4642",
-          "date": "2021-03-14",
+          "harvestDate": "2021-03-14",
           "labelImageUrl": "https://img.example.org/640/480/",
           "labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
           "agricultureProduct": [
@@ -212,4 +212,4 @@ example: |-
       "jobTitle": "Import Specialist"
     },
     "date": "2022-04-21"
-  }
+  }
diff --git a/docs/openapi/components/schemas/credentials/FoodGradeInspectionCredential.yml b/docs/openapi/components/schemas/credentials/FoodGradeInspectionCredential.yml
@@ -298,7 +298,7 @@ example: |-
               "phoneNumber": "+1-750-555-5996"
             },
             "voicePickCode": "4642",
-            "date": "2021-03-14",
+            "harvestDate": "2021-03-14",
             "labelImageUrl": "https://img.example.org/640/480/",
             "labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
             "agricultureProduct": [