Skip to content

Commit eaf2657

Browse files
author
Anton Hokkonen
authored
Merge pull request #165 from adewg/ADE-1-1
Correct so branches are only MAJOR versions + Develop
2 parents 9041bd3 + 100bca5 commit eaf2657

File tree

54 files changed

+2068
-165
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+2068
-165
lines changed

‎CHANGELOG.md

+55-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,66 @@
11
# Changelog
22

3-
## [Unreleased](https://github.com/adewg/ICAR/tree/HEAD)
3+
## [v1.1.1](https://github.com/adewg/ICAR/tree/HEAD)
44

5-
[Full Changelog](https://github.com/adewg/ICAR/compare/1.0.2...HEAD)
5+
[Full Changelog](https://github.com/adewg/ICAR/compare/v1.1.0...HEAD)
6+
7+
**Fixed bugs:**
8+
9+
- Error when generating code from tag v1.1.0 [\#158](https://github.com/adewg/ICAR/issues/158)
10+
11+
**Merged pull requests:**
12+
13+
- Hotfix: Remove oneOf: allow both courses and treatments [\#159](https://github.com/adewg/ICAR/pull/159) ([cookeac](https://github.com/cookeac))
14+
15+
## [v1.1.0](https://github.com/adewg/ICAR/tree/v1.1.0) (2020-09-28)
16+
17+
[Full Changelog](https://github.com/adewg/ICAR/compare/1.0.2...v1.1.0)
618

719
**Closed issues:**
820

21+
- Latest OAS3 \(open API specification 3\) validation now enforced on examples [\#144](https://github.com/adewg/ICAR/issues/144)
22+
- For which use cases do we use AnimalEvents and for which do we just use PUT/POST/DELETE? [\#140](https://github.com/adewg/ICAR/issues/140)
23+
- Animal Sets \(groups\) membership change events [\#139](https://github.com/adewg/ICAR/issues/139)
24+
- do not breeds RESOURCE API [\#138](https://github.com/adewg/ICAR/issues/138)
25+
- Add list of available locations [\#125](https://github.com/adewg/ICAR/issues/125)
26+
- gestations API [\#121](https://github.com/adewg/ICAR/issues/121)
927
- Add documentation for icarValidSampleFillingIndicatorType.json [\#116](https://github.com/adewg/ICAR/issues/116)
1028
- Quarter Milking Type Quarter Id Enum differs from ICAR Data Dictionary [\#112](https://github.com/adewg/ICAR/issues/112)
29+
- Reproduction and lactation status values [\#111](https://github.com/adewg/ICAR/issues/111)
30+
- Resource for listing test days [\#110](https://github.com/adewg/ICAR/issues/110)
31+
- Cannot find information about ICAR\_ValidSampleFillingIndicator code list [\#108](https://github.com/adewg/ICAR/issues/108)
32+
- Conformation Scores [\#97](https://github.com/adewg/ICAR/issues/97)
33+
- Animal Health Treatments [\#96](https://github.com/adewg/ICAR/issues/96)
34+
- breeding values of an animal API [\#89](https://github.com/adewg/ICAR/issues/89)
35+
- Group assignments missing \(feeding, milking, barn\) [\#88](https://github.com/adewg/ICAR/issues/88)
36+
- BCS \(body condition score\) API [\#83](https://github.com/adewg/ICAR/issues/83)
37+
- Splitting complex types, event-based types and code-based types \(enums\) into saparate sub-folders [\#66](https://github.com/adewg/ICAR/issues/66)
38+
- Define recommended url scheme [\#18](https://github.com/adewg/ICAR/issues/18)
39+
40+
**Merged pull requests:**
41+
42+
- Merge from Develop to ADE-1-1 [\#157](https://github.com/adewg/ICAR/pull/157) ([cookeac](https://github.com/cookeac))
43+
- Release 1.1 changelog [\#152](https://github.com/adewg/ICAR/pull/152) ([cookeac](https://github.com/cookeac))
44+
- Add observation events for animal status - lactation and reproduction status [\#151](https://github.com/adewg/ICAR/pull/151) ([cookeac](https://github.com/cookeac))
45+
- organised the API's in sections [\#150](https://github.com/adewg/ICAR/pull/150) ([erwinspeybroeck](https://github.com/erwinspeybroeck))
46+
- Add DoNotBreed to Repro status [\#146](https://github.com/adewg/ICAR/pull/146) ([cookeac](https://github.com/cookeac))
47+
- Corrected linting errors and file names [\#145](https://github.com/adewg/ICAR/pull/145) ([cookeac](https://github.com/cookeac))
48+
- creation of a do-not-breed event [\#143](https://github.com/adewg/ICAR/pull/143) ([erwinspeybroeck](https://github.com/erwinspeybroeck))
49+
- Added animal status [\#142](https://github.com/adewg/ICAR/pull/142) ([thomasd-gea](https://github.com/thomasd-gea))
50+
- Added animalSetJoin and animalSetLeave events [\#141](https://github.com/adewg/ICAR/pull/141) ([thomasd-gea](https://github.com/thomasd-gea))
51+
- Gestations API issue https://github.com/adewg/ICAR/issues/121 [\#137](https://github.com/adewg/ICAR/pull/137) ([erwinspeybroeck](https://github.com/erwinspeybroeck))
52+
- Additional changes for conformation score [\#136](https://github.com/adewg/ICAR/pull/136) ([ahokkonen](https://github.com/ahokkonen))
53+
- Add animal health diagnosis, treatment, and treatment program events [\#134](https://github.com/adewg/ICAR/pull/134) ([cookeac](https://github.com/cookeac))
54+
- Added resources for conformation score event \(\#97\) [\#133](https://github.com/adewg/ICAR/pull/133) ([ahokkonen](https://github.com/ahokkonen))
55+
- Corrected typo, added icarSetPurposeType enum. [\#132](https://github.com/adewg/ICAR/pull/132) ([cookeac](https://github.com/cookeac))
56+
- Fixed a typo in icarLocationResource.json [\#131](https://github.com/adewg/ICAR/pull/131) ([cookeac](https://github.com/cookeac))
57+
- Add animal set resource [\#127](https://github.com/adewg/ICAR/pull/127) ([MetroMarv](https://github.com/MetroMarv))
58+
- Add locations resource [\#126](https://github.com/adewg/ICAR/pull/126) ([MetroMarv](https://github.com/MetroMarv))
59+
- Add test day resource [\#124](https://github.com/adewg/ICAR/pull/124) ([MetroMarv](https://github.com/MetroMarv))
60+
- removed redoc since it does not work anymore with current spec [\#123](https://github.com/adewg/ICAR/pull/123) ([alamers](https://github.com/alamers))
61+
- Develop [\#122](https://github.com/adewg/ICAR/pull/122) ([erwinspeybroeck](https://github.com/erwinspeybroeck))
62+
- Update changelog for 1.0.2 release [\#120](https://github.com/adewg/ICAR/pull/120) ([cookeac](https://github.com/cookeac))
63+
- Update changelog [\#119](https://github.com/adewg/ICAR/pull/119) ([cookeac](https://github.com/cookeac))
1164

1265
## [1.0.2](https://github.com/adewg/ICAR/tree/1.0.2) (2020-06-08)
1366

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ You can find the documentation for this project in [the Wiki](https://github.com
99
There you will find:
1010
* Information about [ICAR and the ADE working group](https://github.com/adewg/ICAR/wiki/About-ICAR-and-ADE)
1111
* The design principles considered by the ADE working group when developing the standard
12-
* How to understand the data model
12+
* How to understand the data model and what [resources we support](https://github.com/adewg/ICAR/wiki/Resource-entities)
1313
* Tips for [implementing a client application](https://github.com/adewg/ICAR/wiki/Implementing-a-client-application) using the standard
1414
* Tips for [implementing a service](https://github.com/adewg/ICAR/wiki/Implementing-a-service) using the standard
1515

1616
## OpenAPI Quick Start
1717
Developers may wish to start by reading the **\url-schemes\exampleUrlScheme.json** file in their favourite OpenAPI specification editor.
18-
You can also [see a preview using the free Redoc tool](https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/adewg/ICAR/ADE-1/url-schemes/exampleUrlScheme.json). Or (by using the swagger editor : https://editor.swagger.io/?url=https://raw.githubusercontent.com/adewg/ICAR/ADE-1/url-schemes/exampleUrlScheme.json
18+
You can also [view the API using the swagger editor](https://editor.swagger.io/?url=https://raw.githubusercontent.com/adewg/ICAR/ADE-1/url-schemes/exampleUrlScheme.json).
1919

2020

2121
## Acknowledgements

‎collections/icarAnimalSetCollection.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"description": "Represents a collection of animal sets. Based on icarResourceCollection to provide paging etc.",
3+
4+
"allOf": [{
5+
"$ref": "../collections/icarResourceCollection.json"
6+
},
7+
{
8+
"type": "object",
9+
10+
"properties": {
11+
"member": {
12+
"type": "array",
13+
"items": {
14+
"$ref": "../resources/icarAnimalSetResource.json"
15+
},
16+
"description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case animal sets."
17+
}
18+
}
19+
}
20+
]
21+
}

‎collections/icarAnimalSetJoinEventCollection.json

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"description": "Represents a collection of animal set join events. Based on icarResourceCollection to provide paging etc.",
3+
"allOf": [
4+
{
5+
"$ref": "../collections/icarResourceCollection.json"
6+
},
7+
{
8+
"type": "object",
9+
"properties": {
10+
"member": {
11+
"type": "array",
12+
"items": {
13+
"$ref": "../resources/icarAnimalSetJoinEventResource.json"
14+
},
15+
"description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case animal set join events."
16+
}
17+
}
18+
}
19+
]
20+
}

‎collections/icarAnimalSetLeaveEventCollection.json

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"description": "Represents a collection of animal set leave events. Based on icarResourceCollection to provide paging etc.",
3+
"allOf": [
4+
{
5+
"$ref": "../collections/icarResourceCollection.json"
6+
},
7+
{
8+
"type": "object",
9+
"properties": {
10+
"member": {
11+
"type": "array",
12+
"items": {
13+
"$ref": "../resources/icarAnimalSetLeaveEventResource.json"
14+
},
15+
"description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case animal set leave events."
16+
}
17+
}
18+
}
19+
]
20+
}

‎collections/icarBreedingValueCollection.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"description": "Represents a collection of breeding values. Based on icarResourceCollection to provide paging etc.",
3+
4+
"allOf": [{
5+
"$ref": "icarResourceCollection.json"
6+
},
7+
{
8+
"type": "object",
9+
10+
"properties": {
11+
"member": {
12+
"type": "array",
13+
"items": {
14+
"$ref": "../resources/icarBreedingValueResource.json"
15+
},
16+
"description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case breeding values."
17+
}
18+
}
19+
}
20+
]
21+
}

‎collections/icarConformationScoreEventCollection.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"description": "Represents a collection of animal conformation scores. Based on icarResourceCollection to provide paging etc.",
3+
4+
"allOf": [{
5+
"$ref": "../collections/icarResourceCollection.json"
6+
},
7+
{
8+
"type": "object",
9+
10+
"properties": {
11+
"member": {
12+
"type": "array",
13+
"items": {
14+
"$ref": "../resources/icarConformationScoreEventResource.json"
15+
},
16+
"description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case conformation score events."
17+
}
18+
}
19+
}
20+
]
21+
}

‎collections/icarDiagnosisEventCollection.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"description": "Represents a collection of animal health diagnosis events. Based on icarResourceCollection to provide paging etc.",
3+
4+
"allOf": [
5+
{
6+
"$ref": "icarResourceCollection.json"
7+
},
8+
{
9+
"type": "object",
10+
"properties": {
11+
"member": {
12+
"type": "array",
13+
"items": {
14+
"$ref": "../resources/icarDiagnosisEventResource.json"
15+
},
16+
"description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case diagnosis events."
17+
}
18+
}
19+
}
20+
]
21+
}

‎collections/icarGestationCollection.json

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
{
3+
"description": "Represents a collection of gestations. Based on icarResourceCollection to provide paging etc.",
4+
5+
"allOf": [{
6+
"$ref": "icarResourceCollection.json"
7+
},
8+
{
9+
"type": "object",
10+
11+
"properties": {
12+
"member": {
13+
"type": "array",
14+
"items": {
15+
"$ref": "../resources/icarGestationResource.json"
16+
},
17+
"description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case gestations."
18+
}
19+
}
20+
}
21+
]
22+
}

‎collections/icarLactationStatusObservedEventCollection.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"description": "Represents a collection of animal lactation status observation events. Based on icarResourceCollection to provide paging etc.",
3+
4+
"allOf": [{
5+
"$ref": "../collections/icarResourceCollection.json"
6+
},
7+
{
8+
"type": "object",
9+
10+
"properties": {
11+
"member": {
12+
"type": "array",
13+
"items": {
14+
"$ref": "../resources/icarLactationStatusObservedEventResource.json"
15+
},
16+
"description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case lactation status events."
17+
}
18+
}
19+
}
20+
]
21+
}

‎collections/icarLocationCollection.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"description": "Represents a collection of locations. Based on icarResourceCollection to provide paging etc.",
3+
4+
"allOf": [{
5+
"$ref": "../collections/icarResourceCollection.json"
6+
},
7+
{
8+
"type": "object",
9+
10+
"properties": {
11+
"member": {
12+
"type": "array",
13+
"items": {
14+
"$ref": "../resources/icarLocationResource.json"
15+
},
16+
"description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case locations."
17+
}
18+
}
19+
}
20+
]
21+
}

‎collections/icarReproDoNotBreedEventCollection.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"description": "Represents a collection of do not breed events. Based on icarResourceCollection to provide paging etc.",
3+
4+
"allOf": [{
5+
"$ref": "../collections/icarResourceCollection.json"
6+
},
7+
{
8+
"type": "object",
9+
10+
"properties": {
11+
"member": {
12+
"type": "array",
13+
"items": {
14+
"$ref": "../resources/icarReproDoNotBreedEventResource.json"
15+
},
16+
"description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case do not breed events."
17+
}
18+
}
19+
}
20+
]
21+
}

‎collections/icarReproStatusObservedEventCollection.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"description": "Represents a collection of animal reproductive status observation events. Based on icarResourceCollection to provide paging etc.",
3+
4+
"allOf": [{
5+
"$ref": "../collections/icarResourceCollection.json"
6+
},
7+
{
8+
"type": "object",
9+
10+
"properties": {
11+
"member": {
12+
"type": "array",
13+
"items": {
14+
"$ref": "../resources/icarReproStatusObservedEventResource.json"
15+
},
16+
"description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case reproductive status events."
17+
}
18+
}
19+
}
20+
]
21+
}

‎collections/icarTestDayCollection.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"description": "Represents a collection of test days. Based on icarResourceCollection to provide paging etc.",
3+
4+
"allOf": [{
5+
"$ref": "icarResourceCollection.json"
6+
},
7+
{
8+
"type": "object",
9+
10+
"properties": {
11+
"member": {
12+
"type": "array",
13+
"items": {
14+
"$ref": "../resources/icarTestDayResource.json"
15+
},
16+
"description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case test days."
17+
}
18+
}
19+
}
20+
]
21+
}

‎collections/icarTreatmentEventCollection.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"description": "Represents a collection of animal health treatment events. Based on icarResourceCollection to provide paging etc.",
3+
4+
"allOf": [
5+
{
6+
"$ref": "../collections/icarResourceCollection.json"
7+
},
8+
{
9+
"type": "object",
10+
"properties": {
11+
"member": {
12+
"type": "array",
13+
"items": {
14+
"$ref": "../resources/icarTreatmentEventResource.json"
15+
},
16+
"description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case treatment events."
17+
}
18+
}
19+
}
20+
]
21+
}

0 commit comments

Comments
 (0)