Dose Amount

Author: nhsdevws

delta_backend/src/ConversionChecker.py

@@ -259,7 +259,7 @@ def _convertToDefaultTo(self, expressionRule, fieldName, fieldValue, summarise,
         try:
             if fieldValue == "":
                 return expressionRule
-            return fieldValue
+            return str(fieldValue)
         except Exception as e:
             if report_unexpected_exception:
                 message = ExceptionMessages.MESSAGES[ExceptionMessages.UNEXPECTED_EXCEPTION] % (e.__class__.__name__, e)

delta_backend/src/Converter.py

@@ -122,7 +122,7 @@ def runConversion(self, json_data, summarise=False, report_unexpected_exception=
         if error_records:
             error_summary = error_records
         else:
-            error_summary = ""
+            error_summary = []
         self.converted["CONVERSION_ERRORS"] = error_summary
 
         return self.converted

delta_backend/src/delta.py

@@ -76,6 +76,7 @@ def handler(event, context):
                     flat_json = FHIRConverter.runConversion(resource_json)  # Get the flat JSON
                     error_records = FHIRConverter.getErrorRecords()
                     flat_json["ACTION_FLAG"] = action_flag
+                    logger.info(f"Record to delta:{flat_json}")
                     response = delta_table.put_item(
                         Item={
                             "PK": str(uuid.uuid4()),
@@ -145,6 +146,7 @@ def handler(event, context):
                 return {"statusCode": 500, "body": "Records not processed successfully"}
 
     except Exception as e:
+        logger.info(f"Exception in Delta Handler {e}")
         operation_outcome["statusCode"] = "500"
         operation_outcome["statusDesc"] = "Exception"
         if intrusion_check:

delta_backend/tests/utils_for_converter_tests.py

@@ -202,7 +202,7 @@ def get_expected_imms(expected_action_flag):
                 "INDICATION_CODE": "443684005",
                 "LOCATION_CODE": "EC1111",
                 "LOCATION_CODE_TYPE_URI": "https://fhir.nhs.uk/Id/ods-organization-code",
-                "CONVERSION_ERRORS": ''
+                "CONVERSION_ERRORS": []
             }
 
     expected_imms = {
@@ -240,7 +240,7 @@ def get_expected_imms(expected_action_flag):
             "INDICATION_CODE": "443684005",
             "LOCATION_CODE": "EC1111",
             "LOCATION_CODE_TYPE_URI": "https://fhir.nhs.uk/Id/ods-organization-code",
-            "CONVERSION_ERRORS": ''
+            "CONVERSION_ERRORS": []
         }
 
     expected_imms2 = {
@@ -278,7 +278,7 @@ def get_expected_imms(expected_action_flag):
             "INDICATION_CODE": "443684005",
             "LOCATION_CODE": "EC1111",
             "LOCATION_CODE_TYPE_URI": "https://fhir.nhs.uk/Id/ods-organization-code",
-            "CONVERSION_ERRORS": ''
+            "CONVERSION_ERRORS": []
         }
 
 
@@ -431,6 +431,6 @@ def get_expected_imms_error_output(expected_action_flag):
                 "INDICATION_CODE": "443684005",
                 "LOCATION_CODE": "E712",
                 "LOCATION_CODE_TYPE_URI": "https://fhir.nhs.uk/Id/ods-organization-code",
-                "CONVERSION_ERRORS": ''
+                "CONVERSION_ERRORS": []
             }
         ]