darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-05-05 16:38:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

initial timezone pass, which breaks many tests

Browse Source
This commit is contained in:
stvnrlly
2022-11-22 12:00:29 -05:00
parent 3a3239a27e
commit 46723b6c11
11 changed files with 117 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/utils/letters.py
View File

@@ -7,17 +7,16 @@ from notifications_utils.formatters import unescaped_formatted_list
from notifications_utils.letter_timings import letter_can_be_cancelled
from notifications_utils.postal_address import PostalAddress
from notifications_utils.timezones import (
convert_bst_to_utc,
convert_utc_to_bst,
utc_string_to_aware_gmt_datetime,
convert_local_timezone_to_utc,
convert_utc_to_local_timezone,
)
def printing_today_or_tomorrow(created_at):
print_cutoff = convert_bst_to_utc(
convert_utc_to_bst(datetime.utcnow()).replace(hour=17, minute=30)
print_cutoff = convert_local_timezone_to_utc(
convert_utc_to_local_timezone(datetime.utcnow()).replace(hour=17, minute=30)
).replace(tzinfo=pytz.utc)
created_at = utc_string_to_aware_gmt_datetime(created_at)
created_at = convert_utc_to_local_timezone(created_at)
if created_at < print_cutoff:
return 'today'
@@ -31,7 +30,7 @@ def get_letter_printing_statement(status, created_at, long_form=True):
decription = 'Printing starts' if long_form else 'Printing'
return f'{decription} {printing_today_or_tomorrow(created_at)} at 5:30pm'
else:
printed_datetime = utc_string_to_aware_gmt_datetime(created_at) + timedelta(hours=6, minutes=30)
printed_datetime = convert_utc_to_local_timezone(created_at) + timedelta(hours=6, minutes=30)
if printed_datetime.date() == datetime.now().date():
return 'Printed today at 5:30pm'
elif printed_datetime.date() == datetime.now().date() - timedelta(days=1):

4
app/utils/time.py
View File

@@ -2,11 +2,11 @@ from datetime import datetime
import pytz
from dateutil import parser
from notifications_utils.timezones import utc_string_to_aware_gmt_datetime
from notifications_utils.timezones import convert_utc_to_local_timezone
def get_current_financial_year():
now = utc_string_to_aware_gmt_datetime(
now = convert_utc_to_local_timezone(
datetime.utcnow()
)
current_month = int(now.strftime('%-m'))