From 27d8a4ddb8a9c57efa33c8e1283de73c32d26c83 Mon Sep 17 00:00:00 2001
From: Dmitry Repchevsky <redmitry@list.ru>
Date: Fri, 13 Sep 2024 15:56:13 +0200
Subject: [PATCH 1/2] fix invalid aCollectionOf property definition

#114
---
 framework/json/configuration/entryTypeDefinition.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/framework/json/configuration/entryTypeDefinition.json b/framework/json/configuration/entryTypeDefinition.json
index 434bebcf6..af25f70b1 100644
--- a/framework/json/configuration/entryTypeDefinition.json
+++ b/framework/json/configuration/entryTypeDefinition.json
@@ -9,9 +9,9 @@
         },
         "aCollectionOf": {
             "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).",
-            "includedConcepts": {
-                "$ref": "../common/basicElement.json",
-                "type": "array"
+            "type": "array",
+            "items": {
+                "$ref": "../common/basicElement.json"
             }
         },
         "additionallySupportedSchemas": {
@@ -65,4 +65,4 @@
     ],
     "title": "",
     "type": "object"
-}
\ No newline at end of file
+}

From a729ef4f79a2fe6a8b9bccaba10d75ad43fa4deb Mon Sep 17 00:00:00 2001
From: Dmitry Repchevsky <redmitry@list.ru>
Date: Fri, 13 Sep 2024 15:58:34 +0200
Subject: [PATCH 2/2] update yaml

---
 framework/src/configuration/entryTypeDefinition.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/src/configuration/entryTypeDefinition.yaml b/framework/src/configuration/entryTypeDefinition.yaml
index 99f3ef974..f9d47608b 100644
--- a/framework/src/configuration/entryTypeDefinition.yaml
+++ b/framework/src/configuration/entryTypeDefinition.yaml
@@ -50,8 +50,8 @@ properties:
       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).
-    includedConcepts:
-      type: array
+    type: array
+    items:
       $ref: ../common/basicElement.yaml
   filteringTerms:
     description: Reference to the file with the list of filtering terms that could