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

Added send delivery status to SES callbacks

Browse Source
This commit is contained in:
venusbb
2017-12-01 21:13:01 +00:00
parent a604fb82bb
commit 096657799c
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/notifications/notifications_ses_callback.py
View File

@@ -12,6 +12,8 @@ from app.dao import (
) )
from app.celery.statistics_tasks import create_outcome_notification_statistic_tasks from app.celery.statistics_tasks import create_outcome_notification_statistic_tasks
from app.notifications.process_client_response import validate_callback_data from app.notifications.process_client_response import validate_callback_data
from app.celery.service_callback_tasks import send_delivery_status_to_service
from app.config import QueueNames
def process_ses_response(ses_request): def process_ses_response(ses_request):
@@ -75,7 +77,7 @@ def process_ses_response(ses_request):
) )
create_outcome_notification_statistic_tasks(notification) create_outcome_notification_statistic_tasks(notification)
send_delivery_status_to_service.apply_async([notification.id], queue=QueueNames.NOTIFY)
return return
except KeyError: except KeyError:

16
tests/app/notifications/test_notifications_ses_callback.py
View File

@@ -46,6 +46,7 @@ def test_ses_callback_should_update_notification_status(
) )
statsd_client.incr.assert_any_call("callback.ses.delivered") statsd_client.incr.assert_any_call("callback.ses.delivered")
stats_mock.assert_called_once_with(notification) stats_mock.assert_called_once_with(notification)
send_mock.assert_called_once_with([notification.id], queue="notify-internal-tasks")
def test_ses_callback_should_update_multiple_notification_status_sent( def test_ses_callback_should_update_multiple_notification_status_sent(
@@ -58,7 +59,9 @@ def test_ses_callback_should_update_multiple_notification_status_sent(
stats_mock = mocker.patch( stats_mock = mocker.patch(
'app.notifications.notifications_ses_callback.create_outcome_notification_statistic_tasks' 'app.notifications.notifications_ses_callback.create_outcome_notification_statistic_tasks'
) )
send_mock = mocker.patch(
'app.celery.service_callback_tasks.send_delivery_status_to_service.apply_async'
)
notification1 = create_sample_notification( notification1 = create_sample_notification(
notify_db, notify_db,
notify_db_session, notify_db_session,
@@ -92,6 +95,7 @@ def test_ses_callback_should_update_multiple_notification_status_sent(
call(notification2), call(notification2),
call(notification3) call(notification3)
]) ])
assert send_mock.called
def test_ses_callback_should_set_status_to_temporary_failure(client, def test_ses_callback_should_set_status_to_temporary_failure(client,
@@ -103,7 +107,9 @@ def test_ses_callback_should_set_status_to_temporary_failure(client,
stats_mock = mocker.patch( stats_mock = mocker.patch(
'app.notifications.notifications_ses_callback.create_outcome_notification_statistic_tasks' 'app.notifications.notifications_ses_callback.create_outcome_notification_statistic_tasks'
) )
send_mock = mocker.patch(
'app.celery.service_callback_tasks.send_delivery_status_to_service.apply_async'
)
notification = create_sample_notification( notification = create_sample_notification(
notify_db, notify_db,
notify_db_session, notify_db_session,
@@ -115,6 +121,7 @@ def test_ses_callback_should_set_status_to_temporary_failure(client,
assert get_notification_by_id(notification.id).status == 'sending' assert get_notification_by_id(notification.id).status == 'sending'
assert process_ses_response(ses_soft_bounce_callback(reference='ref')) is None assert process_ses_response(ses_soft_bounce_callback(reference='ref')) is None
assert get_notification_by_id(notification.id).status == 'temporary-failure' assert get_notification_by_id(notification.id).status == 'temporary-failure'
assert send_mock.called
stats_mock.assert_called_once_with(notification) stats_mock.assert_called_once_with(notification)
@@ -148,7 +155,9 @@ def test_ses_callback_should_set_status_to_permanent_failure(client,
stats_mock = mocker.patch( stats_mock = mocker.patch(
'app.notifications.notifications_ses_callback.create_outcome_notification_statistic_tasks' 'app.notifications.notifications_ses_callback.create_outcome_notification_statistic_tasks'
) )
send_mock = mocker.patch(
'app.celery.service_callback_tasks.send_delivery_status_to_service.apply_async'
)
notification = create_sample_notification( notification = create_sample_notification(
notify_db, notify_db,
notify_db_session, notify_db_session,
@@ -161,6 +170,7 @@ def test_ses_callback_should_set_status_to_permanent_failure(client,
assert get_notification_by_id(notification.id).status == 'sending' assert get_notification_by_id(notification.id).status == 'sending'
assert process_ses_response(ses_hard_bounce_callback(reference='ref')) is None assert process_ses_response(ses_hard_bounce_callback(reference='ref')) is None
assert get_notification_by_id(notification.id).status == 'permanent-failure' assert get_notification_by_id(notification.id).status == 'permanent-failure'
assert send_mock.called
stats_mock.assert_called_once_with(notification) stats_mock.assert_called_once_with(notification)