darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-05 02:41:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update all calls to get_folder_name to include the parameter name.

Browse Source 
Use created_at date of the notification for precompiled letters.
This commit is contained in:
Rebecca Law
2019-09-20 16:25:25 +01:00
committed by Leo Hemsted
parent f234e94572
commit a1863fa419
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/celery/letters_pdf_tasks.py
View File

@@ -253,7 +253,9 @@ def process_virus_scan_passed(self, filename):
_upload_pdf_to_test_or_live_pdf_bucket( _upload_pdf_to_test_or_live_pdf_bucket(
new_pdf, new_pdf,
filename, filename,
is_test_letter=is_test_key) is_test_letter=is_test_key,
created_at=notification.created_at
)
update_letter_pdf_status( update_letter_pdf_status(
reference=reference, 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) 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_config = 'TEST_LETTERS_BUCKET_NAME' if is_test_letter else 'LETTERS_PDF_BUCKET_NAME'
target_bucket_name = current_app.config[target_bucket_config] 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( s3upload(
filedata=pdf_data, filedata=pdf_data,

6
app/letters/utils.py
View File

@@ -25,7 +25,7 @@ LETTERS_PDF_FILE_LOCATION_STRUCTURE = \
PRECOMPILED_BUCKET_PREFIX = '{folder}NOTIFY.{reference}' 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: if dont_use_sending_date:
folder_name = '' folder_name = ''
else: 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): 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( 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, reference=reference,
duplex="D", duplex="D",
letter_class=RESOLVE_POSTAGE_FOR_FILE_NAME[postage], 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'] bucket_name = current_app.config['TEST_LETTERS_BUCKET_NAME']
else: else:
bucket_name = current_app.config['LETTERS_PDF_BUCKET_NAME'] 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( upload_file_name = PRECOMPILED_BUCKET_PREFIX.format(
folder=folder, folder=folder,