From 11dee961de2c598155f77bdc6040ddde237ac0ea Mon Sep 17 00:00:00 2001 From: Anton Hokkonen Date: Wed, 29 Jan 2020 12:46:39 +0200 Subject: [PATCH 1/6] Added file with drying off examples from finnish national milk recording organizations --- .../Examples/exampleDryOffEvent_Finland.json | 62 +++++++++++++++++++ .../exampleUrlScheme.json | 13 +++- 2 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 Release Candidate Messages/Examples/exampleDryOffEvent_Finland.json diff --git a/Release Candidate Messages/Examples/exampleDryOffEvent_Finland.json b/Release Candidate Messages/Examples/exampleDryOffEvent_Finland.json new file mode 100644 index 0000000..63ba698 --- /dev/null +++ b/Release Candidate Messages/Examples/exampleDryOffEvent_Finland.json @@ -0,0 +1,62 @@ +[ + { + "id": "4bd700b2-4f8b-4ab8-8cbf-7bb62d4e2bc3", + "animal": { + "id": "FI000010065148-2", + "scheme": "fi.animal-id" + }, + "eventDateTime": "2000-03-19T00:00:00", + "location": { + "id": "990000001", + "scheme": "fi.farm-id" + }, + "meta": { + "source": "fi.mro", + "creator": "administrator", + "modified": null, + "created": "2020-01-29T08:49:06.0421042+00:00", + "validFrom": null, + "validTo": null + } + }, + { + "id": "85ec425d-f079-437e-801b-88756c912102", + "animal": { + "id": "FI000010065150-1", + "scheme": "fi.animal-id" + }, + "eventDateTime": "2000-04-03T00:00:00", + "location": { + "id": "990000001", + "scheme": "fi.farm-id" + }, + "meta": { + "source": "fi.mro", + "creator": "administrator", + "modified": null, + "created": "2020-01-29T08:49:06.1314223+00:00", + "validFrom": null, + "validTo": null + } + }, + { + "id": "5fc45dfd-a347-4d5b-9d8d-dd5c0ef94fca", + "animal": { + "id": "FI000010214759-3", + "scheme": "fi.animal-id" + }, + "eventDateTime": "2000-05-22T00:00:00", + "location": { + "id": "990000001", + "scheme": "fi.farm-id" + }, + "meta": { + "source": "fi.mro", + "creator": "administrator", + "modified": null, + "created": "2020-01-29T08:49:06.4306292+00:00", + "validFrom": null, + "validTo": null + } + } +] \ No newline at end of file diff --git a/Release Candidate Messages/exampleUrlScheme.json b/Release Candidate Messages/exampleUrlScheme.json index 17e777a..187eff7 100644 --- a/Release Candidate Messages/exampleUrlScheme.json +++ b/Release Candidate Messages/exampleUrlScheme.json @@ -412,6 +412,11 @@ "items": { "$ref": "#/components/schemas/drying-off" } + }, + "examples": { + "finland": { + "$ref": "#/components/examples/dryOffFinland" + } } } } @@ -805,7 +810,13 @@ ] } ] - } + }, + "dryOffFinland": { + "value": { + "summary": "Dry off event examples from finnish milk recording organization", + "externalValue": "examples/exampleDryOffEvent_Finland.json" + } + } } } } From 69412df9630c75e9c8ddc0f0c436612e26f52747 Mon Sep 17 00:00:00 2001 From: Anton Hokkonen Date: Wed, 29 Jan 2020 13:42:20 +0200 Subject: [PATCH 2/6] SOme small tweaks to previous change --- Release Candidate Messages/exampleUrlScheme.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Release Candidate Messages/exampleUrlScheme.json b/Release Candidate Messages/exampleUrlScheme.json index 187eff7..197f8c4 100644 --- a/Release Candidate Messages/exampleUrlScheme.json +++ b/Release Candidate Messages/exampleUrlScheme.json @@ -12,7 +12,7 @@ }, "servers": [ { - "url": "https://icar-ade.standard.com" + "url": "https://raw.githubusercontent.com/ahokkonen/ICAR/master/Release%20Candidate%20Messages" } ], "tags": [ @@ -814,7 +814,7 @@ "dryOffFinland": { "value": { "summary": "Dry off event examples from finnish milk recording organization", - "externalValue": "examples/exampleDryOffEvent_Finland.json" + "externalValue": "/Examples/exampleDryOffEvent_Finland.json" } } } From 0f8c1057ee95bbba41fbb70d4b7b1b4241a4a3bb Mon Sep 17 00:00:00 2001 From: Anton Hokkonen Date: Wed, 29 Jan 2020 15:59:37 +0200 Subject: [PATCH 3/6] Added drying off examples for finnish and swedish milk recording organizations --- .../Examples/exampleDryOffEvent_Finland.json | 62 ---- .../exampleUrlScheme.json | 320 ++++++++++++++---- 2 files changed, 256 insertions(+), 126 deletions(-) delete mode 100644 Release Candidate Messages/Examples/exampleDryOffEvent_Finland.json diff --git a/Release Candidate Messages/Examples/exampleDryOffEvent_Finland.json b/Release Candidate Messages/Examples/exampleDryOffEvent_Finland.json deleted file mode 100644 index 63ba698..0000000 --- a/Release Candidate Messages/Examples/exampleDryOffEvent_Finland.json +++ /dev/null @@ -1,62 +0,0 @@ -[ - { - "id": "4bd700b2-4f8b-4ab8-8cbf-7bb62d4e2bc3", - "animal": { - "id": "FI000010065148-2", - "scheme": "fi.animal-id" - }, - "eventDateTime": "2000-03-19T00:00:00", - "location": { - "id": "990000001", - "scheme": "fi.farm-id" - }, - "meta": { - "source": "fi.mro", - "creator": "administrator", - "modified": null, - "created": "2020-01-29T08:49:06.0421042+00:00", - "validFrom": null, - "validTo": null - } - }, - { - "id": "85ec425d-f079-437e-801b-88756c912102", - "animal": { - "id": "FI000010065150-1", - "scheme": "fi.animal-id" - }, - "eventDateTime": "2000-04-03T00:00:00", - "location": { - "id": "990000001", - "scheme": "fi.farm-id" - }, - "meta": { - "source": "fi.mro", - "creator": "administrator", - "modified": null, - "created": "2020-01-29T08:49:06.1314223+00:00", - "validFrom": null, - "validTo": null - } - }, - { - "id": "5fc45dfd-a347-4d5b-9d8d-dd5c0ef94fca", - "animal": { - "id": "FI000010214759-3", - "scheme": "fi.animal-id" - }, - "eventDateTime": "2000-05-22T00:00:00", - "location": { - "id": "990000001", - "scheme": "fi.farm-id" - }, - "meta": { - "source": "fi.mro", - "creator": "administrator", - "modified": null, - "created": "2020-01-29T08:49:06.4306292+00:00", - "validFrom": null, - "validTo": null - } - } -] \ No newline at end of file diff --git a/Release Candidate Messages/exampleUrlScheme.json b/Release Candidate Messages/exampleUrlScheme.json index 197f8c4..838f0ad 100644 --- a/Release Candidate Messages/exampleUrlScheme.json +++ b/Release Candidate Messages/exampleUrlScheme.json @@ -12,7 +12,7 @@ }, "servers": [ { - "url": "https://raw.githubusercontent.com/ahokkonen/ICAR/master/Release%20Candidate%20Messages" + "url": "https://icar-ade.standard.com" } ], "tags": [ @@ -43,10 +43,18 @@ "release-candidate-milk" ], "parameters": [ - { "$ref": "#/components/parameters/location-scheme" }, - { "$ref": "#/components/parameters/location-id" }, - { "$ref": "#/components/parameters/start-date-time" }, - { "$ref": "#/components/parameters/end-date-time" } + { + "$ref": "#/components/parameters/location-scheme" + }, + { + "$ref": "#/components/parameters/location-id" + }, + { + "$ref": "#/components/parameters/start-date-time" + }, + { + "$ref": "#/components/parameters/end-date-time" + } ], "responses": { "200": { @@ -82,10 +90,18 @@ "release-candidate-milk" ], "parameters": [ - { "$ref": "#/components/parameters/location-scheme" }, - { "$ref": "#/components/parameters/location-id" }, - { "$ref": "#/components/parameters/start-date-time" }, - { "$ref": "#/components/parameters/end-date-time" } + { + "$ref": "#/components/parameters/location-scheme" + }, + { + "$ref": "#/components/parameters/location-id" + }, + { + "$ref": "#/components/parameters/start-date-time" + }, + { + "$ref": "#/components/parameters/end-date-time" + } ], "responses": { "200": { @@ -121,10 +137,18 @@ "release-candidate-registration" ], "parameters": [ - { "$ref": "#/components/parameters/location-scheme" }, - { "$ref": "#/components/parameters/location-id" }, - { "$ref": "#/components/parameters/start-date-time" }, - { "$ref": "#/components/parameters/end-date-time" } + { + "$ref": "#/components/parameters/location-scheme" + }, + { + "$ref": "#/components/parameters/location-id" + }, + { + "$ref": "#/components/parameters/start-date-time" + }, + { + "$ref": "#/components/parameters/end-date-time" + } ], "responses": { "200": { @@ -155,10 +179,18 @@ "release-candidate-registration" ], "parameters": [ - { "$ref": "#/components/parameters/location-scheme" }, - { "$ref": "#/components/parameters/location-id" }, - { "$ref": "#/components/parameters/start-date-time" }, - { "$ref": "#/components/parameters/end-date-time" } + { + "$ref": "#/components/parameters/location-scheme" + }, + { + "$ref": "#/components/parameters/location-id" + }, + { + "$ref": "#/components/parameters/start-date-time" + }, + { + "$ref": "#/components/parameters/end-date-time" + } ], "responses": { "200": { @@ -189,10 +221,18 @@ "release-candidate-registration" ], "parameters": [ - { "$ref": "#/components/parameters/location-scheme" }, - { "$ref": "#/components/parameters/location-id" }, - { "$ref": "#/components/parameters/start-date-time" }, - { "$ref": "#/components/parameters/end-date-time" } + { + "$ref": "#/components/parameters/location-scheme" + }, + { + "$ref": "#/components/parameters/location-id" + }, + { + "$ref": "#/components/parameters/start-date-time" + }, + { + "$ref": "#/components/parameters/end-date-time" + } ], "responses": { "200": { @@ -228,10 +268,18 @@ "release-candidate-registration" ], "parameters": [ - { "$ref": "#/components/parameters/location-scheme" }, - { "$ref": "#/components/parameters/location-id" }, - { "$ref": "#/components/parameters/start-date-time" }, - { "$ref": "#/components/parameters/end-date-time" } + { + "$ref": "#/components/parameters/location-scheme" + }, + { + "$ref": "#/components/parameters/location-id" + }, + { + "$ref": "#/components/parameters/start-date-time" + }, + { + "$ref": "#/components/parameters/end-date-time" + } ], "responses": { "200": { @@ -262,8 +310,12 @@ "release-candidate-registration" ], "parameters": [ - { "$ref": "#/components/parameters/location-scheme" }, - { "$ref": "#/components/parameters/location-id" } + { + "$ref": "#/components/parameters/location-scheme" + }, + { + "$ref": "#/components/parameters/location-id" + } ], "responses": { "200": { @@ -285,7 +337,6 @@ } } }, - "/locations/{location-scheme}/{location-id}/pregnancy-checks": { "get": { "operationId": "get-pregnancy-checks", @@ -295,10 +346,18 @@ "release-candidate-reproduction" ], "parameters": [ - { "$ref": "#/components/parameters/location-scheme" }, - { "$ref": "#/components/parameters/location-id" }, - { "$ref": "#/components/parameters/start-date-time" }, - { "$ref": "#/components/parameters/end-date-time" } + { + "$ref": "#/components/parameters/location-scheme" + }, + { + "$ref": "#/components/parameters/location-id" + }, + { + "$ref": "#/components/parameters/start-date-time" + }, + { + "$ref": "#/components/parameters/end-date-time" + } ], "responses": { "200": { @@ -329,10 +388,18 @@ "release-candidate-reproduction" ], "parameters": [ - { "$ref": "#/components/parameters/location-scheme" }, - { "$ref": "#/components/parameters/location-id" }, - { "$ref": "#/components/parameters/start-date-time" }, - { "$ref": "#/components/parameters/end-date-time" } + { + "$ref": "#/components/parameters/location-scheme" + }, + { + "$ref": "#/components/parameters/location-id" + }, + { + "$ref": "#/components/parameters/start-date-time" + }, + { + "$ref": "#/components/parameters/end-date-time" + } ], "responses": { "200": { @@ -363,10 +430,18 @@ "release-candidate-reproduction" ], "parameters": [ - { "$ref": "#/components/parameters/location-scheme" }, - { "$ref": "#/components/parameters/location-id" }, - { "$ref": "#/components/parameters/start-date-time" }, - { "$ref": "#/components/parameters/end-date-time" } + { + "$ref": "#/components/parameters/location-scheme" + }, + { + "$ref": "#/components/parameters/location-id" + }, + { + "$ref": "#/components/parameters/start-date-time" + }, + { + "$ref": "#/components/parameters/end-date-time" + } ], "responses": { "200": { @@ -397,10 +472,18 @@ "release-candidate-reproduction" ], "parameters": [ - { "$ref": "#/components/parameters/location-scheme" }, - { "$ref": "#/components/parameters/location-id" }, - { "$ref": "#/components/parameters/start-date-time" }, - { "$ref": "#/components/parameters/end-date-time" } + { + "$ref": "#/components/parameters/location-scheme" + }, + { + "$ref": "#/components/parameters/location-id" + }, + { + "$ref": "#/components/parameters/start-date-time" + }, + { + "$ref": "#/components/parameters/end-date-time" + } ], "responses": { "200": { @@ -415,7 +498,10 @@ }, "examples": { "finland": { - "$ref": "#/components/examples/dryOffFinland" + "$ref": "#/components/examples/drying-off-finland" + }, + "sweden": { + "$ref": "#/components/examples/drying-off-sweden" } } } @@ -436,10 +522,18 @@ "release-candidate-reproduction" ], "parameters": [ - { "$ref": "#/components/parameters/location-scheme" }, - { "$ref": "#/components/parameters/location-id" }, - { "$ref": "#/components/parameters/start-date-time" }, - { "$ref": "#/components/parameters/end-date-time" } + { + "$ref": "#/components/parameters/location-scheme" + }, + { + "$ref": "#/components/parameters/location-id" + }, + { + "$ref": "#/components/parameters/start-date-time" + }, + { + "$ref": "#/components/parameters/end-date-time" + } ], "responses": { "200": { @@ -470,10 +564,18 @@ "release-candidate-reproduction" ], "parameters": [ - { "$ref": "#/components/parameters/location-scheme" }, - { "$ref": "#/components/parameters/location-id" }, - { "$ref": "#/components/parameters/start-date-time" }, - { "$ref": "#/components/parameters/end-date-time" } + { + "$ref": "#/components/parameters/location-scheme" + }, + { + "$ref": "#/components/parameters/location-id" + }, + { + "$ref": "#/components/parameters/start-date-time" + }, + { + "$ref": "#/components/parameters/end-date-time" + } ], "responses": { "200": { @@ -504,10 +606,18 @@ "release-candidate-reproduction" ], "parameters": [ - { "$ref": "#/components/parameters/location-scheme" }, - { "$ref": "#/components/parameters/location-id" }, - { "$ref": "#/components/parameters/start-date-time" }, - { "$ref": "#/components/parameters/end-date-time" } + { + "$ref": "#/components/parameters/location-scheme" + }, + { + "$ref": "#/components/parameters/location-id" + }, + { + "$ref": "#/components/parameters/start-date-time" + }, + { + "$ref": "#/components/parameters/end-date-time" + } ], "responses": { "200": { @@ -811,12 +921,94 @@ } ] }, - "dryOffFinland": { - "value": { - "summary": "Dry off event examples from finnish milk recording organization", - "externalValue": "/Examples/exampleDryOffEvent_Finland.json" - } - } + "drying-off-finland": { + "value": [ + { + "id": "4bd700b2-4f8b-4ab8-8cbf-7bb62d4e2bc3", + "animal": { + "id": "FI000010065148-2", + "scheme": "fi.animal-id" + }, + "eventDateTime": "2000-03-19T00:00:00", + "location": { + "id": "990000001", + "scheme": "fi.herd-id" + }, + "meta": { + "source": "fi.mro", + "creator": "v990000001", + "modified": "2020-01-29T08:49:06.0421042+00:00", + "created": null, + "validFrom": null, + "validTo": null + } + }, + { + "id": "85ec425d-f079-437e-801b-88756c912102", + "animal": { + "id": "FI000010065150-1", + "scheme": "fi.animal-id" + }, + "eventDateTime": "2000-04-03T00:00:00", + "location": { + "id": "990000001", + "scheme": "fi.herd-id" + }, + "meta": { + "source": "fi.mro", + "creator": "v990000001", + "modified": "2020-01-29T08:49:06.1314223+00:00", + "created": null, + "validFrom": null, + "validTo": null + } + } + ] + }, + "drying-off-sweden": { + "value": [ + { + "id": "1", + "animal": { + "id": "SE-801-2137-4", + "scheme": "se.animal-id" + }, + "eventDateTime": "2000-03-19T00:00:00", + "location": { + "id": "801", + "scheme": "se.herd-id" + }, + "meta": { + "source": "vxa.mro", + "creator": "bza632", + "modified": "2020-01-29T08:49:06.0421042+00:00", + "created": null, + "validFrom": null, + "validTo": null + } + }, + { + "id": "2", + "animal": { + "id": "SE-801-4259-5", + "scheme": "se.animal-id" + }, + "eventDateTime": "2000-04-03T00:00:00", + "location": { + "id": "801", + "scheme": "se.herd-id" + }, + "meta": { + "source": "vxa.mro", + "creator": "bza632", + "modified": "2020-01-29T08:49:06.1314223+00:00", + "created": null, + "validFrom": null, + "validTo": null + } + } + ] + } } } -} +} \ No newline at end of file From 6cf6d693faa59831e0ac96c6690b5e497f692a08 Mon Sep 17 00:00:00 2001 From: Anton Hokkonen Date: Fri, 31 Jan 2020 12:33:27 +0200 Subject: [PATCH 4/6] Revorked finnish and swedish examples for dryin off and pregnancy check messages --- .../exampleUrlScheme.json | 97 +++---------------- .../exampleDryOffEventResources_Finland.json | 42 ++++++++ .../exampleDryOffEventResources_Sweden.json | 42 ++++++++ ...ePregnancyCheckEventResources_Finland.json | 56 +++++++++++ 4 files changed, 153 insertions(+), 84 deletions(-) create mode 100644 Release Candidate Messages/examples/exampleDryOffEventResources_Finland.json create mode 100644 Release Candidate Messages/examples/exampleDryOffEventResources_Sweden.json create mode 100644 Release Candidate Messages/examples/examplePregnancyCheckEventResources_Finland.json diff --git a/Release Candidate Messages/exampleUrlScheme.json b/Release Candidate Messages/exampleUrlScheme.json index 838f0ad..7830e64 100644 --- a/Release Candidate Messages/exampleUrlScheme.json +++ b/Release Candidate Messages/exampleUrlScheme.json @@ -369,6 +369,11 @@ "items": { "$ref": "#/components/schemas/pregnancy-check" } + }, + "examples": { + "finland": { + "$ref": "#/components/examples/pregnancy-check-finland" + } } } } @@ -921,93 +926,17 @@ } ] }, + "pregnancy-check-finland": { + "summary": "Example of pregnancy check event messages from finnish milk recording organization", + "externalValue": "./examples/examplePregnancyCheckEventResources_Finland.json" + }, "drying-off-finland": { - "value": [ - { - "id": "4bd700b2-4f8b-4ab8-8cbf-7bb62d4e2bc3", - "animal": { - "id": "FI000010065148-2", - "scheme": "fi.animal-id" - }, - "eventDateTime": "2000-03-19T00:00:00", - "location": { - "id": "990000001", - "scheme": "fi.herd-id" - }, - "meta": { - "source": "fi.mro", - "creator": "v990000001", - "modified": "2020-01-29T08:49:06.0421042+00:00", - "created": null, - "validFrom": null, - "validTo": null - } - }, - { - "id": "85ec425d-f079-437e-801b-88756c912102", - "animal": { - "id": "FI000010065150-1", - "scheme": "fi.animal-id" - }, - "eventDateTime": "2000-04-03T00:00:00", - "location": { - "id": "990000001", - "scheme": "fi.herd-id" - }, - "meta": { - "source": "fi.mro", - "creator": "v990000001", - "modified": "2020-01-29T08:49:06.1314223+00:00", - "created": null, - "validFrom": null, - "validTo": null - } - } - ] + "summary": "Example of drying off event messages from finnish milk recording organization", + "externalValue": "./examples/exampleDryOffEventResources_Finland.json" }, "drying-off-sweden": { - "value": [ - { - "id": "1", - "animal": { - "id": "SE-801-2137-4", - "scheme": "se.animal-id" - }, - "eventDateTime": "2000-03-19T00:00:00", - "location": { - "id": "801", - "scheme": "se.herd-id" - }, - "meta": { - "source": "vxa.mro", - "creator": "bza632", - "modified": "2020-01-29T08:49:06.0421042+00:00", - "created": null, - "validFrom": null, - "validTo": null - } - }, - { - "id": "2", - "animal": { - "id": "SE-801-4259-5", - "scheme": "se.animal-id" - }, - "eventDateTime": "2000-04-03T00:00:00", - "location": { - "id": "801", - "scheme": "se.herd-id" - }, - "meta": { - "source": "vxa.mro", - "creator": "bza632", - "modified": "2020-01-29T08:49:06.1314223+00:00", - "created": null, - "validFrom": null, - "validTo": null - } - } - ] + "summary": "Example of drying off event messages from swedish milk recording organization", + "externalValue": "./examples/exampleDryOffEventResources_Sweden.json" } } } diff --git a/Release Candidate Messages/examples/exampleDryOffEventResources_Finland.json b/Release Candidate Messages/examples/exampleDryOffEventResources_Finland.json new file mode 100644 index 0000000..b18ee26 --- /dev/null +++ b/Release Candidate Messages/examples/exampleDryOffEventResources_Finland.json @@ -0,0 +1,42 @@ +[ + { + "id": "4bd700b2-4f8b-4ab8-8cbf-7bb62d4e2bc3", + "animal": { + "id": "FI000010065148-2", + "scheme": "fi.animal-id" + }, + "eventDateTime": "2017-03-19T00:00:00", + "location": { + "id": "990000001", + "scheme": "fi.herd-id" + }, + "meta": { + "source": "fi.mro", + "creator": "v990000001", + "modified": "2017-03-29T08:49:06.0421042+00:00", + "created": "2017-03-29T08:49:06.0421042+00:00", + "validFrom": null, + "validTo": null + } + }, + { + "id": "85ec425d-f079-437e-801b-88756c912102", + "animal": { + "id": "FI000010065150-1", + "scheme": "fi.animal-id" + }, + "eventDateTime": "2017-01-29T08:00:00", + "location": { + "id": "990000001", + "scheme": "fi.herd-id" + }, + "meta": { + "source": "fi.mro", + "creator": "v990000001", + "modified": "2017-01-29T08:49:06.1314223+00:00", + "created": "2017-01-29T08:49:06.1314223+00:00", + "validFrom": null, + "validTo": null + } + } +] \ No newline at end of file diff --git a/Release Candidate Messages/examples/exampleDryOffEventResources_Sweden.json b/Release Candidate Messages/examples/exampleDryOffEventResources_Sweden.json new file mode 100644 index 0000000..b034deb --- /dev/null +++ b/Release Candidate Messages/examples/exampleDryOffEventResources_Sweden.json @@ -0,0 +1,42 @@ +[ + { + "id": "1", + "animal": { + "id": "SE-801-2137-4", + "scheme": "se.animal-id" + }, + "eventDateTime": "2020-03-19T00:00:00", + "location": { + "id": "801", + "scheme": "se.herd-id" + }, + "meta": { + "source": "vxa.mro", + "creator": "bza632", + "modified": "2020-01-29T08:49:06.0421042+00:00", + "created": "2020-01-19T10:20:00.0421042+00:00", + "validFrom": null, + "validTo": null + } + }, + { + "id": "2", + "animal": { + "id": "SE-801-4259-5", + "scheme": "se.animal-id" + }, + "eventDateTime": "2020-01-03T00:00:00", + "location": { + "id": "801", + "scheme": "se.herd-id" + }, + "meta": { + "source": "vxa.mro", + "creator": "bza632", + "modified": "2020-01-18T08:49:06.1314223+00:00", + "created": "2020-01-03T10:29:00.0421042+00:00", + "validFrom": null, + "validTo": null + } + } +] \ No newline at end of file diff --git a/Release Candidate Messages/examples/examplePregnancyCheckEventResources_Finland.json b/Release Candidate Messages/examples/examplePregnancyCheckEventResources_Finland.json new file mode 100644 index 0000000..fe96f25 --- /dev/null +++ b/Release Candidate Messages/examples/examplePregnancyCheckEventResources_Finland.json @@ -0,0 +1,56 @@ +[ + { + "id": "4bd700b2-4f8b-4ab8-8cbf-7bb62d4e2bc3", + "animal": { + "id": "FI000010773604-2", + "scheme": "fi.animal-id" + }, + "eventDateTime": "2018-03-19T00:00:00", + "location": { + "id": "9900001", + "scheme": "fi.herd-id" + }, + "method": "Palpation", + "result": "Unknown", + "foetalAge": null, + "foetusCount": null, + "foetusCountMale": null, + "foetusCountFemale": null, + "exceptions": null, + "meta": { + "source": "fi.mro", + "creator": "v9900001", + "modified": "2018-03-29T08:49:06.0421042+00:00", + "created": "2018-03-19T08:49:06.0421042+00:00", + "validFrom": null, + "validTo": null + } + }, + { + "id": "85ec425d-f079-437e-801b-88756c912102", + "animal": { + "id": "FI000010065148-1", + "scheme": "fi.animal-id" + }, + "eventDateTime": "2018-04-03T00:00:00", + "location": { + "id": "9900001", + "scheme": "fi.herd-id" + }, + "method": "Palpation", + "result": "Pregnant", + "foetalAge": null, + "foetusCount": null, + "foetusCountMale": null, + "foetusCountFemale": null, + "exceptions": null, + "meta": { + "source": "fi.mro", + "creator": "v9900001", + "modified": "2018-04-29T08:49:06.0421042+00:00", + "created": "2018-04-19T08:49:06.0421042+00:00", + "validFrom": null, + "validTo": null + } + } +] \ No newline at end of file From 868c973b219dbfcc82518ddc62a15baacf43caab Mon Sep 17 00:00:00 2001 From: Anton Hokkonen Date: Fri, 31 Jan 2020 12:38:36 +0200 Subject: [PATCH 5/6] some small fixes into previous examples implementation --- .../exampleUrlScheme.json | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Release Candidate Messages/exampleUrlScheme.json b/Release Candidate Messages/exampleUrlScheme.json index 7830e64..cf9c385 100644 --- a/Release Candidate Messages/exampleUrlScheme.json +++ b/Release Candidate Messages/exampleUrlScheme.json @@ -927,16 +927,22 @@ ] }, "pregnancy-check-finland": { - "summary": "Example of pregnancy check event messages from finnish milk recording organization", - "externalValue": "./examples/examplePregnancyCheckEventResources_Finland.json" + "value": { + "summary": "Example of pregnancy check event messages from finnish milk recording organization", + "externalValue": "./examples/examplePregnancyCheckEventResources_Finland.json" + } }, "drying-off-finland": { - "summary": "Example of drying off event messages from finnish milk recording organization", - "externalValue": "./examples/exampleDryOffEventResources_Finland.json" + "value": { + "summary": "Example of drying off event messages from finnish milk recording organization", + "externalValue": "./examples/exampleDryOffEventResources_Finland.json" + } }, "drying-off-sweden": { - "summary": "Example of drying off event messages from swedish milk recording organization", - "externalValue": "./examples/exampleDryOffEventResources_Sweden.json" + "value": { + "summary": "Example of drying off event messages from swedish milk recording organization", + "externalValue": "./examples/exampleDryOffEventResources_Sweden.json" + } } } } From 70bf4de39e0a5fb47f6e1907661caa4d89b5a161 Mon Sep 17 00:00:00 2001 From: Anton Hokkonen Date: Fri, 31 Jan 2020 13:18:23 +0200 Subject: [PATCH 6/6] Added example of insemination event message from finnish milk recording organization --- .../exampleUrlScheme.json | 11 ++++++ ...pleInseminationEventResources_Finland.json | 35 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 Release Candidate Messages/examples/exampleInseminationEventResources_Finland.json diff --git a/Release Candidate Messages/exampleUrlScheme.json b/Release Candidate Messages/exampleUrlScheme.json index cf9c385..806df24 100644 --- a/Release Candidate Messages/exampleUrlScheme.json +++ b/Release Candidate Messages/exampleUrlScheme.json @@ -458,6 +458,11 @@ "items": { "$ref": "#/components/schemas/insemination" } + }, + "examples": { + "finland": { + "$ref": "#/components/examples/insemination-finland" + } } } } @@ -926,6 +931,12 @@ } ] }, + "insemination-finland": { + "value": { + "summary": "Example of insemination event messages from finnish milk recording organization", + "externalValue": "./examples/exampleInseminationEventResources_Finland.json" + } + }, "pregnancy-check-finland": { "value": { "summary": "Example of pregnancy check event messages from finnish milk recording organization", diff --git a/Release Candidate Messages/examples/exampleInseminationEventResources_Finland.json b/Release Candidate Messages/examples/exampleInseminationEventResources_Finland.json new file mode 100644 index 0000000..a7418bc --- /dev/null +++ b/Release Candidate Messages/examples/exampleInseminationEventResources_Finland.json @@ -0,0 +1,35 @@ +[ + { + "id": "4bd700b2-4f8b-4ab8-8cbf-7bb62d4e2bc3", + "animal": { + "id": "FI000010065148-2", + "scheme": "fi.animal-id" + }, + "eventDateTime": "2017-03-19T00:00:00", + "location": { + "id": "990000001", + "scheme": "fi.herd-id" + }, + "inseminationType": "Insemination", + "sireIdentifiers": [ + { + "id": "FI000013718337-8", + "scheme": "fi.animal-id" + } + ], + "sireOfficialName": "3-95890", + "sireURI": null, + "semenFromFarmStocks": true, + "farmContainer": 6202, + "straw": null, + "embryo": null, + "meta": { + "source": "fi.mro", + "creator": "v990000001", + "modified": "2017-03-29T08:49:06.0421042+00:00", + "created": "2017-03-29T08:49:06.0421042+00:00", + "validFrom": null, + "validTo": null + } + } +] \ No newline at end of file