Refactor extended attributes

Author: Akol125

lambdas/filenameprocessor/src/constants.py

@@ -17,6 +17,7 @@
 
 VACCINE_TYPE_TO_DISEASES_HASH_KEY = "vacc_to_diseases"
 ODS_CODE_TO_SUPPLIER_SYSTEM_HASH_KEY = "ods_code_to_supplier"
+EXTENDED_ATTRIBUTES_PREFIXES = "Vaccination_Extended_Attributes"
 
 ERROR_TYPE_TO_STATUS_CODE_MAP = {
     VaccineTypePermissionsError: 403,

lambdas/filenameprocessor/src/file_name_processor.py

@@ -16,6 +16,7 @@
 from common.models.errors import UnhandledAuditTableError
 from constants import (
     ERROR_TYPE_TO_STATUS_CODE_MAP,
+    EXTENDED_ATTRIBUTES_PREFIXES,
     SOURCE_BUCKET_NAME,
     FileNotProcessedReason,
     FileStatus,
@@ -76,10 +77,12 @@ def handle_record(record) -> dict:
         message_id = str(uuid4())
         s3_response = get_s3_client().get_object(Bucket=bucket_name, Key=file_key)
         created_at_formatted_string, expiry_timestamp = get_creation_and_expiry_times(s3_response)
+        if file_key.startswith(EXTENDED_ATTRIBUTES_PREFIXES):
+            pass
+        else:
+            vaccine_type, supplier = validate_file_key(file_key)
 
-        vaccine_type, supplier = validate_file_key(file_key)
         permissions = validate_vaccine_type_permissions(vaccine_type=vaccine_type, supplier=supplier)
-
         queue_name = f"{supplier}_{vaccine_type}"
         upsert_audit_table(
             message_id,

lambdas/filenameprocessor/tests/test_lambda_handler.py

@@ -195,7 +195,7 @@ def test_lambda_handler_new_file_success_and_first_in_queue(self, mock_get_redis
         mock_redis.hkeys = Mock(return_value=all_vaccine_types_in_this_test_file)
         mock_get_redis_client.return_value = mock_redis
 
-        test_cases = [MockFileDetails.emis_flu, MockFileDetails.ravs_rsv_1]
+        test_cases = [MockFileDetails.emis_flu, MockFileDetails.ravs_rsv_1, MockFileDetails.extended_attributes_file]
         for file_details in test_cases:
             with self.subTest(file_details.name):
                 # Set up the file in the source bucket

lambdas/filenameprocessor/tests/utils_for_tests/values_for_tests.py

@@ -27,10 +27,18 @@ class FileDetails:
     vaccine type.
     """
 
-    def __init__(self, supplier: str, vaccine_type: str, ods_code: str, file_number: int = 1):
-        self.vaccine_type = vaccine_type.upper()
-        self.ods_code = ods_code.upper()
-        self.supplier = supplier.upper()
+    def __init__(
+        self,
+        supplier: str = "RAVS",
+        vaccine_type: str = None,
+        ods_code: str = None,
+        file_number: int = 1,
+        organization_code: str = None,
+    ):
+        self.vaccine_type = vaccine_type.upper() if vaccine_type else None
+        self.ods_code = ods_code.upper() if ods_code else "X8E5B"
+        self.organization_code = organization_code
+        self.supplier = supplier.upper() if supplier else None
         self.queue_name = f"{self.supplier}_{self.vaccine_type}"
 
         self.created_at_formatted_string = f"200{file_number}0101T00000000"
@@ -39,7 +47,14 @@ def __init__(self, supplier: str, vaccine_type: str, ods_code: str, file_number:
         self.name = f"{self.vaccine_type}/ {self.supplier} file"
 
         file_date_and_time_string = f"20000101T0000000{file_number}"
-        self.file_key = f"{vaccine_type}_Vaccinations_v5_{ods_code}_{file_date_and_time_string}.csv"
+        extended_attributes_prefix = "Vaccination_Extended_Attributes"
+        if self.vaccine_type.startswith(extended_attributes_prefix):
+            file_key = f"{extended_attributes_prefix}_v1_5_{organization_code}_{file_date_and_time_string}.csv"
+        else:
+            file_key = f"{vaccine_type}_Vaccinations_v5_{ods_code}_{file_date_and_time_string}.csv"
+
+        self.file_key = file_key
+
         self.ack_file_key = f"ack/{self.file_key[:-4]}_InfAck_{self.created_at_formatted_string}.csv"
 
         self.permissions_list = [f"{self.vaccine_type}_FULL"]
@@ -78,6 +93,9 @@ class MockFileDetails:
     emis_flu = FileDetails("EMIS", "FLU", "YGM41")
     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"
+    )
 
 
 MOCK_FILE_HEADERS = (