From a45ccc786aba78e1e393bb4c087c1d87d9ae5306 Mon Sep 17 00:00:00 2001 From: redmitry Date: Fri, 6 Oct 2023 16:14:36 +0200 Subject: [PATCH 1/2] provide "required" properties for the "age" and "ageRange" schemas --- models/json/beacon-v2-default-model/common/age.json | 3 +++ models/json/beacon-v2-default-model/common/ageRange.json | 4 ++++ models/src/beacon-v2-default-model/common/age.yaml | 2 ++ models/src/beacon-v2-default-model/common/ageRange.yaml | 3 +++ 4 files changed, 12 insertions(+) diff --git a/models/json/beacon-v2-default-model/common/age.json b/models/json/beacon-v2-default-model/common/age.json index 9ca29f0da..f6b941fde 100644 --- a/models/json/beacon-v2-default-model/common/age.json +++ b/models/json/beacon-v2-default-model/common/age.json @@ -8,6 +8,9 @@ "type": "string" } }, + "required": [ + "iso8601duration" + ], "title": "Age", "type": "object" } \ No newline at end of file diff --git a/models/json/beacon-v2-default-model/common/ageRange.json b/models/json/beacon-v2-default-model/common/ageRange.json index 204fef563..31fb79c76 100644 --- 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" } \ No newline at end of file diff --git a/models/src/beacon-v2-default-model/common/age.yaml b/models/src/beacon-v2-default-model/common/age.yaml index 04e0bfb3c..51a105065 100644 --- 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 index 02011e6c4..cd15ccad5 100644 --- 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 From 1f6fb0bae286687066e5b6a2ea8b3fc161fdc03c Mon Sep 17 00:00:00 2001 From: Dmitry Repchevsky Date: Tue, 10 Oct 2023 10:48:08 +0200 Subject: [PATCH 2/2] comment changes add this to trigger stalled workflow action --- models/json/beacon-v2-default-model/common/age.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/json/beacon-v2-default-model/common/age.json b/models/json/beacon-v2-default-model/common/age.json index f6b941fde..e7f4a6c66 100644 --- a/models/json/beacon-v2-default-model/common/age.json +++ b/models/json/beacon-v2-default-model/common/age.json @@ -3,7 +3,7 @@ "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" } @@ -13,4 +13,4 @@ ], "title": "Age", "type": "object" -} \ No newline at end of file +}