From ba9a774e74fa70618ddb9086bd502f5cc8bbb593 Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Tue, 27 Nov 2018 12:21:41 +0000 Subject: [PATCH] look in correct bucket for letters sent after 5:30pm use the same function that we use when uploading, to ensure consistency (that fn is also well tested already) --- app/letters/utils.py | 2 +- tests/app/letters/test_letter_utils.py | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/letters/utils.py b/app/letters/utils.py index fc84b50ac..fb01e78cb 100644 --- a/app/letters/utils.py +++ b/app/letters/utils.py @@ -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 = '{}/'.format(notification.created_at.date()) + folder = get_folder_name(notification.created_at, False) upload_file_name = PRECOMPILED_BUCKET_PREFIX.format( folder=folder, diff --git a/tests/app/letters/test_letter_utils.py b/tests/app/letters/test_letter_utils.py index f2077b786..32f3f9df9 100644 --- a/tests/app/letters/test_letter_utils.py +++ b/tests/app/letters/test_letter_utils.py @@ -35,13 +35,18 @@ def _sample_precompiled_letter_notification_using_test_key(sample_precompiled_le return sample_precompiled_letter_notification -def test_get_bucket_name_and_prefix_for_notification_valid_notification(sample_notification): +@pytest.mark.parametrize('created_at,folder', [ + (datetime(2017, 1, 1, 17, 29), '2017-01-01'), + (datetime(2017, 1, 1, 17, 31), '2017-01-02'), +]) +def test_get_bucket_name_and_prefix_for_notification_valid_notification(sample_notification, created_at, folder): + sample_notification.created_at = created_at bucket, bucket_prefix = get_bucket_name_and_prefix_for_notification(sample_notification) assert bucket == current_app.config['LETTERS_PDF_BUCKET_NAME'] assert bucket_prefix == '{folder}/NOTIFY.{reference}'.format( - folder=sample_notification.created_at.date(), + folder=folder, reference=sample_notification.reference ).upper()