EXTENDED_ATTRIBUTES_VACC_TYPE

Author: JamesW1-NHS

lambdas/filenameprocessor/src/constants.py

@@ -22,6 +22,7 @@
 VACCINE_TYPE_TO_DISEASES_HASH_KEY = "vacc_to_diseases"
 ODS_CODE_TO_SUPPLIER_SYSTEM_HASH_KEY = "ods_code_to_supplier"
 EXTENDED_ATTRIBUTES_FILE_PREFIX = "Vaccination_Extended_Attributes"
+EXTENDED_ATTRIBUTES_VACC_TYPE = "COVID"
 DPS_DESTINATION_PREFIX = "dps_destination/"
 
 ERROR_TYPE_TO_STATUS_CODE_MAP = {

lambdas/filenameprocessor/src/file_name_processor.py

@@ -25,6 +25,7 @@
     DPS_DESTINATION_BUCKET_NAME,
     ERROR_TYPE_TO_STATUS_CODE_MAP,
     EXTENDED_ATTRIBUTES_FILE_PREFIX,
+    EXTENDED_ATTRIBUTES_VACC_TYPE,
     SOURCE_BUCKET_NAME,
     FileNotProcessedReason,
     FileStatus,
@@ -114,7 +115,8 @@ def handle_unexpected_bucket_name(bucket_name: str, file_key: str) -> dict:
     config and overarching design"""
     try:
         if file_key.startswith(EXTENDED_ATTRIBUTES_FILE_PREFIX):
-            extended_attribute_identifier = validate_extended_attributes_file_key(file_key)
+            organization_code = validate_extended_attributes_file_key(file_key)
+            extended_attribute_identifier = f"{organization_code}_{EXTENDED_ATTRIBUTES_VACC_TYPE}"
             logger.error(
                 "Unable to process file %s due to unexpected bucket name %s",
                 file_key,
@@ -262,7 +264,8 @@ def handle_extended_attributes_file(
     # NB for this to work we have to retool upsert so it accepts overwrites, i.e. ignore the ConditionExpression
 
     try:
-        extended_attribute_identifier = validate_extended_attributes_file_key(file_key)
+        organization_code = validate_extended_attributes_file_key(file_key)
+        extended_attribute_identifier = f"{organization_code}_{EXTENDED_ATTRIBUTES_VACC_TYPE}"
 
         upsert_audit_table(
             message_id,

lambdas/filenameprocessor/src/file_validation.py

@@ -40,14 +40,14 @@ def is_valid_datetime(timestamp: str) -> bool:
 def validate_extended_attributes_file_key(file_key: str) -> str:
     """
     Checks that all elements of the file key are valid, raises an exception otherwise.
-    Returns a string containing the organization code and COVID vaccine type needed in the audit table.
+    Returns a string containing the organization code.
     """
     if not match(r"^[^_.]*_[^_.]*_[^_.]*_[^_.]*_[^_.]*_[^_.]*_[^_.]*", file_key):
         raise InvalidFileKeyError("Initial file validation failed: invalid extended attributes file key format")
 
     file_key_parts_without_extension, _ = split_file_key(file_key)
     organization_code = file_key_parts_without_extension[5]
-    return f"{organization_code}_COVID"
+    return organization_code
 
 
 def validate_batch_file_key(file_key: str) -> tuple[str, str]:

lambdas/filenameprocessor/tests/test_file_key_validation.py

@@ -114,18 +114,18 @@ def test_split_file_key(self, _):
                 self.assertEqual(split_file_key(file_key), expected)
 
     def test_validate_extended_attributes_file_key(self, _):
-        """Tests that validate_extended_attributes_file_key returns organization code and COVID vaccine type if all
+        """Tests that validate_extended_attributes_file_key returns organization codeif all
         elements pass validation, and raises an exception otherwise"""
         test_cases_for_success_scenarios = [
             # Valid extended attributes file key
             (
                 "Vaccination_Extended_Attributes_v1_5_X8E5B_20000101T00000001.csv",
-                "X8E5B_COVID",
+                "X8E5B",
             ),
             # Valid extended attributes file key with different organization code
             (
                 "Vaccination_Extended_Attributes_v1_5_YGM41_20221231T23595999.csv",
-                "YGM41_COVID",
+                "YGM41",
             ),
         ]
 

lambdas/filenameprocessor/tests/test_lambda_handler.py

@@ -35,7 +35,12 @@
 # Ensure environment variables are mocked before importing from src files
 with patch.dict("os.environ", MOCK_ENVIRONMENT_DICT):
     from common.clients import REGION_NAME
-    from constants import AUDIT_TABLE_NAME, AuditTableKeys, FileStatus
+    from constants import (
+        AUDIT_TABLE_NAME, 
+        EXTENDED_ATTRIBUTES_VACC_TYPE, 
+        AuditTableKeys, 
+        FileStatus
+    )
     from file_name_processor import handle_record, lambda_handler
 
 s3_client = boto3_client("s3", region_name=REGION_NAME)
@@ -292,7 +297,9 @@ def test_lambda_handler_extended_attributes_success(self):
         item = table_items[0]
         self.assertEqual(item[AuditTableKeys.MESSAGE_ID]["S"], test_cases[0].message_id)
         self.assertEqual(item[AuditTableKeys.FILENAME]["S"], test_cases[0].file_key)
-        self.assertEqual(item[AuditTableKeys.QUEUE_NAME]["S"], test_cases[0].ods_code + "_COVID")
+        self.assertEqual(
+            item[AuditTableKeys.QUEUE_NAME]["S"], test_cases[0].ods_code + "_" + EXTENDED_ATTRIBUTES_VACC_TYPE
+        )
         self.assertEqual(item[AuditTableKeys.STATUS]["S"], "Processed")
         self.assertEqual(item[AuditTableKeys.TIMESTAMP]["S"], test_cases[0].created_at_formatted_string)
         self.assertEqual(item[AuditTableKeys.EXPIRES_AT]["N"], str(test_cases[0].expires_at))
@@ -347,7 +354,9 @@ def test_lambda_handler_extended_attributes_failure(self):
         item = table_items[0]
         self.assertEqual(item[AuditTableKeys.MESSAGE_ID]["S"], test_cases[0].message_id)
         self.assertEqual(item[AuditTableKeys.FILENAME]["S"], test_cases[0].file_key)
-        self.assertEqual(item[AuditTableKeys.QUEUE_NAME]["S"], test_cases[0].ods_code + "_COVID")
+        self.assertEqual(
+            item[AuditTableKeys.QUEUE_NAME]["S"], test_cases[0].ods_code + "_" + EXTENDED_ATTRIBUTES_VACC_TYPE
+        )
         self.assertEqual(item[AuditTableKeys.TIMESTAMP]["S"], test_cases[0].created_at_formatted_string)
         self.assertEqual(item[AuditTableKeys.STATUS]["S"], "Failed")
         self.assertEqual(