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

Casting columns to TEXT type seems to resolve some bugs with UNION

Browse Source 
queries.

Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
This commit is contained in:
Cliff Hill
2024-02-06 15:09:49 -05:00
parent c6136bb4aa
commit 6717729664
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/dao/fact_notification_status_dao.py
View File

@@ -130,8 +130,10 @@ def fetch_notification_status_for_service_for_today_and_7_previous_days(
start_date = midnight_n_days_ago(limit_days) start_date = midnight_n_days_ago(limit_days)
now = datetime.utcnow() now = datetime.utcnow()
stats_for_7_days = db.session.query( stats_for_7_days = db.session.query(
FactNotificationStatus.notification_type.label("notification_type"), FactNotificationStatus.notification_type.cast(db.Text).label(
FactNotificationStatus.notification_status.label("status"), "notification_type"
),
FactNotificationStatus.notification_status.cast(db.Text).label("status"),
*( *(
[FactNotificationStatus.template_id.label("template_id")] [FactNotificationStatus.template_id.label("template_id")]
if by_template if by_template
@@ -146,8 +148,8 @@ def fetch_notification_status_for_service_for_today_and_7_previous_days(
stats_for_today = ( stats_for_today = (
db.session.query( db.session.query(
Notification.notification_type, Notification.notification_type.cast(db.Text),
Notification.status, Notification.status.cast(db.Text),
*([Notification.template_id] if by_template else []), *([Notification.template_id] if by_template else []),
func.count().label("count"), func.count().label("count"),
) )
@@ -193,9 +195,9 @@ 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( db.session.query(
FactNotificationStatus.notification_type.label("notification_type"), FactNotificationStatus.notification_type.cast(db.Text).label("notification_type"),
FactNotificationStatus.notification_status.label("status"), FactNotificationStatus.notification_status.cast(db.Text).label("status"),
FactNotificationStatus.key_type.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"),
) )
.filter( .filter(
@@ -212,9 +214,9 @@ def fetch_notification_status_totals_for_all_services(start_date, end_date):
if start_date <= datetime.utcnow().date() <= end_date: if start_date <= datetime.utcnow().date() <= end_date:
stats_for_today = ( stats_for_today = (
db.session.query( db.session.query(
Notification.notification_type.label("notification_type"), Notification.notification_type.cast(db.Text).label("notification_type"),
Notification.status, Notification.status.cast(db.Text),
Notification.key_type, Notification.key_type.cast(db.Text),
func.count().label("count"), func.count().label("count"),
) )
.filter(Notification.created_at >= today) .filter(Notification.created_at >= today)