ACTION FLAG

Author: nhsdevws

delta_backend/src/delta.py

@@ -69,8 +69,8 @@ def handler(event, context):
                 if supplier_system not in ("DPSFULL", "DPSREDUCED"):
                     operation = new_image["Operation"]["S"]
                     # TODO check NEW is correct
-                    # action_flag = "NEW" if operation == "CREATE" else operation
-                    action_flag = operation
+                    action_flag = "NEW" if operation == "CREATE" else operation
+                    # action_flag = operation
                     resource_json = json.loads(new_image["Resource"]["S"])
                     FHIRConverter = Converter(json.dumps(resource_json))
                     flat_json = FHIRConverter.runConversion(resource_json)  # Get the flat JSON

delta_backend/tests/test_convert_to_flat_json.py

@@ -104,7 +104,7 @@ def get_event(event_name="INSERT", operation="operation", supplier="EMIS"):
         """Returns test event data."""
         return ValuesForTests.get_event(event_name, operation, supplier)
 
-    def assert_dynamodb_record(self, operation_flag, items, expected_values, expected_imms, response):
+    def assert_dynamodb_record(self, operation_flag, action_flag, items, expected_values, expected_imms, response):
         """
         Asserts that a record with the expected structure exists in DynamoDB.
         Ignores dynamically generated fields like PK, DateTimeStamp, and ExpiresAt.
@@ -117,6 +117,7 @@ def assert_dynamodb_record(self, operation_flag, items, expected_values, expecte
             {k: v for k, v in item.items() if k not in ["PK", "DateTimeStamp", "ExpiresAt"]}
             for item in items
             if item.get("Operation") == operation_flag
+            and item.get("Imms", {}).get("ACTION_FLAG") == action_flag
         ]
 
         self.assertGreater(len(filtered_items), 0, f"No matching item found for {operation_flag}")
@@ -126,12 +127,7 @@ def assert_dynamodb_record(self, operation_flag, items, expected_values, expecte
         self.assertGreater(len(imms_data), 0)
 
         # Check Imms JSON structure matches exactly
-        # self.assertEqual(imms_data, expected_imms, "Imms data does not match expected JSON structure")
-        for key, expected_value in expected_imms.items():
-            actual = imms_data.get(key)
-            print(f"Key: {key}, Actual: {actual}, Expected: {expected_value}")
-            self.assertEqual(actual, expected_value, f"{key} mismatch")
-
+        self.assertEqual(imms_data, expected_imms, "Imms data does not match expected JSON structure")
 
         for key, expected_value in expected_values.items():
             self.assertIn(key, filtered_items[0], f"{key} is missing")
@@ -171,7 +167,7 @@ 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": "CREATE"},
+            {"Operation": "CREATE", "EXPECTED_ACTION_FLAG": "NEW"},
             {"Operation": "UPDATE", "EXPECTED_ACTION_FLAG": "UPDATE"},
             {"Operation": "DELETE", "EXPECTED_ACTION_FLAG": "DELETE"},
         ]
@@ -191,7 +187,9 @@ def test_handler_imms_convert_to_flat_json(self):
                 expected_imms = ValuesForTests.get_expected_imms(test_case["EXPECTED_ACTION_FLAG"])
 
                 self.assert_dynamodb_record(
-                    test_case["EXPECTED_ACTION_FLAG"], items, expected_values, expected_imms, response
+                    test_case["Operation"], 
+                    test_case["EXPECTED_ACTION_FLAG"], 
+                    items, expected_values, expected_imms, response
                 )
 
                 result = self.table.scan()