Merge pull request #1926 from alphagov/letter-timezone-bug

fix letters being put in the wrong bucket when near midnight cut-off
This commit is contained in:
Leo Hemsted
2018-07-02 14:28:59 +01:00
committed by GitHub
2 changed files with 11 additions and 3 deletions

View File

@@ -26,9 +26,9 @@ def get_folder_name(_now, is_test_or_scan_letter=False):
if is_test_or_scan_letter:
folder_name = ''
else:
print_datetime = _now
if convert_utc_to_bst(_now).time() > current_app.config.get('LETTER_PROCESSING_DEADLINE'):
print_datetime = _now + timedelta(days=1)
print_datetime = convert_utc_to_bst(_now)
if print_datetime.time() > current_app.config.get('LETTER_PROCESSING_DEADLINE'):
print_datetime += timedelta(days=1)
folder_name = '{}/'.format(print_datetime.date())
return folder_name

View File

@@ -209,6 +209,14 @@ def test_move_failed_pdf_scan_failed(notify_api):
("2018-07-02 16:31:00", "2018-07-03/"),
("2018-01-02 16:31:00", "2018-01-02/"),
("2018-01-02 17:31:00", "2018-01-03/"),
("2018-07-02 22:30:00", "2018-07-03/"),
("2018-07-02 23:30:00", "2018-07-03/"),
("2018-07-03 00:30:00", "2018-07-03/"),
("2018-01-02 22:30:00", "2018-01-03/"),
("2018-01-02 23:30:00", "2018-01-03/"),
("2018-01-03 00:30:00", "2018-01-03/"),
])
def test_get_folder_name_in_british_summer_time(notify_api, freeze_date, expected_folder_name):
with freeze_time(freeze_date):