Unit Tests Pass

Author: nhsdevws

delta_backend/src/delta.py

@@ -176,6 +176,6 @@ def handler(event, context):
         log_data["operation_outcome"] = operation_outcome
         firehose_log["event"] = log_data
         firehose_logger.send_log(firehose_log)
-        return {"statusCode": 500, "body": "Internal server error"}
-
-        # raise Exception(f"Delta Lambda failure: {e}")
+        # @TODO remove this exception and replace with 500 response
+        # after investigating the impact of this change ``` return {"statusCode": 500, "body": "Internal server error"} ```
+        raise Exception(f"Delta Lambda failure: {e}")

delta_backend/tests/test_delta.py

@@ -51,11 +51,10 @@ def setUp_mock_resources(self, mock_boto_resource, mock_boto_client):
 
     @staticmethod
     def get_event(event_name="INSERT", operation="CREATE", supplier="EMIS", n_records=1):
-        """ create test event for the handler function"""
-        pk = "covid#"
+        """Create test event for the handler function."""
         return {
             "Records": [
-                DeltaTestCase.get_event_record(f"{pk}#000{i}", event_name, operation, supplier)
+                DeltaTestCase.get_event_record(f"covid#{i+1}2345", event_name, operation, supplier)
                 for i in range(n_records)
             ]
         }
@@ -69,12 +68,12 @@ def get_event_record(pk, event_name="INSERT", operation="CREATE", supplier="EMIS
                     "ApproximateCreationDateTime": 1690896000,
                     "NewImage": {
                         "PK": {"S": pk},
-                        "PatientSK": {"S": "covid#12345"},
+                        "PatientSK": {"S": pk},
                         "IdentifierPK": {"S": "system#1"},
                         "Operation": {"S": operation},
                         "SupplierSystem": {"S": supplier},
                         "Resource": {
-                            "S": get_test_data_resource(),
+                            "S": json.dumps(get_test_data_resource()),
                         },
                     },
                 },
