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

[WIP]

Browse Source 
Removing marshmallow from the get_services endpoint should give us better performance.
This commit is contained in:
Rebecca Law
2017-10-25 10:40:02 +01:00
parent 02b2ada174
commit d1561903ed
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/dao/services_dao.py
View File

@@ -371,7 +371,7 @@ def dao_fetch_monthly_historical_stats_for_service(service_id, year):
@statsd(namespace='dao') @statsd(namespace='dao')
def dao_fetch_todays_stats_for_all_services(include_from_test_key=True): def dao_fetch_todays_stats_for_all_services(include_from_test_key=True):
query = db.session.query( subquery = db.session.query(
Notification.notification_type, Notification.notification_type,
Notification.status, Notification.status,
Notification.service_id, Notification.service_id,
@@ -382,12 +382,25 @@ def dao_fetch_todays_stats_for_all_services(include_from_test_key=True):
Notification.notification_type, Notification.notification_type,
Notification.status, Notification.status,
Notification.service_id Notification.service_id
).order_by(
Notification.service_id
) )
if not include_from_test_key: if not include_from_test_key:
query = query.filter(Notification.key_type != KEY_TYPE_TEST) subquery = subquery.filter(Notification.key_type != KEY_TYPE_TEST)
subquery = subquery.subquery()
query = db.session.query(
Service.id.label('service_id'),
Service.name,
Service.restricted,
Service.research_mode,
subquery.c.notification_type,
subquery.c.status,
subquery.c.count
).join(
subquery,
subquery.c.service_id == Service.id
).order_by(Service.id)
return query.all() return query.all()