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

Merge pull request #1485 from alphagov/letters-tomorrow

Browse Source 
put pdfs in tomorrow's dvla bucket after 17:30
This commit is contained in:
Leo Hemsted
2017-12-15 11:55:48 +00:00
committed by GitHub
parent 42318cc335 1ca252dcf9
commit cc574474eb
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/aws/s3.py
View File

@@ -1,4 +1,4 @@
from datetime import datetime, timedelta
from datetime import datetime, timedelta, time
from flask import current_app
@@ -83,8 +83,13 @@ def remove_transformed_dvla_file(job_id):
def upload_letters_pdf(reference, crown, filedata):
now = datetime.utcnow()
print_datetime = now
if now.time() > time(17, 30):
print_datetime = now + timedelta(days=1)
upload_file_name = LETTERS_PDF_FILE_LOCATION_STRUCTURE.format(
folder=now.date().isoformat(),
folder=print_datetime.date(),
reference=reference,
duplex="D",
letter_class="2",

18
tests/app/aws/test_s3.py
View File

@@ -147,7 +147,7 @@ def test_get_s3_bucket_objects_does_not_return_outside_of_date_range(notify_api,
(True, 'C'),
(False, 'N'),
])
@freeze_time("2017-12-04 15:00:00")
@freeze_time("2017-12-04 17:29:00")
def test_upload_letters_pdf_calls_utils_s3upload_with_correct_args(
notify_api, mocker, crown_flag, expected_crown_text):
s3_upload_mock = mocker.patch('app.aws.s3.utils_s3upload')
@@ -157,5 +157,19 @@ def test_upload_letters_pdf_calls_utils_s3upload_with_correct_args(
filedata='some_data',
region='eu-west-1',
bucket_name='test-letters-pdf',
file_location='2017-12-04/NOTIFY.FOO.D.2.C.{}.20171204150000.PDF'.format(expected_crown_text)
file_location='2017-12-04/NOTIFY.FOO.D.2.C.{}.20171204172900.PDF'.format(expected_crown_text)
)
@freeze_time("2017-12-04 17:31:00")
def test_upload_letters_pdf_puts_in_tomorrows_bucket_after_half_five(notify_api, mocker):
s3_upload_mock = mocker.patch('app.aws.s3.utils_s3upload')
upload_letters_pdf(reference='foo', crown=True, filedata='some_data')
s3_upload_mock.assert_called_with(
filedata='some_data',
region='eu-west-1',
bucket_name='test-letters-pdf',
# in tomorrow's folder, but still has this evening's timestamp
file_location='2017-12-05/NOTIFY.FOO.D.2.C.C.20171204173100.PDF'
)