darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-23 08:51:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update notification queries with new TemplateHistory join

Browse Source 
Changes the queries to use `Notification.template` relationship instead
of `.template_history` and TemplateHistory model insteaad of Template.
This commit is contained in:
Alexey Bezhan
2017-11-09 14:25:47 +00:00
parent 52e0367a13
commit a5ca66a01b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/dao/notifications_dao.py
View File

@@ -29,6 +29,7 @@ from app.models import (
ScheduledNotification, ScheduledNotification,
ServiceEmailReplyTo, ServiceEmailReplyTo,
Template, Template,
TemplateHistory,
EMAIL_TYPE, EMAIL_TYPE,
SMS_TYPE, SMS_TYPE,
KEY_TYPE_NORMAL, KEY_TYPE_NORMAL,
@@ -225,7 +226,7 @@ def get_notification_with_personalisation(service_id, notification_id, key_type)
if key_type: if key_type:
filter_dict['key_type'] = key_type filter_dict['key_type'] = key_type
return Notification.query.filter_by(**filter_dict).options(joinedload('template_history')).one() return Notification.query.filter_by(**filter_dict).options(joinedload('template')).one()
@statsd(namespace="dao") @statsd(namespace="dao")
@@ -281,7 +282,7 @@ def get_notifications_for_service(
query = _filter_query(query, filter_dict) query = _filter_query(query, filter_dict)
if personalisation: if personalisation:
query = query.options( query = query.options(
joinedload('template_history') joinedload('template')
) )
return query.order_by(desc(Notification.created_at)).paginate( return query.order_by(desc(Notification.created_at)).paginate(
@@ -305,7 +306,7 @@ def _filter_query(query, filter_dict=None):
# filter by template # filter by template
template_types = multidict.getlist('template_type') template_types = multidict.getlist('template_type')
if template_types: if template_types:
query = query.join(Template).filter(Template.template_type.in_(template_types)) query = query.join(TemplateHistory).filter(TemplateHistory.template_type.in_(template_types))
return query return query