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

Move test letters to test letters bucket without date folder name

Browse Source
This commit is contained in:
Ken Tsang
2018-03-23 14:59:48 +00:00
parent 2f09c943f7
commit 1a9bc2a5cf
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/letters/utils.py
View File

@@ -92,7 +92,8 @@ def move_scanned_pdf_to_test_or_live_pdf_bucket(filename, is_test_letter=False):
s3 = boto3.resource('s3') s3 = boto3.resource('s3')
copy_source = {'Bucket': source_bucket_name, 'Key': filename} copy_source = {'Bucket': source_bucket_name, 'Key': filename}
target_filename = get_folder_name(datetime.utcnow()) + filename target_filename = get_folder_name(datetime.utcnow(), is_test_letter) + filename
target_bucket = s3.Bucket(target_bucket_name) target_bucket = s3.Bucket(target_bucket_name)
obj = target_bucket.Object(target_filename) obj = target_bucket.Object(target_filename)

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

@@ -140,13 +140,13 @@ def test_upload_letter_pdf_to_correct_bucket(
@mock_s3 @mock_s3
@pytest.mark.parametrize('is_test_letter,bucket_config_name', [ @pytest.mark.parametrize('is_test_letter,bucket_config_name,folder_date_name', [
(False, 'LETTERS_PDF_BUCKET_NAME'), (False, 'LETTERS_PDF_BUCKET_NAME', '2018-03-14/'),
(True, 'TEST_LETTERS_BUCKET_NAME') (True, 'TEST_LETTERS_BUCKET_NAME', '')
]) ])
@freeze_time(FROZEN_DATE_TIME) @freeze_time(FROZEN_DATE_TIME)
def test_move_scanned_letter_pdf_to_processing_bucket( def test_move_scanned_letter_pdf_to_processing_bucket(
notify_api, is_test_letter, bucket_config_name notify_api, is_test_letter, bucket_config_name, folder_date_name
): ):
filename = 'test.pdf' filename = 'test.pdf'
source_bucket_name = current_app.config['LETTERS_SCAN_BUCKET_NAME'] source_bucket_name = current_app.config['LETTERS_SCAN_BUCKET_NAME']
@@ -161,5 +161,5 @@ def test_move_scanned_letter_pdf_to_processing_bucket(
move_scanned_pdf_to_test_or_live_pdf_bucket(filename, is_test_letter=is_test_letter) move_scanned_pdf_to_test_or_live_pdf_bucket(filename, is_test_letter=is_test_letter)
assert '2018-03-14/' + filename in [o.key for o in target_bucket.objects.all()] assert folder_date_name + filename in [o.key for o in target_bucket.objects.all()]
assert filename not in [o.key for o in source_bucket.objects.all()] assert filename not in [o.key for o in source_bucket.objects.all()]