WiP

Author: nhsdevws

delta_backend/tests/test_convert_to_flat_json.py

@@ -126,6 +126,11 @@ def assert_dynamodb_record(self, operation_flag, action_flag, items, expected_va
         self.assertIsInstance(imms_data, dict)
         self.assertGreater(len(imms_data), 0)
 
+        for key, expected_value in expected_values.items():
+            self.assertIn(key, filtered_items[0], f"{key} is missing")
+            if (filtered_items[0][key] != expected_value):
+                print (f"{key} mismatch {filtered_items[0][key]} != {expected_value}")
+
         # Check Imms JSON structure matches exactly
         self.assertEqual(imms_data, expected_imms, "Imms data does not match expected JSON structure")
 

delta_backend/tests/test_delta.py

@@ -165,19 +165,19 @@ def test_handler_failure(self, mock_boto_resource):
         result = handler(event, self.context)
 
         # Assert
-        self.assertEqual(result["statusCode"], 500)
+        self.assertFalse(result)
 
     @patch("boto3.resource")
     def test_handler_success_update(self, mock_boto_resource):
         # Arrange
         self.setup_mock_dynamodb(mock_boto_resource)
-        event = self.get_event(event_name="UPDATE", operation="UPDATE")
+        event = ValuesForTests.get_event(event_name=EventName.UPDATE, operation=Operation.UPDATE)
 
         # Act
         result = handler(event, self.context)
 
         # Assert
-        self.assertFalse(result)
+        self.assertTrue(result)
 
     @patch("boto3.resource")
     def test_handler_success_remove(self, mock_boto_resource):
@@ -206,7 +206,7 @@ def test_handler_exception_intrusion_check(self, mock_boto_resource, mock_boto_c
         # Arrange
         self.setup_mock_dynamodb(mock_boto_resource, status_code=500)
         mock_boto_client.return_value = MagicMock()
-        event = self.get_event()
+        event = ValuesForTests.get_event()
 
         # Act & Assert
 

delta_backend/tests/utils_for_converter_tests.py

@@ -167,7 +167,7 @@ def get_event_record(imms_id, event_name, operation, supplier="EMIS"):
                     "ApproximateCreationDateTime": 1690896000,
                     "NewImage": {
                         "PK": {"S": pk},
-                        "PatientSK": {"S": pk},
+                        "PatientSK": {"S": "COVID19#ca8ba2c6-2383-4465-b456-c1174c21cf31"},
                         "IdentifierPK": {"S": "system#1"},
                         "Operation": {"S": operation},
                         "SupplierSystem": {"S": supplier},
@@ -184,52 +184,14 @@ def get_event_record(imms_id, event_name, operation, supplier="EMIS"):
                     "ApproximateCreationDateTime": 1690896000,
                     "Keys": {
                         "PK": {"S": pk},
-                        "PatientSK": {"S": pk},
+                        "PatientSK": {"S": "COVID19#ca8ba2c6-2383-4465-b456-c1174c21cf31"},
                         "SupplierSystem": {"S": supplier},
                         "Resource": {
                             "S": json.dumps(ValuesForTests.get_test_data_resource()),
                         }
                     }
                 }
             }
-            
-        if operation != "REMOVE":
-            return {
-                "Records": [
-                    {
-                        "eventName": event_name,
-                        "dynamodb": {
-                            "ApproximateCreationDateTime": 1690896000,
-                            "NewImage": {
-                                "PK": {"S": "covid#12345"},
-                                "PatientSK": {"S": "COVID19#ca8ba2c6-2383-4465-b456-c1174c21cf31"},
-                                "IdentifierPK": {"S": "system#1"},
-                                "Operation": {"S": operation},
-                                "SupplierSystem": {"S": supplier},
-                                "Resource": {"S": ValuesForTests.json_value_for_test},
-                            },
-                        },
-                    }
-                ]
-            }
-        else:
-            return {
-                "Records": [
-                    {
-                        "eventName": "REMOVE",
-                        "dynamodb": {
-                            "ApproximateCreationDateTime": 1690896000,
-                            "Keys": {
-                                "PK": {"S": "covid#12345"},
-                                "PatientSK": {"S": "covid#12345"},
-                                "SupplierSystem": {"S": "EMIS"},
-                                "Resource": {"S": ValuesForTests.json_value_for_test},
-                                "PatientSK": {"S": "COVID19#ca8ba2c6-2383-4465-b456-c1174c21cf31"},
-                            },
-                        },
-                    }
-                ]
-            }
 
     expected_static_values = {
         "VaccineType": "covid19",