Merge pull request #163 from ga4gh-beacon/aCollectionOf-property-fix

fix invalid aCollectionOf property definition
ga4gh-beacon · Dec 12, 2024 · 4636f61 · 4636f61
2 parents d02c6bf + 8d9715b
commit 4636f61
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/framework/json/configuration/entryTypeDefinition.json b/framework/json/configuration/entryTypeDefinition.json
@@ -7,10 +7,10 @@
             "$ref": "../common/beaconCommonComponents.json#/$defs/$schema"
         },
         "aCollectionOf": {
-            "description": "If the entry type is a collection of other entities, (e.g. a Dataset is a collection of Records), then this attribute must list the entities that can be included. One _collection_ can include more than one entry type  (e.g. a Dataset in teh Beacon cdefault model could include Individuals, Biosamples, GenomicVariations, Analyses amnd Runs). In such cases in each individual response (e.g. `resultSetsResponse` of collections of type \"dataset\") will contain entries of a single entry type (e.g. biosamples) even if a dataset may contain records of multiple types.",
-            "includedConcepts": {
-                "$ref": "../common/basicElement.json",
-                "type": "array"
+            "description": "If the entry type is a collection of other entry types, (e.g. a Dataset is a collection of Records), then this attribute must list the entry types that could be included. One collection type could be defined as included more than one entry type (e.g. a Dataset could include Individuals or Genomic Variants), in such cases the entries are alternative, meaning that a given instance of this entry type could be of only one of the types (e.g. a given Dataset contains Individuals, while another Dataset could contain Genomic Variants, but not both at once).",
+            "type": "array",
+            "items": {
+                "$ref": "../common/basicElement.json"
             }
         },
         "additionallySupportedSchemas": {
@@ -76,4 +76,4 @@
     ],
     "title": "",
     "type": "object"
-}
+}
diff --git a/framework/src/configuration/entryTypeDefinition.yaml b/framework/src/configuration/entryTypeDefinition.yaml
@@ -45,17 +45,16 @@ properties:
     items:
       $ref: ../common/referenceToAnSchema.yaml
   aCollectionOf:
-    description: >-
-      If the entry type is a collection of other entities, (e.g. a Dataset
-      is a collection of Records), then this attribute must list the entities that
-      can be included. One _collection_ can include more than one entry type 
-      (e.g. a Dataset in teh Beacon cdefault model could include Individuals, Biosamples,
-      GenomicVariations, Analyses amnd Runs). In such cases in each individual
-      response (e.g. `resultSetsResponse` of collections of type "dataset") will
-      contain entries of a single entry type (e.g. biosamples) even if a dataset
-      may contain records of multiple types.
-    includedConcepts:
-      type: array
+    description: If the entry type is a collection of other entry types, (e.g. a Dataset
+      is a collection of Records), then this attribute must list the entry types that
+      could be included. One collection type could be defined as included more than
+      one entry type (e.g. a Dataset could include Individuals or Genomic Variants),
+      in such cases the entries are alternative, meaning that a given instance of
+      this entry type could be of only one of the types (e.g. a given Dataset contains
+      Individuals, while another Dataset could contain Genomic Variants, but not both
+      at once).
+    type: array
+    items:
       $ref: ../common/basicElement.yaml
   filteringTerms:
     description: >-