Moved action flag

Author: robertnovac1

delta_backend/src/conversion_layout.py

@@ -111,12 +111,12 @@ def __init__(self, fhir_data):
               }
             },
             {
-              "fieldNameFHIR": "id",
+              "fieldNameFHIR": "",
               "fieldNameFlat": "ACTION_FLAG",
               "expression": {
-                "expressionName": "Change To",
-                "expressionType": "CHANGETO",
-                "expressionRule": "update"
+                "expressionName": "",
+                "expressionType": "",
+                "expressionRule": ""
               }
             },
             {

delta_backend/src/delta.py

@@ -72,7 +72,7 @@ def handler(event, context):
                     operation = new_image["Operation"]["S"]
                     action_flag = ActionFlag.CREATE if operation == Operation.CREATE else operation
                     resource_json = json.loads(new_image["Resource"]["S"])
-                    FHIRConverter = Converter(json.dumps(resource_json))
+                    FHIRConverter = Converter(json.dumps(resource_json), action_flag = action_flag)
                     flat_json = FHIRConverter.run_conversion()  # Get the flat JSON
                     error_records = FHIRConverter.get_error_records()
                     flat_json["ACTION_FLAG"] = action_flag

delta_backend/src/delta_converter.py

@@ -12,9 +12,10 @@
 # Converter
 class Converter:
 
-    def __init__(self, fhir_data, summarise=False, report_unexpected_exception=True):
+    def __init__(self, fhir_data, action_flag = "UPDATE", summarise=False, report_unexpected_exception=True):
         self.converted = {}
         self.error_records = []
+        self.action_flag = action_flag
         self.fhir_data = fhir_data
         self.summarise = summarise
         self.report_unexpected_exception = report_unexpected_exception
@@ -59,11 +60,13 @@ def _convertData(self, expression):
             ### TODO: Remove this after refactoring all fields to be extracted with the Extractor
             values = self.data_parser.get_key_value(fhir_field, flat_field, expr_type, expr_rule)
             ###
-            
-            for val in values:
-                converted = self.conversion_checker.convertData(expr_type, expr_rule, fhir_field, val)
-                if converted is not None:
-                    self.converted[flat_field] = converted
+            if flat_field == "ACTION_FLAG":
+                self.converted[flat_field] = self.action_flag
+            else:
+                for val in values:
+                    converted = self.conversion_checker.convertData(expr_type, expr_rule, fhir_field, val)
+                    if converted is not None:
+                        self.converted[flat_field] = converted
 
         except Exception as e:
             return self._log_error(f"Conversion error [{e.__class__.__name__}]: {e}", code=exception_messages.PARSING_ERROR)

delta_backend/src/json_field_extractor.py

@@ -319,4 +319,4 @@ def extract_location_code_type_uri(self) -> str:
             identifier = location.get("identifier", {})
             return identifier.get("system", self.ODS_ORG_CODE_SYSTEM_URL)
 
-        return self.ODS_ORG_CODE_SYSTEM_URL
+        return self.ODS_ORG_CODE_SYSTEM_URL

delta_backend/tests/sample_data/Final Example.json

@@ -15,6 +15,3 @@ def _run_person_dob_test(self, expected_site_code):
         self.converter = Converter(json.dumps(self.request_json_data))
         flat_json = self.converter.run_conversion()
         self.assertEqual(flat_json.get("PERSON_DOB"), expected_site_code)
-        
-    
-    

delta_backend/tests/test_convert_person_dob.py

@@ -259,7 +259,7 @@ def get_expected_imms(expected_action_flag):
             "SITE_CODE_TYPE_URI": "https://fhir.nhs.uk/Id/ods-organization-code",
             "UNIQUE_ID": "ACME-vacc123456",
             "UNIQUE_ID_URI": "https://supplierABC/identifiers/vacc",
-            "ACTION_FLAG": "update",
+            "ACTION_FLAG": "UPDATE",
             "PERFORMING_PROFESSIONAL_FORENAME": "Florence",
             "PERFORMING_PROFESSIONAL_SURNAME": "Nightingale",
             "RECORDED_DATE": "20210207",
@@ -297,7 +297,7 @@ def get_expected_imms(expected_action_flag):
             "SITE_CODE_TYPE_URI": "https://fhir.nhs.uk/Id/ods-organization-code",
             "UNIQUE_ID": "ACME-vacc123456",
             "UNIQUE_ID_URI": "https://supplierABC/identifiers/vacc",
-            "ACTION_FLAG": "update",
+            "ACTION_FLAG": "UPDATE",
             "PERFORMING_PROFESSIONAL_FORENAME": "Florence",
             "PERFORMING_PROFESSIONAL_SURNAME": "Nightingale",
             "RECORDED_DATE": "20210207",