darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-16 20:48:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

time adjustments in tests

Browse Source
This commit is contained in:
stvnrlly
2022-11-14 14:23:54 -05:00
parent 3528bd37e1
commit 213f699c99
7 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/dao/date_util.py
View File

@@ -2,7 +2,10 @@ from datetime import date, datetime, time, timedelta
from os import getenv
import pytz
from notifications_utils.timezones import convert_local_timezone_to_utc, convert_utc_to_local_timezone
from notifications_utils.timezones import (
convert_local_timezone_to_utc,
convert_utc_to_local_timezone,
)
def get_months_for_financial_year(year):
@@ -47,8 +50,8 @@ def get_april_fools(year):
:param year: the year to calculate the April 1, 00:00 BST for
:return: the datetime of April 1 for the given year, for example 2016 = 2016-03-31 23:00:00
"""
return pytz.timezone(getenv("TIMEZONE", "America/New_York")).localize(datetime(year, 4, 1, 0, 0, 0)).astimezone(pytz.UTC).replace(
tzinfo=None)
return pytz.timezone(getenv("TIMEZONE", "America/New_York")).localize(
datetime(year, 4, 1, 0, 0, 0)).astimezone(pytz.UTC).replace(tzinfo=None)
def get_month_start_and_end_date_in_utc(month_year):

5
app/dao/notifications_dao.py
View File

@@ -12,7 +12,10 @@ from notifications_utils.recipients import (
try_validate_and_format_phone_number,
validate_and_format_email_address,
)
from notifications_utils.timezones import convert_local_timezone_to_utc, convert_utc_to_local_timezone
from notifications_utils.timezones import (
convert_local_timezone_to_utc,
convert_utc_to_local_timezone,
)
from sqlalchemy import and_, asc, desc, func, or_, union
from sqlalchemy.orm import joinedload
from sqlalchemy.orm.exc import NoResultFound

4
app/service/rest.py
View File

@@ -583,7 +583,9 @@ def get_monthly_notification_stats(service_id):
now = datetime.utcnow()
if end_date > now:
todays_deltas = fetch_notification_status_for_service_for_day(convert_utc_to_local_timezone(now), service_id=service_id)
todays_deltas = fetch_notification_status_for_service_for_day(
convert_utc_to_local_timezone(now), service_id=service_id
)
statistics.add_monthly_notification_status_stats(data, todays_deltas)
return jsonify(data=data)