add move_file

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"
 EXTENDED_ATTRIBUTES_VACC_TYPE = "COVID"
-DPS_DESTINATION_PREFIX = "dps_destination/"
+DPS_DESTINATION_PREFIX = "dps_destination"
 VALID_EA_VERSIONS = "V1_5"
 ERROR_TYPE_TO_STATUS_CODE_MAP = {
     VaccineTypePermissionsError: 403,

lambdas/filenameprocessor/src/file_name_processor.py

@@ -12,14 +12,14 @@
 from audit_table import upsert_audit_table
 from common.aws_s3_utils import (
     copy_file_to_external_bucket,
-    delete_file,
     move_file,
 )
 from common.clients import STREAM_NAME, get_s3_client, logger
 from common.log_decorator import logging_decorator
 from common.models.errors import UnhandledAuditTableError
 from constants import (
     DPS_DESTINATION_BUCKET_NAME,
+    DPS_DESTINATION_PREFIX,
     ERROR_TYPE_TO_STATUS_CODE_MAP,
     EXPECTED_BUCKET_OWNER_ACCOUNT,
     EXTENDED_ATTRIBUTES_FILE_PREFIX,
@@ -262,7 +262,7 @@ def handle_extended_attributes_file(
         )
 
         # TODO: agree the prefix with DPS
-        dest_file_key = f"dps_destination/{file_key}"
+        dest_file_key = f"{DPS_DESTINATION_PREFIX}/{file_key}"
         copy_file_to_external_bucket(
             bucket_name,
             file_key,
@@ -271,7 +271,8 @@ def handle_extended_attributes_file(
             EXPECTED_BUCKET_OWNER_ACCOUNT,
             EXPECTED_BUCKET_OWNER_ACCOUNT,
         )
-        delete_file(bucket_name, dest_file_key, EXPECTED_BUCKET_OWNER_ACCOUNT)
+
+        move_file(bucket_name, file_key, f"extended-attributes-archive/{file_key}")
 
         upsert_audit_table(
             message_id,

lambdas/filenameprocessor/tests/test_lambda_handler.py

@@ -284,11 +284,12 @@ def test_lambda_handler_extended_attributes_success(self, mock_get_redis_client)
                 ),
             ),
             patch(
-                "file_name_processor.delete_file",
-                side_effect=lambda src_bucket, key, exp_owner: (
-                    s3_client.delete_object(
-                        Bucket=BucketNames.SOURCE,
-                        Key=key,
+                "file_name_processor.move_file",
+                side_effect=lambda source_bucket, source_key, destination_key: (
+                    s3_client.put_object(
+                        Bucket=source_bucket,
+                        Key=destination_key,
+                        Body=s3_client.get_object(Bucket=source_bucket, Key=source_key)["Body"].read(),
                     ),
                 ),
             ),
@@ -308,6 +309,7 @@ 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)
@@ -350,6 +352,17 @@ def test_lambda_handler_extended_attributes_failure(self, mock_get_redis_client)
         with (
             patch("file_name_processor.uuid4", return_value=test_cases[0].message_id),
             patch("file_name_processor.copy_file_to_external_bucket", side_effect=Exception("Test ClientError")),
+            patch(
+                "file_name_processor.move_file",
+                side_effect=lambda bucket, key, dst_key: (
+                    s3_client.put_object(
+                        Bucket=bucket,
+                        Key=dst_key,
+                        Body=s3_client.get_object(Bucket=bucket, Key=key)["Body"].read(),
+                    ),
+                    s3_client.delete_object(Bucket=bucket, Key=key),
+                ),
+            ),
         ):
             lambda_handler(self.make_event([self.make_record(test_cases[0].file_key)]), None)