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

code review feedback

Browse Source
This commit is contained in:
Kenneth Kehl
2023-06-01 07:07:10 -07:00
parent 80c6c677db
commit 15a70460bc
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/dao/fact_notification_status_dao.py
View File

@@ -104,16 +104,16 @@ def fetch_notification_status_for_service_by_month(start_date, end_date, service
).all() ).all()
def fetch_notification_status_for_service_for_day(bst_day, service_id): def fetch_notification_status_for_service_for_day(fetch_day, service_id):
return db.session.query( return db.session.query(
# return current month as a datetime so the data has the same shape as the ft_notification_status query # return current month as a datetime so the data has the same shape as the ft_notification_status query
literal(bst_day.replace(day=1), type_=DateTime).label('month'), literal(fetch_day.replace(day=1), type_=DateTime).label('month'),
Notification.notification_type, Notification.notification_type,
Notification.status.label('notification_status'), Notification.status.label('notification_status'),
func.count().label('count') func.count().label('count')
).filter( ).filter(
Notification.created_at >= get_midnight_in_utc(bst_day), Notification.created_at >= get_midnight_in_utc(fetch_day),
Notification.created_at < get_midnight_in_utc(bst_day + timedelta(days=1)), Notification.created_at < get_midnight_in_utc(fetch_day + timedelta(days=1)),
Notification.service_id == service_id, Notification.service_id == service_id,
Notification.key_type != KEY_TYPE_TEST Notification.key_type != KEY_TYPE_TEST
).group_by( ).group_by(

3
app/utils.py
View File

@@ -1,5 +1,4 @@
from datetime import datetime, timedelta from datetime import datetime, timedelta
from os import getenv
from flask import url_for from flask import url_for
from notifications_utils.template import HTMLEmailTemplate, SMSMessageTemplate from notifications_utils.template import HTMLEmailTemplate, SMSMessageTemplate
@@ -75,7 +74,7 @@ def get_month_from_utc_column(column):
""" """
return func.date_trunc( return func.date_trunc(
"month", "month",
func.timezone(getenv("TIMEZONE", "UTC"), func.timezone("UTC", column)) func.timezone("UTC", func.timezone("UTC", column))
) )