Merge branch 'schema-urgent-fixes' into changelog

ga4gh-beacon · Nov 12, 2024 · e16fc9f · e16fc9f
2 parents dce8dff + 4803e1d
commit e16fc9f
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 43 deletions.
diff --git a/framework/json/responses/examples-sections/beaconResultsets-MAX-example.json b/framework/json/responses/examples-sections/beaconResultsets-MAX-example.json
@@ -30,7 +30,7 @@
                     "url": "https://api.mygenomeservice.org/Handover/9dcc48d7-fc88-11e8-9110-b0c592dbf8c0"
                 }
             ],
-            "type": "dataset"
+            "setType": "dataset"
         }
     ]
 }
diff --git a/framework/src/responses/examples-sections/beaconResultsets-MAX-example.yaml b/framework/src/responses/examples-sections/beaconResultsets-MAX-example.yaml
@@ -4,7 +4,7 @@ resultSets:
     type: dataset
     exists: false
   - id: datasetB
-    type: dataset
+    setType: dataset
     exists: true
     resultsCount: 2
     resultsHandovers:

diff --git a/models/json/beacon-v2-default-model/cohorts/filteringTerms.json b/models/json/beacon-v2-default-model/cohorts/filteringTerms.json
@@ -1,11 +1,4 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "filteringTerms": [
-        {
-            "ftType": "ontologyTerm",
-            "id": "DUO:0000006",
-            "label": "health or medical or biomedical research",
-            "version": "2021-02-23"
-        }
-    ]
+    "filteringTerms": []
 }
diff --git a/models/json/beacon-v2-default-model/datasets/filteringTerms.json b/models/json/beacon-v2-default-model/datasets/filteringTerms.json
@@ -1,11 +1,4 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "filteringTerms": [
-        {
-            "ftType": "ontologyTerm",
-            "id": "DUO:0000006",
-            "label": "health or medical or biomedical research",
-            "version": "2021-02-23"
-        }
-    ]
+    "filteringTerms": []
 }
diff --git a/models/json/beacon-v2-default-model/genomicVariations/filteringTerms.json b/models/json/beacon-v2-default-model/genomicVariations/filteringTerms.json
@@ -1,13 +1,4 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "filteringTerms": [
-        {
-            "ftType": "alphanumeric",
-            "id": "gene"
-        },
-        {
-            "ftType": "alphanumeric",
-            "id": "aminoacidChanges"
-        }
-    ]
+    "filteringTerms": []
 }
diff --git a/models/src/beacon-v2-default-model/cohorts/filteringTerms.yaml b/models/src/beacon-v2-default-model/cohorts/filteringTerms.yaml
@@ -1,6 +1,2 @@
 $schema: https://json-schema.org/draft/2020-12/schema
-filteringTerms:
-  - ftType: ontologyTerm
-    id: DUO:0000006
-    label: health or medical or biomedical research
-    version: '2021-02-23'
+filteringTerms: []
diff --git a/models/src/beacon-v2-default-model/datasets/filteringTerms.yaml b/models/src/beacon-v2-default-model/datasets/filteringTerms.yaml
@@ -1,6 +1,2 @@
 $schema: https://json-schema.org/draft/2020-12/schema
-filteringTerms:
-  - ftType: ontologyTerm
-    id: DUO:0000006
-    label: health or medical or biomedical research
-    version: '2021-02-23'
+filteringTerms: []
diff --git a/models/src/beacon-v2-default-model/genomicVariations/filteringTerms.yaml b/models/src/beacon-v2-default-model/genomicVariations/filteringTerms.yaml
@@ -1,6 +1,2 @@
 $schema: https://json-schema.org/draft/2020-12/schema
-filteringTerms:
-  - ftType: alphanumeric
-    id: gene
-  - ftType: alphanumeric
-    id: aminoacidChanges
+filteringTerms: []