@@ -85,11 +84,11 @@ def get_event_record(pk, event_name="INSERT", operation="CREATE", supplier="EMIS
                 "dynamodb": {
                     "ApproximateCreationDateTime": 1690896000,
                     "Keys": {
-                        "PK": {"S": "covid#12345"},
-                        "PatientSK": {"S": "covid#12345"},
+                        "PK": {"S": pk},
+                        "PatientSK": {"S": pk},
                         "SupplierSystem": {"S": "EMIS"},
                         "Resource": {
-                            "S": get_test_data_resource
+                            "S": json.dumps(get_test_data_resource()),
                         },
                     },
                 },
@@ -148,7 +147,7 @@ def test_handler_success_insert(self, mock_boto_resource):
     @patch("boto3.resource")
     def test_handler_failure(self, mock_boto_resource):
         # Arrange
-        mock_boto_resource.side_effect = Exception("Simulated DynamoDB failure")
+        self.setup_mock_dynamodb(mock_boto_resource, status_code=500)
         event = self.get_event()
 
         # Act
@@ -157,107 +156,107 @@ def test_handler_failure(self, mock_boto_resource):
         # Assert
         self.assertEqual(result["statusCode"], 500)
 
-    # @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")
-
-    #     # Act
-    #     result = handler(event, self.context)
-
-    #     # Assert
-    #     self.assertEqual(result["statusCode"], 200)
-
-    # @patch("boto3.resource")
-    # def test_handler_success_remove(self, mock_boto_resource):
-    #     # Arrange
-    #     self.setup_mock_dynamodb(mock_boto_resource)
-    #     event = self.get_event(event_name="REMOVE", operation="DELETE")
-
-    #     # Act
-    #     result = handler(event, self.context)
-
-    #     # Assert
-    #     self.assertEqual(result["statusCode"], 200)
-
-    # @patch("boto3.resource")
-    # @patch("boto3.client")
-    # def test_handler_exception_intrusion_check(self, mock_boto_resource, mock_boto_client):
-    #     # Arrange
-    #     self.setup_mock_dynamodb(mock_boto_resource, status_code=500)
-    #     mock_boto_client.return_value = MagicMock()
-    #     event = self.get_event()
-
-    #     # Act & Assert
-
-    #     result = handler(event, self.context)
-    #     self.assertEqual(result["statusCode"], 500)
-
-    # @patch("boto3.resource")
-    # @patch("boto3.client")
-    # def test_handler_exception_intrusion(self, mock_boto_resource, mock_boto_client):
-    #     # Arrange
-    #     self.setUp_mock_resources(mock_boto_resource, mock_boto_client)
-    #     event = self.get_event()
-    #     context = {}
-
-    #     # Act & Assert
-    #     with self.assertRaises(Exception):
-    #         handler(event, context)
-
-    # @patch("boto3.resource")
-    # @patch("delta.handler")
-    # def test_handler_exception_intrusion_check_false(self, mock_boto_resource, mock_boto_client):
-    #     # Arrange
-    #     self.setUp_mock_resources(mock_boto_resource, mock_boto_client)
-    #     event = self.get_event()
-    #     context = {}
-
-    #     # Act & Assert
-    #     with self.assertRaises(Exception):
-    #         handler(event, context)
-
-    # @patch("delta.firehose_logger.send_log")  # Mock Firehose logger
-    # @patch("delta.logger.info")  # Mock logging
-    # def test_dps_record_skipped(self, mock_logger_info, mock_firehose_send_log):
-    #     event = self.get_event(supplier="DPSFULL")
-    #     context = {}
-
-    #     response = handler(event, context)
-    #     print(f"final response1: {response}")
-
-    #     self.assertEqual(response["statusCode"], 200)
-    #     self.assertEqual(response["body"], "Record from DPS skipped for 12345")
-
-    #     # Check logging and Firehose were called
-    #     mock_logger_info.assert_called_with("Record from DPS skipped for 12345")
-
-    # # TODO - amend test once error handling implemented
-    # @patch("delta.firehose_logger.send_log")
-    # @patch("delta.logger.info")
-    # @patch("Converter.Converter")
-    # @patch("delta.boto3.resource")
-    # def test_partial_success_with_errors(self, mock_dynamodb, mock_converter, mock_logger_info, mock_firehose_send_log):
-    #     mock_converter_instance = MagicMock()
-    #     mock_converter_instance.runConversion.return_value = [{}]
-    #     mock_converter_instance.getErrorRecords.return_value = [{"error": "Invalid field"}]
-    #     mock_converter.return_value = mock_converter_instance
-
-    #     # Mock DynamoDB put_item success
-    #     mock_table = MagicMock()
-    #     mock_dynamodb.return_value.Table.return_value = mock_table
-    #     mock_table.put_item.return_value = {"ResponseMetadata": {"HTTPStatusCode": 200}}
-
-    #     event = self.get_event()
-    #     context = {}
-
-    #     response = handler(event, context)
-    #     print(f"final response: {response}")
-
-    #     # self.assertEqual(response["statusCode"], 207)
-    #     # self.assertIn("Partial success", response["body"])
-
-    #     # Check logging and Firehose were called
-    #     # mock_logger_info.assert_called()
-    #     # mock_firehose_send_log.assert_called()
+    @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")
+
+        # Act
+        result = handler(event, self.context)
+
+        # Assert
+        self.assertEqual(result["statusCode"], 200)
+
+    @patch("boto3.resource")
+    def test_handler_success_remove(self, mock_boto_resource):
+        # Arrange
+        self.setup_mock_dynamodb(mock_boto_resource)
+        event = self.get_event(event_name="REMOVE", operation="DELETE")
+
+        # Act
+        result = handler(event, self.context)
+
+        # Assert
+        self.assertEqual(result["statusCode"], 200)
+
+    @patch("boto3.resource")
+    @patch("boto3.client")
+    def test_handler_exception_intrusion_check(self, mock_boto_resource, mock_boto_client):
+        # Arrange
+        self.setup_mock_dynamodb(mock_boto_resource, status_code=500)
+        mock_boto_client.return_value = MagicMock()
+        event = self.get_event()
+
+        # Act & Assert
+
+        result = handler(event, self.context)
+        self.assertEqual(result["statusCode"], 500)
+
+    @patch("boto3.resource")
+    @patch("boto3.client")
+    def test_handler_exception_intrusion(self, mock_boto_resource, mock_boto_client):
+        # Arrange
+        self.setUp_mock_resources(mock_boto_resource, mock_boto_client)
+        event = self.get_event()
+        context = {}
+
+        # Act & Assert
+        with self.assertRaises(Exception):
+            handler(event, context)
+
+    @patch("boto3.resource")
+    @patch("delta.handler")
+    def test_handler_exception_intrusion_check_false(self, mock_boto_resource, mock_boto_client):
+        # Arrange
+        self.setUp_mock_resources(mock_boto_resource, mock_boto_client)
+        event = self.get_event()
+        context = {}
+
+        # Act & Assert
+        with self.assertRaises(Exception):
+            handler(event, context)
+
+    @patch("delta.firehose_logger.send_log")  # Mock Firehose logger
+    @patch("delta.logger.info")  # Mock logging
+    def test_dps_record_skipped(self, mock_logger_info, mock_firehose_send_log):
+        event = self.get_event(supplier="DPSFULL")
+        context = {}
+
+        response = handler(event, context)
+        print(f"final response1: {response}")
+
+        self.assertEqual(response["statusCode"], 200)
+        self.assertEqual(response["body"], "Record from DPS skipped for 12345")
+
+        # Check logging and Firehose were called
+        mock_logger_info.assert_called_with("Record from DPS skipped for 12345")
+
+    # TODO - amend test once error handling implemented
+    @patch("delta.firehose_logger.send_log")
+    @patch("delta.logger.info")
+    @patch("Converter.Converter")
+    @patch("delta.boto3.resource")
+    def test_partial_success_with_errors(self, mock_dynamodb, mock_converter, mock_logger_info, mock_firehose_send_log):
+        mock_converter_instance = MagicMock()
+        mock_converter_instance.runConversion.return_value = [{}]
+        mock_converter_instance.getErrorRecords.return_value = [{"error": "Invalid field"}]
+        mock_converter.return_value = mock_converter_instance
+
+        # Mock DynamoDB put_item success
+        mock_table = MagicMock()
+        mock_dynamodb.return_value.Table.return_value = mock_table
+        mock_table.put_item.return_value = {"ResponseMetadata": {"HTTPStatusCode": 200}}
+
+        event = self.get_event()
+        context = {}
+
+        response = handler(event, context)
+        print(f"final response: {response}")
+
+        # self.assertEqual(response["statusCode"], 207)
+        # self.assertIn("Partial success", response["body"])
+
+        # Check logging and Firehose were called
+        # mock_logger_info.assert_called()
+        # mock_firehose_send_log.assert_called()