Updated

Author: nhsdevws

delta_backend/src/Converter.py

@@ -14,21 +14,17 @@
     get_valid_address,
 )
 
-# Converter variables
-FHIRData = ""
-SchemaFile = {}
-imms = []
-Converted = {}
-
 
 # Converter
 class Converter:
 
     def __init__(self, fhir_data):
-        self.FHIRData = fhir_data  # Store JSON data directly
-        self.SchemaFile = ConversionLayout.ConvertLayout
-        self.ErrorRecords = []
-    
+        self.imms = []
+        self.converted = {}
+        self.error_records = []
+        self.fhir_data = fhir_data  # Store JSON data directly
+        self.schema_file = ConversionLayout.ConvertLayout
+
     # Utility logs tailored to conveter class errors
     def _log_error(self,e,code=ExceptionMessages.UNEXPECTED_EXCEPTION): 
         message = str(e)  # if a simple string message was passed 
@@ -38,8 +34,8 @@ def _log_error(self,e,code=ExceptionMessages.UNEXPECTED_EXCEPTION):
             "message": message
         }
 
-        # if not any(existing.get("message") == message for existing in self.ErrorRecords):
-        self.ErrorRecords.append(error_obj)
+        # if not any(existing.get("message") == message for existing in self.error_records):
+        self.error_records.append(error_obj)
         return error_obj
 
     # create a FHIR  parser - uses fhir json data from delta 
@@ -78,20 +74,20 @@ def _convertData(self, ConversionValidate, expression, dataParser, json_data):
             if "address" in FHIRFieldName or "performer" in FHIRFieldName or "name" in FHIRFieldName:
                 convertedData = self.extract_patient_details(json_data, FlatFieldName)
             if convertedData is not None:
-                Converted[FlatFieldName] = convertedData
+                self.converted[FlatFieldName] = convertedData
 
     # run the conversion against the data
     def runConversion(self, json_data, summarise=False, report_unexpected_exception=True):
         try:
-            dataParser = self._getFHIRParser(self.FHIRData)
+            dataParser = self._getFHIRParser(self.fhir_data)
         except Exception as e:
             if report_unexpected_exception:
                 message = "FHIR Parser Unexpected exception [%s]: %s" % (e.__class__.__name__, e)
                 error = self._log_error(message,code=ExceptionMessages.UNEXPECTED_EXCEPTION)
                 return error
 
         try:
-            schemaParser = self._getSchemaParser(self.SchemaFile)
+            schemaParser = self._getSchemaParser(self.schema_file)
         except Exception as e:
             if report_unexpected_exception:
                 message = "Schema Parser Unexpected exception [%s]: %s" % (e.__class__.__name__, e)
@@ -120,21 +116,21 @@ def runConversion(self, json_data, summarise=False, report_unexpected_exception=
 
         # Collect and store any errors from ConversionChecker
         all_errors = ConversionValidate.get_error_records()
-        self.ErrorRecords.extend(all_errors)
+        self.error_records.extend(all_errors)
 
         # Add CONVERSION_ERRORS as the 35th field
         error_records = self.getErrorRecords()
         if error_records:
             error_summary = error_records
         else:
             error_summary = ""
-        Converted["CONVERSION_ERRORS"] = error_summary
+        self.converted["CONVERSION_ERRORS"] = error_summary
 
-        imms.append(Converted)
-        return imms
+        self.imms.append(self.converted)
+        return self.imms
 
     def getErrorRecords(self):
-        return self.ErrorRecords
+        return self.error_records
 
     def extract_patient_details(self, json_data, FlatFieldName):
         if not hasattr(self, "_cached_values"):

delta_backend/src/SchemaParser.py

@@ -8,8 +8,8 @@ class SchemaParser:
     Conversions = {}
 
     def parseSchema(self, schemaFile):  # changed to accept JSON better for cache
-        self.SchemaFile = schemaFile
-        self.Conversions = self.SchemaFile["conversions"]
+        self.schema_file = schemaFile
+        self.Conversions = self.schema_file["conversions"]
 
     def conversionCount(self):
         count = 0

delta_backend/tests/test_convert_to_flat_json.py

@@ -26,7 +26,6 @@
 request_json_data = ValuesForTests.json_data
 with patch.dict("os.environ", MOCK_ENV_VARS):
     from delta import handler, Converter
-    from Converter import imms
 
 class TestRecordError(unittest.TestCase):
     def test_fields_and_str(self):
@@ -94,6 +93,15 @@ def setUp(self):
                 },
             ],
         )
+        self.logger_info_patcher = patch("logging.Logger.info")
+        self.mock_logger_info = self.logger_info_patcher.start()
+
+        self.logger_exception_patcher = patch("logging.Logger.exception")
+        self.mock_logger_exception = self.logger_exception_patcher.start()
+
+    def tearDown(self):
+        self.logger_exception_patcher.stop()
+        self.logger_info_patcher.stop()
 
     @staticmethod
     def get_event(event_name="INSERT", operation="operation", supplier="EMIS"):
@@ -130,7 +138,6 @@ def assert_dynamodb_record(self, operation_flag, items, expected_values, expecte
 
     def test_fhir_converter_json_direct_data(self):
         """it should convert fhir json data to flat json"""
-        imms.clear()
         json_data = json.dumps(ValuesForTests.json_data)
 
         start = time.time()
@@ -159,7 +166,6 @@ def test_fhir_converter_json_error_scenario(self):
         error_test_cases = [ErrorValuesForTests.missing_json, ErrorValuesForTests.json_dob_error]
 
         for test_case in error_test_cases:
-            imms.clear()
             json_data = json.dumps(test_case)
 
             start = time.time()
@@ -169,12 +175,6 @@ def test_fhir_converter_json_error_scenario(self):
 
             flatJSON = json.dumps(FlatFile)
 
-            # if len(flatJSON) > 0:
-            #     print(flatJSON)
-            # Fix error handling
-            # expected_imms = ErrorValuesForTests.get_expected_imms_error_output
-            # self.assertEqual(flatJSON, expected_imms)
-
             errorRecords = FHIRConverter.getErrorRecords()
 
             if len(errorRecords) > 0:
@@ -196,7 +196,6 @@ def test_handler_imms_convert_to_flat_json(self):
 
         for test_case in expected_action_flags:
             with self.subTest(test_case["Operation"]):
-                imms.clear()
 
                 event = self.get_event(operation=test_case["Operation"])