Skip to content

Commit

Permalink
Merge pull request #941 from mesur-io/feat/remove-sizeoramount
Browse files Browse the repository at this point in the history
Move sizeOrAmount to AgProduct
rhofvendahl authored Mar 13, 2024
2 parents 27362d1 + 073e545 commit 219cb3a
Showing 29 changed files with 102 additions and 240 deletions.
30 changes: 15 additions & 15 deletions docs/openapi/components/schemas/common/AgricultureActivity.yml
Original file line number Diff line number Diff line change
@@ -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: |-
}
}
]
}
}
Original file line number Diff line number Diff line change
@@ -261,13 +261,6 @@ example: |-
},
"name": "Avocados",
"description": "Avocados, 4 pack boxes",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "hg/ha",
"value": "60"
},
"weight": {
"type": [
"QuantitativeValue"
21 changes: 7 additions & 14 deletions docs/openapi/components/schemas/common/AgriculturePackage.yml
Original file line number Diff line number Diff line change
@@ -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"
Original file line number Diff line number Diff line change
@@ -264,13 +264,6 @@ example: |-
},
"name": "Avocados",
"description": "Avocados, 4 pack boxes",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "hg/ha",
"value": "60"
},
"weight": {
"type": [
"QuantitativeValue"
14 changes: 7 additions & 7 deletions docs/openapi/components/schemas/common/AgricultureProduct.yml
Original file line number Diff line number Diff line change
@@ -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"
7 changes: 0 additions & 7 deletions docs/openapi/components/schemas/common/BillOfLading.yml
Original file line number Diff line number Diff line change
@@ -649,13 +649,6 @@ example: |-
}
}
},
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "boxes",
"value": "500"
},
"weight": {
"type": [
"QuantitativeValue"
2 changes: 1 addition & 1 deletion docs/openapi/components/schemas/common/Event.yml
Original file line number Diff line number Diff line change
@@ -134,4 +134,4 @@ example: |-
"products": [
"http://example.org/products/05b6867b-2211-4c8f-ae7a-2a770b9510af?hl=ZfqLwiBj3yidP7p344d71z8ybyjb2+YVfhckGGHHEzk="
]
}
}
14 changes: 0 additions & 14 deletions docs/openapi/components/schemas/common/FoodGradeInspection.yml
Original file line number Diff line number Diff line change
@@ -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"
Original file line number Diff line number Diff line change
@@ -121,13 +121,6 @@ example: |-
},
"name": "Avocados",
"description": "Avocados, 4 pack boxes",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "hg/ha",
"value": "60"
},
"weight": {
"type": [
"QuantitativeValue"
14 changes: 7 additions & 7 deletions docs/openapi/components/schemas/common/GAPInspection.yml
Original file line number Diff line number Diff line change
@@ -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"
Original file line number Diff line number Diff line change
@@ -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"
7 changes: 0 additions & 7 deletions docs/openapi/components/schemas/common/Inbond.yml
Original file line number Diff line number Diff line change
@@ -271,13 +271,6 @@ example: |-
},
"name": "Crude Oil Barrel",
"description": "Heavy Sour Dilbit",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "hg/ha",
"value": "7436"
},
"weight": {
"type": [
"QuantitativeValue"
Original file line number Diff line number Diff line change
@@ -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: |-
}
}
]
}
}
14 changes: 0 additions & 14 deletions docs/openapi/components/schemas/common/OilAndGasProduct.yml
Original file line number Diff line number Diff line change
@@ -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"],
Original file line number Diff line number Diff line change
@@ -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"
},
Original file line number Diff line number Diff line change
@@ -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"
14 changes: 1 addition & 13 deletions docs/openapi/components/schemas/common/Product.yml
Original file line number Diff line number Diff line change
@@ -67,13 +67,6 @@ properties:
$linkedData:
term: category
'@id': https://schema.org/category
sizeOrAmount:
title: Size or Amount
description: The size or amount of the product
$ref: ./QuantitativeValue.yml
$linkedData:
term: sizeOrAmount
'@id': https://schema.org/size
weight:
title: Weight
description: Weight of the product.
@@ -200,11 +193,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"],
"unitCode": "kg",
@@ -213,4 +201,4 @@ example: |-
"sku": "712120934258",
"imageUrl": "https://img.example.org/102934920857/937/903/",
"imageHash": "8kb47j986hklhde4rfh78okjhgjo08765fgu7tfg4t864fy876rfser45thj87f3"
}
}
Original file line number Diff line number Diff line change
@@ -239,13 +239,6 @@ example: |-
},
"name": "Avocados",
"description": "Avocados, 4 pack boxes",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "hg/ha",
"value": "60"
},
"weight": {
"type": [
"QuantitativeValue"
Original file line number Diff line number Diff line change
@@ -288,13 +288,6 @@ example: |-
},
"name": "Tomatoes",
"description": "Tomatoes, Cartons",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "cartons",
"value": "348"
},
"weight": {
"type": [
"QuantitativeValue"
@@ -304,6 +297,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 number Diff line change
@@ -168,13 +168,6 @@ example: |-
},
"name": "Avocados",
"description": "Avocados, 4 pack boxes",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "hg/ha",
"value": "60"
},
"weight": {
"type": [
"QuantitativeValue"
Original file line number Diff line number Diff line change
@@ -462,13 +462,6 @@ example: |-
},
"name": "Tomatoes",
"description": "Tomatoes, Cartons",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "cartons",
"value": "348"
},
"weight": {
"type": [
"QuantitativeValue"
@@ -478,6 +471,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 number Diff line change
@@ -128,13 +128,6 @@ example: |-
},
"name": "Avocados",
"description": "Avocados, 4 pack boxes",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "hg/ha",
"value": "60"
},
"weight": {
"type": [
"QuantitativeValue"
Original file line number Diff line number Diff line change
@@ -167,13 +167,6 @@ example: |-
},
"name": "Tomatoes",
"description": "Tomatoes, Cartons",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "cartons",
"value": "348"
},
"weight": {
"type": [
"QuantitativeValue"
@@ -183,6 +176,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 number Diff line change
@@ -352,13 +352,6 @@ example: |-
}
}
},
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "boxes",
"value": "500"
},
"weight": {
"type": [
"QuantitativeValue"
Original file line number Diff line number Diff line change
@@ -320,13 +320,6 @@ example: |-
},
"name": "Avocados",
"description": "Avocados, 4 pack boxes",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "hg/ha",
"value": "60"
},
"weight": {
"type": [
"QuantitativeValue"
@@ -336,6 +329,13 @@ example: |-
},
"sku": "81055399441"
},
"unitQuantity": {
"type": [
"QuantitativeValue"
],
"unitCode": "hg/ha",
"value": "60"
},
"scientificName": "Persea americana",
"labelImageUrl": "https://img.example.org/033383401508/640/480/",
"labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
@@ -404,13 +404,6 @@ example: |-
},
"name": "Avocados",
"description": "Avocados, 4 pack boxes",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "hg/ha",
"value": "60"
},
"weight": {
"type": [
"QuantitativeValue"
Original file line number Diff line number Diff line change
@@ -263,13 +263,6 @@ example: |-
},
"name": "Tomatoes",
"description": "Tomatoes, Cartons",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "cartons",
"value": "348"
},
"weight": {
"type": [
"QuantitativeValue"
@@ -279,6 +272,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 number Diff line change
@@ -155,13 +155,6 @@ example: |-
},
"name": "Crude Oil Barrel",
"description": "Heavy Sour Dilbit",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "hg/ha",
"value": "8438"
},
"weight": {
"type": [
"QuantitativeValue"
Original file line number Diff line number Diff line change
@@ -200,13 +200,6 @@ example: |-
},
"name": "Crude Oil Barrel",
"description": "Heavy Sour Dilbit",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "hg/ha",
"value": "8438"
},
"weight": {
"type": [
"QuantitativeValue"
Original file line number Diff line number Diff line change
@@ -260,13 +260,6 @@ example: |-
},
"name": "Tomatoes",
"description": "Tomatoes, Cartons",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "cartons",
"value": "348"
},
"weight": {
"type": [
"QuantitativeValue"
@@ -276,6 +269,13 @@ example: |-
},
"sku": "164664203943"
},
"unitQuantity": {
"type": [
"QuantitativeValue"
],
"unitCode": "cartons",
"value": "348"
},
"scientificName": "Solanum lycopersicum",
"labelImageUrl": "https://img.example.org/033383401508/640/480/",
"labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"

0 comments on commit 219cb3a

Please sign in to comment.