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

Remove unnecessary extra method in status DAO

Browse Source 
This makes it easier to see what is being queried.
This commit is contained in:
Ben Thorner
2022-01-11 17:19:25 +00:00
parent 9182ebf4e5
commit 086f0f50a6
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/dao/fact_notification_status_dao.py
View File

@@ -43,17 +43,7 @@ def fetch_status_data_for_service_and_day(process_day, service_id, notification_
service = Service.query.get(service_id) service = Service.query.get(service_id)
table = get_notification_table_to_use(service, notification_type, process_day, has_delete_task_run=False) table = get_notification_table_to_use(service, notification_type, process_day, has_delete_task_run=False)
return query_for_fact_status_data( return db.session.query(
table=table,
start_date=start_date,
end_date=end_date,
notification_type=notification_type,
service_id=service.id
)
def query_for_fact_status_data(table, start_date, end_date, notification_type, service_id):
query = db.session.query(
table.template_id, table.template_id,
table.service_id, table.service_id,
func.coalesce(table.job_id, '00000000-0000-0000-0000-000000000000').label('job_id'), func.coalesce(table.job_id, '00000000-0000-0000-0000-000000000000').label('job_id'),
@@ -72,8 +62,7 @@ def query_for_fact_status_data(table, start_date, end_date, notification_type, s
'job_id', 'job_id',
table.key_type, table.key_type,
table.status table.status
) ).all()
return query.all()
@autocommit @autocommit