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

remove all() from statement

Browse Source
This commit is contained in:
Kenneth Kehl
2024-10-15 12:34:24 -07:00
parent 028f55e0b0
commit 5f6894e5aa
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/dao/fact_notification_status_dao.py
View File

@@ -113,14 +113,15 @@ def fetch_notification_status_for_service_by_month(start_date, end_date, service
def fetch_notification_status_for_service_for_day(fetch_day, service_id): def fetch_notification_status_for_service_for_day(fetch_day, service_id):
return ( stmt = (
db.session.query( select(
# 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(fetch_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"),
) )
.select_from(Notification)
.filter( .filter(
Notification.created_at >= get_midnight_in_utc(fetch_day), Notification.created_at >= get_midnight_in_utc(fetch_day),
Notification.created_at Notification.created_at
@@ -129,8 +130,8 @@ def fetch_notification_status_for_service_for_day(fetch_day, service_id):
Notification.key_type != KeyType.TEST, Notification.key_type != KeyType.TEST,
) )
.group_by(Notification.notification_type, Notification.status) .group_by(Notification.notification_type, Notification.status)
.all()
) )
return db.session.execute(stmt).all()
def fetch_notification_status_for_service_for_today_and_7_previous_days( def fetch_notification_status_for_service_for_today_and_7_previous_days(
@@ -250,7 +251,7 @@ def fetch_notification_status_for_service_for_today_and_7_previous_days(
def fetch_notification_status_totals_for_all_services(start_date, end_date): def fetch_notification_status_totals_for_all_services(start_date, end_date):
stats = ( stats = (
db.session.query( select(
FactNotificationStatus.notification_type.cast(db.Text).label( FactNotificationStatus.notification_type.cast(db.Text).label(
"notification_type" "notification_type"
), ),
@@ -258,6 +259,7 @@ def fetch_notification_status_totals_for_all_services(start_date, end_date):
FactNotificationStatus.key_type.cast(db.Text).label("key_type"), FactNotificationStatus.key_type.cast(db.Text).label("key_type"),
func.sum(FactNotificationStatus.notification_count).label("count"), func.sum(FactNotificationStatus.notification_count).label("count"),
) )
.select_from(FactNotificationStatus)
.filter( .filter(
FactNotificationStatus.local_date >= start_date, FactNotificationStatus.local_date >= start_date,
FactNotificationStatus.local_date <= end_date, FactNotificationStatus.local_date <= end_date,
@@ -271,7 +273,7 @@ def fetch_notification_status_totals_for_all_services(start_date, end_date):
today = get_midnight_in_utc(utc_now()) today = get_midnight_in_utc(utc_now())
if start_date <= utc_now().date() <= end_date: if start_date <= utc_now().date() <= end_date:
stats_for_today = ( stats_for_today = (
db.session.query( select(
Notification.notification_type.cast(db.Text).label("notification_type"), Notification.notification_type.cast(db.Text).label("notification_type"),
Notification.status.cast(db.Text), Notification.status.cast(db.Text),
Notification.key_type.cast(db.Text), Notification.key_type.cast(db.Text),
@@ -286,7 +288,7 @@ def fetch_notification_status_totals_for_all_services(start_date, end_date):
) )
all_stats_table = stats.union_all(stats_for_today).subquery() all_stats_table = stats.union_all(stats_for_today).subquery()
query = ( query = (
db.session.query( select(
all_stats_table.c.notification_type, all_stats_table.c.notification_type,
all_stats_table.c.status, all_stats_table.c.status,
all_stats_table.c.key_type, all_stats_table.c.key_type,
@@ -301,7 +303,7 @@ def fetch_notification_status_totals_for_all_services(start_date, end_date):
) )
else: else:
query = stats.order_by(FactNotificationStatus.notification_type) query = stats.order_by(FactNotificationStatus.notification_type)
return query.all() return db.session.execute(query).all()
def fetch_notification_statuses_for_job(job_id): def fetch_notification_statuses_for_job(job_id):