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

remove ignore_folder from get_folder_name

Browse Source 
it doesn't make sense to get the folder name if you know you aren't
going to use it.
This commit is contained in:
Leo Hemsted
2020-09-21 14:24:43 +01:00
parent bb33927b3d
commit 4f1e5ee5a3
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/letters/utils.py
View File

@@ -27,20 +27,16 @@ LETTERS_PDF_FILE_LOCATION_STRUCTURE = \
PRECOMPILED_BUCKET_PREFIX = '{folder}NOTIFY.{reference}' PRECOMPILED_BUCKET_PREFIX = '{folder}NOTIFY.{reference}'
def get_folder_name(created_at, *, ignore_folder=False): def get_folder_name(created_at):
if ignore_folder: print_datetime = convert_utc_to_bst(created_at)
folder_name = '' if print_datetime.time() > LETTER_PROCESSING_DEADLINE:
else: print_datetime += timedelta(days=1)
print_datetime = convert_utc_to_bst(created_at) return '{}/'.format(print_datetime.date())
if print_datetime.time() > LETTER_PROCESSING_DEADLINE:
print_datetime += timedelta(days=1)
folder_name = '{}/'.format(print_datetime.date())
return folder_name
def get_letter_pdf_filename(reference, crown, sending_date, ignore_folder=False, postage=SECOND_CLASS): def get_letter_pdf_filename(reference, crown, sending_date, ignore_folder=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, ignore_folder=ignore_folder), folder='' if ignore_folder else get_folder_name(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],
@@ -59,7 +55,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, ignore_folder=False) folder = get_folder_name(notification.created_at)
upload_file_name = PRECOMPILED_BUCKET_PREFIX.format( upload_file_name = PRECOMPILED_BUCKET_PREFIX.format(
folder=folder, folder=folder,
@@ -151,7 +147,8 @@ def move_uploaded_pdf_to_letters_bucket(source_filename, upload_filename):
def move_sanitised_letter_to_test_or_live_pdf_bucket(filename, is_test_letter, created_at, new_filename): def move_sanitised_letter_to_test_or_live_pdf_bucket(filename, is_test_letter, created_at, new_filename):
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(created_at, ignore_folder=is_test_letter) + new_filename target_folder = '' if is_test_letter else get_folder_name(created_at)
target_filename = target_folder + new_filename
_move_s3_object( _move_s3_object(
source_bucket=current_app.config['LETTER_SANITISE_BUCKET_NAME'], source_bucket=current_app.config['LETTER_SANITISE_BUCKET_NAME'],

6
tests/app/letters/test_letter_utils.py
View File

@@ -312,14 +312,10 @@ def test_move_failed_pdf_scan_failed(notify_api):
]) ])
def test_get_folder_name_in_british_summer_time(notify_api, timestamp, expected_folder_name): def test_get_folder_name_in_british_summer_time(notify_api, timestamp, expected_folder_name):
timestamp = dateutil.parser.parse(timestamp) timestamp = dateutil.parser.parse(timestamp)
folder_name = get_folder_name(created_at=timestamp, ignore_folder=False) folder_name = get_folder_name(created_at=timestamp)
assert folder_name == expected_folder_name assert folder_name == expected_folder_name
def test_get_folder_name_returns_empty_string_for_test_letter():
assert '' == get_folder_name(datetime.utcnow(), ignore_folder=True)
@mock_s3 @mock_s3
def test_move_sanitised_letter_to_live_pdf_bucket(notify_api, mocker): def test_move_sanitised_letter_to_live_pdf_bucket(notify_api, mocker):
filename = 'my_letter.pdf' filename = 'my_letter.pdf'