Sometimes a message is picked up twice of the SQS queue, we need to safe gaurd ourselves for that.

In this PR the id for the notification is passed in and used to created the notification, which causes a integrity error.
Normally when we get a SQLAlchemy error here we send the message to the retry queue, but if the notification already exists
we just ignore it.

tests/app/celery/test_tasks.py

@@ -806,3 +806,41 @@ def test_send_email_should_go_to_retry_queue_if_database_errors(sample_email_tem
     tasks.send_email.retry.assert_called_with(exc=expected_exception, queue='retry')
 
     assert Notification.query.count() == 0
+
+
+def test_send_email_does_not_send_duplicate_and_does_not_put_in_retry_queue(sample_notification, mocker):
+    json = _notification_json(sample_notification.template, sample_notification.to, job_id=uuid.uuid4(), row_number=1)
+    deliver_email = mocker.patch('app.celery.provider_tasks.deliver_email.apply_async')
+    retry = mocker.patch('app.celery.tasks.send_email.retry', side_effect=Exception())
+    now = datetime.utcnow()
+
+    notification_id = sample_notification.id
+
+    send_email(
+        sample_notification.service_id,
+        notification_id,
+        encryption.encrypt(json),
+        now.strftime(DATETIME_FORMAT)
+    )
+    assert Notification.query.count() == 1
+    assert not deliver_email.called
+    assert not retry.called
+
+
+def test_send_sms_does_not_send_duplicate_and_does_not_put_in_retry_queue(sample_notification, mocker):
+    json = _notification_json(sample_notification.template, sample_notification.to, job_id=uuid.uuid4(), row_number=1)
+    deliver_sms = mocker.patch('app.celery.provider_tasks.deliver_sms.apply_async')
+    retry = mocker.patch('app.celery.tasks.send_sms.retry', side_effect=Exception())
+    now = datetime.utcnow()
+
+    notification_id = sample_notification.id
+
+    send_sms(
+        sample_notification.service_id,
+        notification_id,
+        encryption.encrypt(json),
+        now.strftime(DATETIME_FORMAT)
+    )
+    assert Notification.query.count() == 1
+    assert not deliver_sms.called
+    assert not retry.called

tests/app/notifications/test_process_notification.py

@@ -1,4 +1,5 @@
 import datetime
+import uuid
 
 import pytest
 from boto3.exceptions import Boto3Error
@@ -108,7 +109,7 @@ def test_persist_notification_with_optionals(sample_job, sample_api_key, mocker)
     assert Notification.query.count() == 0
     assert NotificationHistory.query.count() == 0
     mocked_redis = mocker.patch('app.notifications.process_notifications.redis_store.incr')
-
+    n_id = uuid.uuid4()
     created_at = datetime.datetime(2016, 11, 11, 16, 8, 18)
     persist_notification(template_id=sample_job.template.id,
                          template_version=sample_job.template.version,
@@ -120,11 +121,13 @@ def test_persist_notification_with_optionals(sample_job, sample_api_key, mocker)
                          created_at=created_at,
                          job_id=sample_job.id,
                          job_row_number=10,
-                         reference="ref from client")
+                         reference="ref from client",
+                         notification_id=n_id)
     assert Notification.query.count() == 1
     assert NotificationHistory.query.count() == 1
     persisted_notification = Notification.query.all()[0]
-    assert persisted_notification.job_id == sample_job.id
+    assert persisted_notification.id == n_id
+    persisted_notification.job_id == sample_job.id
     assert persisted_notification.job_row_number == 10
     assert persisted_notification.created_at == created_at
     mocked_redis.assert_called_once_with(str(sample_job.service_id) + "-2016-01-01-count")

tests/app/notifications/test_validators.py

@@ -1,3 +1,4 @@
+from datetime import datetime
 import pytest
 from freezegun import freeze_time
 
@@ -21,10 +22,9 @@ from tests.app.conftest import (
 
 
 @pytest.mark.parametrize('key_type', ['team', 'normal'])
-def test_exception_thown_by_redis_store_get_should_not_be_fatal(
+def test_exception_thrown_by_redis_store_get_should_not_be_fatal(
         notify_db,
         notify_db_session,
-        notify_api,
         key_type,
         mocker):
     mocker.patch('app.notifications.validators.redis_store.redis_store.get', side_effect=Exception("broken redis"))
@@ -39,7 +39,8 @@ def test_exception_thown_by_redis_store_get_should_not_be_fatal(
     assert e.value.status_code == 429
     assert e.value.message == 'Exceeded send limits (4) for today'
     assert e.value.fields == []
-    app.notifications.validators.redis_store.set.assert_not_called()
+    app.notifications.validators.redis_store.set\
+        .assert_called_with("{}-{}-count".format(service.id, datetime.utcnow().strftime("%Y-%m-%d")), 5, ex=3600)
 
 
 @pytest.mark.parametrize('key_type', ['test', 'team', 'normal'])