darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-05 02:41:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert running status aggregation in parallel"

Browse Source 
This reverts commit 0f6dea0deb.
This commit is contained in:
Ben Thorner
2022-01-24 13:58:50 +00:00
parent d05bff9efc
commit 018a253b6f
3 changed files with 45 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/dao/fact_notification_status_dao.py
View File

@@ -45,7 +45,6 @@ def fetch_status_data_for_service_and_day(process_day, service_id, notification_
return db.session.query(
table.template_id,
table.service_id,
func.coalesce(table.job_id, '00000000-0000-0000-0000-000000000000').label('job_id'),
table.key_type,
table.status,
@@ -58,7 +57,6 @@ def fetch_status_data_for_service_and_day(process_day, service_id, notification_
table.key_type.in_((KEY_TYPE_NORMAL, KEY_TYPE_TEAM)),
).group_by(
table.template_id,
table.service_id,
'job_id',
table.key_type,
table.status
@@ -66,11 +64,12 @@ def fetch_status_data_for_service_and_day(process_day, service_id, notification_
@autocommit
def update_fact_notification_status(new_status_rows, process_day, notification_type):
def update_fact_notification_status(new_status_rows, process_day, notification_type, service_id):
table = FactNotificationStatus.__table__
FactNotificationStatus.query.filter(
FactNotificationStatus.bst_date == process_day,
FactNotificationStatus.notification_type == notification_type,
FactNotificationStatus.service_id == service_id,
).delete()
for row in new_status_rows:
@@ -78,7 +77,7 @@ def update_fact_notification_status(new_status_rows, process_day, notification_t
insert(table).values(
bst_date=process_day,
template_id=row.template_id,
service_id=row.service_id,
service_id=service_id,
job_id=row.job_id,
notification_type=notification_type,
key_type=row.key_type,