Merge pull request #292 from cookeac/Develop

Create icarAnimalEventCoreResource
adewg · Apr 21, 2022 · db5b7a7 · db5b7a7
2 parents f4440ce + 9f53e2e
commit db5b7a7
Show file tree

Hide file tree

Showing 28 changed files with 52 additions and 37 deletions.
diff --git a/resources/icarAnimalEventCoreResource.json b/resources/icarAnimalEventCoreResource.json
@@ -0,0 +1,19 @@
+{
+  "description": "",
+
+  "allOf": [
+    {
+      "$ref": "../resources/icarEventCoreResource.json"
+    },
+    {
+      "type": "object",
+
+      "properties": {
+        "animal": {
+          "$ref": "../types/icarAnimalIdentifierType.json",
+          "description": "Unique animal scheme and identifier combination."
+        }
+      }
+    }
+  ]
+}
diff --git a/resources/icarAnimalSetJoinEventResource.json b/resources/icarAnimalSetJoinEventResource.json
@@ -3,7 +3,7 @@
 
   "allOf": [
     {
-      "$ref": "../resources/icarEventCoreResource.json"
+      "$ref": "../resources/icarAnimalEventCoreResource.json"
     },
     {
       "type": "object",

diff --git a/resources/icarAnimalSetLeaveEventResource.json b/resources/icarAnimalSetLeaveEventResource.json
@@ -3,7 +3,7 @@
 
   "allOf": [
     {
-      "$ref": "../resources/icarEventCoreResource.json"
+      "$ref": "../resources/icarAnimalEventCoreResource.json"
     },
     {
       "type": "object",

diff --git a/resources/icarConformationScoreEventResource.json b/resources/icarConformationScoreEventResource.json
@@ -1,11 +1,11 @@
 {
-	"description": "Event for recording conformation score",
+    "description": "Event for recording conformation score",
 
-	"allOf": [{
-			"$ref": "../resources/icarEventCoreResource.json"
-		},
-		{
-			"$ref": "../types/icarConformationScoreType.json"
-		}
-	]
+    "allOf": [{
+            "$ref": "../resources/icarAnimalEventCoreResource.json"
+        },
+        {
+           "$ref": "../types/icarConformationScoreType.json"
+        }
+    ]
 }
diff --git a/resources/icarDiagnosisEventResource.json b/resources/icarDiagnosisEventResource.json
@@ -3,7 +3,7 @@
 
     "allOf": [
         {
-            "$ref": "../resources/icarEventCoreResource.json"
+            "$ref": "../resources/icarAnimalEventCoreResource.json"
         },
         {
             "type": "object",

diff --git a/resources/icarEventCoreResource.json b/resources/icarEventCoreResource.json
@@ -13,10 +13,6 @@
           "type": "string",
           "description": "Unique identifier in the source system for this event."
         },
-        "animal": {
-          "$ref": "../types/icarAnimalIdentifierType.json",
-          "description": "Unique animal scheme and identifier combination."
-        },
         "eventDateTime": {
           "$ref": "../types/icarDateTimeType.json",
           "description": "ISO8601 date and time. MUST contain time zone. UTC recommended."

diff --git a/resources/icarFeedIntakeEventResource.json b/resources/icarFeedIntakeEventResource.json
@@ -2,7 +2,7 @@
     "description": "Event for recording a feed intake",
 
     "allOf": [{
-        "$ref": "../resources/icarEventCoreResource.json"
+        "$ref": "../resources/icarAnimalEventCoreResource.json"
       },
       {
         "type": "object",

diff --git a/resources/icarHealthStatusObservedEventResource.json b/resources/icarHealthStatusObservedEventResource.json
@@ -2,7 +2,7 @@
   "description": "Event for recording animal health status",
 
   "allOf": [{
-      "$ref": "../resources/icarEventCoreResource.json"
+      "$ref": "../resources/icarAnimalEventCoreResource.json"
     },
     {
       "type": "object",

diff --git a/resources/icarLactationStatusObservedEventResource.json b/resources/icarLactationStatusObservedEventResource.json
@@ -2,7 +2,7 @@
     "description": "This event records an observed lactation status without necessarily a parturition, drying off, or other event.",
 
     "allOf": [{
-        "$ref": "../resources/icarEventCoreResource.json"
+        "$ref": "../resources/icarAnimalEventCoreResource.json"
       },
       {
           "type": "object",

diff --git a/resources/icarMilkingDryOffEventResource.json b/resources/icarMilkingDryOffEventResource.json
@@ -2,7 +2,7 @@
   "description": "Records that the animal has been dried off from milking. If necessary, also record a separate health treatment event.",
 
   "allOf": [{
-      "$ref": "../resources/icarEventCoreResource.json"
+      "$ref": "../resources/icarAnimalEventCoreResource.json"
     }
   ]
 }
diff --git a/resources/icarMilkingVisitEventResource.json b/resources/icarMilkingVisitEventResource.json
@@ -2,7 +2,7 @@
   "description": "Event for recording milking visit",
 
   "allOf": [{
-      "$ref": "../resources/icarEventCoreResource.json"
+      "$ref": "../resources/icarAnimalEventCoreResource.json"
     },
     {
       "type": "object",

diff --git a/resources/icarMovementArrivalEventResource.json b/resources/icarMovementArrivalEventResource.json
@@ -2,7 +2,7 @@
   "description": "Event for recording animal arrival",
 
   "allOf": [{
-      "$ref": "../resources/icarEventCoreResource.json"
+      "$ref": "../resources/icarAnimalEventCoreResource.json"
     },
     {
       "type": "object",

diff --git a/resources/icarMovementBirthEventResource.json b/resources/icarMovementBirthEventResource.json
@@ -2,7 +2,7 @@
   "description": "Event for recording animal birth",
 
   "allOf": [{
-      "$ref": "../resources/icarEventCoreResource.json"
+      "$ref": "../resources/icarAnimalEventCoreResource.json"
     },
     {
       "type": "object",

diff --git a/resources/icarMovementDeathEventResource.json b/resources/icarMovementDeathEventResource.json
@@ -2,7 +2,7 @@
   "description": "Event for recording animal death",
 
   "allOf": [{
-      "$ref": "../resources/icarEventCoreResource.json"
+      "$ref": "../resources/icarAnimalEventCoreResource.json"
     },
     {
       "type": "object",

diff --git a/resources/icarMovementDepartureEventResource.json b/resources/icarMovementDepartureEventResource.json
@@ -2,7 +2,7 @@
   "description": "Event for recording animal departure",
 
   "allOf": [{
-      "$ref": "../resources/icarEventCoreResource.json"
+      "$ref": "../resources/icarAnimalEventCoreResource.json"
     },
     {
       "type": "object",

diff --git a/resources/icarReproAbortionEventResource.json b/resources/icarReproAbortionEventResource.json
@@ -2,7 +2,7 @@
   "description": "The abortion event records an observation that an abortion has taken place. There are no other parameters.",
 
   "allOf": [{
-      "$ref": "../resources/icarEventCoreResource.json"
+      "$ref": "../resources/icarAnimalEventCoreResource.json"
     }
   ]
 }
diff --git a/resources/icarReproDoNotBreedEventResource.json b/resources/icarReproDoNotBreedEventResource.json
@@ -2,7 +2,7 @@
   "description": "The do not breed event records an observation that an animal has been assigned not to be bred. There are no other parameters.",
 
   "allOf": [{
-      "$ref": "../resources/icarEventCoreResource.json"
+      "$ref": "../resources/icarAnimalEventCoreResource.json"
     },
     {
       "type": "object",

diff --git a/resources/icarReproHeatEventResource.json b/resources/icarReproHeatEventResource.json
@@ -2,7 +2,7 @@
   "description": "Event for recording heats.",
 
   "allOf": [{
-      "$ref": "../resources/icarEventCoreResource.json"
+      "$ref": "../resources/icarAnimalEventCoreResource.json"
     },
     {
       "type": "object",

diff --git a/resources/icarReproInseminationEventResource.json b/resources/icarReproInseminationEventResource.json
@@ -2,7 +2,7 @@
   "description": "Event for recording natural or artificial insemination, including embryo transfer.",
 
   "allOf": [{
-      "$ref": "../resources/icarEventCoreResource.json"
+      "$ref": "../resources/icarAnimalEventCoreResource.json"
     },
     {
       "type": "object",

diff --git a/resources/icarReproMatingRecommendationResource.json b/resources/icarReproMatingRecommendationResource.json
@@ -2,7 +2,7 @@
   "description": "Mating recommendation for an animal",
 
   "allOf": [{
-      "$ref": "../resources/icarEventCoreResource.json"
+      "$ref": "../resources/icarAnimalEventCoreResource.json"
     },
     {
       "type": "object",

diff --git a/resources/icarReproParturitionEventResource.json b/resources/icarReproParturitionEventResource.json
@@ -2,7 +2,7 @@
   "description": "Event for recording parturition (calving, lambing, kidding, fawning).",
 
   "allOf": [{
-      "$ref": "../resources/icarEventCoreResource.json"
+      "$ref": "../resources/icarAnimalEventCoreResource.json"
     },
     {
       "type": "object",

diff --git a/resources/icarReproPregnancyCheckEventResource.json b/resources/icarReproPregnancyCheckEventResource.json
@@ -2,7 +2,7 @@
   "description": "Pregnancy diagnosis or check event.",
 
   "allOf": [{
-      "$ref": "../resources/icarEventCoreResource.json"
+      "$ref": "../resources/icarAnimalEventCoreResource.json"
     },
     {
       "type": "object",

diff --git a/resources/icarReproStatusObservedEventResource.json b/resources/icarReproStatusObservedEventResource.json
@@ -2,7 +2,7 @@
   "description": "This event records an observed reproductive status without necessarily a pregnancy check, parturition, or other event.",
 
   "allOf": [{
-      "$ref": "../resources/icarEventCoreResource.json"
+      "$ref": "../resources/icarAnimalEventCoreResource.json"
     },
     {
         "type": "object",

diff --git a/resources/icarTestDayResultEventResource.json b/resources/icarTestDayResultEventResource.json
@@ -2,7 +2,7 @@
   "description": "Event for representing test day result",
 
   "allOf": [{
-      "$ref": "../resources/icarEventCoreResource.json"
+      "$ref": "../resources/icarAnimalEventCoreResource.json"
     },
     {
       "type": "object",

diff --git a/resources/icarTreatmentEventResource.json b/resources/icarTreatmentEventResource.json
@@ -3,7 +3,7 @@
 
     "allOf": [
         {
-          "$ref": "../resources/icarEventCoreResource.json"
+          "$ref": "../resources/icarAnimalEventCoreResource.json"
         },
         {
             "type": "object",

diff --git a/resources/icarTreatmentProgramEventResource.json b/resources/icarTreatmentProgramEventResource.json
@@ -2,7 +2,7 @@
     "description": "An animal health event combining diagnosis and planned or actual treatment course or events.",
     "allOf": [
         {
-            "$ref": "../resources/icarEventCoreResource.json"
+            "$ref": "../resources/icarAnimalEventCoreResource.json"
         },
         {
             "type": "object",

diff --git a/resources/icarTypeClassificationEventResource.json b/resources/icarTypeClassificationEventResource.json
@@ -2,7 +2,7 @@
     "description": "Event for recording a type calssification consisting of a set of conformation scores",
 
     "allOf": [{
-        "$ref": "../resources/icarEventCoreResource.json"
+        "$ref": "../resources/icarAnimalEventCoreResource.json"
       },
       {
         "type": "object",

diff --git a/resources/icarWeightEventResource.json b/resources/icarWeightEventResource.json
@@ -2,7 +2,7 @@
   "description": "The Weight event records a live weight observation of an animal.",
 
   "allOf": [{
-      "$ref": "../resources/icarEventCoreResource.json"
+      "$ref": "../resources/icarAnimalEventCoreResource.json"
     },
     {
       "type": "object",