Merge pull request #113 from redmitry/invalid-timeElement-fix

invalid timeElement oneOf fix
ga4gh-beacon · Oct 10, 2023 · 7c64fdf · 7c64fdf
2 parents d2be0e2 + 1f6fb0b
commit 7c64fdf
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/models/json/beacon-v2-default-model/common/age.json b/models/json/beacon-v2-default-model/common/age.json
@@ -3,11 +3,14 @@
     "description": "Age value definition. Provenance: GA4GH Phenopackets v2 `Age`",
     "properties": {
         "iso8601duration": {
-            "description": "Represents age as a ISO8601 duration (e.g., P40Y10M05D).",
+            "description": "Represents age as a ISO8601 duration (e.g., 'P40Y10M05D').",
             "example": "P32Y6M1D",
             "type": "string"
         }
     },
+    "required": [
+        "iso8601duration"
+    ],
     "title": "Age",
     "type": "object"
-}
+}
diff --git a/models/json/beacon-v2-default-model/common/ageRange.json b/models/json/beacon-v2-default-model/common/ageRange.json
@@ -11,6 +11,10 @@
             "description": "Represents age as an ISO8601 duration (e.g., P18Y)."
         }
     },
+    "required": [
+        "end",
+        "start"
+    ],
     "title": "AgeRange",
     "type": "object"
 }
diff --git a/models/src/beacon-v2-default-model/common/age.yaml b/models/src/beacon-v2-default-model/common/age.yaml
@@ -7,3 +7,5 @@ properties:
     description: Represents age as a ISO8601 duration (e.g., P40Y10M05D).
     type: string
     example: P32Y6M1D
+required:
+  - iso8601duration
diff --git a/models/src/beacon-v2-default-model/common/ageRange.yaml b/models/src/beacon-v2-default-model/common/ageRange.yaml
@@ -9,3 +9,6 @@ properties:
   end:
     description: Represents age as an ISO8601 duration (e.g., P59Y).
     $ref: ./age.yaml
+required:
+  - start
+  - end