mirror of
https://github.com/GSA/notifications-api.git
synced 2026-07-28 19:59:47 -04:00
remove letters from /service
This commit is contained in:
stvnrlly
@@ -1,248 +0,0 @@
|
||||
import uuid
|
||||
|
||||
import pytest
|
||||
from sqlalchemy.exc import SQLAlchemyError
|
||||
|
||||
from app.dao.service_letter_contact_dao import (
|
||||
add_letter_contact_for_service,
|
||||
archive_letter_contact,
|
||||
dao_get_letter_contact_by_id,
|
||||
dao_get_letter_contacts_by_service_id,
|
||||
update_letter_contact,
|
||||
)
|
||||
from app.models import ServiceLetterContact
|
||||
from tests.app.db import create_letter_contact, create_service, create_template
|
||||
|
||||
|
||||
def test_dao_get_letter_contacts_by_service_id(notify_db_session):
|
||||
service = create_service()
|
||||
default_letter_contact = create_letter_contact(service=service, contact_block='Edinburgh, ED1 1AA')
|
||||
second_letter_contact = create_letter_contact(service=service, contact_block='Cardiff, CA1 2DB', is_default=False)
|
||||
third_letter_contact = create_letter_contact(service=service, contact_block='London, E1 8QS', is_default=False)
|
||||
|
||||
results = dao_get_letter_contacts_by_service_id(service_id=service.id)
|
||||
|
||||
assert len(results) == 3
|
||||
assert default_letter_contact == results[0]
|
||||
assert third_letter_contact == results[1]
|
||||
assert second_letter_contact == results[2]
|
||||
|
||||
|
||||
def test_dao_get_letter_contacts_by_service_id_does_not_return_archived_contacts(notify_db_session):
|
||||
service = create_service()
|
||||
create_letter_contact(service=service, contact_block='Edinburgh, ED1 1AA')
|
||||
create_letter_contact(service=service, contact_block='Cardiff, CA1 2DB', is_default=False)
|
||||
archived_contact = create_letter_contact(
|
||||
service=service,
|
||||
contact_block='London, E1 8QS',
|
||||
is_default=False,
|
||||
archived=True
|
||||
)
|
||||
|
||||
results = dao_get_letter_contacts_by_service_id(service_id=service.id)
|
||||
|
||||
assert len(results) == 2
|
||||
assert archived_contact not in results
|
||||
|
||||
|
||||
def test_add_letter_contact_for_service_creates_additional_letter_contact_for_service(notify_db_session):
|
||||
service = create_service()
|
||||
|
||||
create_letter_contact(service=service, contact_block='Edinburgh, ED1 1AA')
|
||||
add_letter_contact_for_service(service_id=service.id, contact_block='Swansea, SN1 3CC', is_default=False)
|
||||
|
||||
results = dao_get_letter_contacts_by_service_id(service_id=service.id)
|
||||
|
||||
assert len(results) == 2
|
||||
|
||||
assert results[0].contact_block == 'Edinburgh, ED1 1AA'
|
||||
assert results[0].is_default
|
||||
assert not results[0].archived
|
||||
|
||||
assert results[1].contact_block == 'Swansea, SN1 3CC'
|
||||
assert not results[1].is_default
|
||||
assert not results[1].archived
|
||||
|
||||
|
||||
def test_add_another_letter_contact_as_default_overrides_existing(notify_db_session):
|
||||
service = create_service()
|
||||
|
||||
create_letter_contact(service=service, contact_block='Edinburgh, ED1 1AA')
|
||||
add_letter_contact_for_service(service_id=service.id, contact_block='Swansea, SN1 3CC', is_default=True)
|
||||
|
||||
results = dao_get_letter_contacts_by_service_id(service_id=service.id)
|
||||
|
||||
assert len(results) == 2
|
||||
|
||||
assert results[0].contact_block == 'Swansea, SN1 3CC'
|
||||
assert results[0].is_default
|
||||
|
||||
assert results[1].contact_block == 'Edinburgh, ED1 1AA'
|
||||
assert not results[1].is_default
|
||||
|
||||
|
||||
def test_add_letter_contact_does_not_override_default(notify_db_session):
|
||||
service = create_service()
|
||||
|
||||
add_letter_contact_for_service(service_id=service.id, contact_block='Edinburgh, ED1 1AA', is_default=True)
|
||||
add_letter_contact_for_service(service_id=service.id, contact_block='Swansea, SN1 3CC', is_default=False)
|
||||
|
||||
results = dao_get_letter_contacts_by_service_id(service_id=service.id)
|
||||
|
||||
assert len(results) == 2
|
||||
|
||||
assert results[0].contact_block == 'Edinburgh, ED1 1AA'
|
||||
assert results[0].is_default
|
||||
|
||||
assert results[1].contact_block == 'Swansea, SN1 3CC'
|
||||
assert not results[1].is_default
|
||||
|
||||
|
||||
def test_add_letter_contact_with_no_default_is_fine(notify_db_session):
|
||||
service = create_service()
|
||||
letter_contact = add_letter_contact_for_service(
|
||||
service_id=service.id,
|
||||
contact_block='Swansea, SN1 3CC',
|
||||
is_default=False
|
||||
)
|
||||
assert service.letter_contacts == [letter_contact]
|
||||
|
||||
|
||||
def test_add_letter_contact_when_multiple_defaults_exist_raises_exception(notify_db_session):
|
||||
service = create_service()
|
||||
create_letter_contact(service=service, contact_block='Edinburgh, ED1 1AA')
|
||||
create_letter_contact(service=service, contact_block='Aberdeen, AB12 23X')
|
||||
|
||||
with pytest.raises(Exception):
|
||||
add_letter_contact_for_service(service_id=service.id, contact_block='Swansea, SN1 3CC', is_default=False)
|
||||
|
||||
|
||||
def test_can_update_letter_contact(notify_db_session):
|
||||
service = create_service()
|
||||
letter_contact = create_letter_contact(service=service, contact_block='Aberdeen, AB12 23X')
|
||||
|
||||
update_letter_contact(
|
||||
service_id=service.id,
|
||||
letter_contact_id=letter_contact.id,
|
||||
contact_block='Warwick, W14 TSR',
|
||||
is_default=True
|
||||
)
|
||||
|
||||
updated_letter_contact = ServiceLetterContact.query.get(letter_contact.id)
|
||||
|
||||
assert updated_letter_contact.contact_block == 'Warwick, W14 TSR'
|
||||
assert updated_letter_contact.updated_at
|
||||
assert updated_letter_contact.is_default
|
||||
|
||||
|
||||
def test_update_letter_contact_as_default_overides_existing_default(notify_db_session):
|
||||
service = create_service()
|
||||
|
||||
create_letter_contact(service=service, contact_block='Aberdeen, AB12 23X')
|
||||
second_letter_contact = create_letter_contact(service=service, contact_block='Swansea, SN1 3CC', is_default=False)
|
||||
|
||||
update_letter_contact(
|
||||
service_id=service.id,
|
||||
letter_contact_id=second_letter_contact.id,
|
||||
contact_block='Warwick, W14 TSR',
|
||||
is_default=True
|
||||
)
|
||||
|
||||
results = dao_get_letter_contacts_by_service_id(service_id=service.id)
|
||||
assert len(results) == 2
|
||||
|
||||
assert results[0].contact_block == 'Warwick, W14 TSR'
|
||||
assert results[0].is_default
|
||||
|
||||
assert results[1].contact_block == 'Aberdeen, AB12 23X'
|
||||
assert not results[1].is_default
|
||||
|
||||
|
||||
def test_update_letter_contact_unset_default_for_only_letter_contact_is_fine(notify_db_session):
|
||||
service = create_service()
|
||||
only_letter_contact = create_letter_contact(service=service, contact_block='Aberdeen, AB12 23X')
|
||||
update_letter_contact(
|
||||
service_id=service.id,
|
||||
letter_contact_id=only_letter_contact.id,
|
||||
contact_block='Warwick, W14 TSR',
|
||||
is_default=False
|
||||
)
|
||||
assert only_letter_contact.is_default is False
|
||||
|
||||
|
||||
def test_archive_letter_contact(notify_db_session):
|
||||
service = create_service()
|
||||
create_letter_contact(service=service, contact_block='Aberdeen, AB12 23X')
|
||||
letter_contact = create_letter_contact(service=service, contact_block='Edinburgh, ED1 1AA', is_default=False)
|
||||
|
||||
archive_letter_contact(service.id, letter_contact.id)
|
||||
|
||||
assert letter_contact.archived
|
||||
assert letter_contact.updated_at is not None
|
||||
|
||||
|
||||
def test_archive_letter_contact_does_not_archive_a_letter_contact_for_a_different_service(
|
||||
notify_db_session,
|
||||
sample_service,
|
||||
):
|
||||
service = create_service(service_name="First service")
|
||||
letter_contact = create_letter_contact(
|
||||
service=sample_service,
|
||||
contact_block='Edinburgh, ED1 1AA',
|
||||
is_default=False)
|
||||
|
||||
with pytest.raises(SQLAlchemyError):
|
||||
archive_letter_contact(service.id, letter_contact.id)
|
||||
|
||||
assert not letter_contact.archived
|
||||
|
||||
|
||||
def test_archive_letter_contact_can_archive_a_service_default_letter_contact(notify_db_session):
|
||||
service = create_service()
|
||||
letter_contact = create_letter_contact(service=service, contact_block='Edinburgh, ED1 1AA')
|
||||
archive_letter_contact(service.id, letter_contact.id)
|
||||
assert letter_contact.archived is True
|
||||
|
||||
|
||||
def test_archive_letter_contact_does_dissociates_template_defaults_before_archiving(notify_db_session):
|
||||
service = create_service()
|
||||
create_letter_contact(service=service, contact_block='Edinburgh, ED1 1AA')
|
||||
template_default = create_letter_contact(service=service, contact_block='Aberdeen, AB12 23X', is_default=False)
|
||||
associated_template_1 = create_template(service=service, template_type='letter', reply_to=template_default.id)
|
||||
associated_template_2 = create_template(service=service, template_type='letter', reply_to=template_default.id)
|
||||
|
||||
assert associated_template_1.reply_to == template_default.id
|
||||
assert associated_template_2.reply_to == template_default.id
|
||||
assert template_default.archived is False
|
||||
|
||||
archive_letter_contact(service.id, template_default.id)
|
||||
|
||||
assert associated_template_1.reply_to is None
|
||||
assert associated_template_2.reply_to is None
|
||||
assert template_default.archived is True
|
||||
|
||||
|
||||
def test_dao_get_letter_contact_by_id(sample_service):
|
||||
letter_contact = create_letter_contact(service=sample_service, contact_block='Aberdeen, AB12 23X')
|
||||
result = dao_get_letter_contact_by_id(service_id=sample_service.id, letter_contact_id=letter_contact.id)
|
||||
assert result == letter_contact
|
||||
|
||||
|
||||
def test_dao_get_letter_contact_by_id_raises_sqlalchemy_error_when_letter_contact_does_not_exist(sample_service):
|
||||
with pytest.raises(SQLAlchemyError):
|
||||
dao_get_letter_contact_by_id(service_id=sample_service.id, letter_contact_id=uuid.uuid4())
|
||||
|
||||
|
||||
def test_dao_get_letter_contact_by_id_raises_sqlalchemy_error_when_letter_contact_is_archived(sample_service):
|
||||
archived_contact = create_letter_contact(
|
||||
service=sample_service,
|
||||
contact_block='Aberdeen, AB12 23X',
|
||||
archived=True)
|
||||
with pytest.raises(SQLAlchemyError):
|
||||
dao_get_letter_contact_by_id(service_id=sample_service.id, letter_contact_id=archived_contact.id)
|
||||
|
||||
|
||||
def test_dao_get_letter_contact_by_id_raises_sqlalchemy_error_when_service_does_not_exist(sample_service):
|
||||
letter_contact = create_letter_contact(service=sample_service, contact_block='Some address')
|
||||
with pytest.raises(SQLAlchemyError):
|
||||
dao_get_letter_contact_by_id(service_id=uuid.uuid4(), letter_contact_id=letter_contact.id)
|
||||
@@ -7,7 +7,7 @@ from notifications_utils import SMS_CHAR_COUNT_LIMIT
|
||||
|
||||
import app
|
||||
from app.dao import templates_dao
|
||||
from app.models import EMAIL_TYPE, LETTER_TYPE, SMS_TYPE
|
||||
from app.models import EMAIL_TYPE, SMS_TYPE
|
||||
from app.notifications.process_notifications import (
|
||||
create_content_for_notification,
|
||||
)
|
||||
@@ -18,7 +18,6 @@ from app.notifications.validators import (
|
||||
check_rate_limiting,
|
||||
check_reply_to,
|
||||
check_service_email_reply_to_id,
|
||||
check_service_letter_contact_id,
|
||||
check_service_over_api_rate_limit,
|
||||
check_service_over_daily_message_limit,
|
||||
check_service_sms_sender_id,
|
||||
@@ -37,7 +36,6 @@ from app.utils import get_template_instance
|
||||
from app.v2.errors import BadRequestError, RateLimitError, TooManyRequestsError
|
||||
from tests.app.db import (
|
||||
create_api_key,
|
||||
create_letter_contact,
|
||||
create_reply_to_email,
|
||||
create_service,
|
||||
create_service_guest_list,
|
||||
@@ -266,7 +264,7 @@ def test_service_can_send_to_recipient_fails_when_mobile_number_is_not_on_team(s
|
||||
|
||||
@pytest.mark.parametrize('char_count', [612, 0, 494, 200, 918])
|
||||
@pytest.mark.parametrize('show_prefix', [True, False])
|
||||
@pytest.mark.parametrize('template_type', ['sms', 'email', 'letter'])
|
||||
@pytest.mark.parametrize('template_type', ['sms', 'email'])
|
||||
def test_check_is_message_too_long_passes(notify_db_session, show_prefix, char_count, template_type):
|
||||
service = create_service(prefix_sms=show_prefix)
|
||||
t = create_template(service=service, content='a' * char_count, template_type=template_type)
|
||||
@@ -502,7 +500,7 @@ def test_validate_and_format_recipient_fails_when_no_recipient():
|
||||
assert e.value.message == "Recipient can't be empty"
|
||||
|
||||
|
||||
@pytest.mark.parametrize('notification_type', ['sms', 'email', 'letter'])
|
||||
@pytest.mark.parametrize('notification_type', ['sms', 'email'])
|
||||
def test_check_service_email_reply_to_id_where_reply_to_id_is_none(notification_type):
|
||||
assert check_service_email_reply_to_id(None, None, notification_type) is None
|
||||
|
||||
@@ -529,7 +527,7 @@ def test_check_service_email_reply_to_id_where_reply_to_id_is_not_found(sample_s
|
||||
.format(fake_uuid, sample_service.id)
|
||||
|
||||
|
||||
@pytest.mark.parametrize('notification_type', ['sms', 'email', 'letter'])
|
||||
@pytest.mark.parametrize('notification_type', ['sms', 'email'])
|
||||
def test_check_service_sms_sender_id_where_sms_sender_id_is_none(notification_type):
|
||||
assert check_service_sms_sender_id(None, None, notification_type) is None
|
||||
|
||||
@@ -556,33 +554,7 @@ def test_check_service_sms_sender_id_where_sms_sender_is_not_found(sample_servic
|
||||
.format(fake_uuid, sample_service.id)
|
||||
|
||||
|
||||
def test_check_service_letter_contact_id_where_letter_contact_id_is_none():
|
||||
assert check_service_letter_contact_id(None, None, 'letter') is None
|
||||
|
||||
|
||||
def test_check_service_letter_contact_id_where_letter_contact_id_is_found(sample_service):
|
||||
letter_contact = create_letter_contact(service=sample_service, contact_block='123456')
|
||||
assert check_service_letter_contact_id(sample_service.id, letter_contact.id, LETTER_TYPE) == '123456'
|
||||
|
||||
|
||||
def test_check_service_letter_contact_id_where_service_id_is_not_found(sample_service, fake_uuid):
|
||||
letter_contact = create_letter_contact(service=sample_service, contact_block='123456')
|
||||
with pytest.raises(BadRequestError) as e:
|
||||
check_service_letter_contact_id(fake_uuid, letter_contact.id, LETTER_TYPE)
|
||||
assert e.value.status_code == 400
|
||||
assert e.value.message == 'letter_contact_id {} does not exist in database for service id {}' \
|
||||
.format(letter_contact.id, fake_uuid)
|
||||
|
||||
|
||||
def test_check_service_letter_contact_id_where_letter_contact_is_not_found(sample_service, fake_uuid):
|
||||
with pytest.raises(BadRequestError) as e:
|
||||
check_service_letter_contact_id(sample_service.id, fake_uuid, LETTER_TYPE)
|
||||
assert e.value.status_code == 400
|
||||
assert e.value.message == 'letter_contact_id {} does not exist in database for service id {}' \
|
||||
.format(fake_uuid, sample_service.id)
|
||||
|
||||
|
||||
@pytest.mark.parametrize('notification_type', ['sms', 'email', 'letter'])
|
||||
@pytest.mark.parametrize('notification_type', ['sms', 'email'])
|
||||
def test_check_reply_to_with_empty_reply_to(sample_service, notification_type):
|
||||
assert check_reply_to(sample_service.id, None, notification_type) is None
|
||||
|
||||
@@ -597,11 +569,6 @@ def test_check_reply_to_sms_type(sample_service):
|
||||
assert check_reply_to(sample_service.id, sms_sender.id, SMS_TYPE) == '123456'
|
||||
|
||||
|
||||
def test_check_reply_to_letter_type(sample_service):
|
||||
letter_contact = create_letter_contact(service=sample_service, contact_block='123456')
|
||||
assert check_reply_to(sample_service.id, letter_contact.id, LETTER_TYPE) == '123456'
|
||||
|
||||
|
||||
@pytest.mark.skip(reason="Needs updating for TTS: Failing for unknown reason")
|
||||
def test_check_if_service_can_send_files_by_email_raises_if_no_contact_link_set(sample_service):
|
||||
with pytest.raises(BadRequestError) as e:
|
||||
|
||||
@@ -1167,8 +1167,7 @@ def test_should_not_allow_email_notifications_if_service_permission_not_set(
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"notification_type, err_msg",
|
||||
[("letter", "letter notification type is not supported, please use the latest version of the client"),
|
||||
("apple", "apple notification type is not supported")])
|
||||
[("apple", "apple notification type is not supported")])
|
||||
def test_should_throw_exception_if_notification_type_is_invalid(client, sample_service, notification_type, err_msg):
|
||||
auth_header = create_service_authorization_header(service_id=sample_service.id)
|
||||
response = client.post(
|
||||
|
||||
@@ -47,7 +47,6 @@ from tests.app.db import (
|
||||
create_ft_billing,
|
||||
create_ft_notification_status,
|
||||
create_inbound_number,
|
||||
create_letter_contact,
|
||||
create_notification,
|
||||
create_organisation,
|
||||
create_reply_to_email,
|
||||
@@ -2771,192 +2770,6 @@ def test_get_email_reply_to_address(client, notify_db_session):
|
||||
assert json.loads(response.get_data(as_text=True)) == reply_to.serialize()
|
||||
|
||||
|
||||
def test_get_letter_contacts_when_there_are_no_letter_contacts(client, sample_service):
|
||||
response = client.get('/service/{}/letter-contact'.format(sample_service.id),
|
||||
headers=[create_admin_authorization_header()])
|
||||
|
||||
assert json.loads(response.get_data(as_text=True)) == []
|
||||
assert response.status_code == 200
|
||||
|
||||
|
||||
def test_get_letter_contacts_with_one_letter_contact(client, notify_db_session):
|
||||
service = create_service()
|
||||
create_letter_contact(service, 'Aberdeen, AB23 1XH')
|
||||
|
||||
response = client.get('/service/{}/letter-contact'.format(service.id),
|
||||
headers=[create_admin_authorization_header()])
|
||||
json_response = json.loads(response.get_data(as_text=True))
|
||||
|
||||
assert len(json_response) == 1
|
||||
assert json_response[0]['contact_block'] == 'Aberdeen, AB23 1XH'
|
||||
assert json_response[0]['is_default']
|
||||
assert json_response[0]['created_at']
|
||||
assert not json_response[0]['updated_at']
|
||||
assert response.status_code == 200
|
||||
|
||||
|
||||
def test_get_letter_contacts_with_multiple_letter_contacts(client, notify_db_session):
|
||||
service = create_service()
|
||||
letter_contact_a = create_letter_contact(service, 'Aberdeen, AB23 1XH')
|
||||
letter_contact_b = create_letter_contact(service, 'London, E1 8QS', False)
|
||||
|
||||
response = client.get('/service/{}/letter-contact'.format(service.id),
|
||||
headers=[create_admin_authorization_header()])
|
||||
json_response = json.loads(response.get_data(as_text=True))
|
||||
|
||||
assert len(json_response) == 2
|
||||
assert response.status_code == 200
|
||||
|
||||
assert json_response[0]['id'] == str(letter_contact_a.id)
|
||||
assert json_response[0]['service_id'] == str(letter_contact_a.service_id)
|
||||
assert json_response[0]['contact_block'] == 'Aberdeen, AB23 1XH'
|
||||
assert json_response[0]['is_default']
|
||||
assert json_response[0]['created_at']
|
||||
assert not json_response[0]['updated_at']
|
||||
|
||||
assert json_response[1]['id'] == str(letter_contact_b.id)
|
||||
assert json_response[1]['service_id'] == str(letter_contact_b.service_id)
|
||||
assert json_response[1]['contact_block'] == 'London, E1 8QS'
|
||||
assert not json_response[1]['is_default']
|
||||
assert json_response[1]['created_at']
|
||||
assert not json_response[1]['updated_at']
|
||||
|
||||
|
||||
def test_get_letter_contact_by_id(client, notify_db_session):
|
||||
service = create_service()
|
||||
letter_contact = create_letter_contact(service, 'London, E1 8QS')
|
||||
|
||||
response = client.get('/service/{}/letter-contact/{}'.format(service.id, letter_contact.id),
|
||||
headers=[('Content-Type', 'application/json'), create_admin_authorization_header()])
|
||||
|
||||
assert response.status_code == 200
|
||||
assert json.loads(response.get_data(as_text=True)) == letter_contact.serialize()
|
||||
|
||||
|
||||
def test_get_letter_contact_return_404_when_invalid_contact_id(client, notify_db_session):
|
||||
service = create_service()
|
||||
|
||||
response = client.get('/service/{}/letter-contact/{}'.format(service.id, '93d59f88-4aa1-453c-9900-f61e2fc8a2de'),
|
||||
headers=[('Content-Type', 'application/json'), create_admin_authorization_header()])
|
||||
|
||||
assert response.status_code == 404
|
||||
|
||||
|
||||
def test_add_service_contact_block(client, sample_service):
|
||||
data = json.dumps({"contact_block": "London, E1 8QS", "is_default": True})
|
||||
response = client.post('/service/{}/letter-contact'.format(sample_service.id),
|
||||
data=data,
|
||||
headers=[('Content-Type', 'application/json'), create_admin_authorization_header()])
|
||||
|
||||
assert response.status_code == 201
|
||||
json_resp = json.loads(response.get_data(as_text=True))
|
||||
results = ServiceLetterContact.query.all()
|
||||
assert len(results) == 1
|
||||
assert json_resp['data'] == results[0].serialize()
|
||||
|
||||
|
||||
def test_add_service_letter_contact_can_add_multiple_addresses(client, sample_service):
|
||||
first = json.dumps({"contact_block": "London, E1 8QS", "is_default": True})
|
||||
client.post('/service/{}/letter-contact'.format(sample_service.id),
|
||||
data=first,
|
||||
headers=[('Content-Type', 'application/json'), create_admin_authorization_header()])
|
||||
|
||||
second = json.dumps({"contact_block": "Aberdeen, AB23 1XH", "is_default": True})
|
||||
response = client.post('/service/{}/letter-contact'.format(sample_service.id),
|
||||
data=second,
|
||||
headers=[('Content-Type', 'application/json'), create_admin_authorization_header()])
|
||||
assert response.status_code == 201
|
||||
json_resp = json.loads(response.get_data(as_text=True))
|
||||
results = ServiceLetterContact.query.all()
|
||||
assert len(results) == 2
|
||||
default = [x for x in results if x.is_default]
|
||||
assert json_resp['data'] == default[0].serialize()
|
||||
first_letter_contact_not_default = [x for x in results if not x.is_default]
|
||||
assert first_letter_contact_not_default[0].contact_block == 'London, E1 8QS'
|
||||
|
||||
|
||||
def test_add_service_letter_contact_block_fine_if_no_default(client, sample_service):
|
||||
data = json.dumps({"contact_block": "London, E1 8QS", "is_default": False})
|
||||
response = client.post('/service/{}/letter-contact'.format(sample_service.id),
|
||||
data=data,
|
||||
headers=[('Content-Type', 'application/json'), create_admin_authorization_header()])
|
||||
assert response.status_code == 201
|
||||
|
||||
|
||||
def test_add_service_letter_contact_block_404s_when_invalid_service_id(client, notify_db_session):
|
||||
response = client.post('/service/{}/letter-contact'.format(uuid.uuid4()),
|
||||
data={},
|
||||
headers=[('Content-Type', 'application/json'), create_admin_authorization_header()])
|
||||
|
||||
assert response.status_code == 404
|
||||
result = json.loads(response.get_data(as_text=True))
|
||||
assert result['result'] == 'error'
|
||||
assert result['message'] == 'No result found'
|
||||
|
||||
|
||||
def test_update_service_letter_contact(client, sample_service):
|
||||
original_letter_contact = create_letter_contact(service=sample_service, contact_block="Aberdeen, AB23 1XH")
|
||||
data = json.dumps({"contact_block": "London, E1 8QS", "is_default": True})
|
||||
response = client.post('/service/{}/letter-contact/{}'.format(sample_service.id, original_letter_contact.id),
|
||||
data=data,
|
||||
headers=[('Content-Type', 'application/json'), create_admin_authorization_header()])
|
||||
|
||||
assert response.status_code == 200
|
||||
json_resp = json.loads(response.get_data(as_text=True))
|
||||
results = ServiceLetterContact.query.all()
|
||||
assert len(results) == 1
|
||||
assert json_resp['data'] == results[0].serialize()
|
||||
|
||||
|
||||
def test_update_service_letter_contact_returns_200_when_no_default(client, sample_service):
|
||||
original_reply_to = create_letter_contact(service=sample_service, contact_block="Aberdeen, AB23 1XH")
|
||||
data = json.dumps({"contact_block": "London, E1 8QS", "is_default": False})
|
||||
response = client.post('/service/{}/letter-contact/{}'.format(sample_service.id, original_reply_to.id),
|
||||
data=data,
|
||||
headers=[('Content-Type', 'application/json'), create_admin_authorization_header()])
|
||||
assert response.status_code == 200
|
||||
|
||||
|
||||
def test_update_service_letter_contact_returns_404_when_invalid_service_id(client, notify_db_session):
|
||||
response = client.post('/service/{}/letter-contact/{}'.format(uuid.uuid4(), uuid.uuid4()),
|
||||
data={},
|
||||
headers=[('Content-Type', 'application/json'), create_admin_authorization_header()])
|
||||
|
||||
assert response.status_code == 404
|
||||
result = json.loads(response.get_data(as_text=True))
|
||||
assert result['result'] == 'error'
|
||||
assert result['message'] == 'No result found'
|
||||
|
||||
|
||||
def test_delete_service_letter_contact_can_archive_letter_contact(admin_request, notify_db_session):
|
||||
service = create_service()
|
||||
create_letter_contact(service=service, contact_block='Edinburgh, ED1 1AA')
|
||||
letter_contact = create_letter_contact(service=service, contact_block='Swansea, SN1 3CC', is_default=False)
|
||||
|
||||
admin_request.post(
|
||||
'service.delete_service_letter_contact',
|
||||
service_id=service.id,
|
||||
letter_contact_id=letter_contact.id,
|
||||
)
|
||||
|
||||
assert letter_contact.archived is True
|
||||
|
||||
|
||||
def test_delete_service_letter_contact_returns_200_if_archiving_template_default(admin_request, notify_db_session):
|
||||
service = create_service()
|
||||
create_letter_contact(service=service, contact_block='Edinburgh, ED1 1AA')
|
||||
letter_contact = create_letter_contact(service=service, contact_block='Swansea, SN1 3CC', is_default=False)
|
||||
create_template(service=service, template_type='letter', reply_to=letter_contact.id)
|
||||
|
||||
response = admin_request.post(
|
||||
'service.delete_service_letter_contact',
|
||||
service_id=service.id,
|
||||
letter_contact_id=letter_contact.id,
|
||||
_expected_status=200
|
||||
)
|
||||
assert response['data']['archived'] is True
|
||||
|
||||
|
||||
def test_add_service_sms_sender_can_add_multiple_senders(client, notify_db_session):
|
||||
service = create_service()
|
||||
data = {
|
||||
|
||||
@@ -785,28 +785,6 @@ def test_create_a_template_with_reply_to(admin_request, sample_user):
|
||||
assert th.service_letter_contact_id == letter_contact.id
|
||||
|
||||
|
||||
def test_create_a_template_with_foreign_service_reply_to(admin_request, sample_user):
|
||||
service = create_service(service_permissions=['letter'])
|
||||
service2 = create_service(service_name='test service', email_from='test@example.com',
|
||||
service_permissions=['letter'])
|
||||
letter_contact = create_letter_contact(service2, "Edinburgh, ED1 1AA")
|
||||
data = {
|
||||
'name': 'my template',
|
||||
'subject': 'subject',
|
||||
'template_type': 'letter',
|
||||
'content': 'template <b>content</b>',
|
||||
'service': str(service.id),
|
||||
'created_by': str(sample_user.id),
|
||||
'reply_to': str(letter_contact.id),
|
||||
}
|
||||
|
||||
json_resp = admin_request.post('template.create_template', service_id=service.id, _data=data, _expected_status=400)
|
||||
|
||||
assert json_resp['message'] == "letter_contact_id {} does not exist in database for service id {}".format(
|
||||
str(letter_contact.id), str(service.id)
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.parametrize('post_data, expected_errors', [
|
||||
(
|
||||
{},
|
||||
|
||||
Reference in New Issue
Block a user