Remove New

Author: nhsdevws

delta_backend/src/delta.py

@@ -68,7 +68,9 @@ def handler(event, context):
                 supplier_system = new_image["SupplierSystem"]["S"]
                 if supplier_system not in ("DPSFULL", "DPSREDUCED"):
                     operation = new_image["Operation"]["S"]
-                    action_flag = "NEW" if operation == "Create" else operation
+                    # TODO check NEW is correct
+                    # 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

@@ -122,11 +122,16 @@ def assert_dynamodb_record(self, operation_flag, items, expected_values, expecte
         self.assertGreater(len(filtered_items), 0, f"No matching item found for {operation_flag}")
 
         imms_data = filtered_items[0]["Imms"]
-        self.assertIsInstance(imms_data, str)
+        self.assertIsInstance(imms_data, dict)
         self.assertGreater(len(imms_data), 0)
 
         # Check Imms JSON structure matches exactly
-        self.assertEqual(imms_data, str(expected_imms), "Imms data does not match expected JSON structure")
+        # 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")
+
 
         for key, expected_value in expected_values.items():
             self.assertIn(key, filtered_items[0], f"{key} is missing")
@@ -166,8 +171,8 @@ 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": "CREATE", "EXPECTED_ACTION_FLAG": "CREATE"},
+            {"Operation": "UPDATE", "EXPECTED_ACTION_FLAG": "UPDATE"},
             {"Operation": "DELETE", "EXPECTED_ACTION_FLAG": "DELETE"},
         ]