Merge pull request #79 from beda-software/76-multiple-atomic-extract

Added fullUrl unique check to $extract

app/sdc/extract.py

@@ -1,6 +1,8 @@
 from aiohttp import ClientSession, web
 from funcy.seqs import flatten
 
+from .utils import check_mappers_bundles_full_url_duplicates
+
 
 async def get_external_service_bundle(session, service, template, context):
     async with session.post(
@@ -17,12 +19,16 @@ async def get_external_service_bundle(session, service, template, context):
 
 
 async def execute_mappers_bundles(client, mappers_bundles):
+    flattened_mappers_bundles = list(flatten(bundle["entry"] for bundle in mappers_bundles))
+
+    check_mappers_bundles_full_url_duplicates(flattened_mappers_bundles)
+
     not_transaction = any(bundle.get("type") != "transaction" for bundle in mappers_bundles)
 
     result_bundle = {
         "resourceType": "Bundle",
         "type": "batch" if not_transaction else "transaction",
-        "entry": list(flatten(bundle["entry"] for bundle in mappers_bundles)),
+        "entry": flattened_mappers_bundles,
     }
 
     return await client.execute("/", data=result_bundle)

app/sdc/utils.py

@@ -42,10 +42,7 @@ def get_type(item, data):
 def walk_dict(d, transform):
     for k, v in d.items():
         if is_list(v):
-            d[k] = [
-                walk_dict(vi, transform) if is_mapping(vi) else transform(vi, k)
-                for vi in v
-            ]
+            d[k] = [walk_dict(vi, transform) if is_mapping(vi) else transform(vi, k) for vi in v]
         elif is_mapping(v):
             d[k] = walk_dict(v, transform)
         else:
@@ -68,9 +65,7 @@ def prepare_link_ids(questionnaire, variables):
 
 
 def prepare_bundle(raw_bundle, env):
-    return walk_dict(
-        raw_bundle, lambda v, _k: resolve_string_template(v, env, encode_result=True)
-    )
+    return walk_dict(raw_bundle, lambda v, _k: resolve_string_template(v, env, encode_result=True))
 
 
 def resolve_string_template(i, env, encode_result=False):
@@ -170,3 +165,26 @@ def validate_context(context_definition, env):
                 )
         if len(errors) > 0:
             raise ConstraintCheckOperationOutcome(errors)
+
+
+def check_mappers_bundles_full_url_duplicates(flattened_mappers_bundles):
+    full_urls_set = set()
+
+    for bundle in flattened_mappers_bundles:
+        full_url = bundle.get("fullUrl")
+
+        if full_url is None:
+            continue
+
+        if full_url in full_urls_set:
+            raise ConstraintCheckOperationOutcome(
+                [
+                    {
+                        "severity": "error",
+                        "key": "duplicate-full-url",
+                        "human": f"Duplicate fullUrl '{full_url}' in mappers bundles",
+                    }
+                ]
+            )
+
+        full_urls_set.add(full_url)