Merge pull request #941 from mesur-io/feat/remove-sizeoramount

Move sizeOrAmount to AgProduct
w3c-ccg · Mar 13, 2024 · 219cb3a · 219cb3a
2 parents 27362d1 + 073e545
commit 219cb3a
Show file tree

Hide file tree

Showing 29 changed files with 102 additions and 240 deletions.
diff --git a/docs/openapi/components/schemas/common/AgricultureActivity.yml b/docs/openapi/components/schemas/common/AgricultureActivity.yml
@@ -132,6 +132,13 @@ example: |-
           "AgricultureProduct"
         ],
         "plu": "94225",
+        "unitQuantity": {
+          "type": [
+            "QuantitativeValue"
+          ],
+          "unitCode": "boxes",
+          "value": "893"
+        },
         "product": {
           "type": [
             "Product"
@@ -145,13 +152,6 @@ example: |-
           },
           "name": "Avocados",
           "description": "Avocados, 4 pack boxes",
-          "sizeOrAmount": {
-            "type": [
-              "QuantitativeValue"
-            ],
-            "unitCode": "boxes",
-            "value": "893"
-          },
           "weight": {
             "type": [
               "QuantitativeValue"
@@ -183,13 +183,6 @@ example: |-
           },
           "name": "Tomatoes",
           "description": "Tomatoes, Cartons",
-          "sizeOrAmount": {
-            "type": [
-              "QuantitativeValue"
-            ],
-            "unitCode": "cartons",
-            "value": "348"
-          },
           "weight": {
             "type": [
               "QuantitativeValue"
@@ -199,6 +192,13 @@ example: |-
           },
           "sku": "164664203943"
         },
+        "unitQuantity": {
+          "type": [
+            "QuantitativeValue"
+          ],
+          "unitCode": "cartons",
+          "value": "348"
+        },
         "scientificName": "Solanum lycopersicum",
         "labelImageUrl": "https://img.example.org/033383401508/640/480/",
         "labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
@@ -246,4 +246,4 @@ example: |-
         }
       }
     ]
-  }
+  }
diff --git a/docs/openapi/components/schemas/common/AgricultureInspectionGeneric.yml b/docs/openapi/components/schemas/common/AgricultureInspectionGeneric.yml
@@ -261,13 +261,6 @@ example: |-
                 },
                 "name": "Avocados",
                 "description": "Avocados, 4 pack boxes",
