VED-1084: Allow additional extended attributes file versions. (#1243)

* VED-1084: Allow additional extended attributes file version.

* VED-1084: Allow major version 1 and any numeric minor version.

Author: mfjarvis

lambdas/filenameprocessor/src/constants.py

@@ -23,7 +23,7 @@
 
 DPS_DESTINATION_PREFIX = "generic/EXTENDED_ATTRIBUTES_DAILY_1"
 EXTENDED_ATTRIBUTES_ARCHIVE_PREFIX = "extended-attributes-archive"
-VALID_EA_VERSIONS = ["V1_5"]
+VALID_EA_MAJOR_VERSIONS = ["V1"]
 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

@@ -6,7 +6,7 @@
 from constants import (
     EXTENDED_ATTRIBUTES_FILE_PREFIX,
     EXTENDED_ATTRIBUTES_VACC_TYPE,
-    VALID_EA_VERSIONS,
+    VALID_EA_MAJOR_VERSIONS,
     VALID_TIMESTAMP_LENGTH,
     VALID_TIMEZONE_OFFSETS,
     VALID_VERSIONS,
@@ -66,7 +66,8 @@ def validate_extended_attributes_file_key(file_key: str) -> tuple[str, str]:
 
     file_key_parts_without_extension, extension = split_file_key(file_key)
     file_type = "_".join(file_key_parts_without_extension[:3])
-    version = "_".join(file_key_parts_without_extension[3:5])
+    major_version = file_key_parts_without_extension[3]
+    minor_version = file_key_parts_without_extension[4]
     organization_code = file_key_parts_without_extension[5]
     timestamp = file_key_parts_without_extension[6]
     supplier = get_supplier_system_from_cache(organization_code)
@@ -76,7 +77,8 @@ def validate_extended_attributes_file_key(file_key: str) -> tuple[str, str]:
     if not (
         vaccine_type in valid_vaccine_types
         and file_type == EXTENDED_ATTRIBUTES_FILE_PREFIX.upper()
-        and version in VALID_EA_VERSIONS
+        and major_version in VALID_EA_MAJOR_VERSIONS
+        and minor_version.isdigit()
         and supplier  # Note that if supplier could be identified, this also implies that ODS code is valid
         and is_valid_datetime(timestamp)
         and (

lambdas/filenameprocessor/tests/test_file_key_validation.py

@@ -129,6 +129,11 @@ def test_validate_extended_attributes_file_key(self, mock_get_redis_client):
                 "Vaccination_Extended_Attributes_v1_5_YGM41_20221231T23595900.csv",
                 "YGM41",
             ),
+            # Valid extended attributes file key with version v1_4
+            (
+                "Vaccination_Extended_Attributes_v1_4_X8E5B_20000101T00000001.csv",
+                "X8E5B",
+            ),
         ]
 
         for file_key, expected_result in test_cases_for_success_scenarios: