fix: merge conflict fix

ehrbase · Oct 2, 2024 · 3d1e132 · 3d1e132
2 parents 486a806 + 69b9bf3
commit 3d1e132
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git a/tests/robot/_resources/test_data_sets/aql/data_load/folder/folder_details.json b/tests/robot/_resources/test_data_sets/aql/data_load/folder/folder_details.json
@@ -2,7 +2,7 @@
   "_type": "FOLDER",
   "uid": {
     "_type": "HIER_OBJECT_ID",
-    "value": "00e952ca-a5b2-4f24-8d37-59240fd37020"
+    "value": "30e952ca-a5b2-4f24-8d37-59240fd37020"
   },
   "name": {
     "_type": "DV_TEXT",

diff --git a/tests/robot/_resources/test_data_sets/aql/data_load/folder/folder_multi_compositions.json b/tests/robot/_resources/test_data_sets/aql/data_load/folder/folder_multi_compositions.json
@@ -2,7 +2,7 @@
   "_type": "FOLDER",
   "uid": {
     "_type": "HIER_OBJECT_ID",
-    "value": "00e952ca-a5b2-4f24-8d37-59240fd37020"
+    "value": "40e952ca-a5b2-4f24-8d37-59240fd37020"
   },
   "name": {
     "_type": "DV_TEXT",

diff --git a/tests/robot/_resources/test_data_sets/aql/data_load/folder/folder_simple_hierarchy.json b/tests/robot/_resources/test_data_sets/aql/data_load/folder/folder_simple_hierarchy.json
@@ -2,7 +2,7 @@
   "_type": "FOLDER",
   "uid": {
     "_type": "HIER_OBJECT_ID",
-    "value": "00e952ca-a5b2-4f24-8d37-59240fd37020"
+    "value": "60e952ca-a5b2-4f24-8d37-59240fd37020"
   },
   "name": {
     "_type": "DV_TEXT",

diff --git a/tests/robot/_resources/test_data_sets/aql/data_load/folder/folder_with_compositions.json b/tests/robot/_resources/test_data_sets/aql/data_load/folder/folder_with_compositions.json
@@ -1,8 +1,8 @@
 {
   "_type": "FOLDER",
-  "uuid": {
+  "uid": {
     "_type": "HIER_OBJECT_ID",
-    "value": "00e952ca-a5b2-4f24-8d37-59240fd37020"
+    "value": "70e952ca-a5b2-4f24-8d37-59240fd37020"
   },
   "name": {
     "_type": "DV_TEXT",
@@ -12,7 +12,7 @@
   "folders": [
     {
       "_type": "FOLDER",
-      "uuid": {
+      "uid": {
         "_type": "HIER_OBJECT_ID",
         "value": "d936409e-901f-4994-8d33-ed104d460151"
       },
@@ -24,7 +24,7 @@
       "folders": [
         {
           "_type": "FOLDER",
-          "uuid": {
+          "uid": {
             "_type": "HIER_OBJECT_ID",
             "value": "0cc504b1-4d6d-4cd5-81d9-0ef1b870edb3"
           },
@@ -35,7 +35,7 @@
           "folders": [
             {
               "_type": "FOLDER",
-              "uuid": {
+              "uid": {
                 "_type": "HIER_OBJECT_ID",
                 "value": "70939d97-8add-4419-b27c-516e64b1c744 "
               },
@@ -70,7 +70,7 @@
         },
         {
           "_type": "FOLDER",
-          "uuid": {
+          "uid": {
             "_type": "HIER_OBJECT_ID",
             "value": "643b71ca-f9d5-4d84-9f39-b2d89cbab44a"
           },

diff --git a/tests/robot/_resources/test_data_sets/aql/data_load/folder/folder_with_compositions1.json b/tests/robot/_resources/test_data_sets/aql/data_load/folder/folder_with_compositions1.json
@@ -1,8 +1,8 @@
 {
   "_type": "FOLDER",
-  "uuid": {
+  "uid": {
     "_type": "HIER_OBJECT_ID",
-    "value": "00e952ca-a5b2-4f24-8d37-59240fd37020"
+    "value": "80e952ca-a5b2-4f24-8d37-59240fd37020"
   },
   "name": {
     "_type": "DV_TEXT",
@@ -12,7 +12,7 @@
   "folders": [
     {
       "_type": "FOLDER",
-      "uuid": {
+      "uid": {
         "_type": "HIER_OBJECT_ID",
         "value": "d936409e-901f-4994-8d33-ed104d460151"
       },
@@ -24,7 +24,7 @@
       "folders": [
         {
           "_type": "FOLDER",
-          "uuid": {
+          "uid": {
             "_type": "HIER_OBJECT_ID",
             "value": "0cc504b1-4d6d-4cd5-81d9-0ef1b870edb3"
           },
@@ -35,9 +35,9 @@
           "folders": [
             {
               "_type": "FOLDER",
-              "uuid": {
+              "uid": {
                 "_type": "HIER_OBJECT_ID",
-                "value": "70939d97-8add-4419-b27c-516e64b1c744 "
+                "value": "70939d97-8add-4419-b27c-516e64b1c744"
               },
               "name": {
                 "_type": "DV_TEXT",
@@ -70,7 +70,7 @@
         },
         {
           "_type": "FOLDER",
-          "uuid": {
+          "uid": {
             "_type": "HIER_OBJECT_ID",
             "value": "643b71ca-f9d5-4d84-9f39-b2d89cbab44a"
           },

diff --git a/tests/robot/_resources/test_data_sets/aql/fields_and_results/folder/expected_find_all.json b/tests/robot/_resources/test_data_sets/aql/fields_and_results/folder/expected_find_all.json
@@ -23,7 +23,7 @@
 	],
 	"rows": [
 		[
-			"00e952ca-a5b2-4f24-8d37-59240fd37020::local.ehrbase.org::1",
+			"60e952ca-a5b2-4f24-8d37-59240fd37020::local.ehrbase.org::1",
 			"root1",
 			"openEHR-EHR-FOLDER.generic.v1"
 		],

diff --git a/.../_resources/test_data_sets/aql/fields_and_results/folder/expected_find_by_name_root1.json b/.../_resources/test_data_sets/aql/fields_and_results/folder/expected_find_by_name_root1.json
@@ -15,7 +15,7 @@
 	],
 	"rows": [
 		[
-			"00e952ca-a5b2-4f24-8d37-59240fd37020::local.ehrbase.org::1"
+			"60e952ca-a5b2-4f24-8d37-59240fd37020::local.ehrbase.org::1"
 		]
 	]
 }
diff --git a/...t/_resources/test_data_sets/aql/fields_and_results/folder/expected_folder_find_items.json b/...t/_resources/test_data_sets/aql/fields_and_results/folder/expected_folder_find_items.json
@@ -27,13 +27,13 @@
 	],
 	"rows": [
 		[
-			"00e952ca-a5b2-4f24-8d37-59240fd37020::local.ehrbase.org::1",
+			"40e952ca-a5b2-4f24-8d37-59240fd37020::local.ehrbase.org::1",
 			"root1",
 			"openEHR-EHR-FOLDER.generic.v1",
 			"${c_uid1}"
 		],
 		[
-			"00e952ca-a5b2-4f24-8d37-59240fd37020::local.ehrbase.org::1",
+			"40e952ca-a5b2-4f24-8d37-59240fd37020::local.ehrbase.org::1",
 			"root1",
 			"openEHR-EHR-FOLDER.generic.v1",
 			"${c_uid2}"