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

Updated endpoints to use the

Browse Source 
NotificationAllTimeView which is a view created
to merge notifiations and notification_history
This commit is contained in:
Anastasia Gradova
2024-06-06 16:00:12 -06:00
parent 227b9a3fc9
commit a5055a0cf9
1 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
app/dao/services_dao.py
View File

@@ -28,6 +28,7 @@ from app.models import (
Job,
Notification,
NotificationHistory,
NotificationAllTimeView,
Organization,
Permission,
Service,
@@ -434,19 +435,19 @@ def dao_fetch_stats_for_service_from_day(service_id, day):
end_date = get_midnight_in_utc(day + timedelta(days=1))
return (
db.session.query(
NotificationHistory.notification_type,
NotificationHistory.status,
func.count(NotificationHistory.id).label("count"),
NotificationAllTimeView.notification_type,
NotificationAllTimeView.status,
func.count(NotificationAllTimeView.id).label("count"),
)
.filter(
NotificationHistory.service_id == service_id,
NotificationHistory.key_type != KeyType.TEST,
NotificationHistory.created_at >= start_date,
NotificationHistory.created_at <= end_date,
NotificationAllTimeView.service_id == service_id,
NotificationAllTimeView.key_type != KeyType.TEST,
NotificationAllTimeView.created_at >= start_date,
NotificationAllTimeView.created_at <= end_date,
)
.group_by(
NotificationHistory.notification_type,
NotificationHistory.status,
NotificationAllTimeView.notification_type,
NotificationAllTimeView.status,
)
.all()
)
@@ -460,20 +461,20 @@ def dao_fetch_stats_for_service_from_day_for_user(service_id, day, user_id):
end_date = get_midnight_in_utc(day + timedelta(days=1))
return (
db.session.query(
NotificationHistory.notification_type,
NotificationHistory.status,
func.count(NotificationHistory.id).label("count"),
NotificationAllTimeView.notification_type,
NotificationAllTimeView.status,
func.count(NotificationAllTimeView.id).label("count"),
)
.filter(
NotificationHistory.service_id == service_id,
NotificationHistory.key_type != KeyType.TEST,
NotificationHistory.created_at >= start_date,
NotificationHistory.created_at <= end_date,
NotificationHistory.created_by_id == user_id,
NotificationAllTimeView.service_id == service_id,
NotificationAllTimeView.key_type != KeyType.TEST,
NotificationAllTimeView.created_at >= start_date,
NotificationAllTimeView.created_at <= end_date,
NotificationAllTimeView.created_by_id == user_id,
)
.group_by(
NotificationHistory.notification_type,
NotificationHistory.status,
NotificationAllTimeView.notification_type,
NotificationAllTimeView.status,
)
.all()
)
@@ -667,22 +668,22 @@ def fetch_notification_stats_for_service_by_month_by_user(
):
return (
db.session.query(
func.date_trunc("month", NotificationHistory.created_at).label("month"),
NotificationHistory.notification_type,
(NotificationHistory.status).label("notification_status"),
func.count(NotificationHistory.id).label("count"),
func.date_trunc("month", NotificationAllTimeView.created_at).label("month"),
NotificationAllTimeView.notification_type,
(NotificationAllTimeView.status).label("notification_status"),
func.count(NotificationAllTimeView.id).label("count"),
)
.filter(
NotificationHistory.service_id == service_id,
NotificationHistory.created_at >= start_date,
NotificationHistory.created_at < end_date,
NotificationHistory.key_type != KeyType.TEST,
NotificationHistory.created_by_id == user_id,
NotificationAllTimeView.service_id == service_id,
NotificationAllTimeView.created_at >= start_date,
NotificationAllTimeView.created_at < end_date,
NotificationAllTimeView.key_type != KeyType.TEST,
NotificationAllTimeView.created_by_id == user_id,
)
.group_by(
func.date_trunc("month", NotificationHistory.created_at).label("month"),
NotificationHistory.notification_type,
NotificationHistory.status,
func.date_trunc("month", NotificationAllTimeView.created_at).label("month"),
NotificationAllTimeView.notification_type,
NotificationAllTimeView.status,
)
.all()
)