2017-06-20 17:13:40 +01:00
|
|
|
|
import json
|
2016-02-16 17:17:02 +00:00
|
|
|
|
import uuid
|
2017-10-16 12:32:44 +01:00
|
|
|
|
from datetime import datetime, timedelta
|
2017-03-30 10:38:41 +01:00
|
|
|
|
from unittest.mock import Mock
|
2017-11-27 15:11:58 +00:00
|
|
|
|
|
2017-01-17 16:51:27 +00:00
|
|
|
|
import pytest
|
2017-06-20 17:13:40 +01:00
|
|
|
|
import requests_mock
|
2016-06-20 13:33:53 +01:00
|
|
|
|
from freezegun import freeze_time
|
2017-11-15 11:43:52 +00:00
|
|
|
|
from requests import RequestException
|
2016-06-20 13:33:53 +01:00
|
|
|
|
from sqlalchemy.exc import SQLAlchemyError
|
2017-12-11 11:00:27 +00:00
|
|
|
|
from celery.exceptions import Retry
|
2018-03-02 14:12:38 +00:00
|
|
|
|
from notifications_utils.template import SMSMessageTemplate, WithSubjectTemplate
|
2018-03-05 15:55:46 +00:00
|
|
|
|
from notifications_utils.columns import Row
|
2017-01-17 16:51:27 +00:00
|
|
|
|
|
2016-08-05 10:44:43 +01:00
|
|
|
|
from app import (encryption, DATETIME_FORMAT)
|
2016-06-07 12:53:31 +01:00
|
|
|
|
from app.celery import provider_tasks
|
2016-06-20 13:33:53 +01:00
|
|
|
|
from app.celery import tasks
|
2017-10-16 12:32:44 +01:00
|
|
|
|
from app.celery.scheduled_tasks import check_job_status
|
2016-03-09 17:46:01 +00:00
|
|
|
|
from app.celery.tasks import (
|
|
|
|
|
|
process_job,
|
2017-01-17 16:51:27 +00:00
|
|
|
|
process_row,
|
2017-10-18 17:00:37 +01:00
|
|
|
|
save_sms,
|
|
|
|
|
|
save_email,
|
|
|
|
|
|
save_letter,
|
2017-10-16 12:32:44 +01:00
|
|
|
|
process_incomplete_job,
|
|
|
|
|
|
process_incomplete_jobs,
|
2017-04-06 17:16:08 +01:00
|
|
|
|
get_template_class,
|
2017-10-16 12:32:44 +01:00
|
|
|
|
s3,
|
2017-12-01 14:06:13 +00:00
|
|
|
|
send_inbound_sms_to_service,
|
|
|
|
|
|
)
|
2017-08-29 12:24:17 +01:00
|
|
|
|
from app.config import QueueNames
|
2018-02-13 18:38:32 +00:00
|
|
|
|
from app.dao import jobs_dao, services_dao
|
2017-04-05 11:57:56 +01:00
|
|
|
|
from app.models import (
|
2017-10-16 12:32:44 +01:00
|
|
|
|
Job,
|
|
|
|
|
|
Notification,
|
2017-09-26 15:06:09 +01:00
|
|
|
|
EMAIL_TYPE,
|
|
|
|
|
|
KEY_TYPE_NORMAL,
|
2017-04-05 11:57:56 +01:00
|
|
|
|
KEY_TYPE_TEAM,
|
|
|
|
|
|
KEY_TYPE_TEST,
|
2017-10-17 11:07:36 +01:00
|
|
|
|
JOB_STATUS_FINISHED,
|
|
|
|
|
|
JOB_STATUS_IN_PROGRESS,
|
2017-04-05 11:57:56 +01:00
|
|
|
|
LETTER_TYPE,
|
2017-10-16 12:32:44 +01:00
|
|
|
|
SMS_TYPE
|
2017-09-26 15:06:09 +01:00
|
|
|
|
)
|
2017-01-17 16:51:27 +00:00
|
|
|
|
|
2016-02-24 17:12:30 +00:00
|
|
|
|
from tests.app import load_example_csv
|
2016-03-03 12:05:18 +00:00
|
|
|
|
from tests.app.conftest import (
|
2017-09-21 11:50:49 +01:00
|
|
|
|
sample_service as create_sample_service,
|
|
|
|
|
|
sample_template as create_sample_template,
|
|
|
|
|
|
sample_job as create_sample_job,
|
|
|
|
|
|
sample_email_template as create_sample_email_template,
|
2017-11-27 11:33:04 +00:00
|
|
|
|
sample_notification as create_sample_notification,
|
2016-03-03 12:05:18 +00:00
|
|
|
|
)
|
2017-09-26 15:06:09 +01:00
|
|
|
|
from tests.app.db import (
|
|
|
|
|
|
create_inbound_sms,
|
|
|
|
|
|
create_job,
|
|
|
|
|
|
create_letter_contact,
|
|
|
|
|
|
create_notification,
|
|
|
|
|
|
create_service_inbound_api,
|
|
|
|
|
|
create_service,
|
|
|
|
|
|
create_template,
|
2017-11-25 11:31:36 +00:00
|
|
|
|
create_user,
|
2017-11-27 11:33:04 +00:00
|
|
|
|
create_reply_to_email,
|
2017-12-01 14:06:13 +00:00
|
|
|
|
create_service_with_defined_sms_sender,
|
2017-11-27 11:33:04 +00:00
|
|
|
|
)
|
2018-01-26 14:05:09 +00:00
|
|
|
|
from tests.conftest import set_config_values
|
2016-02-24 17:12:30 +00:00
|
|
|
|
|
|
|
|
|
|
|
2016-03-18 11:47:01 +00:00
|
|
|
|
class AnyStringWith(str):
|
|
|
|
|
|
def __eq__(self, other):
|
|
|
|
|
|
return self in other
|
|
|
|
|
|
|
2016-05-10 09:04:22 +01:00
|
|
|
|
|
2016-04-06 14:31:33 +01:00
|
|
|
|
mmg_error = {'Error': '40', 'Description': 'error'}
|
|
|
|
|
|
|
2016-03-10 15:40:41 +00:00
|
|
|
|
|
persist_letter saves address correctly to database
the `to` field stores either the phone number or the email address
of the recipient - it's a bit more complicated for letters, since
there are address lines 1 through 6, and a postcode. In utils, they're
stored alongside the personalisation, and we have to ensure that when
we persist to the database we keep as much parity with utils to make
our work easier. Aside from sending, the `to` field is also used to
show recipients on the front end report pages - we've decided that the
best thing to store here is address_line_1 - which is probably going to
be either a person's name, company name, or PO box number
Also, a lot of tests and test cleanup - I added create_template and
create_notification functions in db.py, so if you're creating new
fixtures you can use these functions, and you won't need to pass
notify_db and notify_db_session around, huzzah!
also removed create param from sample_notification since it's not used
anywhere
2017-01-19 12:10:32 +00:00
|
|
|
|
def _notification_json(template, to, personalisation=None, job_id=None, row_number=0):
|
|
|
|
|
|
return {
|
2016-06-20 16:23:56 +01:00
|
|
|
|
"template": str(template.id),
|
|
|
|
|
|
"template_version": template.version,
|
|
|
|
|
|
"to": to,
|
persist_letter saves address correctly to database
the `to` field stores either the phone number or the email address
of the recipient - it's a bit more complicated for letters, since
there are address lines 1 through 6, and a postcode. In utils, they're
stored alongside the personalisation, and we have to ensure that when
we persist to the database we keep as much parity with utils to make
our work easier. Aside from sending, the `to` field is also used to
show recipients on the front end report pages - we've decided that the
best thing to store here is address_line_1 - which is probably going to
be either a person's name, company name, or PO box number
Also, a lot of tests and test cleanup - I added create_template and
create_notification functions in db.py, so if you're creating new
fixtures you can use these functions, and you won't need to pass
notify_db and notify_db_session around, huzzah!
also removed create param from sample_notification since it's not used
anywhere
2017-01-19 12:10:32 +00:00
|
|
|
|
"notification_type": template.template_type,
|
|
|
|
|
|
"personalisation": personalisation or {},
|
|
|
|
|
|
"job": job_id and str(job_id),
|
|
|
|
|
|
"row_number": row_number
|
2016-06-20 16:23:56 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2016-08-05 10:44:43 +01:00
|
|
|
|
def test_should_have_decorated_tasks_functions():
|
|
|
|
|
|
assert process_job.__wrapped__.__name__ == 'process_job'
|
2017-10-18 17:00:37 +01:00
|
|
|
|
assert save_sms.__wrapped__.__name__ == 'save_sms'
|
|
|
|
|
|
assert save_email.__wrapped__.__name__ == 'save_email'
|
|
|
|
|
|
assert save_letter.__wrapped__.__name__ == 'save_letter'
|
2016-08-05 10:44:43 +01:00
|
|
|
|
|
|
|
|
|
|
|
2017-01-17 12:00:34 +00:00
|
|
|
|
@pytest.fixture
|
|
|
|
|
|
def email_job_with_placeholders(notify_db, notify_db_session, sample_email_template_with_placeholders):
|
2017-09-21 11:50:49 +01:00
|
|
|
|
return create_sample_job(notify_db, notify_db_session, template=sample_email_template_with_placeholders)
|
2017-01-17 12:00:34 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# -------------- process_job tests -------------- #
|
|
|
|
|
|
|
|
|
|
|
|
|
2016-09-07 15:35:12 +01:00
|
|
|
|
def test_should_process_sms_job(sample_job, mocker):
|
2016-02-24 17:12:30 +00:00
|
|
|
|
mocker.patch('app.celery.tasks.s3.get_job_from_s3', return_value=load_example_csv('sms'))
|
2017-10-18 17:00:37 +01:00
|
|
|
|
mocker.patch('app.celery.tasks.save_sms.apply_async')
|
2016-02-24 17:12:30 +00:00
|
|
|
|
mocker.patch('app.encryption.encrypt', return_value="something_encrypted")
|
|
|
|
|
|
mocker.patch('app.celery.tasks.create_uuid', return_value="uuid")
|
|
|
|
|
|
|
|
|
|
|
|
process_job(sample_job.id)
|
2016-04-07 13:44:04 +01:00
|
|
|
|
s3.get_job_from_s3.assert_called_once_with(
|
|
|
|
|
|
str(sample_job.service.id),
|
|
|
|
|
|
str(sample_job.id)
|
|
|
|
|
|
)
|
2016-03-09 07:27:26 +00:00
|
|
|
|
assert encryption.encrypt.call_args[0][0]['to'] == '+441234123123'
|
2016-05-13 16:25:05 +01:00
|
|
|
|
assert encryption.encrypt.call_args[0][0]['template'] == str(sample_job.template.id)
|
|
|
|
|
|
assert encryption.encrypt.call_args[0][0]['template_version'] == sample_job.template.version
|
2016-11-30 17:22:03 +00:00
|
|
|
|
assert encryption.encrypt.call_args[0][0]['personalisation'] == {'phonenumber': '+441234123123'}
|
2016-05-19 10:46:03 +01:00
|
|
|
|
assert encryption.encrypt.call_args[0][0]['row_number'] == 0
|
2017-10-18 17:00:37 +01:00
|
|
|
|
tasks.save_sms.apply_async.assert_called_once_with(
|
2016-02-24 17:12:30 +00:00
|
|
|
|
(str(sample_job.service_id),
|
|
|
|
|
|
"uuid",
|
2017-10-18 17:00:37 +01:00
|
|
|
|
"something_encrypted"),
|
2017-05-25 10:51:49 +01:00
|
|
|
|
queue="database-tasks"
|
2016-02-24 17:12:30 +00:00
|
|
|
|
)
|
|
|
|
|
|
job = jobs_dao.dao_get_job_by_id(sample_job.id)
|
2016-10-05 14:56:32 +01:00
|
|
|
|
assert job.job_status == 'finished'
|
2016-02-24 17:12:30 +00:00
|
|
|
|
|
|
|
|
|
|
|
2016-03-09 11:28:52 +00:00
|
|
|
|
@freeze_time("2016-01-01 11:09:00.061258")
|
2016-04-05 14:28:19 +01:00
|
|
|
|
def test_should_not_process_sms_job_if_would_exceed_send_limits(notify_db,
|
|
|
|
|
|
notify_db_session,
|
2016-09-07 15:35:12 +01:00
|
|
|
|
mocker):
|
2017-09-21 11:50:49 +01:00
|
|
|
|
service = create_sample_service(notify_db, notify_db_session, limit=9)
|
|
|
|
|
|
job = create_sample_job(notify_db, notify_db_session, service=service, notification_count=10)
|
2016-03-09 11:28:52 +00:00
|
|
|
|
|
|
|
|
|
|
mocker.patch('app.celery.tasks.s3.get_job_from_s3', return_value=load_example_csv('multiple_sms'))
|
2017-01-17 12:00:34 +00:00
|
|
|
|
mocker.patch('app.celery.tasks.process_row')
|
2016-03-09 11:28:52 +00:00
|
|
|
|
|
|
|
|
|
|
process_job(job.id)
|
|
|
|
|
|
|
|
|
|
|
|
job = jobs_dao.dao_get_job_by_id(job.id)
|
2016-10-05 14:56:32 +01:00
|
|
|
|
assert job.job_status == 'sending limits exceeded'
|
2016-10-07 12:48:58 +01:00
|
|
|
|
assert s3.get_job_from_s3.called is False
|
2017-01-17 12:00:34 +00:00
|
|
|
|
assert tasks.process_row.called is False
|
2016-03-09 13:57:53 +00:00
|
|
|
|
|
|
|
|
|
|
|
2016-04-05 14:28:19 +01:00
|
|
|
|
def test_should_not_process_sms_job_if_would_exceed_send_limits_inc_today(notify_db,
|
|
|
|
|
|
notify_db_session,
|
2016-09-07 15:35:12 +01:00
|
|
|
|
mocker):
|
2017-09-21 11:50:49 +01:00
|
|
|
|
service = create_sample_service(notify_db, notify_db_session, limit=1)
|
|
|
|
|
|
job = create_sample_job(notify_db, notify_db_session, service=service)
|
2016-03-09 13:57:53 +00:00
|
|
|
|
|
2017-09-21 11:50:49 +01:00
|
|
|
|
create_sample_notification(notify_db, notify_db_session, service=service, job=job)
|
2016-03-09 13:57:53 +00:00
|
|
|
|
|
|
|
|
|
|
mocker.patch('app.celery.tasks.s3.get_job_from_s3', return_value=load_example_csv('sms'))
|
2017-01-17 12:00:34 +00:00
|
|
|
|
mocker.patch('app.celery.tasks.process_row')
|
2016-03-09 13:57:53 +00:00
|
|
|
|
|
|
|
|
|
|
process_job(job.id)
|
|
|
|
|
|
|
|
|
|
|
|
job = jobs_dao.dao_get_job_by_id(job.id)
|
2016-10-05 14:56:32 +01:00
|
|
|
|
assert job.job_status == 'sending limits exceeded'
|
2016-10-07 12:48:58 +01:00
|
|
|
|
assert s3.get_job_from_s3.called is False
|
2017-01-17 12:00:34 +00:00
|
|
|
|
assert tasks.process_row.called is False
|
2016-03-09 13:57:53 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_should_not_process_email_job_if_would_exceed_send_limits_inc_today(notify_db, notify_db_session, mocker):
|
2017-09-21 11:50:49 +01:00
|
|
|
|
service = create_sample_service(notify_db, notify_db_session, limit=1)
|
|
|
|
|
|
template = create_sample_email_template(notify_db, notify_db_session, service=service)
|
|
|
|
|
|
job = create_sample_job(notify_db, notify_db_session, service=service, template=template)
|
2016-03-09 13:57:53 +00:00
|
|
|
|
|
2017-09-21 11:50:49 +01:00
|
|
|
|
create_sample_notification(notify_db, notify_db_session, service=service, job=job)
|
2016-03-09 13:57:53 +00:00
|
|
|
|
|
2017-01-17 12:00:34 +00:00
|
|
|
|
mocker.patch('app.celery.tasks.s3.get_job_from_s3')
|
|
|
|
|
|
mocker.patch('app.celery.tasks.process_row')
|
2016-03-09 13:57:53 +00:00
|
|
|
|
|
|
|
|
|
|
process_job(job.id)
|
|
|
|
|
|
|
|
|
|
|
|
job = jobs_dao.dao_get_job_by_id(job.id)
|
2016-10-05 14:56:32 +01:00
|
|
|
|
assert job.job_status == 'sending limits exceeded'
|
2016-10-07 12:48:58 +01:00
|
|
|
|
assert s3.get_job_from_s3.called is False
|
2017-01-17 12:00:34 +00:00
|
|
|
|
assert tasks.process_row.called is False
|
2016-03-09 11:28:52 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@freeze_time("2016-01-01 11:09:00.061258")
|
2016-03-09 14:49:14 +00:00
|
|
|
|
def test_should_not_process_email_job_if_would_exceed_send_limits(notify_db, notify_db_session, mocker):
|
2017-09-21 11:50:49 +01:00
|
|
|
|
service = create_sample_service(notify_db, notify_db_session, limit=0)
|
|
|
|
|
|
template = create_sample_email_template(notify_db, notify_db_session, service=service)
|
|
|
|
|
|
job = create_sample_job(notify_db, notify_db_session, service=service, template=template)
|
2016-03-09 11:28:52 +00:00
|
|
|
|
|
2016-10-07 12:48:58 +01:00
|
|
|
|
mocker.patch('app.celery.tasks.s3.get_job_from_s3')
|
2017-01-17 12:00:34 +00:00
|
|
|
|
mocker.patch('app.celery.tasks.process_row')
|
2016-03-09 11:28:52 +00:00
|
|
|
|
|
|
|
|
|
|
process_job(job.id)
|
|
|
|
|
|
|
|
|
|
|
|
job = jobs_dao.dao_get_job_by_id(job.id)
|
2016-10-05 14:56:32 +01:00
|
|
|
|
assert job.job_status == 'sending limits exceeded'
|
2016-10-07 12:48:58 +01:00
|
|
|
|
assert s3.get_job_from_s3.called is False
|
2017-01-17 12:00:34 +00:00
|
|
|
|
assert tasks.process_row.called is False
|
2016-03-09 11:28:52 +00:00
|
|
|
|
|
|
|
|
|
|
|
2016-10-07 12:55:48 +01:00
|
|
|
|
def test_should_not_process_job_if_already_pending(notify_db, notify_db_session, mocker):
|
2017-09-21 11:50:49 +01:00
|
|
|
|
job = create_sample_job(notify_db, notify_db_session, job_status='scheduled')
|
2016-10-07 12:55:48 +01:00
|
|
|
|
|
|
|
|
|
|
mocker.patch('app.celery.tasks.s3.get_job_from_s3')
|
2017-01-17 12:00:34 +00:00
|
|
|
|
mocker.patch('app.celery.tasks.process_row')
|
2016-10-07 12:55:48 +01:00
|
|
|
|
|
|
|
|
|
|
process_job(job.id)
|
|
|
|
|
|
|
|
|
|
|
|
assert s3.get_job_from_s3.called is False
|
2017-01-17 12:00:34 +00:00
|
|
|
|
assert tasks.process_row.called is False
|
2016-10-07 12:55:48 +01:00
|
|
|
|
|
|
|
|
|
|
|
2016-04-25 16:37:55 +01:00
|
|
|
|
def test_should_process_email_job_if_exactly_on_send_limits(notify_db,
|
|
|
|
|
|
notify_db_session,
|
2016-09-07 15:35:12 +01:00
|
|
|
|
mocker):
|
2017-09-21 11:50:49 +01:00
|
|
|
|
service = create_sample_service(notify_db, notify_db_session, limit=10)
|
|
|
|
|
|
template = create_sample_email_template(notify_db, notify_db_session, service=service)
|
|
|
|
|
|
job = create_sample_job(notify_db, notify_db_session, service=service, template=template, notification_count=10)
|
2016-03-09 11:35:12 +00:00
|
|
|
|
|
|
|
|
|
|
mocker.patch('app.celery.tasks.s3.get_job_from_s3', return_value=load_example_csv('multiple_email'))
|
2017-10-18 17:00:37 +01:00
|
|
|
|
mocker.patch('app.celery.tasks.save_email.apply_async')
|
2016-03-09 11:35:12 +00:00
|
|
|
|
mocker.patch('app.encryption.encrypt', return_value="something_encrypted")
|
|
|
|
|
|
mocker.patch('app.celery.tasks.create_uuid', return_value="uuid")
|
|
|
|
|
|
|
|
|
|
|
|
process_job(job.id)
|
|
|
|
|
|
|
2016-04-07 13:44:04 +01:00
|
|
|
|
s3.get_job_from_s3.assert_called_once_with(
|
|
|
|
|
|
str(job.service.id),
|
|
|
|
|
|
str(job.id)
|
|
|
|
|
|
)
|
2016-03-09 11:35:12 +00:00
|
|
|
|
job = jobs_dao.dao_get_job_by_id(job.id)
|
2016-10-05 14:56:32 +01:00
|
|
|
|
assert job.job_status == 'finished'
|
2017-10-18 17:00:37 +01:00
|
|
|
|
tasks.save_email.apply_async.assert_called_with(
|
2016-04-25 16:37:55 +01:00
|
|
|
|
(
|
|
|
|
|
|
str(job.service_id),
|
|
|
|
|
|
"uuid",
|
|
|
|
|
|
"something_encrypted",
|
|
|
|
|
|
),
|
2017-05-25 10:51:49 +01:00
|
|
|
|
queue="database-tasks"
|
2016-03-09 11:35:12 +00:00
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
def test_should_not_create_save_task_for_empty_file(sample_job, mocker):
|
2016-02-25 09:59:50 +00:00
|
|
|
|
mocker.patch('app.celery.tasks.s3.get_job_from_s3', return_value=load_example_csv('empty'))
|
2017-10-18 17:00:37 +01:00
|
|
|
|
mocker.patch('app.celery.tasks.save_sms.apply_async')
|
2016-02-25 09:59:50 +00:00
|
|
|
|
|
|
|
|
|
|
process_job(sample_job.id)
|
|
|
|
|
|
|
2016-04-07 13:44:04 +01:00
|
|
|
|
s3.get_job_from_s3.assert_called_once_with(
|
|
|
|
|
|
str(sample_job.service.id),
|
|
|
|
|
|
str(sample_job.id)
|
|
|
|
|
|
)
|
2016-02-25 09:59:50 +00:00
|
|
|
|
job = jobs_dao.dao_get_job_by_id(sample_job.id)
|
2016-10-05 14:56:32 +01:00
|
|
|
|
assert job.job_status == 'finished'
|
2017-10-18 17:00:37 +01:00
|
|
|
|
assert tasks.save_sms.apply_async.called is False
|
2016-12-22 14:40:33 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_should_process_email_job(email_job_with_placeholders, mocker):
|
|
|
|
|
|
email_csv = """email_address,name
|
|
|
|
|
|
test@test.com,foo
|
|
|
|
|
|
"""
|
|
|
|
|
|
mocker.patch('app.celery.tasks.s3.get_job_from_s3', return_value=email_csv)
|
2017-10-18 17:00:37 +01:00
|
|
|
|
mocker.patch('app.celery.tasks.save_email.apply_async')
|
2016-02-25 09:59:50 +00:00
|
|
|
|
mocker.patch('app.encryption.encrypt', return_value="something_encrypted")
|
|
|
|
|
|
mocker.patch('app.celery.tasks.create_uuid', return_value="uuid")
|
|
|
|
|
|
|
2016-12-22 14:40:33 +00:00
|
|
|
|
process_job(email_job_with_placeholders.id)
|
2016-02-25 09:59:50 +00:00
|
|
|
|
|
2016-04-07 13:44:04 +01:00
|
|
|
|
s3.get_job_from_s3.assert_called_once_with(
|
2016-12-22 14:40:33 +00:00
|
|
|
|
str(email_job_with_placeholders.service.id),
|
|
|
|
|
|
str(email_job_with_placeholders.id)
|
2016-04-07 13:44:04 +01:00
|
|
|
|
)
|
2016-03-09 07:27:26 +00:00
|
|
|
|
assert encryption.encrypt.call_args[0][0]['to'] == 'test@test.com'
|
2016-12-22 14:40:33 +00:00
|
|
|
|
assert encryption.encrypt.call_args[0][0]['template'] == str(email_job_with_placeholders.template.id)
|
|
|
|
|
|
assert encryption.encrypt.call_args[0][0]['template_version'] == email_job_with_placeholders.template.version
|
|
|
|
|
|
assert encryption.encrypt.call_args[0][0]['personalisation'] == {'emailaddress': 'test@test.com', 'name': 'foo'}
|
2017-10-18 17:00:37 +01:00
|
|
|
|
tasks.save_email.apply_async.assert_called_once_with(
|
2016-04-25 16:37:55 +01:00
|
|
|
|
(
|
2016-12-22 14:40:33 +00:00
|
|
|
|
str(email_job_with_placeholders.service_id),
|
2016-04-25 16:37:55 +01:00
|
|
|
|
"uuid",
|
|
|
|
|
|
"something_encrypted",
|
|
|
|
|
|
),
|
2017-05-25 10:51:49 +01:00
|
|
|
|
queue="database-tasks"
|
2016-02-25 09:59:50 +00:00
|
|
|
|
)
|
2016-12-22 14:40:33 +00:00
|
|
|
|
job = jobs_dao.dao_get_job_by_id(email_job_with_placeholders.id)
|
2016-10-05 14:56:32 +01:00
|
|
|
|
assert job.job_status == 'finished'
|
2016-02-25 09:59:50 +00:00
|
|
|
|
|
|
|
|
|
|
|
persist_letter saves address correctly to database
the `to` field stores either the phone number or the email address
of the recipient - it's a bit more complicated for letters, since
there are address lines 1 through 6, and a postcode. In utils, they're
stored alongside the personalisation, and we have to ensure that when
we persist to the database we keep as much parity with utils to make
our work easier. Aside from sending, the `to` field is also used to
show recipients on the front end report pages - we've decided that the
best thing to store here is address_line_1 - which is probably going to
be either a person's name, company name, or PO box number
Also, a lot of tests and test cleanup - I added create_template and
create_notification functions in db.py, so if you're creating new
fixtures you can use these functions, and you won't need to pass
notify_db and notify_db_session around, huzzah!
also removed create param from sample_notification since it's not used
anywhere
2017-01-19 12:10:32 +00:00
|
|
|
|
@freeze_time("2016-01-01 11:09:00.061258")
|
|
|
|
|
|
def test_should_process_letter_job(sample_letter_job, mocker):
|
|
|
|
|
|
csv = """address_line_1,address_line_2,address_line_3,address_line_4,postcode,name
|
|
|
|
|
|
A1,A2,A3,A4,A_POST,Alice
|
|
|
|
|
|
"""
|
|
|
|
|
|
s3_mock = mocker.patch('app.celery.tasks.s3.get_job_from_s3', return_value=csv)
|
|
|
|
|
|
process_row_mock = mocker.patch('app.celery.tasks.process_row')
|
|
|
|
|
|
mocker.patch('app.celery.tasks.create_uuid', return_value="uuid")
|
|
|
|
|
|
|
|
|
|
|
|
process_job(sample_letter_job.id)
|
|
|
|
|
|
|
|
|
|
|
|
s3_mock.assert_called_once_with(
|
|
|
|
|
|
str(sample_letter_job.service.id),
|
|
|
|
|
|
str(sample_letter_job.id)
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
row_call = process_row_mock.mock_calls[0][1]
|
2018-03-05 15:55:46 +00:00
|
|
|
|
assert row_call[0].index == 0
|
|
|
|
|
|
assert row_call[0].recipient == ['A1', 'A2', 'A3', 'A4', None, None, 'A_POST']
|
|
|
|
|
|
assert row_call[0].personalisation == {
|
persist_letter saves address correctly to database
the `to` field stores either the phone number or the email address
of the recipient - it's a bit more complicated for letters, since
there are address lines 1 through 6, and a postcode. In utils, they're
stored alongside the personalisation, and we have to ensure that when
we persist to the database we keep as much parity with utils to make
our work easier. Aside from sending, the `to` field is also used to
show recipients on the front end report pages - we've decided that the
best thing to store here is address_line_1 - which is probably going to
be either a person's name, company name, or PO box number
Also, a lot of tests and test cleanup - I added create_template and
create_notification functions in db.py, so if you're creating new
fixtures you can use these functions, and you won't need to pass
notify_db and notify_db_session around, huzzah!
also removed create param from sample_notification since it's not used
anywhere
2017-01-19 12:10:32 +00:00
|
|
|
|
'addressline1': 'A1',
|
|
|
|
|
|
'addressline2': 'A2',
|
|
|
|
|
|
'addressline3': 'A3',
|
|
|
|
|
|
'addressline4': 'A4',
|
|
|
|
|
|
'postcode': 'A_POST'
|
|
|
|
|
|
}
|
2018-03-05 15:55:46 +00:00
|
|
|
|
assert row_call[2] == sample_letter_job
|
|
|
|
|
|
assert row_call[3] == sample_letter_job.service
|
persist_letter saves address correctly to database
the `to` field stores either the phone number or the email address
of the recipient - it's a bit more complicated for letters, since
there are address lines 1 through 6, and a postcode. In utils, they're
stored alongside the personalisation, and we have to ensure that when
we persist to the database we keep as much parity with utils to make
our work easier. Aside from sending, the `to` field is also used to
show recipients on the front end report pages - we've decided that the
best thing to store here is address_line_1 - which is probably going to
be either a person's name, company name, or PO box number
Also, a lot of tests and test cleanup - I added create_template and
create_notification functions in db.py, so if you're creating new
fixtures you can use these functions, and you won't need to pass
notify_db and notify_db_session around, huzzah!
also removed create param from sample_notification since it's not used
anywhere
2017-01-19 12:10:32 +00:00
|
|
|
|
|
|
|
|
|
|
assert process_row_mock.call_count == 1
|
|
|
|
|
|
|
2018-02-13 18:38:32 +00:00
|
|
|
|
assert sample_letter_job.job_status == 'finished'
|
persist_letter saves address correctly to database
the `to` field stores either the phone number or the email address
of the recipient - it's a bit more complicated for letters, since
there are address lines 1 through 6, and a postcode. In utils, they're
stored alongside the personalisation, and we have to ensure that when
we persist to the database we keep as much parity with utils to make
our work easier. Aside from sending, the `to` field is also used to
show recipients on the front end report pages - we've decided that the
best thing to store here is address_line_1 - which is probably going to
be either a person's name, company name, or PO box number
Also, a lot of tests and test cleanup - I added create_template and
create_notification functions in db.py, so if you're creating new
fixtures you can use these functions, and you won't need to pass
notify_db and notify_db_session around, huzzah!
also removed create param from sample_notification since it's not used
anywhere
2017-01-19 12:10:32 +00:00
|
|
|
|
|
|
|
|
|
|
|
2017-04-05 11:57:56 +01:00
|
|
|
|
def test_should_process_all_sms_job(sample_job_with_placeholdered_template,
|
2016-09-07 15:35:12 +01:00
|
|
|
|
mocker):
|
2016-02-24 17:12:30 +00:00
|
|
|
|
mocker.patch('app.celery.tasks.s3.get_job_from_s3', return_value=load_example_csv('multiple_sms'))
|
2017-10-18 17:00:37 +01:00
|
|
|
|
mocker.patch('app.celery.tasks.save_sms.apply_async')
|
2016-02-24 17:12:30 +00:00
|
|
|
|
mocker.patch('app.encryption.encrypt', return_value="something_encrypted")
|
|
|
|
|
|
mocker.patch('app.celery.tasks.create_uuid', return_value="uuid")
|
|
|
|
|
|
|
2016-03-09 07:27:26 +00:00
|
|
|
|
process_job(sample_job_with_placeholdered_template.id)
|
2016-02-24 17:12:30 +00:00
|
|
|
|
|
2016-03-09 07:27:26 +00:00
|
|
|
|
s3.get_job_from_s3.assert_called_once_with(
|
2016-04-07 13:44:04 +01:00
|
|
|
|
str(sample_job_with_placeholdered_template.service.id),
|
|
|
|
|
|
str(sample_job_with_placeholdered_template.id)
|
2016-03-09 07:27:26 +00:00
|
|
|
|
)
|
|
|
|
|
|
assert encryption.encrypt.call_args[0][0]['to'] == '+441234123120'
|
2016-05-13 16:25:05 +01:00
|
|
|
|
assert encryption.encrypt.call_args[0][0]['template'] == str(sample_job_with_placeholdered_template.template.id)
|
2016-06-13 11:38:25 +01:00
|
|
|
|
assert encryption.encrypt.call_args[0][0][
|
|
|
|
|
|
'template_version'] == sample_job_with_placeholdered_template.template.version # noqa
|
2016-11-30 17:22:03 +00:00
|
|
|
|
assert encryption.encrypt.call_args[0][0]['personalisation'] == {'phonenumber': '+441234123120', 'name': 'chris'}
|
2017-10-18 17:00:37 +01:00
|
|
|
|
assert tasks.save_sms.apply_async.call_count == 10
|
2016-03-09 07:27:26 +00:00
|
|
|
|
job = jobs_dao.dao_get_job_by_id(sample_job_with_placeholdered_template.id)
|
2016-10-05 14:56:32 +01:00
|
|
|
|
assert job.job_status == 'finished'
|
2016-02-16 17:17:02 +00:00
|
|
|
|
|
|
|
|
|
|
|
2017-01-17 12:00:34 +00:00
|
|
|
|
# -------------- process_row tests -------------- #
|
|
|
|
|
|
|
2017-01-18 11:29:38 +00:00
|
|
|
|
|
|
|
|
|
|
@pytest.mark.parametrize('template_type, research_mode, expected_function, expected_queue', [
|
2017-10-18 17:00:37 +01:00
|
|
|
|
(SMS_TYPE, False, 'save_sms', 'database-tasks'),
|
|
|
|
|
|
(SMS_TYPE, True, 'save_sms', 'research-mode-tasks'),
|
|
|
|
|
|
(EMAIL_TYPE, False, 'save_email', 'database-tasks'),
|
|
|
|
|
|
(EMAIL_TYPE, True, 'save_email', 'research-mode-tasks'),
|
|
|
|
|
|
(LETTER_TYPE, False, 'save_letter', 'database-tasks'),
|
|
|
|
|
|
(LETTER_TYPE, True, 'save_letter', 'research-mode-tasks'),
|
2017-01-18 11:29:38 +00:00
|
|
|
|
])
|
|
|
|
|
|
def test_process_row_sends_letter_task(template_type, research_mode, expected_function, expected_queue, mocker):
|
|
|
|
|
|
mocker.patch('app.celery.tasks.create_uuid', return_value='noti_uuid')
|
|
|
|
|
|
task_mock = mocker.patch('app.celery.tasks.{}.apply_async'.format(expected_function))
|
|
|
|
|
|
encrypt_mock = mocker.patch('app.celery.tasks.encryption.encrypt')
|
|
|
|
|
|
template = Mock(id='template_id', template_type=template_type)
|
|
|
|
|
|
job = Mock(id='job_id', template_version='temp_vers')
|
|
|
|
|
|
service = Mock(id='service_id', research_mode=research_mode)
|
|
|
|
|
|
|
2018-03-05 15:55:46 +00:00
|
|
|
|
process_row(
|
|
|
|
|
|
Row(
|
|
|
|
|
|
{'foo': 'bar', 'to': 'recip'},
|
|
|
|
|
|
index='row_num',
|
|
|
|
|
|
error_fn=lambda k, v: None,
|
|
|
|
|
|
recipient_column_headers=['to'],
|
|
|
|
|
|
placeholders={'foo'},
|
|
|
|
|
|
template=template,
|
|
|
|
|
|
),
|
|
|
|
|
|
template,
|
|
|
|
|
|
job,
|
|
|
|
|
|
service,
|
|
|
|
|
|
)
|
2017-01-18 11:29:38 +00:00
|
|
|
|
|
|
|
|
|
|
encrypt_mock.assert_called_once_with({
|
|
|
|
|
|
'template': 'template_id',
|
|
|
|
|
|
'template_version': 'temp_vers',
|
|
|
|
|
|
'job': 'job_id',
|
|
|
|
|
|
'to': 'recip',
|
|
|
|
|
|
'row_number': 'row_num',
|
|
|
|
|
|
'personalisation': {'foo': 'bar'}
|
|
|
|
|
|
})
|
|
|
|
|
|
task_mock.assert_called_once_with(
|
|
|
|
|
|
(
|
|
|
|
|
|
'service_id',
|
|
|
|
|
|
'noti_uuid',
|
|
|
|
|
|
# encrypted data
|
|
|
|
|
|
encrypt_mock.return_value,
|
|
|
|
|
|
),
|
|
|
|
|
|
queue=expected_queue
|
|
|
|
|
|
)
|
2017-10-18 17:00:37 +01:00
|
|
|
|
# -------- save_sms and save_email tests -------- #
|
2017-01-17 12:00:34 +00:00
|
|
|
|
|
|
|
|
|
|
|
2016-06-13 11:38:25 +01:00
|
|
|
|
def test_should_send_template_to_correct_sms_task_and_persist(sample_template_with_placeholders, mocker):
|
2016-11-22 15:05:11 +00:00
|
|
|
|
notification = _notification_json(sample_template_with_placeholders,
|
|
|
|
|
|
to="+447234123123", personalisation={"name": "Jo"})
|
|
|
|
|
|
|
|
|
|
|
|
mocked_deliver_sms = mocker.patch('app.celery.provider_tasks.deliver_sms.apply_async')
|
|
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
save_sms(
|
2016-11-22 15:05:11 +00:00
|
|
|
|
sample_template_with_placeholders.service_id,
|
|
|
|
|
|
uuid.uuid4(),
|
|
|
|
|
|
encryption.encrypt(notification),
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
persisted_notification = Notification.query.one()
|
|
|
|
|
|
assert persisted_notification.to == '+447234123123'
|
|
|
|
|
|
assert persisted_notification.template_id == sample_template_with_placeholders.id
|
|
|
|
|
|
assert persisted_notification.template_version == sample_template_with_placeholders.version
|
|
|
|
|
|
assert persisted_notification.status == 'created'
|
|
|
|
|
|
assert persisted_notification.created_at <= datetime.utcnow()
|
|
|
|
|
|
assert not persisted_notification.sent_at
|
|
|
|
|
|
assert not persisted_notification.sent_by
|
|
|
|
|
|
assert not persisted_notification.job_id
|
|
|
|
|
|
assert persisted_notification.personalisation == {'name': 'Jo'}
|
|
|
|
|
|
assert persisted_notification._personalisation == encryption.encrypt({"name": "Jo"})
|
|
|
|
|
|
assert persisted_notification.notification_type == 'sms'
|
|
|
|
|
|
mocked_deliver_sms.assert_called_once_with(
|
|
|
|
|
|
[str(persisted_notification.id)],
|
2017-07-20 16:17:04 +01:00
|
|
|
|
queue="send-sms-tasks"
|
2016-11-22 15:05:11 +00:00
|
|
|
|
)
|
2016-02-23 17:39:08 +00:00
|
|
|
|
|
|
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
def test_should_put_save_sms_task_in_research_mode_queue_if_research_mode_service(notify_db, notify_db_session, mocker):
|
2017-09-21 11:50:49 +01:00
|
|
|
|
service = create_sample_service(notify_db, notify_db_session)
|
2016-09-28 15:29:10 +01:00
|
|
|
|
service.research_mode = True
|
|
|
|
|
|
services_dao.dao_update_service(service)
|
|
|
|
|
|
|
2017-09-21 11:50:49 +01:00
|
|
|
|
template = create_sample_template(notify_db, notify_db_session, service=service)
|
2016-09-28 15:29:10 +01:00
|
|
|
|
|
|
|
|
|
|
notification = _notification_json(template, to="+447234123123")
|
|
|
|
|
|
|
2016-11-11 10:41:39 +00:00
|
|
|
|
mocked_deliver_sms = mocker.patch('app.celery.provider_tasks.deliver_sms.apply_async')
|
2016-09-28 15:29:10 +01:00
|
|
|
|
|
|
|
|
|
|
notification_id = uuid.uuid4()
|
|
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
save_sms(
|
2016-09-28 15:29:10 +01:00
|
|
|
|
template.service_id,
|
|
|
|
|
|
notification_id,
|
|
|
|
|
|
encryption.encrypt(notification),
|
|
|
|
|
|
)
|
2016-11-14 14:41:32 +00:00
|
|
|
|
persisted_notification = Notification.query.one()
|
2016-09-28 15:29:10 +01:00
|
|
|
|
provider_tasks.deliver_sms.apply_async.assert_called_once_with(
|
2016-11-16 16:15:30 +00:00
|
|
|
|
[str(persisted_notification.id)],
|
2017-05-25 10:51:49 +01:00
|
|
|
|
queue="research-mode-tasks"
|
2016-09-28 15:29:10 +01:00
|
|
|
|
)
|
2016-11-11 10:41:39 +00:00
|
|
|
|
assert mocked_deliver_sms.called
|
2016-09-28 15:29:10 +01:00
|
|
|
|
|
|
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
def test_should_save_sms_if_restricted_service_and_valid_number(notify_db, notify_db_session, mocker):
|
2016-12-28 12:30:26 +00:00
|
|
|
|
user = create_user(mobile_number="07700 900890")
|
2017-09-21 11:50:49 +01:00
|
|
|
|
service = create_sample_service(notify_db, notify_db_session, user=user, restricted=True)
|
|
|
|
|
|
template = create_sample_template(notify_db, notify_db_session, service=service)
|
2016-05-13 16:25:05 +01:00
|
|
|
|
notification = _notification_json(template, "+447700900890") # The user’s own number, but in a different format
|
|
|
|
|
|
|
2016-09-28 15:05:50 +01:00
|
|
|
|
mocker.patch('app.celery.provider_tasks.deliver_sms.apply_async')
|
2016-03-03 12:05:18 +00:00
|
|
|
|
|
|
|
|
|
|
notification_id = uuid.uuid4()
|
2016-06-22 13:32:27 +01:00
|
|
|
|
encrypt_notification = encryption.encrypt(notification)
|
2017-10-18 17:00:37 +01:00
|
|
|
|
save_sms(
|
2016-03-03 12:05:18 +00:00
|
|
|
|
service.id,
|
|
|
|
|
|
notification_id,
|
2016-06-22 13:32:27 +01:00
|
|
|
|
encrypt_notification,
|
2016-03-03 12:05:18 +00:00
|
|
|
|
)
|
|
|
|
|
|
|
2016-11-14 14:41:32 +00:00
|
|
|
|
persisted_notification = Notification.query.one()
|
2016-06-21 14:38:17 +01:00
|
|
|
|
assert persisted_notification.to == '+447700900890'
|
|
|
|
|
|
assert persisted_notification.template_id == template.id
|
|
|
|
|
|
assert persisted_notification.template_version == template.version
|
|
|
|
|
|
assert persisted_notification.status == 'created'
|
2016-06-22 13:32:27 +01:00
|
|
|
|
assert persisted_notification.created_at <= datetime.utcnow()
|
2016-06-21 14:38:17 +01:00
|
|
|
|
assert not persisted_notification.sent_at
|
|
|
|
|
|
assert not persisted_notification.sent_by
|
|
|
|
|
|
assert not persisted_notification.job_id
|
2016-06-22 13:32:27 +01:00
|
|
|
|
assert not persisted_notification.personalisation
|
2016-07-06 14:31:52 +01:00
|
|
|
|
assert persisted_notification.notification_type == 'sms'
|
2016-11-11 16:00:31 +00:00
|
|
|
|
provider_tasks.deliver_sms.apply_async.assert_called_once_with(
|
2016-11-16 16:15:30 +00:00
|
|
|
|
[str(persisted_notification.id)],
|
2017-07-20 16:17:04 +01:00
|
|
|
|
queue="send-sms-tasks"
|
2016-11-11 16:00:31 +00:00
|
|
|
|
)
|
2016-06-21 14:38:17 +01:00
|
|
|
|
|
2016-03-03 12:05:18 +00:00
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
def test_should_save_sms_if_restricted_service_and_non_team_number_with_test_key(notify_db,
|
2016-11-11 10:41:39 +00:00
|
|
|
|
notify_db_session,
|
|
|
|
|
|
mocker):
|
2016-12-28 12:30:26 +00:00
|
|
|
|
user = create_user(mobile_number="07700 900205")
|
2017-09-21 11:50:49 +01:00
|
|
|
|
service = create_sample_service(notify_db, notify_db_session, user=user, restricted=True)
|
|
|
|
|
|
template = create_sample_template(notify_db, notify_db_session, service=service)
|
2016-09-07 09:57:20 +01:00
|
|
|
|
|
|
|
|
|
|
notification = _notification_json(template, "07700 900849")
|
2016-11-11 10:41:39 +00:00
|
|
|
|
mocked_deliver_sms = mocker.patch('app.celery.provider_tasks.deliver_sms.apply_async')
|
2016-09-07 09:57:20 +01:00
|
|
|
|
|
|
|
|
|
|
notification_id = uuid.uuid4()
|
2017-10-18 17:00:37 +01:00
|
|
|
|
save_sms(
|
2016-09-07 09:57:20 +01:00
|
|
|
|
service.id,
|
|
|
|
|
|
notification_id,
|
|
|
|
|
|
encryption.encrypt(notification),
|
|
|
|
|
|
key_type=KEY_TYPE_TEST
|
|
|
|
|
|
)
|
|
|
|
|
|
|
2016-11-14 14:41:32 +00:00
|
|
|
|
persisted_notification = Notification.query.one()
|
2016-11-11 16:00:31 +00:00
|
|
|
|
mocked_deliver_sms.assert_called_once_with(
|
2016-11-16 16:15:30 +00:00
|
|
|
|
[str(persisted_notification.id)],
|
2017-07-20 16:17:04 +01:00
|
|
|
|
queue="send-sms-tasks"
|
2016-09-07 09:57:20 +01:00
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
def test_should_save_email_if_restricted_service_and_non_team_email_address_with_test_key(notify_db,
|
2016-11-11 10:41:39 +00:00
|
|
|
|
notify_db_session,
|
|
|
|
|
|
mocker):
|
2016-12-28 12:30:26 +00:00
|
|
|
|
user = create_user()
|
2017-09-21 11:50:49 +01:00
|
|
|
|
service = create_sample_service(notify_db, notify_db_session, user=user, restricted=True)
|
|
|
|
|
|
template = create_sample_template(
|
2016-09-07 09:57:20 +01:00
|
|
|
|
notify_db, notify_db_session, service=service, template_type='email', subject_line='Hello'
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
notification = _notification_json(template, to="test@example.com")
|
2016-11-11 10:41:39 +00:00
|
|
|
|
mocked_deliver_email = mocker.patch('app.celery.provider_tasks.deliver_email.apply_async')
|
2016-09-07 09:57:20 +01:00
|
|
|
|
|
|
|
|
|
|
notification_id = uuid.uuid4()
|
2017-10-18 17:00:37 +01:00
|
|
|
|
save_email(
|
2016-09-07 09:57:20 +01:00
|
|
|
|
service.id,
|
|
|
|
|
|
notification_id,
|
|
|
|
|
|
encryption.encrypt(notification),
|
|
|
|
|
|
key_type=KEY_TYPE_TEST
|
|
|
|
|
|
)
|
|
|
|
|
|
|
2016-11-14 14:41:32 +00:00
|
|
|
|
persisted_notification = Notification.query.one()
|
2016-11-11 16:00:31 +00:00
|
|
|
|
mocked_deliver_email.assert_called_once_with(
|
2016-11-16 16:15:30 +00:00
|
|
|
|
[str(persisted_notification.id)],
|
2017-07-20 16:17:04 +01:00
|
|
|
|
queue="send-email-tasks"
|
2016-09-07 09:57:20 +01:00
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-11-25 11:31:36 +00:00
|
|
|
|
def test_save_email_should_save_default_email_reply_to_text_on_notification(notify_db_session, mocker):
|
|
|
|
|
|
service = create_service()
|
|
|
|
|
|
create_reply_to_email(service=service, email_address='reply_to@digital.gov.uk', is_default=True)
|
|
|
|
|
|
template = create_template(service=service, template_type='email', subject='Hello')
|
|
|
|
|
|
|
|
|
|
|
|
notification = _notification_json(template, to="test@example.com")
|
|
|
|
|
|
mocker.patch('app.celery.provider_tasks.deliver_email.apply_async')
|
|
|
|
|
|
|
|
|
|
|
|
notification_id = uuid.uuid4()
|
|
|
|
|
|
save_email(
|
|
|
|
|
|
service.id,
|
|
|
|
|
|
notification_id,
|
|
|
|
|
|
encryption.encrypt(notification),
|
|
|
|
|
|
key_type=KEY_TYPE_TEST
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
persisted_notification = Notification.query.one()
|
|
|
|
|
|
assert persisted_notification.reply_to_text == 'reply_to@digital.gov.uk'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_save_sms_should_save_default_smm_sender_notification_reply_to_text_on(notify_db_session, mocker):
|
|
|
|
|
|
service = create_service_with_defined_sms_sender(sms_sender_value='12345')
|
|
|
|
|
|
template = create_template(service=service)
|
|
|
|
|
|
|
|
|
|
|
|
notification = _notification_json(template, to="07700 900205")
|
|
|
|
|
|
mocker.patch('app.celery.provider_tasks.deliver_sms.apply_async')
|
|
|
|
|
|
|
|
|
|
|
|
notification_id = uuid.uuid4()
|
|
|
|
|
|
save_sms(
|
|
|
|
|
|
service.id,
|
|
|
|
|
|
notification_id,
|
|
|
|
|
|
encryption.encrypt(notification),
|
|
|
|
|
|
key_type=KEY_TYPE_TEST
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
persisted_notification = Notification.query.one()
|
|
|
|
|
|
assert persisted_notification.reply_to_text == '12345'
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
def test_should_not_save_sms_if_restricted_service_and_invalid_number(notify_db, notify_db_session, mocker):
|
2016-12-28 12:30:26 +00:00
|
|
|
|
user = create_user(mobile_number="07700 900205")
|
2017-09-21 11:50:49 +01:00
|
|
|
|
service = create_sample_service(notify_db, notify_db_session, user=user, restricted=True)
|
|
|
|
|
|
template = create_sample_template(notify_db, notify_db_session, service=service)
|
2016-03-03 12:05:18 +00:00
|
|
|
|
|
2016-05-13 16:25:05 +01:00
|
|
|
|
notification = _notification_json(template, "07700 900849")
|
2016-09-28 15:05:50 +01:00
|
|
|
|
mocker.patch('app.celery.provider_tasks.deliver_sms.apply_async')
|
2016-03-03 12:05:18 +00:00
|
|
|
|
|
|
|
|
|
|
notification_id = uuid.uuid4()
|
2017-10-18 17:00:37 +01:00
|
|
|
|
save_sms(
|
2016-03-03 12:05:18 +00:00
|
|
|
|
service.id,
|
|
|
|
|
|
notification_id,
|
2016-06-22 13:32:27 +01:00
|
|
|
|
encryption.encrypt(notification),
|
2016-03-03 12:05:18 +00:00
|
|
|
|
)
|
2016-10-07 12:48:58 +01:00
|
|
|
|
assert provider_tasks.deliver_sms.apply_async.called is False
|
2016-11-11 10:41:39 +00:00
|
|
|
|
assert Notification.query.count() == 0
|
2016-03-03 12:05:18 +00:00
|
|
|
|
|
|
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
def test_should_not_save_email_if_restricted_service_and_invalid_email_address(notify_db, notify_db_session, mocker):
|
2016-12-28 12:30:26 +00:00
|
|
|
|
user = create_user()
|
2017-09-21 11:50:49 +01:00
|
|
|
|
service = create_sample_service(notify_db, notify_db_session, user=user, restricted=True)
|
|
|
|
|
|
template = create_sample_template(
|
2016-04-05 15:27:16 +01:00
|
|
|
|
notify_db, notify_db_session, service=service, template_type='email', subject_line='Hello'
|
|
|
|
|
|
)
|
2016-05-13 16:25:05 +01:00
|
|
|
|
notification = _notification_json(template, to="test@example.com")
|
2016-04-05 15:27:16 +01:00
|
|
|
|
|
|
|
|
|
|
notification_id = uuid.uuid4()
|
2017-10-18 17:00:37 +01:00
|
|
|
|
save_email(
|
2016-04-05 15:27:16 +01:00
|
|
|
|
service.id,
|
|
|
|
|
|
notification_id,
|
2016-06-22 13:32:27 +01:00
|
|
|
|
encryption.encrypt(notification),
|
2016-04-05 15:27:16 +01:00
|
|
|
|
)
|
|
|
|
|
|
|
2016-11-11 10:41:39 +00:00
|
|
|
|
assert Notification.query.count() == 0
|
2016-04-05 15:27:16 +01:00
|
|
|
|
|
|
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
def test_should_put_save_email_task_in_research_mode_queue_if_research_mode_service(
|
2016-09-28 15:48:12 +01:00
|
|
|
|
notify_db, notify_db_session, mocker
|
|
|
|
|
|
):
|
2017-09-21 11:50:49 +01:00
|
|
|
|
service = create_sample_service(notify_db, notify_db_session)
|
2016-09-28 15:29:10 +01:00
|
|
|
|
service.research_mode = True
|
|
|
|
|
|
services_dao.dao_update_service(service)
|
|
|
|
|
|
|
2017-09-21 11:50:49 +01:00
|
|
|
|
template = create_sample_email_template(notify_db, notify_db_session, service=service)
|
2016-09-28 15:29:10 +01:00
|
|
|
|
|
|
|
|
|
|
notification = _notification_json(template, to="test@test.com")
|
|
|
|
|
|
|
|
|
|
|
|
mocker.patch('app.celery.provider_tasks.deliver_email.apply_async')
|
|
|
|
|
|
|
|
|
|
|
|
notification_id = uuid.uuid4()
|
|
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
save_email(
|
2016-09-28 15:29:10 +01:00
|
|
|
|
template.service_id,
|
|
|
|
|
|
notification_id,
|
|
|
|
|
|
encryption.encrypt(notification),
|
|
|
|
|
|
)
|
|
|
|
|
|
|
2016-11-14 14:41:32 +00:00
|
|
|
|
persisted_notification = Notification.query.one()
|
2016-09-28 15:29:10 +01:00
|
|
|
|
provider_tasks.deliver_email.apply_async.assert_called_once_with(
|
2016-11-16 16:15:30 +00:00
|
|
|
|
[str(persisted_notification.id)],
|
2017-05-25 10:51:49 +01:00
|
|
|
|
queue="research-mode-tasks"
|
2016-09-28 15:29:10 +01:00
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
def test_should_save_sms_template_to_and_persist_with_job_id(sample_job, sample_api_key, mocker):
|
2016-05-19 10:46:03 +01:00
|
|
|
|
notification = _notification_json(
|
|
|
|
|
|
sample_job.template,
|
|
|
|
|
|
to="+447234123123",
|
|
|
|
|
|
job_id=sample_job.id,
|
|
|
|
|
|
row_number=2)
|
2016-09-28 15:05:50 +01:00
|
|
|
|
mocker.patch('app.celery.provider_tasks.deliver_sms.apply_async')
|
2016-02-23 17:39:08 +00:00
|
|
|
|
|
|
|
|
|
|
notification_id = uuid.uuid4()
|
2016-11-11 14:56:33 +00:00
|
|
|
|
now = datetime.utcnow()
|
2017-10-18 17:00:37 +01:00
|
|
|
|
save_sms(
|
2016-02-23 17:39:08 +00:00
|
|
|
|
sample_job.service.id,
|
|
|
|
|
|
notification_id,
|
2016-06-22 13:32:27 +01:00
|
|
|
|
encryption.encrypt(notification),
|
2016-06-30 17:32:49 +01:00
|
|
|
|
api_key_id=str(sample_api_key.id),
|
2016-09-28 17:02:57 +01:00
|
|
|
|
key_type=KEY_TYPE_NORMAL
|
2016-03-08 17:45:37 +00:00
|
|
|
|
)
|
2016-11-14 14:41:32 +00:00
|
|
|
|
persisted_notification = Notification.query.one()
|
2016-03-16 13:33:12 +00:00
|
|
|
|
assert persisted_notification.to == '+447234123123'
|
2016-02-23 17:39:08 +00:00
|
|
|
|
assert persisted_notification.job_id == sample_job.id
|
|
|
|
|
|
assert persisted_notification.template_id == sample_job.template.id
|
2016-06-21 14:38:17 +01:00
|
|
|
|
assert persisted_notification.status == 'created'
|
2016-06-07 12:53:31 +01:00
|
|
|
|
assert not persisted_notification.sent_at
|
2017-10-17 16:05:31 +01:00
|
|
|
|
assert persisted_notification.created_at >= now
|
2016-06-07 12:53:31 +01:00
|
|
|
|
assert not persisted_notification.sent_by
|
2016-05-19 10:46:03 +01:00
|
|
|
|
assert persisted_notification.job_row_number == 2
|
2016-06-30 17:32:49 +01:00
|
|
|
|
assert persisted_notification.api_key_id == sample_api_key.id
|
2016-09-28 17:02:57 +01:00
|
|
|
|
assert persisted_notification.key_type == KEY_TYPE_NORMAL
|
2016-07-06 14:31:52 +01:00
|
|
|
|
assert persisted_notification.notification_type == 'sms'
|
2016-02-16 17:17:02 +00:00
|
|
|
|
|
2016-11-11 16:00:31 +00:00
|
|
|
|
provider_tasks.deliver_sms.apply_async.assert_called_once_with(
|
2016-11-16 16:15:30 +00:00
|
|
|
|
[str(persisted_notification.id)],
|
2017-07-20 16:17:04 +01:00
|
|
|
|
queue="send-sms-tasks"
|
2016-11-11 16:00:31 +00:00
|
|
|
|
)
|
|
|
|
|
|
|
2016-02-16 17:17:02 +00:00
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
def test_should_not_save_email_if_team_key_and_recipient_not_in_team(sample_email_template_with_placeholders,
|
2016-09-28 17:02:57 +01:00
|
|
|
|
sample_team_api_key,
|
|
|
|
|
|
mocker):
|
2016-05-19 10:46:03 +01:00
|
|
|
|
notification = _notification_json(
|
|
|
|
|
|
sample_email_template_with_placeholders,
|
|
|
|
|
|
"my_email@my_email.com",
|
|
|
|
|
|
{"name": "Jo"},
|
|
|
|
|
|
row_number=1)
|
2016-09-30 11:07:32 +01:00
|
|
|
|
apply_async = mocker.patch('app.celery.provider_tasks.deliver_email.apply_async')
|
2016-09-28 17:02:57 +01:00
|
|
|
|
notification_id = uuid.uuid4()
|
|
|
|
|
|
|
|
|
|
|
|
team_members = [user.email_address for user in sample_email_template_with_placeholders.service.users]
|
|
|
|
|
|
assert "my_email@my_email.com" not in team_members
|
|
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
save_email(
|
|
|
|
|
|
sample_email_template_with_placeholders.service_id,
|
|
|
|
|
|
notification_id,
|
|
|
|
|
|
encryption.encrypt(notification),
|
|
|
|
|
|
api_key_id=str(sample_team_api_key.id),
|
|
|
|
|
|
key_type=KEY_TYPE_TEAM
|
|
|
|
|
|
)
|
2016-09-28 17:02:57 +01:00
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
assert Notification.query.count() == 0
|
2016-09-28 17:02:57 +01:00
|
|
|
|
|
|
|
|
|
|
apply_async.not_called()
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
def test_should_not_save_sms_if_team_key_and_recipient_not_in_team(notify_db, notify_db_session, mocker):
|
2016-11-11 10:41:39 +00:00
|
|
|
|
assert Notification.query.count() == 0
|
2016-12-28 12:30:26 +00:00
|
|
|
|
user = create_user(mobile_number="07700 900205")
|
2017-09-21 11:50:49 +01:00
|
|
|
|
service = create_sample_service(notify_db, notify_db_session, user=user, restricted=True)
|
|
|
|
|
|
template = create_sample_template(notify_db, notify_db_session, service=service)
|
2016-09-28 17:02:57 +01:00
|
|
|
|
|
|
|
|
|
|
team_members = [user.mobile_number for user in service.users]
|
|
|
|
|
|
assert "07890 300000" not in team_members
|
|
|
|
|
|
|
|
|
|
|
|
notification = _notification_json(template, "07700 900849")
|
2016-10-13 15:53:01 +01:00
|
|
|
|
mocker.patch('app.celery.provider_tasks.deliver_sms.apply_async')
|
2016-09-28 17:02:57 +01:00
|
|
|
|
|
|
|
|
|
|
notification_id = uuid.uuid4()
|
2017-10-18 17:00:37 +01:00
|
|
|
|
save_sms(
|
2016-09-28 17:02:57 +01:00
|
|
|
|
service.id,
|
|
|
|
|
|
notification_id,
|
|
|
|
|
|
encryption.encrypt(notification),
|
|
|
|
|
|
)
|
2016-10-13 15:53:01 +01:00
|
|
|
|
assert provider_tasks.deliver_sms.apply_async.called is False
|
2016-11-11 10:41:39 +00:00
|
|
|
|
assert Notification.query.count() == 0
|
2016-09-28 17:02:57 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_should_use_email_template_and_persist(sample_email_template_with_placeholders, sample_api_key, mocker):
|
2017-01-17 12:00:34 +00:00
|
|
|
|
mocker.patch('app.celery.provider_tasks.deliver_email.apply_async')
|
|
|
|
|
|
|
|
|
|
|
|
now = datetime(2016, 1, 1, 11, 9, 0)
|
|
|
|
|
|
notification_id = uuid.uuid4()
|
|
|
|
|
|
|
2016-11-11 17:36:38 +00:00
|
|
|
|
with freeze_time("2016-01-01 12:00:00.000000"):
|
|
|
|
|
|
notification = _notification_json(
|
|
|
|
|
|
sample_email_template_with_placeholders,
|
|
|
|
|
|
'my_email@my_email.com',
|
|
|
|
|
|
{"name": "Jo"},
|
|
|
|
|
|
row_number=1)
|
2017-01-17 12:00:34 +00:00
|
|
|
|
|
|
|
|
|
|
with freeze_time("2016-01-01 11:10:00.00000"):
|
2017-10-18 17:00:37 +01:00
|
|
|
|
save_email(
|
2017-01-17 12:00:34 +00:00
|
|
|
|
sample_email_template_with_placeholders.service_id,
|
|
|
|
|
|
notification_id,
|
|
|
|
|
|
encryption.encrypt(notification),
|
|
|
|
|
|
api_key_id=str(sample_api_key.id),
|
|
|
|
|
|
key_type=sample_api_key.key_type
|
|
|
|
|
|
)
|
2016-11-11 17:36:38 +00:00
|
|
|
|
|
2016-11-14 14:41:32 +00:00
|
|
|
|
persisted_notification = Notification.query.one()
|
2016-04-13 15:31:08 +01:00
|
|
|
|
assert persisted_notification.to == 'my_email@my_email.com'
|
|
|
|
|
|
assert persisted_notification.template_id == sample_email_template_with_placeholders.id
|
2016-05-13 16:25:05 +01:00
|
|
|
|
assert persisted_notification.template_version == sample_email_template_with_placeholders.version
|
2017-10-17 16:05:31 +01:00
|
|
|
|
assert persisted_notification.created_at >= now
|
2016-07-01 14:14:28 +01:00
|
|
|
|
assert not persisted_notification.sent_at
|
|
|
|
|
|
assert persisted_notification.status == 'created'
|
|
|
|
|
|
assert not persisted_notification.sent_by
|
2016-05-19 10:46:03 +01:00
|
|
|
|
assert persisted_notification.job_row_number == 1
|
2016-06-22 13:32:27 +01:00
|
|
|
|
assert persisted_notification.personalisation == {'name': 'Jo'}
|
|
|
|
|
|
assert persisted_notification._personalisation == encryption.encrypt({"name": "Jo"})
|
2016-06-30 17:32:49 +01:00
|
|
|
|
assert persisted_notification.api_key_id == sample_api_key.id
|
2016-09-28 17:02:57 +01:00
|
|
|
|
assert persisted_notification.key_type == KEY_TYPE_NORMAL
|
2016-07-06 14:31:52 +01:00
|
|
|
|
assert persisted_notification.notification_type == 'email'
|
2016-11-11 17:36:38 +00:00
|
|
|
|
|
2016-11-11 16:00:31 +00:00
|
|
|
|
provider_tasks.deliver_email.apply_async.assert_called_once_with(
|
2017-07-20 16:17:04 +01:00
|
|
|
|
[str(persisted_notification.id)], queue='send-email-tasks')
|
2016-05-13 16:25:05 +01:00
|
|
|
|
|
|
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
def test_save_email_should_use_template_version_from_job_not_latest(sample_email_template, mocker):
|
2016-05-13 16:25:05 +01:00
|
|
|
|
notification = _notification_json(sample_email_template, 'my_email@my_email.com')
|
|
|
|
|
|
version_on_notification = sample_email_template.version
|
|
|
|
|
|
# Change the template
|
|
|
|
|
|
from app.dao.templates_dao import dao_update_template, dao_get_template_by_id
|
|
|
|
|
|
sample_email_template.content = sample_email_template.content + " another version of the template"
|
2016-09-28 15:05:50 +01:00
|
|
|
|
mocker.patch('app.celery.provider_tasks.deliver_email.apply_async')
|
2016-05-13 16:25:05 +01:00
|
|
|
|
dao_update_template(sample_email_template)
|
|
|
|
|
|
t = dao_get_template_by_id(sample_email_template.id)
|
|
|
|
|
|
assert t.version > version_on_notification
|
|
|
|
|
|
now = datetime.utcnow()
|
2017-10-18 17:00:37 +01:00
|
|
|
|
save_email(
|
2016-05-13 16:25:05 +01:00
|
|
|
|
sample_email_template.service_id,
|
2016-11-11 16:00:31 +00:00
|
|
|
|
uuid.uuid4(),
|
2016-07-01 14:14:28 +01:00
|
|
|
|
encryption.encrypt(notification),
|
2016-05-13 16:25:05 +01:00
|
|
|
|
)
|
2016-07-01 14:14:28 +01:00
|
|
|
|
|
2016-11-14 14:41:32 +00:00
|
|
|
|
persisted_notification = Notification.query.one()
|
2016-05-13 16:25:05 +01:00
|
|
|
|
assert persisted_notification.to == 'my_email@my_email.com'
|
|
|
|
|
|
assert persisted_notification.template_id == sample_email_template.id
|
|
|
|
|
|
assert persisted_notification.template_version == version_on_notification
|
2017-10-17 16:05:31 +01:00
|
|
|
|
assert persisted_notification.created_at >= now
|
2016-07-01 14:14:28 +01:00
|
|
|
|
assert not persisted_notification.sent_at
|
|
|
|
|
|
assert persisted_notification.status == 'created'
|
|
|
|
|
|
assert not persisted_notification.sent_by
|
2016-07-06 14:31:52 +01:00
|
|
|
|
assert persisted_notification.notification_type == 'email'
|
2016-11-16 16:15:30 +00:00
|
|
|
|
provider_tasks.deliver_email.apply_async.assert_called_once_with([str(persisted_notification.id)],
|
2017-07-20 16:17:04 +01:00
|
|
|
|
queue='send-email-tasks')
|
2016-04-13 15:31:08 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_should_use_email_template_subject_placeholders(sample_email_template_with_placeholders, mocker):
|
2016-05-13 16:25:05 +01:00
|
|
|
|
notification = _notification_json(sample_email_template_with_placeholders,
|
|
|
|
|
|
"my_email@my_email.com", {"name": "Jo"})
|
2016-09-28 15:05:50 +01:00
|
|
|
|
mocker.patch('app.celery.provider_tasks.deliver_email.apply_async')
|
2016-04-13 15:31:08 +01:00
|
|
|
|
|
|
|
|
|
|
notification_id = uuid.uuid4()
|
|
|
|
|
|
now = datetime.utcnow()
|
2017-10-18 17:00:37 +01:00
|
|
|
|
save_email(
|
2016-04-13 15:31:08 +01:00
|
|
|
|
sample_email_template_with_placeholders.service_id,
|
|
|
|
|
|
notification_id,
|
2016-06-22 13:32:27 +01:00
|
|
|
|
encryption.encrypt(notification),
|
2016-04-13 15:31:08 +01:00
|
|
|
|
)
|
2016-11-14 14:41:32 +00:00
|
|
|
|
persisted_notification = Notification.query.one()
|
2016-02-22 17:17:29 +00:00
|
|
|
|
assert persisted_notification.to == 'my_email@my_email.com'
|
2016-02-29 14:43:44 +00:00
|
|
|
|
assert persisted_notification.template_id == sample_email_template_with_placeholders.id
|
2016-07-01 14:14:28 +01:00
|
|
|
|
assert persisted_notification.status == 'created'
|
2017-10-17 16:05:31 +01:00
|
|
|
|
assert persisted_notification.created_at >= now
|
2016-07-01 14:14:28 +01:00
|
|
|
|
assert not persisted_notification.sent_by
|
2016-06-22 13:32:27 +01:00
|
|
|
|
assert persisted_notification.personalisation == {"name": "Jo"}
|
2016-07-01 14:14:28 +01:00
|
|
|
|
assert not persisted_notification.reference
|
2016-07-06 14:31:52 +01:00
|
|
|
|
assert persisted_notification.notification_type == 'email'
|
2016-11-11 16:00:31 +00:00
|
|
|
|
provider_tasks.deliver_email.apply_async.assert_called_once_with(
|
2017-07-20 16:17:04 +01:00
|
|
|
|
[str(persisted_notification.id)], queue='send-email-tasks'
|
2016-11-11 16:00:31 +00:00
|
|
|
|
)
|
2016-03-11 09:40:35 +00:00
|
|
|
|
|
|
|
|
|
|
|
2016-05-13 16:25:05 +01:00
|
|
|
|
def test_should_use_email_template_and_persist_without_personalisation(sample_email_template, mocker):
|
2016-06-22 13:32:27 +01:00
|
|
|
|
notification = _notification_json(sample_email_template, "my_email@my_email.com")
|
2016-09-28 15:05:50 +01:00
|
|
|
|
mocker.patch('app.celery.provider_tasks.deliver_email.apply_async')
|
2016-03-02 12:27:07 +00:00
|
|
|
|
|
|
|
|
|
|
notification_id = uuid.uuid4()
|
2016-06-30 17:32:49 +01:00
|
|
|
|
|
2016-03-02 12:27:07 +00:00
|
|
|
|
now = datetime.utcnow()
|
2017-10-18 17:00:37 +01:00
|
|
|
|
save_email(
|
2016-03-02 12:27:07 +00:00
|
|
|
|
sample_email_template.service_id,
|
|
|
|
|
|
notification_id,
|
2016-06-22 13:32:27 +01:00
|
|
|
|
encryption.encrypt(notification),
|
2016-03-02 12:27:07 +00:00
|
|
|
|
)
|
2016-11-14 15:29:23 +00:00
|
|
|
|
persisted_notification = Notification.query.one()
|
2016-06-22 13:32:27 +01:00
|
|
|
|
assert persisted_notification.to == 'my_email@my_email.com'
|
|
|
|
|
|
assert persisted_notification.template_id == sample_email_template.id
|
2017-10-17 16:05:31 +01:00
|
|
|
|
assert persisted_notification.created_at >= now
|
2016-07-01 14:14:28 +01:00
|
|
|
|
assert not persisted_notification.sent_at
|
|
|
|
|
|
assert persisted_notification.status == 'created'
|
|
|
|
|
|
assert not persisted_notification.sent_by
|
2016-06-22 13:32:27 +01:00
|
|
|
|
assert not persisted_notification.personalisation
|
2016-07-01 14:14:28 +01:00
|
|
|
|
assert not persisted_notification.reference
|
|
|
|
|
|
assert persisted_notification.notification_type == 'email'
|
2016-11-16 16:15:30 +00:00
|
|
|
|
provider_tasks.deliver_email.apply_async.assert_called_once_with([str(persisted_notification.id)],
|
2017-07-20 16:17:04 +01:00
|
|
|
|
queue='send-email-tasks')
|
2016-03-02 12:27:07 +00:00
|
|
|
|
|
|
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
def test_save_sms_should_go_to_retry_queue_if_database_errors(sample_template, mocker):
|
2016-05-13 16:25:05 +01:00
|
|
|
|
notification = _notification_json(sample_template, "+447234123123")
|
2016-06-07 12:53:31 +01:00
|
|
|
|
|
|
|
|
|
|
expected_exception = SQLAlchemyError()
|
|
|
|
|
|
|
2016-09-28 15:05:50 +01:00
|
|
|
|
mocker.patch('app.celery.provider_tasks.deliver_sms.apply_async')
|
2017-10-18 17:00:37 +01:00
|
|
|
|
mocker.patch('app.celery.tasks.save_sms.retry', side_effect=Retry)
|
2016-11-11 10:41:39 +00:00
|
|
|
|
mocker.patch('app.notifications.process_notifications.dao_create_notification', side_effect=expected_exception)
|
2016-02-16 17:17:02 +00:00
|
|
|
|
|
|
|
|
|
|
notification_id = uuid.uuid4()
|
|
|
|
|
|
|
2017-01-17 16:51:27 +00:00
|
|
|
|
with pytest.raises(Retry):
|
2017-10-18 17:00:37 +01:00
|
|
|
|
save_sms(
|
2016-06-07 12:53:31 +01:00
|
|
|
|
sample_template.service_id,
|
|
|
|
|
|
notification_id,
|
2016-06-22 13:32:27 +01:00
|
|
|
|
encryption.encrypt(notification),
|
2016-06-07 12:53:31 +01:00
|
|
|
|
)
|
2016-10-07 12:48:58 +01:00
|
|
|
|
assert provider_tasks.deliver_sms.apply_async.called is False
|
2017-10-18 17:00:37 +01:00
|
|
|
|
tasks.save_sms.retry.assert_called_with(exc=expected_exception, queue="retry-tasks")
|
2016-02-16 17:17:02 +00:00
|
|
|
|
|
2016-11-11 10:41:39 +00:00
|
|
|
|
assert Notification.query.count() == 0
|
2016-02-16 17:17:02 +00:00
|
|
|
|
|
2016-06-13 11:38:25 +01:00
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
def test_save_email_should_go_to_retry_queue_if_database_errors(sample_email_template, mocker):
|
2016-07-01 14:14:28 +01:00
|
|
|
|
notification = _notification_json(sample_email_template, "test@example.gov.uk")
|
2016-02-22 17:17:29 +00:00
|
|
|
|
|
2016-07-01 14:14:28 +01:00
|
|
|
|
expected_exception = SQLAlchemyError()
|
2016-02-22 17:17:29 +00:00
|
|
|
|
|
2016-09-28 15:05:50 +01:00
|
|
|
|
mocker.patch('app.celery.provider_tasks.deliver_email.apply_async')
|
2017-10-18 17:00:37 +01:00
|
|
|
|
mocker.patch('app.celery.tasks.save_email.retry', side_effect=Retry)
|
2016-11-11 10:41:39 +00:00
|
|
|
|
mocker.patch('app.notifications.process_notifications.dao_create_notification', side_effect=expected_exception)
|
2016-02-22 17:17:29 +00:00
|
|
|
|
|
|
|
|
|
|
notification_id = uuid.uuid4()
|
|
|
|
|
|
|
2017-01-17 16:51:27 +00:00
|
|
|
|
with pytest.raises(Retry):
|
2017-10-18 17:00:37 +01:00
|
|
|
|
save_email(
|
2016-07-01 14:14:28 +01:00
|
|
|
|
sample_email_template.service_id,
|
|
|
|
|
|
notification_id,
|
|
|
|
|
|
encryption.encrypt(notification),
|
|
|
|
|
|
)
|
2016-11-11 16:00:31 +00:00
|
|
|
|
assert not provider_tasks.deliver_email.apply_async.called
|
2017-10-18 17:00:37 +01:00
|
|
|
|
tasks.save_email.retry.assert_called_with(exc=expected_exception, queue="retry-tasks")
|
2016-07-01 14:14:28 +01:00
|
|
|
|
|
2016-11-11 10:41:39 +00:00
|
|
|
|
assert Notification.query.count() == 0
|
2016-11-25 17:32:01 +00:00
|
|
|
|
|
|
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
def test_save_email_does_not_send_duplicate_and_does_not_put_in_retry_queue(sample_notification, mocker):
|
2016-11-25 17:32:01 +00:00
|
|
|
|
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')
|
2017-10-18 17:00:37 +01:00
|
|
|
|
retry = mocker.patch('app.celery.tasks.save_email.retry', side_effect=Exception())
|
2016-11-25 17:32:01 +00:00
|
|
|
|
|
|
|
|
|
|
notification_id = sample_notification.id
|
|
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
save_email(
|
2016-11-25 17:32:01 +00:00
|
|
|
|
sample_notification.service_id,
|
|
|
|
|
|
notification_id,
|
|
|
|
|
|
encryption.encrypt(json),
|
|
|
|
|
|
)
|
|
|
|
|
|
assert Notification.query.count() == 1
|
|
|
|
|
|
assert not deliver_email.called
|
|
|
|
|
|
assert not retry.called
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
def test_save_sms_does_not_send_duplicate_and_does_not_put_in_retry_queue(sample_notification, mocker):
|
2016-11-25 17:32:01 +00:00
|
|
|
|
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')
|
2017-10-18 17:00:37 +01:00
|
|
|
|
retry = mocker.patch('app.celery.tasks.save_sms.retry', side_effect=Exception())
|
2016-11-25 17:32:01 +00:00
|
|
|
|
|
|
|
|
|
|
notification_id = sample_notification.id
|
|
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
save_sms(
|
2016-11-25 17:32:01 +00:00
|
|
|
|
sample_notification.service_id,
|
|
|
|
|
|
notification_id,
|
|
|
|
|
|
encryption.encrypt(json),
|
|
|
|
|
|
)
|
|
|
|
|
|
assert Notification.query.count() == 1
|
|
|
|
|
|
assert not deliver_sms.called
|
|
|
|
|
|
assert not retry.called
|
2017-01-17 16:51:27 +00:00
|
|
|
|
|
|
|
|
|
|
|
2017-11-27 11:33:04 +00:00
|
|
|
|
def test_save_letter_saves_letter_to_database(mocker, notify_db_session):
|
|
|
|
|
|
service = create_service()
|
2018-01-08 15:54:58 +00:00
|
|
|
|
contact_block = create_letter_contact(service=service, contact_block="Address contact", is_default=True)
|
|
|
|
|
|
template = create_template(service=service, template_type=LETTER_TYPE, reply_to=contact_block.id)
|
2017-11-27 11:33:04 +00:00
|
|
|
|
job = create_job(template=template)
|
2017-04-12 17:56:55 +01:00
|
|
|
|
|
|
|
|
|
|
mocker.patch('app.celery.tasks.create_random_identifier', return_value="this-is-random-in-real-life")
|
2018-02-13 18:38:32 +00:00
|
|
|
|
mocker.patch('app.celery.tasks.letters_pdf_tasks.create_letters_pdf.apply_async')
|
2017-04-12 17:56:55 +01:00
|
|
|
|
|
persist_letter saves address correctly to database
the `to` field stores either the phone number or the email address
of the recipient - it's a bit more complicated for letters, since
there are address lines 1 through 6, and a postcode. In utils, they're
stored alongside the personalisation, and we have to ensure that when
we persist to the database we keep as much parity with utils to make
our work easier. Aside from sending, the `to` field is also used to
show recipients on the front end report pages - we've decided that the
best thing to store here is address_line_1 - which is probably going to
be either a person's name, company name, or PO box number
Also, a lot of tests and test cleanup - I added create_template and
create_notification functions in db.py, so if you're creating new
fixtures you can use these functions, and you won't need to pass
notify_db and notify_db_session around, huzzah!
also removed create param from sample_notification since it's not used
anywhere
2017-01-19 12:10:32 +00:00
|
|
|
|
personalisation = {
|
|
|
|
|
|
'addressline1': 'Foo',
|
|
|
|
|
|
'addressline2': 'Bar',
|
|
|
|
|
|
'addressline3': 'Baz',
|
|
|
|
|
|
'addressline4': 'Wibble',
|
|
|
|
|
|
'addressline5': 'Wobble',
|
|
|
|
|
|
'addressline6': 'Wubble',
|
|
|
|
|
|
'postcode': 'Flob',
|
|
|
|
|
|
}
|
|
|
|
|
|
notification_json = _notification_json(
|
2017-11-27 11:33:04 +00:00
|
|
|
|
template=job.template,
|
persist_letter saves address correctly to database
the `to` field stores either the phone number or the email address
of the recipient - it's a bit more complicated for letters, since
there are address lines 1 through 6, and a postcode. In utils, they're
stored alongside the personalisation, and we have to ensure that when
we persist to the database we keep as much parity with utils to make
our work easier. Aside from sending, the `to` field is also used to
show recipients on the front end report pages - we've decided that the
best thing to store here is address_line_1 - which is probably going to
be either a person's name, company name, or PO box number
Also, a lot of tests and test cleanup - I added create_template and
create_notification functions in db.py, so if you're creating new
fixtures you can use these functions, and you won't need to pass
notify_db and notify_db_session around, huzzah!
also removed create param from sample_notification since it's not used
anywhere
2017-01-19 12:10:32 +00:00
|
|
|
|
to='Foo',
|
|
|
|
|
|
personalisation=personalisation,
|
2017-11-27 11:33:04 +00:00
|
|
|
|
job_id=job.id,
|
persist_letter saves address correctly to database
the `to` field stores either the phone number or the email address
of the recipient - it's a bit more complicated for letters, since
there are address lines 1 through 6, and a postcode. In utils, they're
stored alongside the personalisation, and we have to ensure that when
we persist to the database we keep as much parity with utils to make
our work easier. Aside from sending, the `to` field is also used to
show recipients on the front end report pages - we've decided that the
best thing to store here is address_line_1 - which is probably going to
be either a person's name, company name, or PO box number
Also, a lot of tests and test cleanup - I added create_template and
create_notification functions in db.py, so if you're creating new
fixtures you can use these functions, and you won't need to pass
notify_db and notify_db_session around, huzzah!
also removed create param from sample_notification since it's not used
anywhere
2017-01-19 12:10:32 +00:00
|
|
|
|
row_number=1
|
|
|
|
|
|
)
|
|
|
|
|
|
notification_id = uuid.uuid4()
|
|
|
|
|
|
created_at = datetime.utcnow()
|
|
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
save_letter(
|
2017-11-27 11:33:04 +00:00
|
|
|
|
job.service_id,
|
persist_letter saves address correctly to database
the `to` field stores either the phone number or the email address
of the recipient - it's a bit more complicated for letters, since
there are address lines 1 through 6, and a postcode. In utils, they're
stored alongside the personalisation, and we have to ensure that when
we persist to the database we keep as much parity with utils to make
our work easier. Aside from sending, the `to` field is also used to
show recipients on the front end report pages - we've decided that the
best thing to store here is address_line_1 - which is probably going to
be either a person's name, company name, or PO box number
Also, a lot of tests and test cleanup - I added create_template and
create_notification functions in db.py, so if you're creating new
fixtures you can use these functions, and you won't need to pass
notify_db and notify_db_session around, huzzah!
also removed create param from sample_notification since it's not used
anywhere
2017-01-19 12:10:32 +00:00
|
|
|
|
notification_id,
|
|
|
|
|
|
encryption.encrypt(notification_json),
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
notification_db = Notification.query.one()
|
|
|
|
|
|
assert notification_db.id == notification_id
|
|
|
|
|
|
assert notification_db.to == 'Foo'
|
2017-11-27 11:33:04 +00:00
|
|
|
|
assert notification_db.job_id == job.id
|
|
|
|
|
|
assert notification_db.template_id == job.template.id
|
|
|
|
|
|
assert notification_db.template_version == job.template.version
|
persist_letter saves address correctly to database
the `to` field stores either the phone number or the email address
of the recipient - it's a bit more complicated for letters, since
there are address lines 1 through 6, and a postcode. In utils, they're
stored alongside the personalisation, and we have to ensure that when
we persist to the database we keep as much parity with utils to make
our work easier. Aside from sending, the `to` field is also used to
show recipients on the front end report pages - we've decided that the
best thing to store here is address_line_1 - which is probably going to
be either a person's name, company name, or PO box number
Also, a lot of tests and test cleanup - I added create_template and
create_notification functions in db.py, so if you're creating new
fixtures you can use these functions, and you won't need to pass
notify_db and notify_db_session around, huzzah!
also removed create param from sample_notification since it's not used
anywhere
2017-01-19 12:10:32 +00:00
|
|
|
|
assert notification_db.status == 'created'
|
2017-10-17 16:05:31 +01:00
|
|
|
|
assert notification_db.created_at >= created_at
|
persist_letter saves address correctly to database
the `to` field stores either the phone number or the email address
of the recipient - it's a bit more complicated for letters, since
there are address lines 1 through 6, and a postcode. In utils, they're
stored alongside the personalisation, and we have to ensure that when
we persist to the database we keep as much parity with utils to make
our work easier. Aside from sending, the `to` field is also used to
show recipients on the front end report pages - we've decided that the
best thing to store here is address_line_1 - which is probably going to
be either a person's name, company name, or PO box number
Also, a lot of tests and test cleanup - I added create_template and
create_notification functions in db.py, so if you're creating new
fixtures you can use these functions, and you won't need to pass
notify_db and notify_db_session around, huzzah!
also removed create param from sample_notification since it's not used
anywhere
2017-01-19 12:10:32 +00:00
|
|
|
|
assert notification_db.notification_type == 'letter'
|
|
|
|
|
|
assert notification_db.sent_at is None
|
|
|
|
|
|
assert notification_db.sent_by is None
|
|
|
|
|
|
assert notification_db.personalisation == personalisation
|
2017-04-12 17:56:55 +01:00
|
|
|
|
assert notification_db.reference == "this-is-random-in-real-life"
|
2018-01-08 15:54:58 +00:00
|
|
|
|
assert notification_db.reply_to_text == contact_block.contact_block
|
persist_letter saves address correctly to database
the `to` field stores either the phone number or the email address
of the recipient - it's a bit more complicated for letters, since
there are address lines 1 through 6, and a postcode. In utils, they're
stored alongside the personalisation, and we have to ensure that when
we persist to the database we keep as much parity with utils to make
our work easier. Aside from sending, the `to` field is also used to
show recipients on the front end report pages - we've decided that the
best thing to store here is address_line_1 - which is probably going to
be either a person's name, company name, or PO box number
Also, a lot of tests and test cleanup - I added create_template and
create_notification functions in db.py, so if you're creating new
fixtures you can use these functions, and you won't need to pass
notify_db and notify_db_session around, huzzah!
also removed create param from sample_notification since it's not used
anywhere
2017-01-19 12:10:32 +00:00
|
|
|
|
|
|
|
|
|
|
|
2018-01-09 16:41:58 +00:00
|
|
|
|
def test_save_letter_saves_letter_to_database_right_reply_to(mocker, notify_db_session):
|
|
|
|
|
|
service = create_service()
|
|
|
|
|
|
create_letter_contact(service=service, contact_block="Address contact", is_default=True)
|
|
|
|
|
|
template = create_template(service=service, template_type=LETTER_TYPE, reply_to=None)
|
|
|
|
|
|
job = create_job(template=template)
|
|
|
|
|
|
|
|
|
|
|
|
mocker.patch('app.celery.tasks.create_random_identifier', return_value="this-is-random-in-real-life")
|
2018-02-13 18:38:32 +00:00
|
|
|
|
mocker.patch('app.celery.tasks.letters_pdf_tasks.create_letters_pdf.apply_async')
|
2018-01-09 16:41:58 +00:00
|
|
|
|
|
|
|
|
|
|
personalisation = {
|
|
|
|
|
|
'addressline1': 'Foo',
|
|
|
|
|
|
'addressline2': 'Bar',
|
|
|
|
|
|
'addressline3': 'Baz',
|
|
|
|
|
|
'addressline4': 'Wibble',
|
|
|
|
|
|
'addressline5': 'Wobble',
|
|
|
|
|
|
'addressline6': 'Wubble',
|
|
|
|
|
|
'postcode': 'Flob',
|
|
|
|
|
|
}
|
|
|
|
|
|
notification_json = _notification_json(
|
|
|
|
|
|
template=job.template,
|
|
|
|
|
|
to='Foo',
|
|
|
|
|
|
personalisation=personalisation,
|
|
|
|
|
|
job_id=job.id,
|
|
|
|
|
|
row_number=1
|
|
|
|
|
|
)
|
|
|
|
|
|
notification_id = uuid.uuid4()
|
|
|
|
|
|
created_at = datetime.utcnow()
|
|
|
|
|
|
|
|
|
|
|
|
save_letter(
|
|
|
|
|
|
job.service_id,
|
|
|
|
|
|
notification_id,
|
|
|
|
|
|
encryption.encrypt(notification_json),
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
notification_db = Notification.query.one()
|
|
|
|
|
|
assert notification_db.id == notification_id
|
|
|
|
|
|
assert notification_db.to == 'Foo'
|
|
|
|
|
|
assert notification_db.job_id == job.id
|
|
|
|
|
|
assert notification_db.template_id == job.template.id
|
|
|
|
|
|
assert notification_db.template_version == job.template.version
|
|
|
|
|
|
assert notification_db.status == 'created'
|
|
|
|
|
|
assert notification_db.created_at >= created_at
|
|
|
|
|
|
assert notification_db.notification_type == 'letter'
|
|
|
|
|
|
assert notification_db.sent_at is None
|
|
|
|
|
|
assert notification_db.sent_by is None
|
|
|
|
|
|
assert notification_db.personalisation == personalisation
|
|
|
|
|
|
assert notification_db.reference == "this-is-random-in-real-life"
|
|
|
|
|
|
assert not notification_db.reply_to_text
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-12-15 17:15:31 +00:00
|
|
|
|
def test_save_letter_uses_template_reply_to_text(mocker, notify_db_session):
|
|
|
|
|
|
service = create_service()
|
|
|
|
|
|
create_letter_contact(service=service, contact_block="Address contact", is_default=True)
|
|
|
|
|
|
template_contact = create_letter_contact(
|
|
|
|
|
|
service=service,
|
|
|
|
|
|
contact_block="Template address contact",
|
|
|
|
|
|
is_default=False
|
|
|
|
|
|
)
|
|
|
|
|
|
template = create_template(
|
|
|
|
|
|
service=service,
|
|
|
|
|
|
template_type=LETTER_TYPE,
|
|
|
|
|
|
reply_to=template_contact.id
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
job = create_job(template=template)
|
|
|
|
|
|
|
|
|
|
|
|
mocker.patch('app.celery.tasks.create_random_identifier', return_value="this-is-random-in-real-life")
|
2018-02-13 18:38:32 +00:00
|
|
|
|
mocker.patch('app.celery.tasks.letters_pdf_tasks.create_letters_pdf.apply_async')
|
2017-12-15 17:15:31 +00:00
|
|
|
|
|
|
|
|
|
|
personalisation = {
|
|
|
|
|
|
'addressline1': 'Foo',
|
|
|
|
|
|
'addressline2': 'Bar',
|
|
|
|
|
|
'postcode': 'Flob',
|
|
|
|
|
|
}
|
|
|
|
|
|
notification_json = _notification_json(
|
|
|
|
|
|
template=job.template,
|
|
|
|
|
|
to='Foo',
|
|
|
|
|
|
personalisation=personalisation,
|
|
|
|
|
|
job_id=job.id,
|
|
|
|
|
|
row_number=1
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
save_letter(
|
|
|
|
|
|
job.service_id,
|
|
|
|
|
|
uuid.uuid4(),
|
|
|
|
|
|
encryption.encrypt(notification_json),
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
notification_db = Notification.query.one()
|
|
|
|
|
|
assert notification_db.reply_to_text == "Template address contact"
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-12-18 16:14:09 +00:00
|
|
|
|
def test_save_sms_uses_sms_sender_reply_to_text(mocker, notify_db_session):
|
|
|
|
|
|
service = create_service_with_defined_sms_sender(sms_sender_value='07123123123')
|
|
|
|
|
|
template = create_template(service=service)
|
|
|
|
|
|
|
|
|
|
|
|
notification = _notification_json(template, to="07700 900205")
|
|
|
|
|
|
mocker.patch('app.celery.provider_tasks.deliver_sms.apply_async')
|
|
|
|
|
|
|
|
|
|
|
|
notification_id = uuid.uuid4()
|
|
|
|
|
|
save_sms(
|
|
|
|
|
|
service.id,
|
|
|
|
|
|
notification_id,
|
|
|
|
|
|
encryption.encrypt(notification),
|
|
|
|
|
|
key_type=KEY_TYPE_TEST
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
persisted_notification = Notification.query.one()
|
|
|
|
|
|
assert persisted_notification.reply_to_text == '447123123123'
|
|
|
|
|
|
|
|
|
|
|
|
|
2018-01-26 14:05:09 +00:00
|
|
|
|
@pytest.mark.parametrize('env', ['staging', 'live'])
|
|
|
|
|
|
def test_save_letter_sets_delivered_letters_as_pdf_permission_in_research_mode_in_staging_live(
|
|
|
|
|
|
notify_api, mocker, notify_db_session, sample_letter_job, env):
|
2017-12-11 16:13:41 +00:00
|
|
|
|
sample_letter_job.service.research_mode = True
|
2018-01-26 14:05:09 +00:00
|
|
|
|
sample_reference = "this-is-random-in-real-life"
|
|
|
|
|
|
mock_create_fake_letter_response_file = mocker.patch(
|
|
|
|
|
|
'app.celery.research_mode_tasks.create_fake_letter_response_file.apply_async')
|
|
|
|
|
|
mocker.patch('app.celery.tasks.create_random_identifier', return_value=sample_reference)
|
2017-12-11 16:13:41 +00:00
|
|
|
|
|
|
|
|
|
|
personalisation = {
|
|
|
|
|
|
'addressline1': 'Foo',
|
|
|
|
|
|
'addressline2': 'Bar',
|
|
|
|
|
|
'postcode': 'Flob',
|
|
|
|
|
|
}
|
|
|
|
|
|
notification_json = _notification_json(
|
|
|
|
|
|
template=sample_letter_job.template,
|
|
|
|
|
|
to='Foo',
|
|
|
|
|
|
personalisation=personalisation,
|
|
|
|
|
|
job_id=sample_letter_job.id,
|
|
|
|
|
|
row_number=1
|
|
|
|
|
|
)
|
|
|
|
|
|
notification_id = uuid.uuid4()
|
|
|
|
|
|
|
2018-01-26 14:05:09 +00:00
|
|
|
|
with set_config_values(notify_api, {
|
|
|
|
|
|
'NOTIFY_ENVIRONMENT': env
|
|
|
|
|
|
}):
|
|
|
|
|
|
save_letter(
|
|
|
|
|
|
sample_letter_job.service_id,
|
|
|
|
|
|
notification_id,
|
|
|
|
|
|
encryption.encrypt(notification_json),
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
notification = Notification.query.filter(Notification.id == notification_id).one()
|
|
|
|
|
|
assert notification.status == 'delivered'
|
|
|
|
|
|
assert not mock_create_fake_letter_response_file.called
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.mark.parametrize('env', ['development', 'preview'])
|
2018-02-13 18:38:32 +00:00
|
|
|
|
def test_save_letter_calls_create_fake_response_for_letters_in_research_mode_on_development_preview(
|
2018-01-26 14:05:09 +00:00
|
|
|
|
notify_api, mocker, notify_db_session, sample_letter_job, env):
|
|
|
|
|
|
sample_letter_job.service.research_mode = True
|
|
|
|
|
|
sample_reference = "this-is-random-in-real-life"
|
|
|
|
|
|
mock_create_fake_letter_response_file = mocker.patch(
|
|
|
|
|
|
'app.celery.research_mode_tasks.create_fake_letter_response_file.apply_async')
|
|
|
|
|
|
mocker.patch('app.celery.tasks.create_random_identifier', return_value=sample_reference)
|
|
|
|
|
|
|
|
|
|
|
|
personalisation = {
|
|
|
|
|
|
'addressline1': 'Foo',
|
|
|
|
|
|
'addressline2': 'Bar',
|
|
|
|
|
|
'postcode': 'Flob',
|
|
|
|
|
|
}
|
|
|
|
|
|
notification_json = _notification_json(
|
|
|
|
|
|
template=sample_letter_job.template,
|
|
|
|
|
|
to='Foo',
|
|
|
|
|
|
personalisation=personalisation,
|
|
|
|
|
|
job_id=sample_letter_job.id,
|
|
|
|
|
|
row_number=1
|
2017-12-11 16:13:41 +00:00
|
|
|
|
)
|
2018-01-26 14:05:09 +00:00
|
|
|
|
notification_id = uuid.uuid4()
|
|
|
|
|
|
|
|
|
|
|
|
with set_config_values(notify_api, {
|
|
|
|
|
|
'NOTIFY_ENVIRONMENT': env
|
|
|
|
|
|
}):
|
|
|
|
|
|
save_letter(
|
|
|
|
|
|
sample_letter_job.service_id,
|
|
|
|
|
|
notification_id,
|
|
|
|
|
|
encryption.encrypt(notification_json),
|
|
|
|
|
|
)
|
2017-12-11 16:13:41 +00:00
|
|
|
|
|
2018-01-26 14:05:09 +00:00
|
|
|
|
mock_create_fake_letter_response_file.assert_called_once_with(
|
|
|
|
|
|
(sample_reference,),
|
2017-12-11 16:13:41 +00:00
|
|
|
|
queue=QueueNames.RESEARCH_MODE
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
2018-02-13 18:38:32 +00:00
|
|
|
|
def test_save_letter_calls_create_letters_pdf_task_not_in_research(
|
2017-12-08 17:40:00 +00:00
|
|
|
|
mocker, notify_db_session, sample_letter_job):
|
2017-12-11 11:00:27 +00:00
|
|
|
|
mock_create_letters_pdf = mocker.patch('app.celery.letters_pdf_tasks.create_letters_pdf.apply_async')
|
2017-12-08 17:40:00 +00:00
|
|
|
|
|
|
|
|
|
|
personalisation = {
|
|
|
|
|
|
'addressline1': 'Foo',
|
|
|
|
|
|
'addressline2': 'Bar',
|
|
|
|
|
|
'postcode': 'Flob',
|
|
|
|
|
|
}
|
|
|
|
|
|
notification_json = _notification_json(
|
|
|
|
|
|
template=sample_letter_job.template,
|
|
|
|
|
|
to='Foo',
|
|
|
|
|
|
personalisation=personalisation,
|
|
|
|
|
|
job_id=sample_letter_job.id,
|
|
|
|
|
|
row_number=1
|
|
|
|
|
|
)
|
|
|
|
|
|
notification_id = uuid.uuid4()
|
|
|
|
|
|
|
|
|
|
|
|
save_letter(
|
|
|
|
|
|
sample_letter_job.service_id,
|
|
|
|
|
|
notification_id,
|
|
|
|
|
|
encryption.encrypt(notification_json),
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
assert mock_create_letters_pdf.called
|
|
|
|
|
|
mock_create_letters_pdf.assert_called_once_with(
|
|
|
|
|
|
[str(notification_id)],
|
|
|
|
|
|
queue=QueueNames.CREATE_LETTERS_PDF
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-02-02 11:34:00 +00:00
|
|
|
|
def test_should_cancel_job_if_service_is_inactive(sample_service,
|
|
|
|
|
|
sample_job,
|
|
|
|
|
|
mocker):
|
|
|
|
|
|
sample_service.active = False
|
|
|
|
|
|
|
|
|
|
|
|
mocker.patch('app.celery.tasks.s3.get_job_from_s3')
|
|
|
|
|
|
mocker.patch('app.celery.tasks.process_row')
|
|
|
|
|
|
|
|
|
|
|
|
process_job(sample_job.id)
|
|
|
|
|
|
|
|
|
|
|
|
job = jobs_dao.dao_get_job_by_id(sample_job.id)
|
|
|
|
|
|
assert job.job_status == 'cancelled'
|
|
|
|
|
|
s3.get_job_from_s3.assert_not_called()
|
|
|
|
|
|
tasks.process_row.assert_not_called()
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-01-17 16:51:27 +00:00
|
|
|
|
@pytest.mark.parametrize('template_type, expected_class', [
|
|
|
|
|
|
(SMS_TYPE, SMSMessageTemplate),
|
|
|
|
|
|
(EMAIL_TYPE, WithSubjectTemplate),
|
|
|
|
|
|
(LETTER_TYPE, WithSubjectTemplate),
|
|
|
|
|
|
])
|
|
|
|
|
|
def test_get_template_class(template_type, expected_class):
|
2017-01-24 10:53:41 +00:00
|
|
|
|
assert get_template_class(template_type) == expected_class
|
2017-03-15 15:26:58 +00:00
|
|
|
|
|
|
|
|
|
|
|
2017-06-20 17:13:40 +01:00
|
|
|
|
def test_send_inbound_sms_to_service_post_https_request_to_service(notify_api, sample_service):
|
|
|
|
|
|
inbound_api = create_service_inbound_api(service=sample_service, url="https://some.service.gov.uk/",
|
|
|
|
|
|
bearer_token="something_unique")
|
|
|
|
|
|
inbound_sms = create_inbound_sms(service=sample_service, notify_number="0751421", user_number="447700900111",
|
|
|
|
|
|
provider_date=datetime(2017, 6, 20), content="Here is some content")
|
|
|
|
|
|
data = {
|
|
|
|
|
|
"id": str(inbound_sms.id),
|
2017-06-22 10:15:08 +01:00
|
|
|
|
"source_number": inbound_sms.user_number,
|
|
|
|
|
|
"destination_number": inbound_sms.notify_number,
|
|
|
|
|
|
"message": inbound_sms.content,
|
2017-06-20 17:13:40 +01:00
|
|
|
|
"date_received": inbound_sms.provider_date.strftime(DATETIME_FORMAT)
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
with requests_mock.Mocker() as request_mock:
|
|
|
|
|
|
request_mock.post(inbound_api.url,
|
|
|
|
|
|
json={},
|
|
|
|
|
|
status_code=200)
|
|
|
|
|
|
send_inbound_sms_to_service(inbound_sms.id, inbound_sms.service_id)
|
|
|
|
|
|
assert request_mock.call_count == 1
|
|
|
|
|
|
assert request_mock.request_history[0].url == inbound_api.url
|
|
|
|
|
|
assert request_mock.request_history[0].method == 'POST'
|
|
|
|
|
|
assert request_mock.request_history[0].text == json.dumps(data)
|
|
|
|
|
|
assert request_mock.request_history[0].headers["Content-type"] == "application/json"
|
|
|
|
|
|
assert request_mock.request_history[0].headers["Authorization"] == "Bearer {}".format(inbound_api.bearer_token)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_send_inbound_sms_to_service_does_not_send_request_when_inbound_sms_does_not_exist(notify_api, sample_service):
|
|
|
|
|
|
inbound_api = create_service_inbound_api(service=sample_service)
|
|
|
|
|
|
with requests_mock.Mocker() as request_mock:
|
|
|
|
|
|
request_mock.post(inbound_api.url,
|
|
|
|
|
|
json={},
|
|
|
|
|
|
status_code=200)
|
|
|
|
|
|
with pytest.raises(SQLAlchemyError):
|
|
|
|
|
|
send_inbound_sms_to_service(inbound_sms_id=uuid.uuid4(), service_id=sample_service.id)
|
|
|
|
|
|
|
|
|
|
|
|
assert request_mock.call_count == 0
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_send_inbound_sms_to_service_does_not_sent_request_when_inbound_api_does_not_exist(
|
|
|
|
|
|
notify_api, sample_service, mocker):
|
|
|
|
|
|
inbound_sms = create_inbound_sms(service=sample_service, notify_number="0751421", user_number="447700900111",
|
|
|
|
|
|
provider_date=datetime(2017, 6, 20), content="Here is some content")
|
|
|
|
|
|
mocked = mocker.patch("requests.request")
|
|
|
|
|
|
send_inbound_sms_to_service(inbound_sms.id, inbound_sms.service_id)
|
|
|
|
|
|
|
|
|
|
|
|
mocked.call_count == 0
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_send_inbound_sms_to_service_retries_if_request_returns_500(notify_api, sample_service, mocker):
|
|
|
|
|
|
inbound_api = create_service_inbound_api(service=sample_service, url="https://some.service.gov.uk/",
|
|
|
|
|
|
bearer_token="something_unique")
|
|
|
|
|
|
inbound_sms = create_inbound_sms(service=sample_service, notify_number="0751421", user_number="447700900111",
|
|
|
|
|
|
provider_date=datetime(2017, 6, 20), content="Here is some content")
|
|
|
|
|
|
|
|
|
|
|
|
mocked = mocker.patch('app.celery.tasks.send_inbound_sms_to_service.retry')
|
|
|
|
|
|
with requests_mock.Mocker() as request_mock:
|
|
|
|
|
|
request_mock.post(inbound_api.url,
|
|
|
|
|
|
json={},
|
|
|
|
|
|
status_code=500)
|
|
|
|
|
|
send_inbound_sms_to_service(inbound_sms.id, inbound_sms.service_id)
|
2017-11-15 11:43:52 +00:00
|
|
|
|
|
|
|
|
|
|
assert mocked.call_count == 1
|
|
|
|
|
|
assert mocked.call_args[1]['queue'] == 'retry-tasks'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_send_inbound_sms_to_service_retries_if_request_throws_unknown(notify_api, sample_service, mocker):
|
2017-11-28 17:21:21 +00:00
|
|
|
|
create_service_inbound_api(
|
|
|
|
|
|
service=sample_service,
|
|
|
|
|
|
url="https://some.service.gov.uk/",
|
|
|
|
|
|
bearer_token="something_unique")
|
2017-11-15 11:43:52 +00:00
|
|
|
|
inbound_sms = create_inbound_sms(service=sample_service, notify_number="0751421", user_number="447700900111",
|
|
|
|
|
|
provider_date=datetime(2017, 6, 20), content="Here is some content")
|
|
|
|
|
|
|
|
|
|
|
|
mocked = mocker.patch('app.celery.tasks.send_inbound_sms_to_service.retry')
|
|
|
|
|
|
mocker.patch("app.celery.tasks.request", side_effect=RequestException())
|
|
|
|
|
|
|
|
|
|
|
|
send_inbound_sms_to_service(inbound_sms.id, inbound_sms.service_id)
|
2017-06-20 17:13:40 +01:00
|
|
|
|
|
2017-08-21 09:41:00 +01:00
|
|
|
|
assert mocked.call_count == 1
|
|
|
|
|
|
assert mocked.call_args[1]['queue'] == 'retry-tasks'
|
2017-06-20 17:13:40 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_send_inbound_sms_to_service_does_not_retries_if_request_returns_404(notify_api, sample_service, mocker):
|
|
|
|
|
|
inbound_api = create_service_inbound_api(service=sample_service, url="https://some.service.gov.uk/",
|
|
|
|
|
|
bearer_token="something_unique")
|
|
|
|
|
|
inbound_sms = create_inbound_sms(service=sample_service, notify_number="0751421", user_number="447700900111",
|
|
|
|
|
|
provider_date=datetime(2017, 6, 20), content="Here is some content")
|
|
|
|
|
|
|
|
|
|
|
|
mocked = mocker.patch('app.celery.tasks.send_inbound_sms_to_service.retry')
|
|
|
|
|
|
with requests_mock.Mocker() as request_mock:
|
|
|
|
|
|
request_mock.post(inbound_api.url,
|
|
|
|
|
|
json={},
|
|
|
|
|
|
status_code=404)
|
|
|
|
|
|
send_inbound_sms_to_service(inbound_sms.id, inbound_sms.service_id)
|
|
|
|
|
|
|
|
|
|
|
|
mocked.call_count == 0
|
2017-10-16 12:32:44 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_check_job_status_task_does_not_raise_error(sample_template):
|
2017-11-28 17:21:21 +00:00
|
|
|
|
create_job(
|
|
|
|
|
|
template=sample_template,
|
|
|
|
|
|
notification_count=3,
|
|
|
|
|
|
created_at=datetime.utcnow() - timedelta(hours=2),
|
|
|
|
|
|
scheduled_for=datetime.utcnow() - timedelta(minutes=31),
|
|
|
|
|
|
processing_started=datetime.utcnow() - timedelta(minutes=31),
|
|
|
|
|
|
job_status=JOB_STATUS_FINISHED)
|
|
|
|
|
|
create_job(
|
|
|
|
|
|
template=sample_template,
|
|
|
|
|
|
notification_count=3,
|
|
|
|
|
|
created_at=datetime.utcnow() - timedelta(minutes=31),
|
|
|
|
|
|
processing_started=datetime.utcnow() - timedelta(minutes=31),
|
|
|
|
|
|
job_status=JOB_STATUS_FINISHED)
|
2017-10-16 12:32:44 +01:00
|
|
|
|
|
|
|
|
|
|
check_job_status()
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-10-17 11:07:36 +01:00
|
|
|
|
def test_process_incomplete_job_sms(mocker, sample_template):
|
2017-10-16 12:32:44 +01:00
|
|
|
|
|
|
|
|
|
|
mocker.patch('app.celery.tasks.s3.get_job_from_s3', return_value=load_example_csv('multiple_sms'))
|
2017-10-18 17:00:37 +01:00
|
|
|
|
save_sms = mocker.patch('app.celery.tasks.save_sms.apply_async')
|
2017-10-16 12:32:44 +01:00
|
|
|
|
|
2017-10-17 11:07:36 +01:00
|
|
|
|
job = create_job(template=sample_template, notification_count=10,
|
2017-10-16 12:32:44 +01:00
|
|
|
|
created_at=datetime.utcnow() - timedelta(hours=2),
|
|
|
|
|
|
scheduled_for=datetime.utcnow() - timedelta(minutes=31),
|
|
|
|
|
|
processing_started=datetime.utcnow() - timedelta(minutes=31),
|
|
|
|
|
|
job_status=JOB_STATUS_IN_PROGRESS)
|
|
|
|
|
|
|
|
|
|
|
|
create_notification(sample_template, job, 0)
|
|
|
|
|
|
create_notification(sample_template, job, 1)
|
|
|
|
|
|
|
|
|
|
|
|
assert Notification.query.filter(Notification.job_id == job.id).count() == 2
|
|
|
|
|
|
|
|
|
|
|
|
process_incomplete_job(str(job.id))
|
|
|
|
|
|
|
|
|
|
|
|
completed_job = Job.query.filter(Job.id == job.id).one()
|
|
|
|
|
|
|
|
|
|
|
|
assert completed_job.job_status == JOB_STATUS_FINISHED
|
|
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
assert save_sms.call_count == 8 # There are 10 in the file and we've added two already
|
2017-10-16 12:32:44 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_process_incomplete_job_with_notifications_all_sent(mocker, sample_template):
|
|
|
|
|
|
|
|
|
|
|
|
mocker.patch('app.celery.tasks.s3.get_job_from_s3', return_value=load_example_csv('multiple_sms'))
|
2017-10-18 17:00:37 +01:00
|
|
|
|
mock_save_sms = mocker.patch('app.celery.tasks.save_sms.apply_async')
|
2017-10-16 12:32:44 +01:00
|
|
|
|
|
2017-10-17 11:07:36 +01:00
|
|
|
|
job = create_job(template=sample_template, notification_count=10,
|
2017-10-16 12:32:44 +01:00
|
|
|
|
created_at=datetime.utcnow() - timedelta(hours=2),
|
|
|
|
|
|
scheduled_for=datetime.utcnow() - timedelta(minutes=31),
|
|
|
|
|
|
processing_started=datetime.utcnow() - timedelta(minutes=31),
|
|
|
|
|
|
job_status=JOB_STATUS_IN_PROGRESS)
|
|
|
|
|
|
|
|
|
|
|
|
create_notification(sample_template, job, 0)
|
|
|
|
|
|
create_notification(sample_template, job, 1)
|
|
|
|
|
|
create_notification(sample_template, job, 2)
|
|
|
|
|
|
create_notification(sample_template, job, 3)
|
|
|
|
|
|
create_notification(sample_template, job, 4)
|
|
|
|
|
|
create_notification(sample_template, job, 5)
|
|
|
|
|
|
create_notification(sample_template, job, 6)
|
|
|
|
|
|
create_notification(sample_template, job, 7)
|
|
|
|
|
|
create_notification(sample_template, job, 8)
|
|
|
|
|
|
create_notification(sample_template, job, 9)
|
|
|
|
|
|
|
|
|
|
|
|
assert Notification.query.filter(Notification.job_id == job.id).count() == 10
|
|
|
|
|
|
|
|
|
|
|
|
process_incomplete_job(str(job.id))
|
|
|
|
|
|
|
|
|
|
|
|
completed_job = Job.query.filter(Job.id == job.id).one()
|
|
|
|
|
|
|
|
|
|
|
|
assert completed_job.job_status == JOB_STATUS_FINISHED
|
|
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
assert mock_save_sms.call_count == 0 # There are 10 in the file and we've added 10 it should not have been called
|
2017-10-16 12:32:44 +01:00
|
|
|
|
|
|
|
|
|
|
|
2017-10-17 11:07:36 +01:00
|
|
|
|
def test_process_incomplete_jobs_sms(mocker, sample_template):
|
2017-10-16 12:32:44 +01:00
|
|
|
|
|
|
|
|
|
|
mocker.patch('app.celery.tasks.s3.get_job_from_s3', return_value=load_example_csv('multiple_sms'))
|
2017-10-18 17:00:37 +01:00
|
|
|
|
mock_save_sms = mocker.patch('app.celery.tasks.save_sms.apply_async')
|
2017-10-16 12:32:44 +01:00
|
|
|
|
|
2017-10-17 11:07:36 +01:00
|
|
|
|
job = create_job(template=sample_template, notification_count=10,
|
2017-10-16 12:32:44 +01:00
|
|
|
|
created_at=datetime.utcnow() - timedelta(hours=2),
|
|
|
|
|
|
scheduled_for=datetime.utcnow() - timedelta(minutes=31),
|
|
|
|
|
|
processing_started=datetime.utcnow() - timedelta(minutes=31),
|
|
|
|
|
|
job_status=JOB_STATUS_IN_PROGRESS)
|
|
|
|
|
|
create_notification(sample_template, job, 0)
|
|
|
|
|
|
create_notification(sample_template, job, 1)
|
|
|
|
|
|
create_notification(sample_template, job, 2)
|
|
|
|
|
|
|
|
|
|
|
|
assert Notification.query.filter(Notification.job_id == job.id).count() == 3
|
|
|
|
|
|
|
2017-10-17 11:07:36 +01:00
|
|
|
|
job2 = create_job(template=sample_template, notification_count=10,
|
2017-10-16 12:32:44 +01:00
|
|
|
|
created_at=datetime.utcnow() - timedelta(hours=2),
|
|
|
|
|
|
scheduled_for=datetime.utcnow() - timedelta(minutes=31),
|
|
|
|
|
|
processing_started=datetime.utcnow() - timedelta(minutes=31),
|
|
|
|
|
|
job_status=JOB_STATUS_IN_PROGRESS)
|
|
|
|
|
|
|
|
|
|
|
|
create_notification(sample_template, job2, 0)
|
|
|
|
|
|
create_notification(sample_template, job2, 1)
|
|
|
|
|
|
create_notification(sample_template, job2, 2)
|
|
|
|
|
|
create_notification(sample_template, job2, 3)
|
|
|
|
|
|
create_notification(sample_template, job2, 4)
|
|
|
|
|
|
|
|
|
|
|
|
assert Notification.query.filter(Notification.job_id == job2.id).count() == 5
|
|
|
|
|
|
|
|
|
|
|
|
jobs = [job.id, job2.id]
|
|
|
|
|
|
process_incomplete_jobs(jobs)
|
|
|
|
|
|
|
|
|
|
|
|
completed_job = Job.query.filter(Job.id == job.id).one()
|
|
|
|
|
|
completed_job2 = Job.query.filter(Job.id == job2.id).one()
|
|
|
|
|
|
|
|
|
|
|
|
assert completed_job.job_status == JOB_STATUS_FINISHED
|
|
|
|
|
|
|
|
|
|
|
|
assert completed_job2.job_status == JOB_STATUS_FINISHED
|
|
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
assert mock_save_sms.call_count == 12 # There are 20 in total over 2 jobs we've added 8 already
|
2017-10-16 12:32:44 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_process_incomplete_jobs_no_notifications_added(mocker, sample_template):
|
|
|
|
|
|
mocker.patch('app.celery.tasks.s3.get_job_from_s3', return_value=load_example_csv('multiple_sms'))
|
2017-10-18 17:00:37 +01:00
|
|
|
|
mock_save_sms = mocker.patch('app.celery.tasks.save_sms.apply_async')
|
2017-10-16 12:32:44 +01:00
|
|
|
|
|
2017-10-17 11:07:36 +01:00
|
|
|
|
job = create_job(template=sample_template, notification_count=10,
|
2017-10-16 12:32:44 +01:00
|
|
|
|
created_at=datetime.utcnow() - timedelta(hours=2),
|
|
|
|
|
|
scheduled_for=datetime.utcnow() - timedelta(minutes=31),
|
|
|
|
|
|
processing_started=datetime.utcnow() - timedelta(minutes=31),
|
|
|
|
|
|
job_status=JOB_STATUS_IN_PROGRESS)
|
|
|
|
|
|
|
|
|
|
|
|
assert Notification.query.filter(Notification.job_id == job.id).count() == 0
|
|
|
|
|
|
|
|
|
|
|
|
process_incomplete_job(job.id)
|
|
|
|
|
|
|
|
|
|
|
|
completed_job = Job.query.filter(Job.id == job.id).one()
|
|
|
|
|
|
|
|
|
|
|
|
assert completed_job.job_status == JOB_STATUS_FINISHED
|
|
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
assert mock_save_sms.call_count == 10 # There are 10 in the csv file
|
2017-10-16 12:32:44 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_process_incomplete_jobs(mocker):
|
|
|
|
|
|
|
|
|
|
|
|
mocker.patch('app.celery.tasks.s3.get_job_from_s3', return_value=load_example_csv('multiple_sms'))
|
2017-10-18 17:00:37 +01:00
|
|
|
|
mock_save_sms = mocker.patch('app.celery.tasks.save_sms.apply_async')
|
2017-10-16 12:32:44 +01:00
|
|
|
|
|
|
|
|
|
|
jobs = []
|
|
|
|
|
|
process_incomplete_jobs(jobs)
|
|
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
assert mock_save_sms.call_count == 0 # There are no jobs to process so it will not have been called
|
2017-10-16 12:32:44 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_process_incomplete_job_no_job_in_database(mocker, fake_uuid):
|
|
|
|
|
|
|
|
|
|
|
|
mocker.patch('app.celery.tasks.s3.get_job_from_s3', return_value=load_example_csv('multiple_sms'))
|
2017-10-18 17:00:37 +01:00
|
|
|
|
mock_save_sms = mocker.patch('app.celery.tasks.save_sms.apply_async')
|
2017-10-16 12:32:44 +01:00
|
|
|
|
|
2017-11-28 17:21:21 +00:00
|
|
|
|
with pytest.raises(expected_exception=Exception):
|
2017-10-16 12:32:44 +01:00
|
|
|
|
process_incomplete_job(fake_uuid)
|
|
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
assert mock_save_sms.call_count == 0 # There is no job in the db it will not have been called
|
2017-10-17 11:07:36 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_process_incomplete_job_email(mocker, sample_email_template):
|
|
|
|
|
|
|
|
|
|
|
|
mocker.patch('app.celery.tasks.s3.get_job_from_s3', return_value=load_example_csv('multiple_email'))
|
2017-10-18 17:00:37 +01:00
|
|
|
|
mock_email_saver = mocker.patch('app.celery.tasks.save_email.apply_async')
|
2017-10-17 11:07:36 +01:00
|
|
|
|
|
|
|
|
|
|
job = create_job(template=sample_email_template, notification_count=10,
|
|
|
|
|
|
created_at=datetime.utcnow() - timedelta(hours=2),
|
|
|
|
|
|
scheduled_for=datetime.utcnow() - timedelta(minutes=31),
|
|
|
|
|
|
processing_started=datetime.utcnow() - timedelta(minutes=31),
|
|
|
|
|
|
job_status=JOB_STATUS_IN_PROGRESS)
|
|
|
|
|
|
|
|
|
|
|
|
create_notification(sample_email_template, job, 0)
|
|
|
|
|
|
create_notification(sample_email_template, job, 1)
|
|
|
|
|
|
|
|
|
|
|
|
assert Notification.query.filter(Notification.job_id == job.id).count() == 2
|
|
|
|
|
|
|
|
|
|
|
|
process_incomplete_job(str(job.id))
|
|
|
|
|
|
|
|
|
|
|
|
completed_job = Job.query.filter(Job.id == job.id).one()
|
|
|
|
|
|
|
|
|
|
|
|
assert completed_job.job_status == JOB_STATUS_FINISHED
|
|
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
assert mock_email_saver.call_count == 8 # There are 10 in the file and we've added two already
|
2017-10-17 11:07:36 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_process_incomplete_job_letter(mocker, sample_letter_template):
|
|
|
|
|
|
mocker.patch('app.celery.tasks.s3.get_job_from_s3', return_value=load_example_csv('multiple_letter'))
|
2017-10-18 17:00:37 +01:00
|
|
|
|
mock_letter_saver = mocker.patch('app.celery.tasks.save_letter.apply_async')
|
2017-10-17 11:07:36 +01:00
|
|
|
|
|
|
|
|
|
|
job = create_job(template=sample_letter_template, notification_count=10,
|
|
|
|
|
|
created_at=datetime.utcnow() - timedelta(hours=2),
|
|
|
|
|
|
scheduled_for=datetime.utcnow() - timedelta(minutes=31),
|
|
|
|
|
|
processing_started=datetime.utcnow() - timedelta(minutes=31),
|
|
|
|
|
|
job_status=JOB_STATUS_IN_PROGRESS)
|
|
|
|
|
|
|
|
|
|
|
|
create_notification(sample_letter_template, job, 0)
|
|
|
|
|
|
create_notification(sample_letter_template, job, 1)
|
|
|
|
|
|
|
|
|
|
|
|
assert Notification.query.filter(Notification.job_id == job.id).count() == 2
|
|
|
|
|
|
|
|
|
|
|
|
process_incomplete_job(str(job.id))
|
|
|
|
|
|
|
2017-10-18 17:00:37 +01:00
|
|
|
|
assert mock_letter_saver.call_count == 8
|