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

Merge branch 'master' into refactor-send_notifications

Browse Source 
Conflicts:
	tests/app/notifications/rest/test_send_notification.py
This commit is contained in:
Rebecca Law
2016-10-03 11:40:31 +01:00
parent e3d418506a 1d9e8c03b1
commit 9e7a7b1857
9 changed files with 280 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/notifications/rest.py
View File

@@ -44,7 +44,7 @@ from app.errors import (
)
register_errors(notifications)
from app.celery.provider_tasks import send_sms_to_provider, send_email_to_provider
from app.celery import provider_tasks
@notifications.route('/notifications/email/ses', methods=['POST'])
@@ -297,10 +297,17 @@ def persist_notification(
)
try:
research_mode = service.research_mode or key_type == KEY_TYPE_TEST
if notification_type == SMS_TYPE:
send_sms_to_provider.apply_async((str(service.id), str(notification_id)), queue='send-sms')
provider_tasks.deliver_sms.apply_async(
[str(notification_id)],
queue='send-sms' if not research_mode else 'research-mode'
)
if notification_type == EMAIL_TYPE:
send_email_to_provider.apply_async((str(service.id), str(notification_id)), queue='send-email')
provider_tasks.deliver_email.apply_async(
[str(notification_id)],
queue='send-email' if not research_mode else 'research-mode'
)
except Exception as e:
current_app.logger.exception("Failed to send to SQS exception", e)
dao_delete_notifications_and_history_by_id(notification_id)