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

Performance improvement to the template usage query.

Browse Source
This commit is contained in:
Rebecca Law
2017-02-02 09:45:06 +00:00
parent 855a412c90
commit da07f9dde8
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/dao/notifications_dao.py
View File

@@ -93,22 +93,30 @@ def dao_get_template_usage(service_id, limit_days=None):
if limit_days and limit_days <= 7: # can get this data from notifications table if limit_days and limit_days <= 7: # can get this data from notifications table
table = Notification table = Notification
query = db.session.query(
func.count(table.template_id).label('count'),
table.template_id,
Template.name,
Template.template_type
)
query_filter = [table.service_id == service_id, table.key_type != KEY_TYPE_TEST] query_filter = [table.service_id == service_id, table.key_type != KEY_TYPE_TEST]
if limit_days is not None: if limit_days is not None:
query_filter.append(table.created_at >= days_ago(limit_days)) query_filter.append(table.created_at >= days_ago(limit_days))
return query.filter(*query_filter) \ notifications_aggregate_query = db.session.query(
.join(Template) \ func.count().label('count'),
.group_by(table.template_id, Template.name, Template.template_type) \ table.template_id
.order_by(asc(Template.name)) \ ).filter(
.all() *query_filter
).group_by(
table.template_id
).subquery()
query = db.session.query(
Template.id.label('template_id'),
Template.name,
Template.template_type,
notifications_aggregate_query.c.count
).join(
notifications_aggregate_query,
notifications_aggregate_query.c.template_id == Template.id
).order_by(Template.name)
return query.all()
@statsd(namespace="dao") @statsd(namespace="dao")