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

Merge pull request #1134 from alphagov/imdad-feat-check-notification-table-for-last-template-usage

Browse Source 
Update the last template usage query to check Notification table
This commit is contained in:
Imdad Ahad
2017-08-09 10:22:21 +01:00
committed by GitHub
parent 6c0b59b544 864e356163
commit 4d53481737
3 changed files with 64 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/dao/notifications_dao.py
View File

@@ -149,11 +149,11 @@ def dao_get_template_usage(service_id, limit_days=None):
@statsd(namespace="dao")
def dao_get_last_template_usage(template_id):
return NotificationHistory.query.filter(
NotificationHistory.template_id == template_id,
NotificationHistory.key_type != KEY_TYPE_TEST
return Notification.query.filter(
Notification.template_id == template_id,
Notification.key_type != KEY_TYPE_TEST
).order_by(
desc(NotificationHistory.created_at)
desc(Notification.created_at)
).first()

19
app/template_statistics/rest.py
View File

@@ -7,8 +7,12 @@ from flask import (
from app import redis_store
from app.dao.notifications_dao import (
dao_get_template_usage,
dao_get_last_template_usage)
from app.dao.templates_dao import dao_get_templates_for_cache
dao_get_last_template_usage
)
from app.dao.templates_dao import (
dao_get_templates_for_cache,
dao_get_template_by_id_and_service_id
)
from app.schemas import notification_with_template_schema
from app.utils import cache_key_for_service_template_counter
@@ -52,12 +56,17 @@ def get_template_statistics_for_service_by_day(service_id):
@template_statistics.route('/<template_id>')
def get_template_statistics_for_template_id(service_id, template_id):
notification = dao_get_last_template_usage(template_id)
if not notification:
template = dao_get_template_by_id_and_service_id(template_id, service_id)
if not template:
message = 'No template found for id {}'.format(template_id)
errors = {'template_id': [message]}
raise InvalidRequest(errors, status_code=404)
data = notification_with_template_schema.dump(notification).data
data = None
notification = dao_get_last_template_usage(template_id)
if notification:
data = notification_with_template_schema.dump(notification).data
return jsonify(data=data)