-                "sizeOrAmount": {
-                  "type": [
-                    "QuantitativeValue"
-                  ],
-                  "unitCode": "hg/ha",
-                  "value": "60"
-                },
                 "weight": {
                   "type": [
                     "QuantitativeValue"

diff --git a/docs/openapi/components/schemas/common/AgriculturePackage.yml b/docs/openapi/components/schemas/common/AgriculturePackage.yml
@@ -145,13 +145,6 @@ example: |-
           },
           "name": "Avocados",
           "description": "Avocados, 4 pack boxes",
-          "sizeOrAmount": {
-            "type": [
-              "QuantitativeValue"
-            ],
-            "unitCode": "hg/ha",
-            "value": "60"
-          },
           "weight": {
             "type": [
               "QuantitativeValue"
@@ -183,13 +176,6 @@ example: |-
           },
           "name": "Avocados",
           "description": "Avocados, 4 pack boxes",
-          "sizeOrAmount": {
-            "type": [
-              "QuantitativeValue"
-            ],
-            "unitCode": "boxes",
-            "value": "893"
-          },
           "weight": {
             "type": [
               "QuantitativeValue"
@@ -199,6 +185,13 @@ example: |-
           },
           "sku": "563279941950"
         },
+        "unitQuantity": {
+          "type": [
+            "QuantitativeValue"
+          ],
+          "unitCode": "boxes",
+          "value": "893"
+        },
         "scientificName": "Persea americana",
         "labelImageUrl": "https://img.example.org/033383401508/640/480/",
         "labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"

diff --git a/docs/openapi/components/schemas/common/AgricultureParcelDelivery.yml b/docs/openapi/components/schemas/common/AgricultureParcelDelivery.yml
@@ -264,13 +264,6 @@ example: |-
               },
               "name": "Avocados",
               "description": "Avocados, 4 pack boxes",
-              "sizeOrAmount": {
-                "type": [
-                  "QuantitativeValue"
-                ],
-                "unitCode": "hg/ha",
-                "value": "60"
-              },
               "weight": {
                 "type": [
                   "QuantitativeValue"

diff --git a/docs/openapi/components/schemas/common/AgricultureProduct.yml b/docs/openapi/components/schemas/common/AgricultureProduct.yml
@@ -37,6 +37,13 @@ properties:
     $linkedData:
       term: product
       '@id': https://www.gs1.org/voc/Product
+  unitQuantity:
+    title: Unit Quantity
+    description: The quantity of units making up the product.
+    $ref: ./QuantitativeValue.yml
+    $linkedData:
+      term: unitQuantity
+      '@id': https://schema.org/value
   scientificName:
     title: Scientific Name
     description: >-
@@ -139,13 +146,6 @@ example: |-
       "countryOfOrigin": "United States",
       "name": "Handmade Fresh Hat",
       "description": "The Nagasaki Lander is the trademarked name of several series of Nagasaki sport bikes, that started with the 1984 ABC800J",
-      "sizeOrAmount": {
-        "type": [
-          "QuantitativeValue"
-        ],
-        "unitCode": "sqm",
-        "value": "47"
-      },
       "weight": {
         "type": [
           "QuantitativeValue"

diff --git a/docs/openapi/components/schemas/common/BillOfLading.yml b/docs/openapi/components/schemas/common/BillOfLading.yml
@@ -649,13 +649,6 @@ example: |-
                       }
                     }    
                   },
-                  "sizeOrAmount": {
-                    "type": [
-                      "QuantitativeValue"
-                    ],
-                    "unitCode": "boxes",
-                    "value": "500"
-                  },
                   "weight": {
                     "type": [
                       "QuantitativeValue"

diff --git a/docs/openapi/components/schemas/common/Event.yml b/docs/openapi/components/schemas/common/Event.yml
@@ -134,4 +134,4 @@ example: |-
     "products": [
       "http://example.org/products/05b6867b-2211-4c8f-ae7a-2a770b9510af?hl=ZfqLwiBj3yidP7p344d71z8ybyjb2+YVfhckGGHHEzk="
     ]
-  }
+  }
diff --git a/docs/openapi/components/schemas/common/FoodGradeInspection.yml b/docs/openapi/components/schemas/common/FoodGradeInspection.yml
@@ -259,13 +259,6 @@ example: |-
                 },
                 "name": "Avocados",
                 "description": "Avocados, 4 pack boxes",
-                "sizeOrAmount": {
-                  "type": [
-                    "QuantitativeValue"
-                  ],
-                  "unitCode": "hg/ha",
-                  "value": "60"
-                },
                 "weight": {
                   "type": [
                     "QuantitativeValue"
@@ -335,13 +328,6 @@ example: |-
             },
             "name": "Avocados",
             "description": "Avocados, 4 pack boxes",
-            "sizeOrAmount": {
-              "type": [
-                "QuantitativeValue"
-              ],
-              "unitCode": "hg/ha",
-              "value": "60"
-            },
             "weight": {
               "type": [
                 "QuantitativeValue"

diff --git a/docs/openapi/components/schemas/common/FoodGradeInspectionLot.yml b/docs/openapi/components/schemas/common/FoodGradeInspectionLot.yml
@@ -121,13 +121,6 @@ example: |-
         },
         "name": "Avocados",
         "description": "Avocados, 4 pack boxes",
-        "sizeOrAmount": {
-          "type": [
-            "QuantitativeValue"
-          ],
-          "unitCode": "hg/ha",
-          "value": "60"
-        },
         "weight": {
           "type": [
             "QuantitativeValue"

diff --git a/docs/openapi/components/schemas/common/GAPInspection.yml b/docs/openapi/components/schemas/common/GAPInspection.yml
@@ -326,13 +326,6 @@ example: |-
           },
           "name": "Tomatoes",
           "description": "Tomatoes, Cartons",
-          "sizeOrAmount": {
-            "type": [
-              "QuantitativeValue"
-            ],
-            "unitCode": "cartons",
-            "value": "348"
-          },
           "weight": {
             "type": [
               "QuantitativeValue"
@@ -342,6 +335,13 @@ example: |-
           },
           "sku": "164664203943"
         },
+        "unitQuantity": {
+          "type": [
+            "QuantitativeValue"
+          ],
+          "unitCode": "cartons",
+          "value": "348"
+        },
         "scientificName": "Solanum lycopersicum",
         "labelImageUrl": "https://img.example.org/033383401508/640/480/",
         "labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"

diff --git a/docs/openapi/components/schemas/common/GAPLocationCertification.yml b/docs/openapi/components/schemas/common/GAPLocationCertification.yml
@@ -173,13 +173,6 @@ example: |-
             },
             "name": "Tomatoes",
             "description": "Tomatoes, Cartons",
-            "sizeOrAmount": {
-              "type": [
-                "QuantitativeValue"
-              ],
-              "unitCode": "cartons",
-              "value": "348"
-            },
             "weight": {
               "type": [
                 "QuantitativeValue"
@@ -189,6 +182,13 @@ example: |-
             },
             "sku": "164664203943"
           },
+          "unitQuantity": {
+            "type": [
+              "QuantitativeValue"
+            ],
+            "unitCode": "cartons",
+            "value": "348"
+          },
           "scientificName": "Solanum lycopersicum",
           "labelImageUrl": "https://img.example.org/033383401508/640/480/",
           "labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"

diff --git a/docs/openapi/components/schemas/common/Inbond.yml b/docs/openapi/components/schemas/common/Inbond.yml
@@ -271,13 +271,6 @@ example: |-
       },
       "name": "Crude Oil Barrel",
       "description": "Heavy Sour Dilbit",
-      "sizeOrAmount": {
-        "type": [
-          "QuantitativeValue"
-        ],
-        "unitCode": "hg/ha",
-        "value": "7436"
-      },
       "weight": {
         "type": [
           "QuantitativeValue"

diff --git a/docs/openapi/components/schemas/common/OilAndGasDeliveryTicket.yml b/docs/openapi/components/schemas/common/OilAndGasDeliveryTicket.yml
@@ -173,13 +173,6 @@ example: |-
       },
       "name":"Crude Oil Barrel",
       "description":"Heavy Sour Dilbit",
-      "sizeOrAmount":{
-        "type":[
-          "QuantitativeValue"
-        ],
-        "unitCode":"hg/ha",
-        "value":"8438"
-      },
       "weight":{
         "type":[
           "QuantitativeValue"
@@ -306,4 +299,4 @@ example: |-
         }
       }
     ]
-  }
+  }
diff --git a/docs/openapi/components/schemas/common/OilAndGasProduct.yml b/docs/openapi/components/schemas/common/OilAndGasProduct.yml
@@ -167,20 +167,6 @@ example: |-
       },
       "name":"Crude Oil Barrel",
       "description":"Heavy Sour Dilbit",
