darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-01 23:55:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Dissociate letter contact blocks before archiving

Browse Source 
Otherwise you can’t archive it.
This commit is contained in:
Chris Hill-Scott
2019-07-05 13:29:42 +01:00
parent ed6f9e4736
commit dd225fbc6e
3 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/app/dao/test_service_letter_contact_dao.py
View File

@@ -209,16 +209,22 @@ def test_archive_letter_contact_does_not_archive_a_service_default_letter_contac
assert 'You cannot delete a default letter contact block' in str(e.value)
def test_archive_letter_contact_does_not_archive_a_template_default_letter_contact(notify_db_session):
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)
create_template(service=service, template_type='letter', reply_to=template_default.id)
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)
with pytest.raises(ArchiveValidationError) as e:
archive_letter_contact(service.id, 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
assert 'You cannot delete the default letter contact block for a template' in str(e.value)
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):

9
tests/app/service/test_rest.py
View File

@@ -2901,7 +2901,7 @@ def test_delete_service_letter_contact_can_archive_letter_contact(admin_request,
assert letter_contact.archived is True
def test_delete_service_letter_contact_returns_400_if_archiving_template_default(admin_request, notify_db_session):
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)
@@ -2911,12 +2911,9 @@ def test_delete_service_letter_contact_returns_400_if_archiving_template_default
'service.delete_service_letter_contact',
service_id=service.id,
letter_contact_id=letter_contact.id,
_expected_status=400
_expected_status=200
)
assert response == {
'message': 'You cannot delete the default letter contact block for a template',
'result': 'error'}
assert letter_contact.archived is False
assert response['data']['archived'] is True
def test_add_service_sms_sender_can_add_multiple_senders(client, notify_db_session):