mirror of
https://github.com/GSA/notifications-api.git
synced 2026-07-25 10:29:34 -04:00
Merge pull request #414 from alphagov/split-sms-and-retry
Split sms and retry
This commit is contained in:
minglis
381
tests/app/celery/test_provider_tasks.py
Normal file
381
tests/app/celery/test_provider_tasks.py
Normal file
@@ -0,0 +1,381 @@
|
||||
from celery.exceptions import MaxRetriesExceededError
|
||||
|
||||
from mock import ANY, call
|
||||
|
||||
from app import statsd_client, mmg_client
|
||||
from app.celery import provider_tasks
|
||||
from app.celery.provider_tasks import send_sms_to_provider
|
||||
from app.celery.tasks import provider_to_use
|
||||
from app.clients.sms import SmsClientException
|
||||
from app.dao import provider_statistics_dao
|
||||
from datetime import datetime
|
||||
from freezegun import freeze_time
|
||||
from app.dao import notifications_dao, provider_details_dao
|
||||
from notifications_utils.recipients import validate_phone_number, format_phone_number
|
||||
from app.celery.research_mode_tasks import send_sms_response
|
||||
from app.models import Notification, NotificationStatistics, Job
|
||||
|
||||
from tests.app.conftest import (
|
||||
sample_notification
|
||||
)
|
||||
|
||||
|
||||
def test_should_by_10_second_delay_as_default():
|
||||
assert provider_tasks.retry_iteration_to_delay() == 10
|
||||
|
||||
|
||||
def test_should_by_10_second_delay_on_unmapped_retry_iteration():
|
||||
assert provider_tasks.retry_iteration_to_delay(99) == 10
|
||||
|
||||
|
||||
def test_should_by_10_second_delay_on_retry_one():
|
||||
assert provider_tasks.retry_iteration_to_delay(0) == 10
|
||||
|
||||
|
||||
def test_should_by_1_minute_delay_on_retry_two():
|
||||
assert provider_tasks.retry_iteration_to_delay(1) == 60
|
||||
|
||||
|
||||
def test_should_by_5_minute_delay_on_retry_two():
|
||||
assert provider_tasks.retry_iteration_to_delay(2) == 300
|
||||
|
||||
|
||||
def test_should_by_60_minute_delay_on_retry_two():
|
||||
assert provider_tasks.retry_iteration_to_delay(3) == 3600
|
||||
|
||||
|
||||
def test_should_by_240_minute_delay_on_retry_two():
|
||||
assert provider_tasks.retry_iteration_to_delay(4) == 14400
|
||||
|
||||
|
||||
def test_should_return_highest_priority_active_provider(notify_db, notify_db_session):
|
||||
providers = provider_details_dao.get_provider_details_by_notification_type('sms')
|
||||
first = providers[0]
|
||||
second = providers[1]
|
||||
|
||||
assert provider_to_use('sms', '1234').name == first.identifier
|
||||
|
||||
first.priority = 20
|
||||
second.priority = 10
|
||||
|
||||
provider_details_dao.dao_update_provider_details(first)
|
||||
provider_details_dao.dao_update_provider_details(second)
|
||||
|
||||
assert provider_to_use('sms', '1234').name == second.identifier
|
||||
|
||||
first.priority = 10
|
||||
first.active = False
|
||||
second.priority = 20
|
||||
|
||||
provider_details_dao.dao_update_provider_details(first)
|
||||
provider_details_dao.dao_update_provider_details(second)
|
||||
|
||||
assert provider_to_use('sms', '1234').name == second.identifier
|
||||
|
||||
first.active = True
|
||||
provider_details_dao.dao_update_provider_details(first)
|
||||
|
||||
assert provider_to_use('sms', '1234').name == first.identifier
|
||||
|
||||
|
||||
def test_should_send_personalised_template_to_correct_sms_provider_and_persist(
|
||||
notify_db,
|
||||
notify_db_session,
|
||||
sample_template_with_placeholders,
|
||||
mocker):
|
||||
db_notification = sample_notification(notify_db, notify_db_session, template=sample_template_with_placeholders)
|
||||
|
||||
notification = _notification_json(
|
||||
sample_template_with_placeholders,
|
||||
to="+447234123123",
|
||||
personalisation={"name": "Jo"}
|
||||
)
|
||||
mocker.patch('app.encryption.decrypt', return_value=notification)
|
||||
mocker.patch('app.mmg_client.send_sms')
|
||||
mocker.patch('app.mmg_client.get_name', return_value="mmg")
|
||||
mocker.patch('app.statsd_client.incr')
|
||||
mocker.patch('app.statsd_client.timing_with_dates')
|
||||
mocker.patch('app.statsd_client.timing')
|
||||
|
||||
freezer = freeze_time("2016-01-01 11:09:00.00000")
|
||||
freezer.start()
|
||||
now = datetime.utcnow()
|
||||
freezer.stop()
|
||||
|
||||
freezer = freeze_time("2016-01-01 11:10:00.00000")
|
||||
freezer.start()
|
||||
|
||||
send_sms_to_provider(
|
||||
db_notification.service_id,
|
||||
db_notification.id,
|
||||
"encrypted-in-reality"
|
||||
)
|
||||
freezer.stop()
|
||||
|
||||
mmg_client.send_sms.assert_called_once_with(
|
||||
to=format_phone_number(validate_phone_number("+447234123123")),
|
||||
content="Sample service: Hello Jo",
|
||||
reference=str(db_notification.id)
|
||||
)
|
||||
|
||||
statsd_client.incr.assert_called_once_with("notifications.tasks.send-sms-to-provider")
|
||||
statsd_client.timing.assert_has_calls([
|
||||
call("notifications.tasks.send-sms-to-provider.task-time", ANY),
|
||||
call("notifications.sms.total-time", ANY)
|
||||
])
|
||||
|
||||
notification = notifications_dao.get_notification(
|
||||
db_notification.service_id, db_notification.id
|
||||
)
|
||||
|
||||
assert notification.status == 'sending'
|
||||
assert notification.sent_at > now
|
||||
assert notification.sent_by == 'mmg'
|
||||
|
||||
|
||||
def test_should_send_template_to_correct_sms_provider_and_persist(
|
||||
notify_db,
|
||||
notify_db_session,
|
||||
sample_template,
|
||||
mocker):
|
||||
db_notification = sample_notification(notify_db, notify_db_session, template=sample_template)
|
||||
|
||||
notification = _notification_json(
|
||||
sample_template,
|
||||
to="+447234123123"
|
||||
)
|
||||
mocker.patch('app.encryption.decrypt', return_value=notification)
|
||||
mocker.patch('app.mmg_client.send_sms')
|
||||
mocker.patch('app.mmg_client.get_name', return_value="mmg")
|
||||
mocker.patch('app.statsd_client.incr')
|
||||
mocker.patch('app.statsd_client.timing_with_dates')
|
||||
mocker.patch('app.statsd_client.timing')
|
||||
|
||||
freezer = freeze_time("2016-01-01 11:09:00.00000")
|
||||
freezer.start()
|
||||
now = datetime.utcnow()
|
||||
freezer.stop()
|
||||
|
||||
freezer = freeze_time("2016-01-01 11:10:00.00000")
|
||||
freezer.start()
|
||||
|
||||
send_sms_to_provider(
|
||||
db_notification.service_id,
|
||||
db_notification.id,
|
||||
"encrypted-in-reality"
|
||||
)
|
||||
freezer.stop()
|
||||
|
||||
mmg_client.send_sms.assert_called_once_with(
|
||||
to=format_phone_number(validate_phone_number("+447234123123")),
|
||||
content="Sample service: This is a template",
|
||||
reference=str(db_notification.id)
|
||||
)
|
||||
|
||||
|
||||
def test_send_sms_should_use_template_version_from_notification_not_latest(
|
||||
notify_db,
|
||||
notify_db_session,
|
||||
sample_template,
|
||||
mocker):
|
||||
db_notification = sample_notification(notify_db, notify_db_session, template=sample_template)
|
||||
|
||||
notification = _notification_json(sample_template, '+447234123123')
|
||||
mocker.patch('app.encryption.decrypt', return_value=notification)
|
||||
mocker.patch('app.mmg_client.send_sms')
|
||||
mocker.patch('app.mmg_client.get_name', return_value="mmg")
|
||||
version_on_notification = sample_template.version
|
||||
|
||||
# Change the template
|
||||
from app.dao.templates_dao import dao_update_template, dao_get_template_by_id
|
||||
sample_template.content = sample_template.content + " another version of the template"
|
||||
dao_update_template(sample_template)
|
||||
t = dao_get_template_by_id(sample_template.id)
|
||||
assert t.version > version_on_notification
|
||||
|
||||
now = datetime.utcnow()
|
||||
|
||||
send_sms_to_provider(
|
||||
db_notification.service_id,
|
||||
db_notification.id,
|
||||
"encrypted-in-reality"
|
||||
)
|
||||
|
||||
mmg_client.send_sms.assert_called_once_with(
|
||||
to=format_phone_number(validate_phone_number("+447234123123")),
|
||||
content="Sample service: This is a template",
|
||||
reference=str(db_notification.id)
|
||||
)
|
||||
|
||||
persisted_notification = notifications_dao.get_notification(sample_template.service_id, db_notification.id)
|
||||
assert persisted_notification.to == db_notification.to
|
||||
assert persisted_notification.template_id == sample_template.id
|
||||
assert persisted_notification.template_version == version_on_notification
|
||||
assert persisted_notification.template_version != sample_template.version
|
||||
assert persisted_notification.sent_at > now
|
||||
assert persisted_notification.status == 'sending'
|
||||
assert persisted_notification.sent_by == 'mmg'
|
||||
assert persisted_notification.content_char_count == len("Sample service: This is a template")
|
||||
|
||||
|
||||
def test_should_call_send_sms_response_task_if_research_mode(notify_db, sample_service, sample_notification, mocker):
|
||||
notification = _notification_json(
|
||||
sample_notification.template,
|
||||
to=sample_notification.to
|
||||
)
|
||||
mocker.patch('app.encryption.decrypt', return_value=notification)
|
||||
mocker.patch('app.mmg_client.send_sms')
|
||||
mocker.patch('app.mmg_client.get_name', return_value="mmg")
|
||||
mocker.patch('app.celery.research_mode_tasks.send_sms_response.apply_async')
|
||||
|
||||
sample_service.research_mode = True
|
||||
notify_db.session.add(sample_service)
|
||||
notify_db.session.commit()
|
||||
|
||||
now = datetime.utcnow()
|
||||
send_sms_to_provider(
|
||||
sample_notification.service_id,
|
||||
sample_notification.id,
|
||||
"encrypted-in-reality"
|
||||
)
|
||||
assert not mmg_client.send_sms.called
|
||||
send_sms_response.apply_async.assert_called_once_with(
|
||||
('mmg', str(sample_notification.id), sample_notification.to), queue='research-mode'
|
||||
)
|
||||
|
||||
persisted_notification = notifications_dao.get_notification(sample_service.id, sample_notification.id)
|
||||
assert persisted_notification.to == sample_notification.to
|
||||
assert persisted_notification.template_id == sample_notification.template_id
|
||||
assert persisted_notification.status == 'sending'
|
||||
assert persisted_notification.sent_at > now
|
||||
assert persisted_notification.sent_by == 'mmg'
|
||||
|
||||
|
||||
def test_should_update_provider_stats_on_success(notify_db, sample_service, sample_notification, mocker):
|
||||
provider_stats = provider_statistics_dao.get_provider_statistics(sample_service).all()
|
||||
assert len(provider_stats) == 0
|
||||
|
||||
notification = _notification_json(
|
||||
sample_notification.template,
|
||||
to=sample_notification.to
|
||||
)
|
||||
mocker.patch('app.encryption.decrypt', return_value=notification)
|
||||
mocker.patch('app.mmg_client.send_sms')
|
||||
mocker.patch('app.mmg_client.get_name', return_value="mmg")
|
||||
mocker.patch('app.celery.research_mode_tasks.send_sms_response.apply_async')
|
||||
|
||||
send_sms_to_provider(
|
||||
sample_notification.service_id,
|
||||
sample_notification.id,
|
||||
"encrypted-in-reality"
|
||||
)
|
||||
|
||||
updated_provider_stats = provider_statistics_dao.get_provider_statistics(sample_service).all()
|
||||
assert updated_provider_stats[0].provider.identifier == 'mmg'
|
||||
assert updated_provider_stats[0].unit_count == 1
|
||||
|
||||
|
||||
def test_not_should_update_provider_stats_on_success(notify_db, sample_service, sample_notification, mocker):
|
||||
provider_stats = provider_statistics_dao.get_provider_statistics(sample_service).all()
|
||||
assert len(provider_stats) == 0
|
||||
|
||||
notification = _notification_json(
|
||||
sample_notification.template,
|
||||
to=sample_notification.to
|
||||
)
|
||||
mocker.patch('app.encryption.decrypt', return_value=notification)
|
||||
mocker.patch('app.mmg_client.send_sms')
|
||||
mocker.patch('app.mmg_client.get_name', return_value="mmg")
|
||||
mocker.patch('app.celery.research_mode_tasks.send_sms_response.apply_async')
|
||||
|
||||
sample_service.research_mode = True
|
||||
notify_db.session.add(sample_service)
|
||||
notify_db.session.commit()
|
||||
|
||||
send_sms_to_provider(
|
||||
sample_notification.service_id,
|
||||
sample_notification.id,
|
||||
"encrypted-in-reality"
|
||||
)
|
||||
|
||||
updated_provider_stats = provider_statistics_dao.get_provider_statistics(sample_service).all()
|
||||
assert len(updated_provider_stats) == 0
|
||||
|
||||
|
||||
def test_statsd_updates(notify_db, notify_db_session, sample_service, sample_notification, mocker):
|
||||
notification = _notification_json(
|
||||
sample_notification.template,
|
||||
to=sample_notification.to
|
||||
)
|
||||
|
||||
mocker.patch('app.statsd_client.incr')
|
||||
mocker.patch('app.statsd_client.timing')
|
||||
mocker.patch('app.encryption.decrypt', return_value=notification)
|
||||
mocker.patch('app.mmg_client.send_sms')
|
||||
mocker.patch('app.mmg_client.get_name', return_value="mmg")
|
||||
mocker.patch('app.celery.research_mode_tasks.send_sms_response.apply_async')
|
||||
|
||||
send_sms_to_provider(
|
||||
sample_notification.service_id,
|
||||
sample_notification.id,
|
||||
"encrypted-in-reality"
|
||||
)
|
||||
|
||||
statsd_client.incr.assert_called_once_with("notifications.tasks.send-sms-to-provider")
|
||||
statsd_client.timing.assert_has_calls([
|
||||
call("notifications.tasks.send-sms-to-provider.task-time", ANY),
|
||||
call("notifications.sms.total-time", ANY)
|
||||
])
|
||||
|
||||
|
||||
def test_should_go_into_technical_error_if_exceeds_retries(
|
||||
notify_db,
|
||||
notify_db_session,
|
||||
sample_service,
|
||||
sample_notification,
|
||||
mocker):
|
||||
|
||||
notification = _notification_json(
|
||||
sample_notification.template,
|
||||
to=sample_notification.to
|
||||
)
|
||||
|
||||
mocker.patch('app.statsd_client.incr')
|
||||
mocker.patch('app.statsd_client.timing')
|
||||
mocker.patch('app.encryption.decrypt', return_value=notification)
|
||||
mocker.patch('app.mmg_client.send_sms', side_effect=SmsClientException("EXPECTED"))
|
||||
mocker.patch('app.celery.provider_tasks.send_sms_to_provider.retry', side_effect=MaxRetriesExceededError())
|
||||
|
||||
send_sms_to_provider(
|
||||
sample_notification.service_id,
|
||||
sample_notification.id,
|
||||
"encrypted-in-reality"
|
||||
)
|
||||
|
||||
provider_tasks.send_sms_to_provider.retry.assert_called_with(queue='retry', countdown=10)
|
||||
assert statsd_client.incr.assert_not_called
|
||||
assert statsd_client.timing.assert_not_called
|
||||
|
||||
db_notification = Notification.query.get(sample_notification.id)
|
||||
assert db_notification.status == 'technical-failure'
|
||||
notification_stats = NotificationStatistics.query.filter_by(service_id=sample_notification.service.id).first()
|
||||
assert notification_stats.sms_requested == 1
|
||||
assert notification_stats.sms_failed == 1
|
||||
job = Job.query.get(sample_notification.job.id)
|
||||
assert job.notification_count == 1
|
||||
assert job.notifications_failed == 1
|
||||
|
||||
|
||||
def _notification_json(template, to, personalisation=None, job_id=None, row_number=None):
|
||||
notification = {
|
||||
"template": template.id,
|
||||
"template_version": template.version,
|
||||
"to": to,
|
||||
}
|
||||
if personalisation:
|
||||
notification.update({"personalisation": personalisation})
|
||||
if job_id:
|
||||
notification.update({"job": job_id})
|
||||
if row_number:
|
||||
notification['row_number'] = row_number
|
||||
return notification
|
||||
@@ -2,8 +2,8 @@ import uuid
|
||||
import pytest
|
||||
from flask import current_app
|
||||
from mock import ANY
|
||||
from notifications_utils.recipients import validate_phone_number, format_phone_number
|
||||
|
||||
from app.celery import provider_tasks
|
||||
from app.celery.tasks import (
|
||||
send_sms,
|
||||
process_job,
|
||||
@@ -13,14 +13,11 @@ from app.celery.tasks import (
|
||||
delete_successful_notifications,
|
||||
provider_to_use,
|
||||
timeout_notifications,
|
||||
send_email)
|
||||
from app.celery.research_mode_tasks import (
|
||||
send_email_response,
|
||||
send_sms_response
|
||||
send_email
|
||||
)
|
||||
from app import (aws_ses_client, encryption, DATETIME_FORMAT, mmg_client, statsd_client)
|
||||
from app import (aws_ses_client, encryption, DATETIME_FORMAT, statsd_client)
|
||||
from app.celery.research_mode_tasks import send_email_response
|
||||
from app.clients.email.aws_ses import AwsSesClientException
|
||||
from app.clients.sms.mmg import MMGClientException
|
||||
from app.dao import notifications_dao, jobs_dao, provider_details_dao
|
||||
from sqlalchemy.exc import SQLAlchemyError
|
||||
from sqlalchemy.orm.exc import NoResultFound
|
||||
@@ -48,6 +45,7 @@ class AnyStringWith(str):
|
||||
mmg_error = {'Error': '40', 'Description': 'error'}
|
||||
|
||||
|
||||
# TODO moved to test_provider_tasks once send-email migrated
|
||||
def test_should_return_highest_priority_active_provider(notify_db, notify_db_session):
|
||||
providers = provider_details_dao.get_provider_details_by_notification_type('sms')
|
||||
first = providers[0]
|
||||
@@ -318,22 +316,22 @@ def test_should_process_all_sms_job(sample_job,
|
||||
)
|
||||
assert encryption.encrypt.call_args[0][0]['to'] == '+441234123120'
|
||||
assert encryption.encrypt.call_args[0][0]['template'] == str(sample_job_with_placeholdered_template.template.id)
|
||||
assert encryption.encrypt.call_args[0][0]['template_version'] == sample_job_with_placeholdered_template.template.version # noqa
|
||||
assert encryption.encrypt.call_args[0][0][
|
||||
'template_version'] == sample_job_with_placeholdered_template.template.version # noqa
|
||||
assert encryption.encrypt.call_args[0][0]['personalisation'] == {'name': 'chris'}
|
||||
tasks.send_sms.apply_async.call_count == 10
|
||||
job = jobs_dao.dao_get_job_by_id(sample_job_with_placeholdered_template.id)
|
||||
assert job.status == 'finished'
|
||||
|
||||
|
||||
def test_should_send_template_to_correct_sms_provider_and_persist(sample_template_with_placeholders, mocker):
|
||||
def test_should_send_template_to_correct_sms_task_and_persist(sample_template_with_placeholders, mocker):
|
||||
notification = _notification_json(sample_template_with_placeholders,
|
||||
to="+447234123123", personalisation={"name": "Jo"})
|
||||
mocker.patch('app.encryption.decrypt', return_value=notification)
|
||||
mocker.patch('app.mmg_client.send_sms')
|
||||
mocker.patch('app.mmg_client.get_name', return_value="mmg")
|
||||
mocker.patch('app.statsd_client.incr')
|
||||
mocker.patch('app.statsd_client.timing_with_dates')
|
||||
mocker.patch('app.statsd_client.timing')
|
||||
mocker.patch('app.celery.provider_tasks.send_sms_to_provider.apply_async')
|
||||
|
||||
notification_id = uuid.uuid4()
|
||||
|
||||
@@ -353,18 +351,15 @@ def test_should_send_template_to_correct_sms_provider_and_persist(sample_templat
|
||||
)
|
||||
freezer.stop()
|
||||
|
||||
statsd_client.timing_with_dates.assert_called_once_with(
|
||||
"notifications.tasks.send-sms.queued-for",
|
||||
datetime(2016, 1, 1, 11, 10, 0, 00000),
|
||||
datetime(2016, 1, 1, 11, 9, 0, 00000)
|
||||
)
|
||||
statsd_client.timing.assert_called_once_with("notifications.tasks.send-sms.task-time", ANY)
|
||||
|
||||
mmg_client.send_sms.assert_called_once_with(
|
||||
to=format_phone_number(validate_phone_number("+447234123123")),
|
||||
content="Sample service: Hello Jo",
|
||||
reference=str(notification_id)
|
||||
provider_tasks.send_sms_to_provider.apply_async.assert_called_once_with(
|
||||
(sample_template_with_placeholders.service_id,
|
||||
notification_id,
|
||||
"encrypted-in-reality"),
|
||||
queue="sms"
|
||||
)
|
||||
|
||||
statsd_client.incr.assert_called_once_with("notifications.tasks.send-sms")
|
||||
persisted_notification = notifications_dao.get_notification(
|
||||
sample_template_with_placeholders.service_id, notification_id
|
||||
@@ -375,33 +370,11 @@ def test_should_send_template_to_correct_sms_provider_and_persist(sample_templat
|
||||
assert persisted_notification.template_version == sample_template_with_placeholders.version
|
||||
assert persisted_notification.status == 'sending'
|
||||
assert persisted_notification.created_at == now
|
||||
assert persisted_notification.sent_at > now
|
||||
assert persisted_notification.sent_by == 'mmg'
|
||||
assert not persisted_notification.sent_at
|
||||
assert not persisted_notification.sent_by
|
||||
assert not persisted_notification.job_id
|
||||
|
||||
|
||||
def test_should_send_sms_without_personalisation(sample_template, mocker):
|
||||
notification = _notification_json(sample_template, "+447234123123")
|
||||
mocker.patch('app.encryption.decrypt', return_value=notification)
|
||||
mocker.patch('app.mmg_client.send_sms')
|
||||
mocker.patch('app.mmg_client.get_name', return_value="mmg")
|
||||
|
||||
notification_id = uuid.uuid4()
|
||||
now = datetime.utcnow()
|
||||
send_sms(
|
||||
sample_template.service_id,
|
||||
notification_id,
|
||||
"encrypted-in-reality",
|
||||
now.strftime(DATETIME_FORMAT)
|
||||
)
|
||||
|
||||
mmg_client.send_sms.assert_called_once_with(
|
||||
to=format_phone_number(validate_phone_number("+447234123123")),
|
||||
content="Sample service: This is a template",
|
||||
reference=str(notification_id)
|
||||
)
|
||||
|
||||
|
||||
def test_should_send_sms_if_restricted_service_and_valid_number(notify_db, notify_db_session, mocker):
|
||||
user = sample_user(notify_db, notify_db_session, mobile_numnber="07700 900890")
|
||||
service = sample_service(notify_db, notify_db_session, user=user, restricted=True)
|
||||
@@ -410,8 +383,7 @@ def test_should_send_sms_if_restricted_service_and_valid_number(notify_db, notif
|
||||
notification = _notification_json(template, "+447700900890") # The user’s own number, but in a different format
|
||||
|
||||
mocker.patch('app.encryption.decrypt', return_value=notification)
|
||||
mocker.patch('app.mmg_client.send_sms')
|
||||
mocker.patch('app.mmg_client.get_name', return_value="mmg")
|
||||
mocker.patch('app.celery.provider_tasks.send_sms_to_provider.apply_async')
|
||||
|
||||
notification_id = uuid.uuid4()
|
||||
now = datetime.utcnow()
|
||||
@@ -422,10 +394,11 @@ def test_should_send_sms_if_restricted_service_and_valid_number(notify_db, notif
|
||||
now.strftime(DATETIME_FORMAT)
|
||||
)
|
||||
|
||||
mmg_client.send_sms.assert_called_once_with(
|
||||
to=format_phone_number(validate_phone_number("+447700900890")),
|
||||
content="Sample service: This is a template",
|
||||
reference=str(notification_id)
|
||||
provider_tasks.send_sms_to_provider.apply_async.assert_called_once_with(
|
||||
(service.id,
|
||||
notification_id,
|
||||
"encrypted-in-reality"),
|
||||
queue="sms"
|
||||
)
|
||||
|
||||
|
||||
@@ -436,8 +409,7 @@ def test_should_not_send_sms_if_restricted_service_and_invalid_number(notify_db,
|
||||
|
||||
notification = _notification_json(template, "07700 900849")
|
||||
mocker.patch('app.encryption.decrypt', return_value=notification)
|
||||
mocker.patch('app.mmg_client.send_sms')
|
||||
mocker.patch('app.mmg_client.get_name', return_value="mmg")
|
||||
mocker.patch('app.celery.provider_tasks.send_sms_to_provider.apply_async')
|
||||
|
||||
notification_id = uuid.uuid4()
|
||||
now = datetime.utcnow()
|
||||
@@ -447,53 +419,11 @@ def test_should_not_send_sms_if_restricted_service_and_invalid_number(notify_db,
|
||||
"encrypted-in-reality",
|
||||
now.strftime(DATETIME_FORMAT)
|
||||
)
|
||||
mmg_client.send_sms.assert_not_called()
|
||||
provider_tasks.send_sms_to_provider.apply_async.assert_not_called()
|
||||
with pytest.raises(NoResultFound):
|
||||
notifications_dao.get_notification(service.id, notification_id)
|
||||
|
||||
|
||||
def test_send_sms_should_use_template_version_from_job_not_latest(sample_template, mocker):
|
||||
notification = _notification_json(sample_template, '+447234123123')
|
||||
mocker.patch('app.encryption.decrypt', return_value=notification)
|
||||
mocker.patch('app.mmg_client.send_sms')
|
||||
mocker.patch('app.mmg_client.get_name', return_value="mmg")
|
||||
version_on_notification = sample_template.version
|
||||
|
||||
# Change the template
|
||||
from app.dao.templates_dao import dao_update_template, dao_get_template_by_id
|
||||
sample_template.content = sample_template.content + " another version of the template"
|
||||
dao_update_template(sample_template)
|
||||
t = dao_get_template_by_id(sample_template.id)
|
||||
assert t.version > version_on_notification
|
||||
|
||||
notification_id = uuid.uuid4()
|
||||
now = datetime.utcnow()
|
||||
send_sms(
|
||||
sample_template.service_id,
|
||||
notification_id,
|
||||
"encrypted-in-reality",
|
||||
now.strftime(DATETIME_FORMAT)
|
||||
)
|
||||
|
||||
mmg_client.send_sms.assert_called_once_with(
|
||||
to=format_phone_number(validate_phone_number("+447234123123")),
|
||||
content="Sample service: This is a template",
|
||||
reference=str(notification_id)
|
||||
)
|
||||
|
||||
persisted_notification = notifications_dao.get_notification(sample_template.service_id, notification_id)
|
||||
assert persisted_notification.id == notification_id
|
||||
assert persisted_notification.to == '+447234123123'
|
||||
assert persisted_notification.template_id == sample_template.id
|
||||
assert persisted_notification.template_version == version_on_notification
|
||||
assert persisted_notification.template_version != sample_template.version
|
||||
assert persisted_notification.created_at == now
|
||||
assert persisted_notification.sent_at > now
|
||||
assert persisted_notification.status == 'sending'
|
||||
assert persisted_notification.sent_by == 'mmg'
|
||||
assert persisted_notification.content_char_count == len("Sample service: This is a template")
|
||||
|
||||
|
||||
def test_should_send_email_if_restricted_service_and_valid_email(notify_db, notify_db_session, mocker):
|
||||
user = sample_user(notify_db, notify_db_session, email="test@restricted.com")
|
||||
service = sample_service(notify_db, notify_db_session, user=user, restricted=True)
|
||||
@@ -551,15 +481,14 @@ def test_should_not_send_email_if_restricted_service_and_invalid_email_address(n
|
||||
notifications_dao.get_notification(service.id, notification_id)
|
||||
|
||||
|
||||
def test_should_send_template_to_correct_sms_provider_and_persist_with_job_id(sample_job, mocker):
|
||||
def test_should_send_template_to_and_persist_with_job_id(sample_job, mocker):
|
||||
notification = _notification_json(
|
||||
sample_job.template,
|
||||
to="+447234123123",
|
||||
job_id=sample_job.id,
|
||||
row_number=2)
|
||||
mocker.patch('app.encryption.decrypt', return_value=notification)
|
||||
mocker.patch('app.mmg_client.send_sms')
|
||||
mocker.patch('app.mmg_client.get_name', return_value="mmg")
|
||||
mocker.patch('app.celery.provider_tasks.send_sms_to_provider.apply_async')
|
||||
|
||||
notification_id = uuid.uuid4()
|
||||
now = datetime.utcnow()
|
||||
@@ -569,10 +498,11 @@ def test_should_send_template_to_correct_sms_provider_and_persist_with_job_id(sa
|
||||
"encrypted-in-reality",
|
||||
now.strftime(DATETIME_FORMAT)
|
||||
)
|
||||
mmg_client.send_sms.assert_called_once_with(
|
||||
to=format_phone_number(validate_phone_number("+447234123123")),
|
||||
content="Sample service: This is a template",
|
||||
reference=str(notification_id)
|
||||
provider_tasks.send_sms_to_provider.apply_async.assert_called_once_with(
|
||||
(sample_job.service.id,
|
||||
notification_id,
|
||||
"encrypted-in-reality"),
|
||||
queue="sms"
|
||||
)
|
||||
persisted_notification = notifications_dao.get_notification(sample_job.template.service_id, notification_id)
|
||||
assert persisted_notification.id == notification_id
|
||||
@@ -580,9 +510,9 @@ def test_should_send_template_to_correct_sms_provider_and_persist_with_job_id(sa
|
||||
assert persisted_notification.job_id == sample_job.id
|
||||
assert persisted_notification.template_id == sample_job.template.id
|
||||
assert persisted_notification.status == 'sending'
|
||||
assert persisted_notification.sent_at > now
|
||||
assert not persisted_notification.sent_at
|
||||
assert persisted_notification.created_at == now
|
||||
assert persisted_notification.sent_by == 'mmg'
|
||||
assert not persisted_notification.sent_by
|
||||
assert persisted_notification.job_row_number == 2
|
||||
|
||||
|
||||
@@ -767,35 +697,32 @@ def test_should_use_email_template_and_persist_without_personalisation(sample_em
|
||||
)
|
||||
|
||||
|
||||
def test_should_persist_notification_as_failed_if_sms_client_fails(sample_template, mocker):
|
||||
def test_should_persist_notification_as_failed_if_database_fails(sample_template, mocker):
|
||||
notification = _notification_json(sample_template, "+447234123123")
|
||||
|
||||
expected_exception = SQLAlchemyError()
|
||||
|
||||
mocker.patch('app.encryption.decrypt', return_value=notification)
|
||||
mocker.patch('app.mmg_client.send_sms', side_effect=MMGClientException(mmg_error))
|
||||
mocker.patch('app.mmg_client.get_name', return_value="mmg")
|
||||
mocker.patch('app.celery.provider_tasks.send_sms_to_provider.apply_async')
|
||||
mocker.patch('app.celery.tasks.send_sms.retry', side_effect=Exception())
|
||||
mocker.patch('app.celery.tasks.dao_create_notification', side_effect=expected_exception)
|
||||
now = datetime.utcnow()
|
||||
|
||||
notification_id = uuid.uuid4()
|
||||
|
||||
send_sms(
|
||||
sample_template.service_id,
|
||||
notification_id,
|
||||
"encrypted-in-reality",
|
||||
now.strftime(DATETIME_FORMAT)
|
||||
)
|
||||
mmg_client.send_sms.assert_called_once_with(
|
||||
to=format_phone_number(validate_phone_number("+447234123123")),
|
||||
content="Sample service: This is a template",
|
||||
reference=str(notification_id)
|
||||
)
|
||||
persisted_notification = notifications_dao.get_notification(sample_template.service_id, notification_id)
|
||||
assert persisted_notification.id == notification_id
|
||||
assert persisted_notification.to == '+447234123123'
|
||||
assert persisted_notification.template_id == sample_template.id
|
||||
assert persisted_notification.template_version == sample_template.version
|
||||
assert persisted_notification.status == 'technical-failure'
|
||||
assert persisted_notification.created_at == now
|
||||
assert persisted_notification.sent_at > now
|
||||
assert persisted_notification.sent_by == 'mmg'
|
||||
with pytest.raises(Exception):
|
||||
send_sms(
|
||||
sample_template.service_id,
|
||||
notification_id,
|
||||
"encrypted-in-reality",
|
||||
now.strftime(DATETIME_FORMAT)
|
||||
)
|
||||
provider_tasks.send_sms_to_provider.apply_async.assert_not_called()
|
||||
tasks.send_sms.retry.assert_called_with(exc=expected_exception, queue='retry')
|
||||
|
||||
with pytest.raises(NoResultFound) as e:
|
||||
notifications_dao.get_notification(sample_template.service_id, notification_id)
|
||||
assert 'No row was found for one' in str(e.value)
|
||||
|
||||
|
||||
def test_should_persist_notification_as_failed_if_email_client_fails(sample_email_template, mocker):
|
||||
@@ -833,27 +760,6 @@ def test_should_persist_notification_as_failed_if_email_client_fails(sample_emai
|
||||
assert persisted_notification.sent_at > now
|
||||
|
||||
|
||||
def test_should_not_send_sms_if_db_peristance_failed(sample_template, mocker):
|
||||
notification = _notification_json(sample_template, "+447234123123")
|
||||
mocker.patch('app.encryption.decrypt', return_value=notification)
|
||||
mocker.patch('app.mmg_client.send_sms')
|
||||
mocker.patch('app.db.session.add', side_effect=SQLAlchemyError())
|
||||
now = datetime.utcnow()
|
||||
|
||||
notification_id = uuid.uuid4()
|
||||
|
||||
send_sms(
|
||||
sample_template.service_id,
|
||||
notification_id,
|
||||
"encrypted-in-reality",
|
||||
now.strftime(DATETIME_FORMAT)
|
||||
)
|
||||
mmg_client.send_sms.assert_not_called()
|
||||
with pytest.raises(NoResultFound) as e:
|
||||
notifications_dao.get_notification(sample_template.service_id, notification_id)
|
||||
assert 'No row was found for one' in str(e.value)
|
||||
|
||||
|
||||
def test_should_not_send_email_if_db_peristance_failed(sample_email_template, mocker):
|
||||
notification = _notification_json(sample_email_template, "my_email@my_email.com")
|
||||
mocker.patch('app.encryption.decrypt', return_value=notification)
|
||||
@@ -897,43 +803,6 @@ def test_process_email_job_should_use_reply_to_email_if_present(sample_email_job
|
||||
)
|
||||
|
||||
|
||||
def test_should_call_send_sms_response_task_if_research_mode(notify_db, sample_service, sample_template, mocker):
|
||||
notification = _notification_json(
|
||||
sample_template,
|
||||
to="+447234123123"
|
||||
)
|
||||
mocker.patch('app.encryption.decrypt', return_value=notification)
|
||||
mocker.patch('app.mmg_client.send_sms')
|
||||
mocker.patch('app.mmg_client.get_name', return_value="mmg")
|
||||
mocker.patch('app.celery.research_mode_tasks.send_sms_response.apply_async')
|
||||
|
||||
sample_service.research_mode = True
|
||||
notify_db.session.add(sample_service)
|
||||
notify_db.session.commit()
|
||||
|
||||
notification_id = uuid.uuid4()
|
||||
now = datetime.utcnow()
|
||||
send_sms(
|
||||
sample_service.id,
|
||||
notification_id,
|
||||
"encrypted-in-reality",
|
||||
now.strftime(DATETIME_FORMAT)
|
||||
)
|
||||
assert not mmg_client.send_sms.called
|
||||
send_sms_response.apply_async.assert_called_once_with(
|
||||
('mmg', str(notification_id), "+447234123123"), queue='research-mode'
|
||||
)
|
||||
|
||||
persisted_notification = notifications_dao.get_notification(sample_service.id, notification_id)
|
||||
assert persisted_notification.id == notification_id
|
||||
assert persisted_notification.to == '+447234123123'
|
||||
assert persisted_notification.template_id == sample_template.id
|
||||
assert persisted_notification.status == 'sending'
|
||||
assert persisted_notification.sent_at > now
|
||||
assert persisted_notification.created_at == now
|
||||
assert persisted_notification.sent_by == 'mmg'
|
||||
|
||||
|
||||
def test_should_call_send_email_response_task_if_research_mode(
|
||||
notify_db,
|
||||
sample_service,
|
||||
@@ -1025,47 +894,6 @@ def test_should_call_send_not_update_provider_email_stats_if_research_mode(
|
||||
providers=[ses_provider.identifier]).first()
|
||||
|
||||
|
||||
def test_should_call_send_sms_response_task_if_research_mode(
|
||||
notify_db,
|
||||
sample_service,
|
||||
sample_template,
|
||||
mmg_provider,
|
||||
mocker):
|
||||
notification = _notification_json(
|
||||
sample_template,
|
||||
to="+447234123123"
|
||||
)
|
||||
mocker.patch('app.encryption.decrypt', return_value=notification)
|
||||
mocker.patch('app.mmg_client.send_sms')
|
||||
mocker.patch('app.mmg_client.get_name', return_value="mmg")
|
||||
mocker.patch('app.celery.research_mode_tasks.send_sms_response.apply_async')
|
||||
|
||||
sample_service.research_mode = True
|
||||
notify_db.session.add(sample_service)
|
||||
notify_db.session.commit()
|
||||
|
||||
assert not get_provider_statistics(
|
||||
sample_template.service,
|
||||
providers=[mmg_provider.identifier]).first()
|
||||
|
||||
notification_id = uuid.uuid4()
|
||||
now = datetime.utcnow()
|
||||
send_sms(
|
||||
sample_service.id,
|
||||
notification_id,
|
||||
"encrypted-in-reality",
|
||||
now.strftime(DATETIME_FORMAT)
|
||||
)
|
||||
assert not mmg_client.send_sms.called
|
||||
send_sms_response.apply_async.assert_called_once_with(
|
||||
('mmg', str(notification_id), "+447234123123"), queue='research-mode'
|
||||
)
|
||||
|
||||
assert not get_provider_statistics(
|
||||
sample_template.service,
|
||||
providers=[mmg_provider.identifier]).first()
|
||||
|
||||
|
||||
def _notification_json(template, to, personalisation=None, job_id=None, row_number=None):
|
||||
notification = {
|
||||
"template": template.id,
|
||||
|
||||
@@ -319,7 +319,6 @@ def sample_notification(notify_db,
|
||||
status='sending',
|
||||
reference=None,
|
||||
created_at=datetime.utcnow(),
|
||||
provider_name=None,
|
||||
content_char_count=160,
|
||||
create=True):
|
||||
if service is None:
|
||||
@@ -331,9 +330,6 @@ def sample_notification(notify_db,
|
||||
|
||||
notification_id = uuid.uuid4()
|
||||
|
||||
if provider_name is None:
|
||||
provider_name = mmg_provider().identifier if template.template_type == 'sms' else ses_provider().identifier
|
||||
|
||||
if to_field:
|
||||
to = to_field
|
||||
else:
|
||||
@@ -342,6 +338,7 @@ def sample_notification(notify_db,
|
||||
data = {
|
||||
'id': notification_id,
|
||||
'to': to,
|
||||
'job_id': job.id,
|
||||
'job': job,
|
||||
'service_id': service.id,
|
||||
'service': service,
|
||||
@@ -356,7 +353,7 @@ def sample_notification(notify_db,
|
||||
data['job_row_number'] = job_row_number
|
||||
notification = Notification(**data)
|
||||
if create:
|
||||
dao_create_notification(notification, template.template_type, provider_name)
|
||||
dao_create_notification(notification, template.template_type)
|
||||
return notification
|
||||
|
||||
|
||||
|
||||
@@ -44,8 +44,7 @@ def test_should_by_able_to_update_status_by_reference(sample_email_template, ses
|
||||
notification = Notification(**data)
|
||||
dao_create_notification(
|
||||
notification,
|
||||
sample_email_template.template_type,
|
||||
ses_provider.identifier)
|
||||
sample_email_template.template_type)
|
||||
|
||||
assert Notification.query.get(notification.id).status == "sending"
|
||||
notification.reference = 'reference'
|
||||
@@ -59,7 +58,7 @@ def test_should_by_able_to_update_status_by_reference(sample_email_template, ses
|
||||
def test_should_by_able_to_update_status_by_id(sample_template, sample_job, mmg_provider):
|
||||
data = _notification_json(sample_template, job_id=sample_job.id)
|
||||
notification = Notification(**data)
|
||||
dao_create_notification(notification, sample_template.template_type, 'mmg')
|
||||
dao_create_notification(notification, sample_template.template_type)
|
||||
assert Notification.query.get(notification.id).status == 'sending'
|
||||
assert update_notification_status_by_id(notification.id, 'delivered', 'delivered')
|
||||
assert Notification.query.get(notification.id).status == 'delivered'
|
||||
@@ -79,7 +78,7 @@ def test_should_not_update_status_by_id_if_not_sending_and_does_not_update_job(n
|
||||
def test_should_by_able_to_update_status_by_id_from_pending_to_delivered(sample_template, sample_job):
|
||||
data = _notification_json(sample_template, job_id=sample_job.id)
|
||||
notification = Notification(**data)
|
||||
dao_create_notification(notification, sample_template.template_type, 'mmg')
|
||||
dao_create_notification(notification, sample_template.template_type)
|
||||
assert Notification.query.get(notification.id).status == 'sending'
|
||||
assert update_notification_status_by_id(notification_id=notification.id, status='pending')
|
||||
assert Notification.query.get(notification.id).status == 'pending'
|
||||
@@ -95,7 +94,7 @@ def test_should_by_able_to_update_status_by_id_from_pending_to_delivered(sample_
|
||||
def test_should_by_able_to_update_status_by_id_from_pending_to_temporary_failure(sample_template, sample_job):
|
||||
data = _notification_json(sample_template, job_id=sample_job.id)
|
||||
notification = Notification(**data)
|
||||
dao_create_notification(notification, sample_template.template_type, 'mmg')
|
||||
dao_create_notification(notification, sample_template.template_type)
|
||||
assert Notification.query.get(notification.id).status == 'sending'
|
||||
assert update_notification_status_by_id(notification_id=notification.id, status='pending')
|
||||
assert Notification.query.get(notification.id).status == 'pending'
|
||||
@@ -114,7 +113,7 @@ def test_should_by_able_to_update_status_by_id_from_pending_to_temporary_failure
|
||||
def test_should_by_able_to_update_status_by_id_from_sending_to_permanent_failure(sample_template, sample_job):
|
||||
data = _notification_json(sample_template, job_id=sample_job.id)
|
||||
notification = Notification(**data)
|
||||
dao_create_notification(notification, sample_template.template_type, 'firetext')
|
||||
dao_create_notification(notification, sample_template.template_type)
|
||||
assert Notification.query.get(notification.id).status == 'sending'
|
||||
|
||||
assert update_notification_status_by_id(
|
||||
@@ -133,8 +132,7 @@ def test_should_not_update_status_one_notification_status_is_delivered(sample_em
|
||||
notification = Notification(**data)
|
||||
dao_create_notification(
|
||||
notification,
|
||||
sample_email_template.template_type,
|
||||
ses_provider.identifier)
|
||||
sample_email_template.template_type)
|
||||
|
||||
assert Notification.query.get(notification.id).status == "sending"
|
||||
update_provider_stats(
|
||||
@@ -163,7 +161,7 @@ def test_should_be_able_to_record_statistics_failure_for_sms(sample_notification
|
||||
def test_should_be_able_to_record_statistics_failure_for_email(sample_email_template, sample_job, ses_provider):
|
||||
data = _notification_json(sample_email_template, job_id=sample_job.id)
|
||||
notification = Notification(**data)
|
||||
dao_create_notification(notification, sample_email_template.template_type, ses_provider.identifier)
|
||||
dao_create_notification(notification, sample_email_template.template_type)
|
||||
|
||||
update_provider_stats(
|
||||
notification.id,
|
||||
@@ -190,7 +188,7 @@ def test_should_be_able_to_get_statistics_for_a_service(sample_template, mmg_pro
|
||||
data = _notification_json(sample_template)
|
||||
|
||||
notification = Notification(**data)
|
||||
dao_create_notification(notification, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification, sample_template.template_type)
|
||||
|
||||
_assert_notification_stats(notification.service_id, sms_requested=1,
|
||||
notification_created_at=notification.created_at.date())
|
||||
@@ -200,7 +198,7 @@ def test_should_be_able_to_get_statistics_for_a_service_for_a_day(sample_templat
|
||||
now = datetime.utcnow()
|
||||
data = _notification_json(sample_template)
|
||||
notification = Notification(**data)
|
||||
dao_create_notification(notification, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification, sample_template.template_type)
|
||||
stat = dao_get_notification_statistics_for_service_and_day(
|
||||
sample_template.service.id, now.date()
|
||||
)
|
||||
@@ -218,7 +216,7 @@ def test_should_return_none_if_no_statistics_for_a_service_for_a_day(sample_temp
|
||||
data = _notification_json(sample_template)
|
||||
|
||||
notification = Notification(**data)
|
||||
dao_create_notification(notification, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification, sample_template.template_type)
|
||||
assert not dao_get_notification_statistics_for_service_and_day(
|
||||
sample_template.service.id, (datetime.utcnow() - timedelta(days=1)).date())
|
||||
|
||||
@@ -229,9 +227,9 @@ def test_should_be_able_to_get_all_statistics_for_a_service(sample_template, mmg
|
||||
notification_1 = Notification(**data)
|
||||
notification_2 = Notification(**data)
|
||||
notification_3 = Notification(**data)
|
||||
dao_create_notification(notification_1, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification_2, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification_3, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification_1, sample_template.template_type)
|
||||
dao_create_notification(notification_2, sample_template.template_type)
|
||||
dao_create_notification(notification_3, sample_template.template_type)
|
||||
|
||||
_assert_notification_stats(sample_template.service.id, sms_requested=3)
|
||||
|
||||
@@ -249,9 +247,9 @@ def test_should_be_able_to_get_all_statistics_for_a_service_for_several_days(sam
|
||||
data.update({'created_at': two_days_ago})
|
||||
notification_3 = Notification(**data)
|
||||
|
||||
dao_create_notification(notification_1, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification_2, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification_3, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification_1, sample_template.template_type)
|
||||
dao_create_notification(notification_2, sample_template.template_type)
|
||||
dao_create_notification(notification_3, sample_template.template_type)
|
||||
|
||||
stats = dao_get_notification_statistics_for_service(sample_template.service.id)
|
||||
assert len(stats) == 3
|
||||
@@ -283,9 +281,9 @@ def test_should_be_able_to_get_all_statistics_for_a_service_for_several_days_pre
|
||||
notification_2 = Notification(**data)
|
||||
data.update({'created_at': eight_days_ago})
|
||||
notification_3 = Notification(**data)
|
||||
dao_create_notification(notification_1, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification_2, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification_3, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification_1, sample_template.template_type)
|
||||
dao_create_notification(notification_2, sample_template.template_type)
|
||||
dao_create_notification(notification_3, sample_template.template_type)
|
||||
|
||||
stats = dao_get_notification_statistics_for_service(sample_template.service.id, 7)
|
||||
assert len(stats) == 2
|
||||
@@ -305,7 +303,7 @@ def test_save_notification_creates_sms_and_template_stats(sample_template, sampl
|
||||
data = _notification_json(sample_template, job_id=sample_job.id)
|
||||
|
||||
notification = Notification(**data)
|
||||
dao_create_notification(notification, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification, sample_template.template_type)
|
||||
|
||||
assert Notification.query.count() == 1
|
||||
notification_from_db = Notification.query.all()[0]
|
||||
@@ -338,7 +336,7 @@ def test_save_notification_and_create_email_and_template_stats(sample_email_temp
|
||||
data = _notification_json(sample_email_template, job_id=sample_job.id)
|
||||
|
||||
notification = Notification(**data)
|
||||
dao_create_notification(notification, sample_email_template.template_type, ses_provider.identifier)
|
||||
dao_create_notification(notification, sample_email_template.template_type)
|
||||
|
||||
assert Notification.query.count() == 1
|
||||
notification_from_db = Notification.query.all()[0]
|
||||
@@ -372,7 +370,7 @@ def test_save_notification_handles_midnight_properly(sample_template, sample_job
|
||||
data = _notification_json(sample_template, sample_job.id)
|
||||
|
||||
notification = Notification(**data)
|
||||
dao_create_notification(notification, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification, sample_template.template_type)
|
||||
|
||||
assert Notification.query.count() == 1
|
||||
|
||||
@@ -388,7 +386,7 @@ def test_save_notification_handles_just_before_midnight_properly(sample_template
|
||||
data = _notification_json(sample_template, job_id=sample_job.id)
|
||||
|
||||
notification = Notification(**data)
|
||||
dao_create_notification(notification, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification, sample_template.template_type)
|
||||
|
||||
assert Notification.query.count() == 1
|
||||
|
||||
@@ -404,7 +402,7 @@ def test_save_notification_and_increment_email_stats(sample_email_template, samp
|
||||
|
||||
notification_1 = Notification(**data)
|
||||
notification_2 = Notification(**data)
|
||||
dao_create_notification(notification_1, sample_email_template.template_type, ses_provider.identifier)
|
||||
dao_create_notification(notification_1, sample_email_template.template_type)
|
||||
|
||||
assert Notification.query.count() == 1
|
||||
|
||||
@@ -414,7 +412,7 @@ def test_save_notification_and_increment_email_stats(sample_email_template, samp
|
||||
assert stats1.emails_requested == 1
|
||||
assert stats1.sms_requested == 0
|
||||
|
||||
dao_create_notification(notification_2, sample_email_template.template_type, ses_provider.identifier)
|
||||
dao_create_notification(notification_2, sample_email_template.template_type)
|
||||
|
||||
assert Notification.query.count() == 2
|
||||
|
||||
@@ -431,7 +429,7 @@ def test_save_notification_and_increment_sms_stats(sample_template, sample_job,
|
||||
|
||||
notification_1 = Notification(**data)
|
||||
notification_2 = Notification(**data)
|
||||
dao_create_notification(notification_1, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification_1, sample_template.template_type)
|
||||
|
||||
assert Notification.query.count() == 1
|
||||
|
||||
@@ -442,7 +440,7 @@ def test_save_notification_and_increment_sms_stats(sample_template, sample_job,
|
||||
assert stats1.emails_requested == 0
|
||||
assert stats1.sms_requested == 1
|
||||
|
||||
dao_create_notification(notification_2, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification_2, sample_template.template_type)
|
||||
|
||||
assert Notification.query.count() == 2
|
||||
|
||||
@@ -462,7 +460,7 @@ def test_not_save_notification_and_not_create_stats_on_commit_error(sample_templ
|
||||
|
||||
notification = Notification(**data)
|
||||
with pytest.raises(SQLAlchemyError):
|
||||
dao_create_notification(notification, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification, sample_template.template_type)
|
||||
|
||||
assert Notification.query.count() == 0
|
||||
assert Job.query.get(sample_job.id).notifications_sent == 0
|
||||
@@ -475,7 +473,7 @@ def test_save_notification_and_increment_job(sample_template, sample_job, mmg_pr
|
||||
data = _notification_json(sample_template, job_id=sample_job.id)
|
||||
|
||||
notification = Notification(**data)
|
||||
dao_create_notification(notification, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification, sample_template.template_type)
|
||||
|
||||
assert Notification.query.count() == 1
|
||||
notification_from_db = Notification.query.all()[0]
|
||||
@@ -490,7 +488,7 @@ def test_save_notification_and_increment_job(sample_template, sample_job, mmg_pr
|
||||
assert Job.query.get(sample_job.id).notifications_sent == 1
|
||||
|
||||
notification_2 = Notification(**data)
|
||||
dao_create_notification(notification_2, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification_2, sample_template.template_type)
|
||||
assert Notification.query.count() == 2
|
||||
# count is off because the count is defaulted to 1 in the sample_job
|
||||
_assert_job_stats(sample_job.id, sent=2, count=1)
|
||||
@@ -502,7 +500,7 @@ def test_should_not_increment_job_if_notification_fails_to_persist(sample_templa
|
||||
data = _notification_json(sample_template, job_id=sample_job.id, id=random_id)
|
||||
|
||||
notification_1 = Notification(**data)
|
||||
dao_create_notification(notification_1, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification_1, sample_template.template_type)
|
||||
|
||||
assert Notification.query.count() == 1
|
||||
assert Job.query.get(sample_job.id).notifications_sent == 1
|
||||
@@ -510,7 +508,7 @@ def test_should_not_increment_job_if_notification_fails_to_persist(sample_templa
|
||||
|
||||
notification_2 = Notification(**data)
|
||||
with pytest.raises(SQLAlchemyError):
|
||||
dao_create_notification(notification_2, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification_2, sample_template.template_type)
|
||||
|
||||
assert Notification.query.count() == 1
|
||||
assert Job.query.get(sample_job.id).notifications_sent == 1
|
||||
@@ -526,7 +524,7 @@ def test_save_notification_and_increment_correct_job(notify_db, notify_db_sessio
|
||||
data = _notification_json(sample_template, job_id=job_1.id)
|
||||
|
||||
notification = Notification(**data)
|
||||
dao_create_notification(notification, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification, sample_template.template_type)
|
||||
|
||||
assert Notification.query.count() == 1
|
||||
notification_from_db = Notification.query.all()[0]
|
||||
@@ -548,7 +546,7 @@ def test_save_notification_with_no_job(sample_template, mmg_provider):
|
||||
data = _notification_json(sample_template)
|
||||
|
||||
notification = Notification(**data)
|
||||
dao_create_notification(notification, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification, sample_template.template_type)
|
||||
|
||||
assert Notification.query.count() == 1
|
||||
notification_from_db = Notification.query.all()[0]
|
||||
@@ -573,7 +571,7 @@ def test_save_notification_no_job_id(sample_template, mmg_provider):
|
||||
data = _notification_json(sample_template)
|
||||
|
||||
notification = Notification(**data)
|
||||
dao_create_notification(notification, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification, sample_template.template_type)
|
||||
|
||||
assert Notification.query.count() == 1
|
||||
notification_from_db = Notification.query.all()[0]
|
||||
@@ -679,7 +677,7 @@ def test_save_new_notification_creates_template_stats(sample_template, sample_jo
|
||||
data = _notification_json(sample_template, job_id=sample_job.id)
|
||||
|
||||
notification = Notification(**data)
|
||||
dao_create_notification(notification, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification, sample_template.template_type)
|
||||
|
||||
assert TemplateStatistics.query.count() == 1
|
||||
template_stats = TemplateStatistics.query.filter(TemplateStatistics.service_id == sample_template.service.id,
|
||||
@@ -697,7 +695,7 @@ def test_save_new_notification_creates_template_stats_per_day(sample_template, s
|
||||
data = _notification_json(sample_template, job_id=sample_job.id)
|
||||
|
||||
notification = Notification(**data)
|
||||
dao_create_notification(notification, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification, sample_template.template_type)
|
||||
|
||||
assert TemplateStatistics.query.count() == 1
|
||||
template_stats = TemplateStatistics.query.filter(TemplateStatistics.service_id == sample_template.service.id,
|
||||
@@ -711,7 +709,7 @@ def test_save_new_notification_creates_template_stats_per_day(sample_template, s
|
||||
with freeze_time('2016-03-31'):
|
||||
assert TemplateStatistics.query.count() == 1
|
||||
new_notification = Notification(**data)
|
||||
dao_create_notification(new_notification, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(new_notification, sample_template.template_type)
|
||||
|
||||
assert TemplateStatistics.query.count() == 2
|
||||
first_stats = TemplateStatistics.query.filter(TemplateStatistics.day == datetime(2016, 3, 30)).first()
|
||||
@@ -734,7 +732,7 @@ def test_save_another_notification_increments_template_stats(sample_template, sa
|
||||
|
||||
notification_1 = Notification(**data)
|
||||
notification_2 = Notification(**data)
|
||||
dao_create_notification(notification_1, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification_1, sample_template.template_type)
|
||||
|
||||
assert TemplateStatistics.query.count() == 1
|
||||
template_stats = TemplateStatistics.query.filter(TemplateStatistics.service_id == sample_template.service.id,
|
||||
@@ -743,7 +741,7 @@ def test_save_another_notification_increments_template_stats(sample_template, sa
|
||||
assert template_stats.template_id == sample_template.id
|
||||
assert template_stats.usage_count == 1
|
||||
|
||||
dao_create_notification(notification_2, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification_2, sample_template.template_type)
|
||||
|
||||
assert TemplateStatistics.query.count() == 1
|
||||
template_stats = TemplateStatistics.query.filter(TemplateStatistics.service_id == sample_template.service.id,
|
||||
@@ -763,9 +761,9 @@ def test_successful_notification_inserts_followed_by_failure_does_not_increment_
|
||||
notification_1 = Notification(**data)
|
||||
notification_2 = Notification(**data)
|
||||
notification_3 = Notification(**data)
|
||||
dao_create_notification(notification_1, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification_2, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification_3, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification_1, sample_template.template_type)
|
||||
dao_create_notification(notification_2, sample_template.template_type)
|
||||
dao_create_notification(notification_3, sample_template.template_type)
|
||||
|
||||
_assert_notification_stats(sample_template.service.id, sms_requested=3)
|
||||
|
||||
@@ -780,32 +778,30 @@ def test_successful_notification_inserts_followed_by_failure_does_not_increment_
|
||||
try:
|
||||
# Mess up db in really bad way
|
||||
db.session.execute('DROP TABLE TEMPLATE_STATISTICS')
|
||||
dao_create_notification(failing_notification, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(failing_notification, sample_template.template_type)
|
||||
except Exception as e:
|
||||
# There should be no additional notification stats or counts
|
||||
_assert_notification_stats(sample_template.service.id, sms_requested=3)
|
||||
|
||||
|
||||
@freeze_time("2016-03-30")
|
||||
def test_get_template_stats_for_service_returns_stats_in_reverse_date_order(sample_template,
|
||||
sample_job,
|
||||
mmg_provider):
|
||||
def test_get_template_stats_for_service_returns_stats_in_reverse_date_order(sample_template, sample_job):
|
||||
template_stats = dao_get_template_statistics_for_service(sample_template.service.id)
|
||||
assert len(template_stats) == 0
|
||||
data = _notification_json(sample_template, job_id=sample_job.id)
|
||||
|
||||
notification = Notification(**data)
|
||||
dao_create_notification(notification, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(notification, sample_template.template_type)
|
||||
|
||||
# move on one day
|
||||
with freeze_time('2016-03-31'):
|
||||
new_notification = Notification(**data)
|
||||
dao_create_notification(new_notification, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(new_notification, sample_template.template_type)
|
||||
|
||||
# move on one more day
|
||||
with freeze_time('2016-04-01'):
|
||||
new_notification = Notification(**data)
|
||||
dao_create_notification(new_notification, sample_template.template_type, mmg_provider.identifier)
|
||||
dao_create_notification(new_notification, sample_template.template_type)
|
||||
|
||||
template_stats = dao_get_template_statistics_for_service(sample_template.service_id)
|
||||
assert len(template_stats) == 3
|
||||
|
||||
@@ -44,21 +44,18 @@ def test_should_update_provider_statistics_sms_multi(notify_db,
|
||||
notify_db,
|
||||
notify_db_session,
|
||||
template=sample_template,
|
||||
provider_name=mmg_provider.identifier,
|
||||
content_char_count=160)
|
||||
update_provider_stats(n1.id, 'sms', mmg_provider.identifier)
|
||||
n2 = create_sample_notification(
|
||||
notify_db,
|
||||
notify_db_session,
|
||||
template=sample_template,
|
||||
provider_name=mmg_provider.identifier,
|
||||
content_char_count=161)
|
||||
update_provider_stats(n2.id, 'sms', mmg_provider.identifier)
|
||||
n3 = create_sample_notification(
|
||||
notify_db,
|
||||
notify_db_session,
|
||||
template=sample_template,
|
||||
provider_name=mmg_provider.identifier,
|
||||
content_char_count=307)
|
||||
update_provider_stats(n3.id, 'sms', mmg_provider.identifier)
|
||||
provider_stats = get_provider_statistics(
|
||||
@@ -74,20 +71,17 @@ def test_should_update_provider_statistics_email_multi(notify_db,
|
||||
n1 = create_sample_notification(
|
||||
notify_db,
|
||||
notify_db_session,
|
||||
template=sample_email_template,
|
||||
provider_name=ses_provider.identifier)
|
||||
template=sample_email_template)
|
||||
update_provider_stats(n1.id, 'email', ses_provider.identifier)
|
||||
n2 = create_sample_notification(
|
||||
notify_db,
|
||||
notify_db_session,
|
||||
template=sample_email_template,
|
||||
provider_name=ses_provider.identifier)
|
||||
template=sample_email_template)
|
||||
update_provider_stats(n2.id, 'email', ses_provider.identifier)
|
||||
n3 = create_sample_notification(
|
||||
notify_db,
|
||||
notify_db_session,
|
||||
template=sample_email_template,
|
||||
provider_name=ses_provider.identifier)
|
||||
template=sample_email_template)
|
||||
update_provider_stats(n3.id, 'email', ses_provider.identifier)
|
||||
provider_stats = get_provider_statistics(
|
||||
sample_email_template.service,
|
||||
|
||||
Reference in New Issue
Block a user