Merge pull request #8 from beda-software/feat-uri-to-reference

feat: convert uri to reference for watch

Author: ruscoder

fhirsnake/utils.py

@@ -18,3 +18,20 @@ def replacer(match):
         return re.sub(r"\$\{(\w+)\}", replacer, obj)
     else:
         return obj
+
+
+def convert_uri_to_reference(uri: str) -> str:
+    if uri.startswith("urn:uuid:"):
+        split = uri.split(":")
+        return f"{split[2]}/{split[3]}"
+    return uri
+
+
+def replace_urn_uuid_with_reference(obj):
+    if isinstance(obj, str):
+        return convert_uri_to_reference(obj)
+    elif isinstance(obj, dict):
+        return {k: replace_urn_uuid_with_reference(v) for k, v in obj.items()}
+    elif isinstance(obj, list):
+        return [replace_urn_uuid_with_reference(item) for item in obj]
+    return obj

fhirsnake/watch.py

@@ -6,6 +6,7 @@
 from converter import convert_questionnaire_fce_to_fhir
 from files import load_resource
 from initial_resources import RESOURCE_DIR
+from utils import replace_urn_uuid_with_reference
 from watchdog.events import FileSystemEventHandler
 from watchdog.observers import Observer
 
@@ -25,7 +26,9 @@ def __init__(
         self.target_dir = target_dir
         self.external_fhir_server_url = external_fhir_server_url
         self.external_fhir_server_headers = external_fhir_server_headers
-        self.external_questionnaire_fce_fhir_converter_url = external_questionnaire_fce_fhir_converter_url
+        self.external_questionnaire_fce_fhir_converter_url = (
+            external_questionnaire_fce_fhir_converter_url
+        )
         super().__init__(*args, **kwargs)
 
     def on_modified(self, event):
@@ -43,7 +46,10 @@ def process_file(self, file_path):
             logging.error("Unable to load resource %s:\a\n%s", file_path, exc)
             return
 
-        if self.external_questionnaire_fce_fhir_converter_url:
+        if (
+            self.external_questionnaire_fce_fhir_converter_url
+            and resource["resourceType"] == "Questionnaire"
+        ):
             try:
                 resource = convert_questionnaire_fce_to_fhir(
                     resource, self.external_questionnaire_fce_fhir_converter_url
@@ -59,9 +65,16 @@ def process_file(self, file_path):
         resource_id = resource["id"]
         url = f"{self.external_fhir_server_url}/{resource_type}/{resource_id}"
 
+        resource = replace_urn_uuid_with_reference(resource)
+
         try:
             response = requests.put(
-                url, json=resource, headers={"Content-Type": "application/json", **self.external_fhir_server_headers}
+                url,
+                json=resource,
+                headers={
+                    "Content-Type": "application/json",
+                    **self.external_fhir_server_headers,
+                },
             )
 
             formatted_error = response.text
@@ -79,7 +92,9 @@ def process_file(self, file_path):
                     formatted_error,
                 )
             else:
-                logging.info("Updated %s via %s (%s)", file_path, url, response.status_code)
+                logging.info(
+                    "Updated %s via %s (%s)", file_path, url, response.status_code
+                )
         except requests.RequestException:
             logging.exception("Failed to PUT %s via %s", file_path, url)