From a1863fa419c533de95fcaea58c3e707bf1062e51 Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Fri, 20 Sep 2019 16:25:25 +0100 Subject: [PATCH] Update all calls to `get_folder_name` to include the parameter name. Use created_at date of the notification for precompiled letters. --- app/celery/letters_pdf_tasks.py | 8 +++++--- app/letters/utils.py | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/celery/letters_pdf_tasks.py b/app/celery/letters_pdf_tasks.py index 1dccb9b2a..434f2fdb7 100644 --- a/app/celery/letters_pdf_tasks.py +++ b/app/celery/letters_pdf_tasks.py @@ -253,7 +253,9 @@ def process_virus_scan_passed(self, filename): _upload_pdf_to_test_or_live_pdf_bucket( new_pdf, filename, - is_test_letter=is_test_key) + is_test_letter=is_test_key, + created_at=notification.created_at + ) update_letter_pdf_status( reference=reference, @@ -284,10 +286,10 @@ def _move_invalid_letter_and_update_status(notification, filename, scan_pdf_obje update_notification_status_by_id(notification.id, NOTIFICATION_TECHNICAL_FAILURE) -def _upload_pdf_to_test_or_live_pdf_bucket(pdf_data, filename, is_test_letter): +def _upload_pdf_to_test_or_live_pdf_bucket(pdf_data, filename, is_test_letter, created_at): target_bucket_config = 'TEST_LETTERS_BUCKET_NAME' if is_test_letter else 'LETTERS_PDF_BUCKET_NAME' target_bucket_name = current_app.config[target_bucket_config] - target_filename = get_folder_name(datetime.utcnow(), is_test_letter) + filename + target_filename = get_folder_name(created_at, dont_use_sending_date=is_test_letter) + filename s3upload( filedata=pdf_data, diff --git a/app/letters/utils.py b/app/letters/utils.py index 25836f475..98e954fb5 100644 --- a/app/letters/utils.py +++ b/app/letters/utils.py @@ -25,7 +25,7 @@ LETTERS_PDF_FILE_LOCATION_STRUCTURE = \ PRECOMPILED_BUCKET_PREFIX = '{folder}NOTIFY.{reference}' -def get_folder_name(_now, dont_use_sending_date=False): +def get_folder_name(_now, *, dont_use_sending_date=False): if dont_use_sending_date: folder_name = '' else: @@ -38,7 +38,7 @@ def get_folder_name(_now, dont_use_sending_date=False): def get_letter_pdf_filename(reference, crown, sending_date, dont_use_sending_date=False, postage=SECOND_CLASS): upload_file_name = LETTERS_PDF_FILE_LOCATION_STRUCTURE.format( - folder=get_folder_name(sending_date, dont_use_sending_date), + folder=get_folder_name(sending_date, dont_use_sending_date=dont_use_sending_date), reference=reference, duplex="D", letter_class=RESOLVE_POSTAGE_FOR_FILE_NAME[postage], @@ -57,7 +57,7 @@ def get_bucket_name_and_prefix_for_notification(notification): bucket_name = current_app.config['TEST_LETTERS_BUCKET_NAME'] else: bucket_name = current_app.config['LETTERS_PDF_BUCKET_NAME'] - folder = get_folder_name(notification.created_at, False) + folder = get_folder_name(notification.created_at, dont_use_sending_date=False) upload_file_name = PRECOMPILED_BUCKET_PREFIX.format( folder=folder,