Unit tests

Author: robertnovac1

filenameprocessor/src/file_name_processor.py

@@ -67,10 +67,10 @@ def handle_record(record) -> dict:
             # Get message_id if the file is not new, else assign one
             message_id = record.get("message_id", str(uuid4()))
 
-            vaccine_type, supplier = validate_file_key(file_key)
-
             created_at_formatted_string = get_created_at_formatted_string(bucket_name, file_key)
 
+            vaccine_type, supplier = validate_file_key(file_key)
+
             permissions = validate_vaccine_type_permissions(vaccine_type=vaccine_type, supplier=supplier)
             if not is_existing_file:
                 ensure_file_is_not_a_duplicate(file_key, created_at_formatted_string)
@@ -136,6 +136,8 @@ def handle_record(record) -> dict:
                 "file_key": file_key,
                 "message_id": message_id,
                 "error": str(error),
+                "vaccine_type": vaccine_type,
+                "supplier": supplier
             }
 
     elif "config" in bucket_name:

filenameprocessor/tests/test_lambda_handler.py

@@ -496,7 +496,7 @@ def test_successful_processing_from_configs(self):
             "file_key": ravs_rsv_file_details_1.file_key,
             "message_id": ravs_rsv_file_details_1.message_id,
             "vaccine_type": ravs_rsv_file_details_1.vaccine_type,
-            "supplier": ravs_rsv_file_details_1.supplier,
+            "supplier": ravs_rsv_file_details_1.supplier
         }
         self.assertEqual(result, expected_result)
 
@@ -524,5 +524,7 @@ def test_successful_processing_from_configs(self):
             "file_key": ravs_rsv_file_details_2.file_key,
             "message_id": ravs_rsv_file_details_2.message_id,
             "error": "Initial file validation failed: RAVS does not have permissions for RSV",
+            "vaccine_type": ravs_rsv_file_details_2.vaccine_type,
+            "supplier": ravs_rsv_file_details_2.supplier
         }
         self.assertEqual(result, expected_result)

filenameprocessor/tests/test_logging_decorator.py

@@ -6,6 +6,7 @@
 from copy import deepcopy
 from contextlib import ExitStack
 from boto3 import client as boto3_client
+from botocore.exceptions import ClientError
 from moto import mock_s3, mock_firehose, mock_sqs, mock_dynamodb
 
 from tests.utils_for_tests.generic_setup_and_teardown import GenericSetUp, GenericTearDown
@@ -192,13 +193,43 @@ def test_logging_failed_validation(self):
             "file_key": FILE_DETAILS.file_key,
             "message_id": FILE_DETAILS.message_id,
             "error": "Initial file validation failed: EMIS does not have permissions for FLU",
+            "vaccine_type": "FLU",
+            "supplier": "EMIS"
         }
 
         log_data = json.loads(mock_logger.info.call_args[0][0])
         self.assertEqual(log_data, expected_log_data)
 
         mock_send_log_to_firehose.assert_called_once_with(log_data)
 
+    def test_logging_throws_exception(self):
+        """Tests that the correct logs are sent to CloudWatch and Splunk when firehose throws an exception"""
+        permissions_config_content = generate_permissions_config_content({"EMIS": ["COVID19_FULL"]})
+
+        firehose_exception = ClientError(
+            error_response={"Error": {"Code": "ServiceUnavailable", "Message": "Service down"}},
+            operation_name="PutRecord"
+        )
+
+        with (
+            patch("file_name_processor.uuid4", return_value=FILE_DETAILS.message_id),
+            patch("elasticache.redis_client.get", return_value=permissions_config_content),
+            patch("logging_decorator.firehose_client.put_record", side_effect=firehose_exception),
+            patch("logging_decorator.logger") as mock_logger,
+        ):
+            lambda_handler(MOCK_VACCINATION_EVENT, context=None)
+
+        # Assert logger.exception was called once
+        mock_logger.exception.assert_called_once()
+
+        # Extract the call arguments
+        exception_message = mock_logger.exception.call_args[0][0]
+        exception_obj = mock_logger.exception.call_args[0][1]
+
+        # Check that the message format is correct
+        self.assertIn("Error sending log to Firehose", exception_message)
+        self.assertEqual(exception_obj, firehose_exception)
+
     def test_logging_successful_config_upload(self):
         """
         Tests that the correct logs are sent to cloudwatch and splunk when the config cache is successfully updated