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

Tidied up the query indentation

Browse Source
This commit is contained in:
Martyn Inglis
2016-08-24 10:50:29 +01:00
parent fe22c876b6
commit acf3c568db
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/dao/notifications_dao.py
View File

@@ -39,11 +39,9 @@ def dao_get_notification_statistics_for_service(service_id, limit_days=None):
query_filter = [NotificationStatistics.service_id == service_id] query_filter = [NotificationStatistics.service_id == service_id]
if limit_days is not None: if limit_days is not None:
query_filter.append(NotificationStatistics.day >= days_ago(limit_days)) query_filter.append(NotificationStatistics.day >= days_ago(limit_days))
return NotificationStatistics.query.filter( return NotificationStatistics.query.filter(*query_filter)\
*query_filter .order_by(desc(NotificationStatistics.day))\
).order_by( .all()
desc(NotificationStatistics.day)
).all()
@statsd(namespace="dao") @statsd(namespace="dao")
@@ -162,9 +160,8 @@ def dao_get_template_usage(service_id, limit_days=None):
@statsd(namespace="dao") @statsd(namespace="dao")
def dao_get_last_template_usage(template_id): def dao_get_last_template_usage(template_id):
return NotificationHistory.query.filter( return NotificationHistory.query.filter(NotificationHistory.template_id == template_id)\
NotificationHistory.template_id == template_id .join(Template) \
).join(Template) \
.order_by(desc(NotificationHistory.created_at)) \ .order_by(desc(NotificationHistory.created_at)) \
.first() .first()