-      "sizeOrAmount":{
-        "type":[
-          "QuantitativeValue"
-        ],
-        "unitCode":"hg/ha",
-        "value":"8438"
-      },
-      "weight":{
-        "type":[
-          "QuantitativeValue"
-        ],
-        "unitCode":"hg/ha",
-        "value":"9813"
-      },
       "sku":"391864383008",
       "commodity": {
         "type": ["Commodity"],

diff --git a/docs/openapi/components/schemas/common/OrganicProductCertificate.yml b/docs/openapi/components/schemas/common/OrganicProductCertificate.yml
@@ -61,13 +61,6 @@ example: |-
         },
         "name": "Tomatoes",
         "description": "Tomatoes, Cartons",
-        "sizeOrAmount": {
-          "type": [
-            "QuantitativeValue"
-          ],
-          "unitCode": "cartons",
-          "value": "348"
-        },
         "weight": {
           "type": [
             "QuantitativeValue"
@@ -78,6 +71,13 @@ example: |-
         "sku": "164664203943"
       },
       "scientificName": "Solanum lycopersicum",
+      "unitQuantity": {
+        "type": [
+          "QuantitativeValue"
+        ],
+        "unitCode": "cartons",
+        "value": "348"
+      },
       "labelImageUrl": "https://img.example.org/033383401508/640/480/",
       "labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
     },

diff --git a/docs/openapi/components/schemas/common/PlantSystemsInspection.yml b/docs/openapi/components/schemas/common/PlantSystemsInspection.yml
@@ -185,13 +185,6 @@ example: |-
           },
           "name": "Tomatoes",
           "description": "Tomatoes, Cartons",
-          "sizeOrAmount": {
-            "type": [
-              "QuantitativeValue"
-            ],
-            "unitCode": "cartons",
-            "value": "348"
-          },
           "weight": {
             "type": [
               "QuantitativeValue"
@@ -201,6 +194,13 @@ example: |-
           },
           "sku": "164664203943"
         },
+        "unitQuantity": {
+          "type": [
+            "QuantitativeValue"
+          ],
+          "unitCode": "cartons",
+          "value": "348"
+        },
         "scientificName": "Solanum lycopersicum",
         "labelImageUrl": "https://img.example.org/033383401508/640/480/",
         "labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-Original file line number
+Diff line change
@@ Expand Up / @@ -134,4 +134,4 @@ example: |- @@
         "products": [
           "http://example.org/products/05b6867b-2211-4c8f-ae7a-2a770b9510af?hl=ZfqLwiBj3yidP7p344d71z8ybyjb2+YVfhckGGHHEzk="
         ]
-      }
+      }