fix extended attribute test

Author: Akol125

lambdas/filenameprocessor/src/constants.py

@@ -24,6 +24,7 @@
 EXTENDED_ATTRIBUTES_FILE_PREFIX = "Vaccination_Extended_Attributes"
 EXTENDED_ATTRIBUTES_VACC_TYPE = "COVID"
 DPS_DESTINATION_PREFIX = "dps_destination"
+EA_ARCHIVE_PREFIX = "extended-attributes-archive"
 VALID_EA_VERSIONS = "V1_5"
 ERROR_TYPE_TO_STATUS_CODE_MAP = {
     VaccineTypePermissionsError: 403,

lambdas/filenameprocessor/src/file_name_processor.py

@@ -20,6 +20,7 @@
 from constants import (
     DPS_DESTINATION_BUCKET_NAME,
     DPS_DESTINATION_PREFIX,
+    EA_ARCHIVE_PREFIX,
     ERROR_TYPE_TO_STATUS_CODE_MAP,
     EXPECTED_BUCKET_OWNER_ACCOUNT,
     EXTENDED_ATTRIBUTES_FILE_PREFIX,
@@ -272,7 +273,7 @@ def handle_extended_attributes_file(
             EXPECTED_BUCKET_OWNER_ACCOUNT,
         )
 
-        move_file(bucket_name, file_key, f"extended-attributes-archive/{file_key}")
+        move_file(bucket_name, file_key, f"{EA_ARCHIVE_PREFIX}/{file_key}")
 
         upsert_audit_table(
             message_id,

lambdas/filenameprocessor/tests/test_lambda_handler.py

@@ -308,7 +308,6 @@ def test_lambda_handler_extended_attributes_success(self, mock_get_redis_client)
         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))
         # File should be moved to destination/
-        # The implementation constructs the destination key with a double slash. Reflect that here.
         dest_key = f"dps_destination/{test_cases[0].file_key}"
         print(f" destination file is at {s3_client.list_objects(Bucket=BucketNames.DESTINATION)}")
         retrieved = s3_client.get_object(Bucket=BucketNames.DESTINATION, Key=dest_key)
@@ -341,7 +340,7 @@ def test_lambda_handler_extended_attributes_failure(self, mock_get_redis_client)
             Body=MOCK_EXTENDED_ATTRIBUTES_FILE_CONTENT,
         )
 
-        # Mock Redis so EA validation passes: supplier present and COVID valid
+        # Mock Redis so Extended Attributes validation passes: supplier present and COVID valid
         mock_redis = fakeredis.FakeStrictRedis()
         mock_redis.hget = Mock(side_effect=create_mock_hget({"X8E5B": "RAVS"}, {}))
         mock_redis.hkeys = Mock(return_value=["COVID", *all_vaccine_types_in_this_test_file])
@@ -414,7 +413,7 @@ def raise_connection_error(*args, **kwargs):
         with patch("file_name_processor.uuid4", return_value=test_case.message_id):
             lambda_handler(self.make_event([self.make_record(test_case.file_key)]), None)
 
-        # Audit should be Failed with unknown queue_name, file moved to archive
+        # Audit status should be Failed with unknown queue_name, file moved to archive
         item = self.get_audit_table_items()[0]
         self.assertEqual(item[AuditTableKeys.MESSAGE_ID]["S"], test_case.message_id)
         self.assertEqual(item[AuditTableKeys.FILENAME]["S"], test_case.file_key)
@@ -439,7 +438,7 @@ def test_lambda_handler_extended_attributes_invalid_timestamp(self, mock_get_red
         s3_client.put_object(
             Bucket=BucketNames.SOURCE, Key=invalid_timestamp_key, Body=MOCK_EXTENDED_ATTRIBUTES_FILE_CONTENT
         )
-        with patch("file_name_processor.uuid4", return_value="EA_bad_ts_id"):
+        with patch("file_name_processor.uuid4", return_value="invalid_timestamp_id"):
             lambda_handler(self.make_event([self.make_record(invalid_timestamp_key)]), None)
         # Failed audit and archive
         item1 = self.get_audit_table_items()[0]
@@ -451,7 +450,7 @@ def test_lambda_handler_extended_attributes_invalid_timestamp(self, mock_get_red
         s3_client.put_object(
             Bucket=BucketNames.SOURCE, Key=invalid_timestamp_key2, Body=MOCK_EXTENDED_ATTRIBUTES_FILE_CONTENT
         )
-        with patch("file_name_processor.uuid4", return_value="EA_bad_ts_id2"):
+        with patch("file_name_processor.uuid4", return_value="invalid_timestamp_id2"):
             lambda_handler(self.make_event([self.make_record(invalid_timestamp_key2)]), None)
         # Failed audit and archive
         item2 = self.get_audit_table_items()[-1]