From b5168e8ed2097dbc903d89230b0b0972656e4519 Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck Date: Thu, 27 Oct 2022 13:35:02 +0200 Subject: [PATCH 01/33] added milk predictions for the moment only the milk url --- .../icarMilkPredictionsCollection.json | 21 +++++++++ resources/icarMilkPredictionResource.json | 39 ++++++++++++++++ resources/icarTestDayResultEventResource.json | 11 ++++- types/icarMilkingFatWeightType.json | 24 ++++++++++ types/icarMilkingProteinWeightType.json | 24 ++++++++++ url-schemes/milkURLScheme.json | 44 ++++++++++++++++++- 6 files changed, 161 insertions(+), 2 deletions(-) create mode 100644 collections/icarMilkPredictionsCollection.json create mode 100644 resources/icarMilkPredictionResource.json create mode 100644 types/icarMilkingFatWeightType.json create mode 100644 types/icarMilkingProteinWeightType.json diff --git a/collections/icarMilkPredictionsCollection.json b/collections/icarMilkPredictionsCollection.json new file mode 100644 index 0000000..3eb46a3 --- /dev/null +++ b/collections/icarMilkPredictionsCollection.json @@ -0,0 +1,21 @@ +{ + "description": "Represents a collection of milk predictions per animal. Based on icarResourceCollection to provide paging etc.", + + "allOf": [{ + "$ref": "../collections/icarResourceCollection.json" + }, + { + "type": "object", + + "properties": { + "member": { + "type": "array", + "items": { + "$ref": "../resources/icarMilkPredictionResource.json" + }, + "description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case milk prediction events." + } + } + } + ] +} \ No newline at end of file diff --git a/resources/icarMilkPredictionResource.json b/resources/icarMilkPredictionResource.json new file mode 100644 index 0000000..4f23b78 --- /dev/null +++ b/resources/icarMilkPredictionResource.json @@ -0,0 +1,39 @@ +{ + "description": "This returns a prediction of the expected milk prodution for a cow in the lactation, and eventually gives indication of when the peak production is reached.", + + "allOf": [{ + "$ref": "../resources/icarAnimalEventCoreResource.json" + }, + { + "type": "object", + + "properties": { + "averageMilkWeight24HoursPredicted": { + "$ref": "../types/icarMilkingMilkWeightType.json" + }, + "averageFatWeight24HoursPredicted": { + "$ref": "../types/icarMilkingFatWeightType.json" + }, + "averageProteinWeight24HoursPredicted": { + "$ref": "../types/icarMilkingProteinWeightType.json" + }, + "daysInMilkAtLactationPeak": { + "type": "integer", + "description": "The days in milk in a lactation when the peak production is expected to occur." + }, + "lacationPeakProduction": { + "$ref": "../types/icarMilkingMilkWeightType.json" + }, + "milkWeight24HoursPredictedNextMR": { + "$ref": "../types/icarMilkingMilkWeightType.json" + }, + "fatWeight24HoursPredictedNextMR": { + "$ref": "../types/icarMilkingFatWeightType.json" + }, + "proteinWeight24HoursPredictedNextMR": { + "$ref": "../types/icarMilkingProteinWeightType.json" + } + } + } + ] +} \ No newline at end of file diff --git a/resources/icarTestDayResultEventResource.json b/resources/icarTestDayResultEventResource.json index e08475d..af72a8f 100644 --- a/resources/icarTestDayResultEventResource.json +++ b/resources/icarTestDayResultEventResource.json @@ -19,7 +19,16 @@ "items": { "$ref": "../types/icarMilkCharacteristicsType.json" } - } + }, + "milkWeight24HoursExpected": { + "$ref": "../types/icarMilkingMilkWeightType.json" + }, + "fatWeight24HoursExpected": { + "$ref": "../types/icarMilkingFatWeightType.json" + }, + "proteinWeight24HoursExpected": { + "$ref": "../types/icarMilkingProteinWeightType.json" + } } } ] diff --git a/types/icarMilkingFatWeightType.json b/types/icarMilkingFatWeightType.json new file mode 100644 index 0000000..4b55e0b --- /dev/null +++ b/types/icarMilkingFatWeightType.json @@ -0,0 +1,24 @@ +{ + "description": "The amount of fat milked", + + "type": "object", + + "required": [ + "unitCode", + "value" + ], + + "properties": { + "unitCode": { + "type": "string", + "description": "UN/CEFACT Common Code for Units of Measurement.", + "enum": [ + "KGM" + ] + }, + "value": { + "type": "number", + "format": "double" + } + } +} \ No newline at end of file diff --git a/types/icarMilkingProteinWeightType.json b/types/icarMilkingProteinWeightType.json new file mode 100644 index 0000000..6e49807 --- /dev/null +++ b/types/icarMilkingProteinWeightType.json @@ -0,0 +1,24 @@ +{ + "description": "The amount of protein milked", + + "type": "object", + + "required": [ + "unitCode", + "value" + ], + + "properties": { + "unitCode": { + "type": "string", + "description": "UN/CEFACT Common Code for Units of Measurement.", + "enum": [ + "KGM" + ] + }, + "value": { + "type": "number", + "format": "double" + } + } +} \ No newline at end of file diff --git a/url-schemes/milkURLScheme.json b/url-schemes/milkURLScheme.json index 710dc98..7148e0b 100644 --- a/url-schemes/milkURLScheme.json +++ b/url-schemes/milkURLScheme.json @@ -361,7 +361,7 @@ ], "responses": { "200": { - "description": "Successful. The response contains the diagnoses for the given location.", + "description": "Successful. The response contains the daily milk averages for the given location.", "content": { "application/json": { "schema": { @@ -376,6 +376,45 @@ } } }, + "/locations/{location-scheme}/{location-id}/milk-predictions": { + "get": { + "operationId": "get-milk-predictions", + "summary": "Get the milk predictions for a certain location", + "description": "# Purpose\nProvides the milk predictions for a location\n", + "tags": [ + "ADE-1.3-milk" + ], + "parameters": [ + { + "$ref": "#/components/parameters/location-scheme" + }, + { + "$ref": "#/components/parameters/location-id" + }, + { + "$ref": "#/components/parameters/meta-modified-from" + }, + { + "$ref": "#/components/parameters/meta-modified-to" + } + ], + "responses": { + "200": { + "description": "Successful. The response contains the milk predictions for the given location.", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/icarMilkPredictionsCollection" + } + } + } + }, + "default": { + "$ref": "#/components/responses/default" + } + } + } + }, "/locations/{location-scheme}/{location-id}/lactations": { "get": { "operationId": "get-lactations", @@ -901,6 +940,9 @@ "icarDailyMilkingAveragesCollection": { "$ref": "../collections/icarDailyMilkingAveragesCollection.json" }, + "icarMilkPredictionsCollection": { + "$ref": "../collections/icarMilkPredictionsCollection.json" + }, "icarLactationCollection": { "$ref": "../collections/icarLactationCollection.json" }, From 84c3ed810830212822c91a8a8d5a594bd9f73c19 Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck Date: Fri, 4 Nov 2022 10:24:05 +0100 Subject: [PATCH 02/33] new type I introduced a new type --- resources/icarMilkPredictionResource.json | 24 +++++------------ resources/icarTestDayResultEventResource.json | 10 ++----- types/icarMilkingPredictionType.json | 26 +++++++++++++++++++ 3 files changed, 34 insertions(+), 26 deletions(-) create mode 100644 types/icarMilkingPredictionType.json diff --git a/resources/icarMilkPredictionResource.json b/resources/icarMilkPredictionResource.json index 4f23b78..3c997aa 100644 --- a/resources/icarMilkPredictionResource.json +++ b/resources/icarMilkPredictionResource.json @@ -1,5 +1,5 @@ { - "description": "This returns a prediction of the expected milk prodution for a cow in the lactation, and eventually gives indication of when the peak production is reached.", + "description": "This returns a prediction of the expected milk, fat and protein for a cow for the remaining the lactation. Also a prediction of this production on the next testday is included and it eventually gives indication of when the peak production is reached.", "allOf": [{ "$ref": "../resources/icarAnimalEventCoreResource.json" @@ -8,30 +8,18 @@ "type": "object", "properties": { - "averageMilkWeight24HoursPredicted": { - "$ref": "../types/icarMilkingMilkWeightType.json" - }, - "averageFatWeight24HoursPredicted": { - "$ref": "../types/icarMilkingFatWeightType.json" - }, - "averageProteinWeight24HoursPredicted": { - "$ref": "../types/icarMilkingProteinWeightType.json" + "averagePredictedProduction": { + "$ref": "../types/icarMilkingPredictionType.json" }, "daysInMilkAtLactationPeak": { "type": "integer", "description": "The days in milk in a lactation when the peak production is expected to occur." }, - "lacationPeakProduction": { + "lactationPeakProduction": { "$ref": "../types/icarMilkingMilkWeightType.json" }, - "milkWeight24HoursPredictedNextMR": { - "$ref": "../types/icarMilkingMilkWeightType.json" - }, - "fatWeight24HoursPredictedNextMR": { - "$ref": "../types/icarMilkingFatWeightType.json" - }, - "proteinWeight24HoursPredictedNextMR": { - "$ref": "../types/icarMilkingProteinWeightType.json" + "PredictedProductionNextMR": { + "$ref": "../types/icarMilkingPredictionType.json" } } } diff --git a/resources/icarTestDayResultEventResource.json b/resources/icarTestDayResultEventResource.json index af72a8f..c91b492 100644 --- a/resources/icarTestDayResultEventResource.json +++ b/resources/icarTestDayResultEventResource.json @@ -20,14 +20,8 @@ "$ref": "../types/icarMilkCharacteristicsType.json" } }, - "milkWeight24HoursExpected": { - "$ref": "../types/icarMilkingMilkWeightType.json" - }, - "fatWeight24HoursExpected": { - "$ref": "../types/icarMilkingFatWeightType.json" - }, - "proteinWeight24HoursExpected": { - "$ref": "../types/icarMilkingProteinWeightType.json" + "PredictedProductionOnTestday": { + "$ref": "../types/icarMilkingPredictionType.json" } } } diff --git a/types/icarMilkingPredictionType.json b/types/icarMilkingPredictionType.json new file mode 100644 index 0000000..13d2a72 --- /dev/null +++ b/types/icarMilkingPredictionType.json @@ -0,0 +1,26 @@ +{ + "description": "The amount of milk, fat and protein milked in a defined period of time", + + "type": "object", + + "required": [ + "unitCode", + "value" + ], + + "properties": { + "MilkWeight": { + "$ref": "../types/icarMilkingMilkWeightType.json" + }, + "FatWeight": { + "$ref": "../types/icarMilkingFatWeightType.json" + }, + "ProteinWeight": { + "$ref": "../types/icarMilkingProteinWeightType.json" + }, + "Hours": { + "type": "number", + "description": "The number of hours in which the mentioned milk, fat and protein were produced. Most commonly used is a 24 hours production." + } + } +} \ No newline at end of file From a23f125afb6e4292a3d83f901aa879dd0f9b0198 Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck Date: Fri, 4 Nov 2022 10:54:03 +0100 Subject: [PATCH 03/33] adapted urls adapted url's to reflect meilk predictions --- url-schemes/exampleUrlScheme.json | 44 ++++++++++++++++++++++++++++++- url-schemes/milkURLScheme.json | 6 ++++- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/url-schemes/exampleUrlScheme.json b/url-schemes/exampleUrlScheme.json index 1ea7e56..cecc191 100644 --- a/url-schemes/exampleUrlScheme.json +++ b/url-schemes/exampleUrlScheme.json @@ -14,7 +14,7 @@ "url": "https://icar-ade.standard.com" }], "tags": [{ - "name": "ADE-1.3 additions", + "name": "ADE-1.4 additions", "description": "new endpoints not yet approved" }, { @@ -249,6 +249,45 @@ } } }, + "/locations/{location-scheme}/{location-id}/milk-predictions": { + "get": { + "operationId": "get-milk-predictions", + "summary": "Get the milk predictions for a certain location", + "description": "# Purpose\nProvides the milk predictions for a location\n", + "tags": [ + "ADE-1.4 additions" + ], + "parameters": [ + { + "$ref": "#/components/parameters/location-scheme" + }, + { + "$ref": "#/components/parameters/location-id" + }, + { + "$ref": "#/components/parameters/meta-modified-from" + }, + { + "$ref": "#/components/parameters/meta-modified-to" + } + ], + "responses": { + "200": { + "description": "Successful. The response contains the milk predictions for the given location.", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/icarMilkPredictionsCollection" + } + } + } + }, + "default": { + "$ref": "#/components/responses/default" + } + } + } + }, "/locations/{location-scheme}/{location-id}/daily-milking-averages": { "get": { "operationId": "get-daily-milking-averages", @@ -2066,6 +2105,9 @@ "icarWithdrawalEventCollection": { "$ref": "../collections/icarWithdrawalEventCollection.json" }, + "icarMilkPredictionsCollection": { + "$ref": "../collections/icarMilkPredictionsCollection.json" + }, "icarReproMatingRecommendationCollection": { "$ref": "../collections/icarReproMatingRecommendationCollection.json" }, diff --git a/url-schemes/milkURLScheme.json b/url-schemes/milkURLScheme.json index 7148e0b..e500dae 100644 --- a/url-schemes/milkURLScheme.json +++ b/url-schemes/milkURLScheme.json @@ -16,6 +16,10 @@ } ], "tags": [ + { + "name": "ADE-1.4-milk", + "description": "new endpoints not yet approved" + }, { "name": "ADE-1.3-milk", "description": "Milking-related messages approved by the working group" @@ -382,7 +386,7 @@ "summary": "Get the milk predictions for a certain location", "description": "# Purpose\nProvides the milk predictions for a location\n", "tags": [ - "ADE-1.3-milk" + "ADE-1.4-milk" ], "parameters": [ { From 19c54c392023847661315f0803a258992b6932ba Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck Date: Thu, 10 Nov 2022 08:43:28 +0100 Subject: [PATCH 04/33] error in tag the tag get-existing-milking-withdrawals was not correct --- url-schemes/milkURLScheme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/url-schemes/milkURLScheme.json b/url-schemes/milkURLScheme.json index e500dae..92c3f6d 100644 --- a/url-schemes/milkURLScheme.json +++ b/url-schemes/milkURLScheme.json @@ -559,7 +559,7 @@ }, "/locations/{location-scheme}/{location-id}/milking-withdrawals": { "get": { - "operationId": "get existing milking-withdrawals", + "operationId": "get-existing-milking-withdrawals", "summary": "Get the milking-withdrawals for a certain location", "description": "# Purpose\nProvides the milking-withdrawals for a certain location\n", "tags": [ From bb69e2b4992e82385164e20bbc76526578e1c76e Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck <47346780+erwinspeybroeck@users.noreply.github.com> Date: Tue, 22 Nov 2022 16:54:30 +0100 Subject: [PATCH 05/33] Update types/icarMilkingPredictionType.json --- types/icarMilkingPredictionType.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/icarMilkingPredictionType.json b/types/icarMilkingPredictionType.json index 13d2a72..e3daeae 100644 --- a/types/icarMilkingPredictionType.json +++ b/types/icarMilkingPredictionType.json @@ -16,7 +16,7 @@ "$ref": "../types/icarMilkingFatWeightType.json" }, "ProteinWeight": { - "$ref": "../types/icarMilkingProteinWeightType.json" + "$ref": "../types/icarMassMeasureType.json" }, "Hours": { "type": "number", From 32b12f088bc0b46ef099263e9e389d3ea770328e Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck <47346780+erwinspeybroeck@users.noreply.github.com> Date: Tue, 22 Nov 2022 16:54:42 +0100 Subject: [PATCH 06/33] Update types/icarMilkingPredictionType.json --- types/icarMilkingPredictionType.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/icarMilkingPredictionType.json b/types/icarMilkingPredictionType.json index e3daeae..8a48dd7 100644 --- a/types/icarMilkingPredictionType.json +++ b/types/icarMilkingPredictionType.json @@ -10,7 +10,7 @@ "properties": { "MilkWeight": { - "$ref": "../types/icarMilkingMilkWeightType.json" + "$ref": "../types/icarMassMeasureType.json" }, "FatWeight": { "$ref": "../types/icarMilkingFatWeightType.json" From dbfca8ae94d3d9a88eccf5aed75f845d29fbb2af Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck <47346780+erwinspeybroeck@users.noreply.github.com> Date: Tue, 22 Nov 2022 16:54:52 +0100 Subject: [PATCH 07/33] Update types/icarMilkingPredictionType.json --- types/icarMilkingPredictionType.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/icarMilkingPredictionType.json b/types/icarMilkingPredictionType.json index 8a48dd7..8ddb1db 100644 --- a/types/icarMilkingPredictionType.json +++ b/types/icarMilkingPredictionType.json @@ -13,7 +13,7 @@ "$ref": "../types/icarMassMeasureType.json" }, "FatWeight": { - "$ref": "../types/icarMilkingFatWeightType.json" + "$ref": "../types/icarMassMeasureType.json" }, "ProteinWeight": { "$ref": "../types/icarMassMeasureType.json" From a54c57e5c5a94579209f5e738cac70887db5fd8c Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck <47346780+erwinspeybroeck@users.noreply.github.com> Date: Tue, 22 Nov 2022 16:55:26 +0100 Subject: [PATCH 08/33] Delete icarMilkingFatWeightType.json --- types/icarMilkingFatWeightType.json | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 types/icarMilkingFatWeightType.json diff --git a/types/icarMilkingFatWeightType.json b/types/icarMilkingFatWeightType.json deleted file mode 100644 index 4b55e0b..0000000 --- a/types/icarMilkingFatWeightType.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "description": "The amount of fat milked", - - "type": "object", - - "required": [ - "unitCode", - "value" - ], - - "properties": { - "unitCode": { - "type": "string", - "description": "UN/CEFACT Common Code for Units of Measurement.", - "enum": [ - "KGM" - ] - }, - "value": { - "type": "number", - "format": "double" - } - } -} \ No newline at end of file From a1ac7eae014d39499d75088751f963e96c181a97 Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck <47346780+erwinspeybroeck@users.noreply.github.com> Date: Tue, 22 Nov 2022 16:55:38 +0100 Subject: [PATCH 09/33] Update resources/icarMilkPredictionResource.json Co-authored-by: Andrew Cooke <45248509+cookeac@users.noreply.github.com> --- resources/icarMilkPredictionResource.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/icarMilkPredictionResource.json b/resources/icarMilkPredictionResource.json index 3c997aa..ce0d5ed 100644 --- a/resources/icarMilkPredictionResource.json +++ b/resources/icarMilkPredictionResource.json @@ -8,7 +8,7 @@ "type": "object", "properties": { - "averagePredictedProduction": { + "averageRemainingProduction": { "$ref": "../types/icarMilkingPredictionType.json" }, "daysInMilkAtLactationPeak": { From 6f902c306c8506629e6deb54b36539fcd2a849ea Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck <47346780+erwinspeybroeck@users.noreply.github.com> Date: Tue, 22 Nov 2022 16:55:45 +0100 Subject: [PATCH 10/33] Update resources/icarMilkPredictionResource.json Co-authored-by: Andrew Cooke <45248509+cookeac@users.noreply.github.com> --- resources/icarMilkPredictionResource.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/icarMilkPredictionResource.json b/resources/icarMilkPredictionResource.json index ce0d5ed..226d5a8 100644 --- a/resources/icarMilkPredictionResource.json +++ b/resources/icarMilkPredictionResource.json @@ -18,7 +18,7 @@ "lactationPeakProduction": { "$ref": "../types/icarMilkingMilkWeightType.json" }, - "PredictedProductionNextMR": { + "productionNextMilkRecording": { "$ref": "../types/icarMilkingPredictionType.json" } } From bfd79d34e0b5463805dca267ded83e94eebdb8c2 Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck <47346780+erwinspeybroeck@users.noreply.github.com> Date: Tue, 22 Nov 2022 16:55:57 +0100 Subject: [PATCH 11/33] Update resources/icarTestDayResultEventResource.json Co-authored-by: Andrew Cooke <45248509+cookeac@users.noreply.github.com> --- resources/icarTestDayResultEventResource.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/icarTestDayResultEventResource.json b/resources/icarTestDayResultEventResource.json index c91b492..3b504c1 100644 --- a/resources/icarTestDayResultEventResource.json +++ b/resources/icarTestDayResultEventResource.json @@ -20,7 +20,7 @@ "$ref": "../types/icarMilkCharacteristicsType.json" } }, - "PredictedProductionOnTestday": { + "predictedProductionOnTestday": { "$ref": "../types/icarMilkingPredictionType.json" } } From c1af1173dd8c799ed222d6a5cf4194168fadbfee Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck <47346780+erwinspeybroeck@users.noreply.github.com> Date: Tue, 22 Nov 2022 16:58:02 +0100 Subject: [PATCH 12/33] Update resources/icarMilkPredictionResource.json --- resources/icarMilkPredictionResource.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/icarMilkPredictionResource.json b/resources/icarMilkPredictionResource.json index 226d5a8..c6ec451 100644 --- a/resources/icarMilkPredictionResource.json +++ b/resources/icarMilkPredictionResource.json @@ -16,7 +16,7 @@ "description": "The days in milk in a lactation when the peak production is expected to occur." }, "lactationPeakProduction": { - "$ref": "../types/icarMilkingMilkWeightType.json" + "$ref": "../types/icarMassMeasureType.json" }, "productionNextMilkRecording": { "$ref": "../types/icarMilkingPredictionType.json" From 7c8daa559a2e009ca2130f699d4633847ceb4e19 Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck <47346780+erwinspeybroeck@users.noreply.github.com> Date: Tue, 22 Nov 2022 16:58:48 +0100 Subject: [PATCH 13/33] Delete icarMilkingProteinWeightType.json --- types/icarMilkingProteinWeightType.json | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 types/icarMilkingProteinWeightType.json diff --git a/types/icarMilkingProteinWeightType.json b/types/icarMilkingProteinWeightType.json deleted file mode 100644 index 6e49807..0000000 --- a/types/icarMilkingProteinWeightType.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "description": "The amount of protein milked", - - "type": "object", - - "required": [ - "unitCode", - "value" - ], - - "properties": { - "unitCode": { - "type": "string", - "description": "UN/CEFACT Common Code for Units of Measurement.", - "enum": [ - "KGM" - ] - }, - "value": { - "type": "number", - "format": "double" - } - } -} \ No newline at end of file From 19f223ed5d12ca1da202a31bb5d67473d4d59638 Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck <47346780+erwinspeybroeck@users.noreply.github.com> Date: Wed, 7 Dec 2022 11:05:13 +0100 Subject: [PATCH 14/33] Update icarStatisticsResource.json statistics should be part of a group --- resources/icarStatisticsResource.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/icarStatisticsResource.json b/resources/icarStatisticsResource.json index ba43024..f9464a7 100644 --- a/resources/icarStatisticsResource.json +++ b/resources/icarStatisticsResource.json @@ -34,13 +34,13 @@ "group": { "type": "array", "items": { - "$ref": "../types/icarStatisticsGroupType.json" - } - }, - "statistics": { - "type": "array", - "items": { - "$ref": "../types/icarStatisticsType.json" + "$ref": "../types/icarStatisticsGroupType.json", + "statistics": { + "type": "array", + "items": { + "$ref": "../types/icarStatisticsType.json" + } + } } } } From e29ae5bbb696fb554e9a2528e61642b2376bead6 Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck <47346780+erwinspeybroeck@users.noreply.github.com> Date: Wed, 7 Dec 2022 11:12:45 +0100 Subject: [PATCH 15/33] Update icarStatisticsResource.json second try --- resources/icarStatisticsResource.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/resources/icarStatisticsResource.json b/resources/icarStatisticsResource.json index f9464a7..f466aeb 100644 --- a/resources/icarStatisticsResource.json +++ b/resources/icarStatisticsResource.json @@ -35,12 +35,6 @@ "type": "array", "items": { "$ref": "../types/icarStatisticsGroupType.json", - "statistics": { - "type": "array", - "items": { - "$ref": "../types/icarStatisticsType.json" - } - } } } } From 247d7d4107b31c8b8fc78d912629324bbafd3fcc Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck <47346780+erwinspeybroeck@users.noreply.github.com> Date: Wed, 7 Dec 2022 11:15:04 +0100 Subject: [PATCH 16/33] Update icarStatisticsGroupType.json added the statistics over here --- types/icarStatisticsGroupType.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/types/icarStatisticsGroupType.json b/types/icarStatisticsGroupType.json index 4da0d24..890c91f 100644 --- a/types/icarStatisticsGroupType.json +++ b/types/icarStatisticsGroupType.json @@ -17,6 +17,12 @@ "items": { "$ref": "../types/icarGroupSpecifierType.json" } + }, + "statistics": { + "type": "array", + "items": { + "$ref": "../types/icarStatisticsType.json" + } } } } From 0e7297a456bf3bc60b7083258bf98875f7f8219d Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck <47346780+erwinspeybroeck@users.noreply.github.com> Date: Wed, 7 Dec 2022 11:22:14 +0100 Subject: [PATCH 17/33] Update managementURLScheme.json added 1.3.2 tag en attached taht to the statistics --- url-schemes/managementURLScheme.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/url-schemes/managementURLScheme.json b/url-schemes/managementURLScheme.json index dd6fc99..00e4eee 100644 --- a/url-schemes/managementURLScheme.json +++ b/url-schemes/managementURLScheme.json @@ -19,6 +19,10 @@ { "name": "ADE-1.3-management", "description": "Management messages approved by the working group" + }, + { + "name": "ADE-1.3.2-management", + "description": "Management messages approved by the working group" } ], "paths": { @@ -448,7 +452,7 @@ "summary": "Get the statistics for a certain location", "description": "# Purpose\nProvides the statistics for a location\n One can specify the period for which the statistics can be calculated by specifying a date to and date from parameter. Also the purpose can be provided to limit the purpose of the statistics", "tags": [ - "ADE-1.3-management" + "ADE-1.3.2-management" ], "parameters": [ { From 26719e16b0b69a39c2249070864c5ba79ae62786 Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck <47346780+erwinspeybroeck@users.noreply.github.com> Date: Wed, 7 Dec 2022 11:24:34 +0100 Subject: [PATCH 18/33] Update exampleUrlScheme.json added 1.3.2 tag and attached that to the statistics API --- url-schemes/exampleUrlScheme.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/url-schemes/exampleUrlScheme.json b/url-schemes/exampleUrlScheme.json index 3fc004d..c849fdb 100644 --- a/url-schemes/exampleUrlScheme.json +++ b/url-schemes/exampleUrlScheme.json @@ -29,6 +29,11 @@ "name": "ADE-1.3-management", "description": "Management messages approved by the working group" }, + { + "name": "ADE-1.3.2-management", + "description": "Management messages approved by the working group" + }, + { "name": "ADE-1.3-milk", "description": "Milk messages approved by the working group" @@ -719,7 +724,7 @@ "summary": "Get the statistics for a certain location", "description": "# Purpose\nProvides the statistics for a location\n One can specify the period for which the statistics can be calculated by specifying a date to and date from parameter. Also the purpose can be provided to limit the purpose of the statistics", "tags": [ - "ADE-1.3-management" + "ADE-1.3.2-management" ], "parameters": [ { From e1e83bfa1f9d67efb3a39023bee966340f13f8e3 Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck <47346780+erwinspeybroeck@users.noreply.github.com> Date: Wed, 22 Mar 2023 07:39:19 +0100 Subject: [PATCH 19/33] Update types/icarMilkingPredictionType.json Co-authored-by: Andrew Cooke <45248509+cookeac@users.noreply.github.com> --- types/icarMilkingPredictionType.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/icarMilkingPredictionType.json b/types/icarMilkingPredictionType.json index 8ddb1db..760cbbc 100644 --- a/types/icarMilkingPredictionType.json +++ b/types/icarMilkingPredictionType.json @@ -9,7 +9,7 @@ ], "properties": { - "MilkWeight": { + "milkWeight": { "$ref": "../types/icarMassMeasureType.json" }, "FatWeight": { From 5b2c3507237ac01c2e06fabb4876e52d6b61a2c7 Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck <47346780+erwinspeybroeck@users.noreply.github.com> Date: Wed, 22 Mar 2023 07:39:32 +0100 Subject: [PATCH 20/33] Update types/icarMilkingPredictionType.json Co-authored-by: Andrew Cooke <45248509+cookeac@users.noreply.github.com> --- types/icarMilkingPredictionType.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/icarMilkingPredictionType.json b/types/icarMilkingPredictionType.json index 760cbbc..908350c 100644 --- a/types/icarMilkingPredictionType.json +++ b/types/icarMilkingPredictionType.json @@ -12,7 +12,7 @@ "milkWeight": { "$ref": "../types/icarMassMeasureType.json" }, - "FatWeight": { + "fatWeight": { "$ref": "../types/icarMassMeasureType.json" }, "ProteinWeight": { From e2d591319a1e5938f834b44efd0362290b41754f Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck <47346780+erwinspeybroeck@users.noreply.github.com> Date: Wed, 22 Mar 2023 07:39:45 +0100 Subject: [PATCH 21/33] Update types/icarMilkingPredictionType.json Co-authored-by: Andrew Cooke <45248509+cookeac@users.noreply.github.com> --- types/icarMilkingPredictionType.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/icarMilkingPredictionType.json b/types/icarMilkingPredictionType.json index 908350c..8ea4eac 100644 --- a/types/icarMilkingPredictionType.json +++ b/types/icarMilkingPredictionType.json @@ -15,7 +15,7 @@ "fatWeight": { "$ref": "../types/icarMassMeasureType.json" }, - "ProteinWeight": { + "proteinWeight": { "$ref": "../types/icarMassMeasureType.json" }, "Hours": { From e3a4ba3a1cef41ed44e5a0a3e74db27dd5e625e6 Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck <47346780+erwinspeybroeck@users.noreply.github.com> Date: Wed, 22 Mar 2023 07:40:03 +0100 Subject: [PATCH 22/33] Update types/icarMilkingPredictionType.json Co-authored-by: Andrew Cooke <45248509+cookeac@users.noreply.github.com> --- types/icarMilkingPredictionType.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/icarMilkingPredictionType.json b/types/icarMilkingPredictionType.json index 8ea4eac..c0e65a0 100644 --- a/types/icarMilkingPredictionType.json +++ b/types/icarMilkingPredictionType.json @@ -18,7 +18,7 @@ "proteinWeight": { "$ref": "../types/icarMassMeasureType.json" }, - "Hours": { + "hours": { "type": "number", "description": "The number of hours in which the mentioned milk, fat and protein were produced. Most commonly used is a 24 hours production." } From 46785ce19024a1bcbb29883422a8cec226f8bf77 Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck <47346780+erwinspeybroeck@users.noreply.github.com> Date: Wed, 22 Mar 2023 07:40:35 +0100 Subject: [PATCH 23/33] Update url-schemes/exampleUrlScheme.json Co-authored-by: Andrew Cooke <45248509+cookeac@users.noreply.github.com> --- url-schemes/exampleUrlScheme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/url-schemes/exampleUrlScheme.json b/url-schemes/exampleUrlScheme.json index c849fdb..1f75a8c 100644 --- a/url-schemes/exampleUrlScheme.json +++ b/url-schemes/exampleUrlScheme.json @@ -14,7 +14,7 @@ "url": "https://icar-ade.standard.com" }], "tags": [{ - "name": "ADE-1.4 additions", + "name": "ADE-1.3 additions", "description": "new endpoints not yet approved" }, { From 5acf5f85b0e6fad9481c83c4fce9f5e5036b17ec Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck <47346780+erwinspeybroeck@users.noreply.github.com> Date: Wed, 22 Mar 2023 07:53:56 +0100 Subject: [PATCH 24/33] Update resources/icarStatisticsResource.json --- resources/icarStatisticsResource.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/icarStatisticsResource.json b/resources/icarStatisticsResource.json index f466aeb..e850457 100644 --- a/resources/icarStatisticsResource.json +++ b/resources/icarStatisticsResource.json @@ -34,7 +34,7 @@ "group": { "type": "array", "items": { - "$ref": "../types/icarStatisticsGroupType.json", + "$ref": "../types/icarStatisticsGroupType.json" } } } From d51c2551a7fa7d1f64d61d5b124212652b14d6d0 Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck <47346780+erwinspeybroeck@users.noreply.github.com> Date: Wed, 22 Mar 2023 07:54:04 +0100 Subject: [PATCH 25/33] Update url-schemes/exampleUrlScheme.json --- url-schemes/exampleUrlScheme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/url-schemes/exampleUrlScheme.json b/url-schemes/exampleUrlScheme.json index 1f75a8c..4e8183f 100644 --- a/url-schemes/exampleUrlScheme.json +++ b/url-schemes/exampleUrlScheme.json @@ -30,7 +30,7 @@ "description": "Management messages approved by the working group" }, { - "name": "ADE-1.3.2-management", + "name": "ADE-1.3-management", "description": "Management messages approved by the working group" }, From 84eed0df41b20d34029c6892caa2199fee681c25 Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck <47346780+erwinspeybroeck@users.noreply.github.com> Date: Wed, 22 Mar 2023 07:54:12 +0100 Subject: [PATCH 26/33] Update url-schemes/exampleUrlScheme.json --- url-schemes/exampleUrlScheme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/url-schemes/exampleUrlScheme.json b/url-schemes/exampleUrlScheme.json index 4e8183f..5b44754 100644 --- a/url-schemes/exampleUrlScheme.json +++ b/url-schemes/exampleUrlScheme.json @@ -260,7 +260,7 @@ "summary": "Get the milk predictions for a certain location", "description": "# Purpose\nProvides the milk predictions for a location\n", "tags": [ - "ADE-1.4 additions" + "ADE-1.3 additions" ], "parameters": [ { From e7dbd5fc5dd8d870ee6e029eacd49802fa2d5010 Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck <47346780+erwinspeybroeck@users.noreply.github.com> Date: Wed, 22 Mar 2023 07:54:20 +0100 Subject: [PATCH 27/33] Update url-schemes/exampleUrlScheme.json --- url-schemes/exampleUrlScheme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/url-schemes/exampleUrlScheme.json b/url-schemes/exampleUrlScheme.json index 5b44754..41b0713 100644 --- a/url-schemes/exampleUrlScheme.json +++ b/url-schemes/exampleUrlScheme.json @@ -724,7 +724,7 @@ "summary": "Get the statistics for a certain location", "description": "# Purpose\nProvides the statistics for a location\n One can specify the period for which the statistics can be calculated by specifying a date to and date from parameter. Also the purpose can be provided to limit the purpose of the statistics", "tags": [ - "ADE-1.3.2-management" + "ADE-1.3-management" ], "parameters": [ { From 7c852534337ef9b2223ce8c182184aababd2fc19 Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck <47346780+erwinspeybroeck@users.noreply.github.com> Date: Wed, 22 Mar 2023 07:54:59 +0100 Subject: [PATCH 28/33] Update url-schemes/managementURLScheme.json --- url-schemes/managementURLScheme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/url-schemes/managementURLScheme.json b/url-schemes/managementURLScheme.json index 00e4eee..c41683d 100644 --- a/url-schemes/managementURLScheme.json +++ b/url-schemes/managementURLScheme.json @@ -21,7 +21,7 @@ "description": "Management messages approved by the working group" }, { - "name": "ADE-1.3.2-management", + "name": "ADE-1.3-management", "description": "Management messages approved by the working group" } ], From cb58dd4397c86c0752b81fe640624f5decbf9b6f Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck <47346780+erwinspeybroeck@users.noreply.github.com> Date: Wed, 22 Mar 2023 07:55:07 +0100 Subject: [PATCH 29/33] Update url-schemes/managementURLScheme.json --- url-schemes/managementURLScheme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/url-schemes/managementURLScheme.json b/url-schemes/managementURLScheme.json index c41683d..f8b8382 100644 --- a/url-schemes/managementURLScheme.json +++ b/url-schemes/managementURLScheme.json @@ -452,7 +452,7 @@ "summary": "Get the statistics for a certain location", "description": "# Purpose\nProvides the statistics for a location\n One can specify the period for which the statistics can be calculated by specifying a date to and date from parameter. Also the purpose can be provided to limit the purpose of the statistics", "tags": [ - "ADE-1.3.2-management" + "ADE-1.3-management" ], "parameters": [ { From b1d68532d68af2d0c31467bc04c71ee44d7abe67 Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck <47346780+erwinspeybroeck@users.noreply.github.com> Date: Wed, 22 Mar 2023 07:55:15 +0100 Subject: [PATCH 30/33] Update url-schemes/milkURLScheme.json --- url-schemes/milkURLScheme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/url-schemes/milkURLScheme.json b/url-schemes/milkURLScheme.json index 92c3f6d..bb30ba4 100644 --- a/url-schemes/milkURLScheme.json +++ b/url-schemes/milkURLScheme.json @@ -17,7 +17,7 @@ ], "tags": [ { - "name": "ADE-1.4-milk", + "name": "ADE-1.3-milk", "description": "new endpoints not yet approved" }, { From ad48008b854ed9440ad9fdc451a6519308c5b7ce Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck <47346780+erwinspeybroeck@users.noreply.github.com> Date: Wed, 22 Mar 2023 07:55:25 +0100 Subject: [PATCH 31/33] Update url-schemes/milkURLScheme.json --- url-schemes/milkURLScheme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/url-schemes/milkURLScheme.json b/url-schemes/milkURLScheme.json index bb30ba4..338a19c 100644 --- a/url-schemes/milkURLScheme.json +++ b/url-schemes/milkURLScheme.json @@ -386,7 +386,7 @@ "summary": "Get the milk predictions for a certain location", "description": "# Purpose\nProvides the milk predictions for a location\n", "tags": [ - "ADE-1.4-milk" + "ADE-1.3-milk" ], "parameters": [ { From b5e5d3578211799893670800ff72f9c922752565 Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck <47346780+erwinspeybroeck@users.noreply.github.com> Date: Wed, 22 Mar 2023 09:29:49 +0100 Subject: [PATCH 32/33] Update url-schemes/milkURLScheme.json --- url-schemes/milkURLScheme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/url-schemes/milkURLScheme.json b/url-schemes/milkURLScheme.json index 338a19c..9932ee8 100644 --- a/url-schemes/milkURLScheme.json +++ b/url-schemes/milkURLScheme.json @@ -17,7 +17,7 @@ ], "tags": [ { - "name": "ADE-1.3-milk", + "name": "ADE-1.4-milk", "description": "new endpoints not yet approved" }, { From b8318c59ee971d82a8e4e87044aaca0672807afc Mon Sep 17 00:00:00 2001 From: Erwin Speybroeck <47346780+erwinspeybroeck@users.noreply.github.com> Date: Wed, 22 Mar 2023 09:29:56 +0100 Subject: [PATCH 33/33] Update url-schemes/managementURLScheme.json --- url-schemes/managementURLScheme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/url-schemes/managementURLScheme.json b/url-schemes/managementURLScheme.json index f8b8382..c63388c 100644 --- a/url-schemes/managementURLScheme.json +++ b/url-schemes/managementURLScheme.json @@ -17,7 +17,7 @@ ], "tags": [ { - "name": "ADE-1.3-management", + "name": "ADE-1.4-management", "description": "Management messages approved by the working group" }, {