add validation

Author: Akol125

lambdas/filenameprocessor/src/constants.py

@@ -23,7 +23,7 @@
 ODS_CODE_TO_SUPPLIER_SYSTEM_HASH_KEY = "ods_code_to_supplier"
 EXTENDED_ATTRIBUTES_FILE_PREFIX = "Vaccination_Extended_Attributes"
 DPS_DESTINATION_PREFIX = "dps_destination/"
-VALID_EA_VERSIONS = "v1_5"
+VALID_EA_VERSIONS = "V1_5"
 ERROR_TYPE_TO_STATUS_CODE_MAP = {
     VaccineTypePermissionsError: 403,
     InvalidFileKeyError: 400,  # Includes invalid ODS code, therefore unable to identify supplier

lambdas/filenameprocessor/src/file_validation.py

@@ -51,9 +51,12 @@ def validate_extended_attributes_file_key(file_key: str) -> str:
     organization_code = file_key_parts_without_extension[5]
     timestamp = file_key_parts_without_extension[6]
     supplier = get_supplier_system_from_cache(organization_code)
+    valid_vaccine_types = get_valid_vaccine_types_from_cache()
+    vaccine_type = "COVID"
 
     if not (
-        file_type == EXTENDED_ATTRIBUTES_FILE_PREFIX
+        vaccine_type in valid_vaccine_types
+        and file_type == EXTENDED_ATTRIBUTES_FILE_PREFIX.upper()
         and version == VALID_EA_VERSIONS
         and supplier  # Note that if supplier could be identified, this also implies that ODS code is valid
         and is_valid_datetime(timestamp)

lambdas/filenameprocessor/tests/test_file_key_validation.py

@@ -113,9 +113,7 @@ def test_split_file_key(self, _):
             with self.subTest(f"SubTest for file key: {file_key}"):
                 self.assertEqual(split_file_key(file_key), expected)
 
-    @patch("file_name_processor.get_supplier_system_from_cache", return_value="RAVS")  # supplier now VALID
-    @patch("file_validation.get")
-    def test_validate_extended_attributes_file_key(self, _):
+    def test_validate_extended_attributes_file_key(self, mock_get_redis_client):
         """Tests that validate_extended_attributes_file_key returns organization code and COVID vaccine type if all
         elements pass validation, and raises an exception otherwise"""
         test_cases_for_success_scenarios = [
@@ -133,6 +131,10 @@ def test_validate_extended_attributes_file_key(self, _):
 
         for file_key, expected_result in test_cases_for_success_scenarios:
             with self.subTest(f"SubTest for file key: {file_key}"):
+                mock_redis = Mock()
+                mock_redis.hget.side_effect = create_mock_hget(MOCK_ODS_CODE_TO_SUPPLIER, {})
+                mock_redis.hkeys.return_value = ["COVID"]
+                mock_get_redis_client.return_value = mock_redis
                 self.assertEqual(
                     validate_extended_attributes_file_key(file_key),
                     expected_result,

lambdas/filenameprocessor/tests/test_lambda_handler.py

@@ -245,9 +245,6 @@ def test_lambda_handler_extended_attributes_success(self):
         Tests that for an extended attributes file (prefix starts with 'Vaccination_Extended_Attributes'):
         * The file is added to the audit table with a status of 'Processing'
         * The queue_name stored is the extended attribute identifier
-        * The file is moved to the destination bucket under archive/
-        * No SQS message is sent
-        * No ack file is created
         """
 
         # Build an extended attributes file.

lambdas/filenameprocessor/tests/utils_for_tests/mock_environment_variables.py

@@ -36,6 +36,7 @@ class Sqs:
 MOCK_ENVIRONMENT_DICT = {
     "SOURCE_BUCKET_NAME": BucketNames.SOURCE,
     "ACK_BUCKET_NAME": BucketNames.DESTINATION,
+    "MOCK_MOTO_ACCOUNT_ID": "123456789012",
     "QUEUE_URL": "https://sqs.eu-west-2.amazonaws.com/123456789012/imms-batch-file-created-queue.fifo",
     "REDIS_HOST": "localhost",
     "REDIS_PORT": "6379",

lambdas/filenameprocessor/tests/utils_for_tests/values_for_tests.py

@@ -93,7 +93,7 @@ class MockFileDetails:
     emis_rsv = FileDetails("EMIS", "RSV", "YGM41")
     ravs_flu = FileDetails("RAVS", "FLU", "X8E5B")
     extended_attributes_file = FileDetails(
-        vaccine_type="Vaccination_Extended_Attributes", file_number=1, organization_code="RJ123"
+        vaccine_type="Vaccination_Extended_Attributes", file_number=1, organization_code="YGM41"
     )