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

Merge branch 'master' of https://github.com/alphagov/notifications-api into vb-receipt-callback-dao

Browse Source
This commit is contained in:
venusbb
2017-12-01 14:36:25 +00:00
parent f32051194d f565cf4824
commit ad861f2d55
15 changed files with 96 additions and 533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/service/send_notification.py
View File

@@ -8,9 +8,7 @@ from app.notifications.validators import (
)
from app.notifications.process_notifications import (
persist_notification,
send_notification_to_queue,
persist_email_reply_to_id_for_notification,
persist_sms_sender_id_for_notification
send_notification_to_queue
)
from app.models import (
KEY_TYPE_NORMAL,
@@ -71,11 +69,6 @@ def send_one_off_notification(service_id, post_data):
created_by_id=post_data['created_by'],
reply_to_text=reply_to
)
if sender_id:
if template.template_type == EMAIL_TYPE:
persist_email_reply_to_id_for_notification(notification.id, sender_id)
if template.template_type == SMS_TYPE:
persist_sms_sender_id_for_notification(notification.id, sender_id)
queue_name = QueueNames.PRIORITY if template.process_type == PRIORITY else None
send_notification_to_queue(