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

Merge branch 'master' of https://github.com/alphagov/notifications-api

Browse Source
This commit is contained in:
venusbb
2017-06-19 09:23:23 +01:00
parent a840f7069f d936b33bce
commit cd5dc0f4fa
3 changed files with 118 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/dao/notifications_dao.py
View File

@@ -103,13 +103,26 @@ def create_notification_statistics_dict(service_id, day):
@statsd(namespace="dao")
def dao_get_template_usage(service_id, limit_days=None):
query_filter = []
table = NotificationHistory
if limit_days and limit_days <= 7: # can get this data from notifications table
if limit_days is not None and limit_days <= 7:
table = Notification
query_filter = [table.service_id == service_id, table.key_type != KEY_TYPE_TEST]
if limit_days is not None:
# only limit days if it's not seven days, as 7 days == the whole of Notifications table.
if limit_days != 7:
query_filter.append(table.created_at >= days_ago(limit_days))
elif limit_days is not None:
# case where not under 7 days, so using NotificationsHistory so limit allowed
query_filter.append(table.created_at >= days_ago(limit_days))
query_filter.append(table.service_id == service_id)
query_filter.append(table.key_type != KEY_TYPE_TEST)
# only limit days if it's not seven days, as 7 days == the whole of Notifications table.
if limit_days is not None and limit_days != 7:
query_filter.append(table.created_at >= days_ago(limit_days))
notifications_aggregate_query = db.session.query(