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

Add results for notification stats for last 7 days and today

Browse Source
This commit is contained in:
Pea Tyczynska
2018-11-06 11:38:50 +00:00
parent 8a3dc8e039
commit c37c399741
2 changed files with 81 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
app/dao/fact_notification_status_dao.py
View File

@@ -95,24 +95,6 @@ def fetch_notification_status_for_service_by_month(start_date, end_date, service
).all()
def fetch_notification_status_for_service_for_7_days(service_id):
start_date = midnight_n_days_ago(7)
return db.session.query(
FactNotificationStatus.bst_date,
FactNotificationStatus.notification_type,
FactNotificationStatus.notification_status,
func.sum(FactNotificationStatus.notification_count).label('count')
).filter(
FactNotificationStatus.service_id == service_id,
FactNotificationStatus.bst_date >= start_date,
FactNotificationStatus.key_type != KEY_TYPE_TEST
).group_by(
FactNotificationStatus.bst_date,
FactNotificationStatus.notification_type,
FactNotificationStatus.notification_status,
).all()
def fetch_notification_status_for_service_for_day(bst_day, service_id):
return db.session.query(
# return current month as a datetime so the data has the same shape as the ft_notification_status query
@@ -129,3 +111,39 @@ def fetch_notification_status_for_service_for_day(bst_day, service_id):
Notification.notification_type,
Notification.status
).all()
def fetch_notification_status_for_service_for_today_and_7_previous_days(service_id):
start_date = midnight_n_days_ago(7)
now = datetime.utcnow()
stats_for_7_days = db.session.query(
FactNotificationStatus.notification_type.label('notification_type'),
FactNotificationStatus.notification_status.label('notification_status'),
FactNotificationStatus.notification_count.label('count')
).filter(
FactNotificationStatus.service_id == service_id,
FactNotificationStatus.bst_date >= start_date,
FactNotificationStatus.key_type != KEY_TYPE_TEST
)
stats_for_today = db.session.query(
Notification.notification_type.cast(db.Text),
Notification.status.label('notification_status'),
func.count().label('count')
).filter(
Notification.created_at >= get_london_midnight_in_utc(now),
Notification.service_id == service_id,
Notification.key_type != KEY_TYPE_TEST
).group_by(
Notification.notification_type,
Notification.status
)
all_stats_table = stats_for_7_days.union_all(stats_for_today).subquery()
return db.session.query(
all_stats_table.c.notification_type,
all_stats_table.c.notification_status,
func.sum(all_stats_table.c.count).label('count')
).group_by(
all_stats_table.c.notification_type,
all_stats_table.c.notification_status,
).all()