Resolve Conflicts

Author: nhsdevws

delta_backend/tests/test_convert_to_flat_json.py

@@ -8,6 +8,7 @@
 from SchemaParser import SchemaParser
 from Converter import Converter
 from ConversionChecker import ConversionChecker
+from common.mappings import ActionFlag, Operation, EventName
 import ExceptionMessages
 
 MOCK_ENV_VARS = {
@@ -73,7 +74,7 @@ def tearDown(self):
         self.mock_firehose_logger.stop()
 
     @staticmethod
-    def get_event(event_name="INSERT", operation="operation", supplier="EMIS"):
+    def get_event(event_name=EventName.CREATE, operation="operation", supplier="EMIS"):
         """Returns test event data."""
         return ValuesForTests.get_event(event_name, operation, supplier)
 
@@ -83,8 +84,7 @@ def assert_dynamodb_record(self, operation_flag, action_flag, items, expected_va
         Ignores dynamically generated fields like PK, DateTimeStamp, and ExpiresAt.
         Ensures that the 'Imms' field matches exactly.
         """
-        self.assertEqual(response["statusCode"], 200)
-        self.assertEqual(response["body"], "Records processed successfully")
+        self.assertTrue(response)
 
         filtered_items = [
             {k: v for k, v in item.items() if k not in ["PK", "DateTimeStamp", "ExpiresAt"]}
@@ -140,9 +140,9 @@ def test_fhir_converter_json_error_scenario(self):
     def test_handler_imms_convert_to_flat_json(self):
         """Test that the Imms field contains the correct flat JSON data for CREATE, UPDATE, and DELETE operations."""
         expected_action_flags = [
-            {"Operation": "CREATE", "EXPECTED_ACTION_FLAG": "NEW"},
-            {"Operation": "UPDATE", "EXPECTED_ACTION_FLAG": "UPDATE"},
-            {"Operation": "DELETE", "EXPECTED_ACTION_FLAG": "DELETE"},
+            {"Operation": Operation.CREATE, "EXPECTED_ACTION_FLAG": ActionFlag.CREATE},
+            {"Operation": Operation.UPDATE, "EXPECTED_ACTION_FLAG": ActionFlag.UPDATE},
+            {"Operation": Operation.DELETE_LOGICAL, "EXPECTED_ACTION_FLAG": ActionFlag.DELETE_LOGICAL},
         ]
 
         for test_case in expected_action_flags:
@@ -546,4 +546,4 @@ def clear_table(self):
         items = result.get("Items", [])
 
     if __name__ == "__main__":
-        unittest.main()
+        unittest.main()