darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-23 17:01:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update error message, now includes the url where the service can add contact details.

Browse Source
This commit is contained in:
Rebecca Law
2020-02-26 16:04:15 +00:00
parent 6d21515adf
commit 95d48d40a9
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/notifications/validators.py
View File

@@ -89,10 +89,12 @@ def check_service_has_permission(notify_type, permissions):
)) ))
def check_if_service_can_send_files_by_email(service_contact_link): def check_if_service_can_send_files_by_email(service_contact_link, service_id):
if not service_contact_link: if not service_contact_link:
raise BadRequestError( raise BadRequestError(
message="Send files by email has not been set up. Go to your Settings page to manage Send files by email." message=f"Send files by email has not been set up - add contact details for your service at "
f"{current_app.config['ADMIN_BASE_URL']}/services/{service_id}/service-settings/send-files-by-email"
) )

5
app/v2/notifications/post_notifications.py
View File

@@ -235,7 +235,10 @@ def process_document_uploads(personalisation_data, service, simulated=False):
personalisation_data = personalisation_data.copy() personalisation_data = personalisation_data.copy()
check_if_service_can_send_files_by_email(authenticated_service.contact_link) check_if_service_can_send_files_by_email(
service_contact_link=authenticated_service.contact_link,
service_id=authenticated_service.id
)
for key in file_keys: for key in file_keys:
if simulated: if simulated:

13
tests/app/notifications/test_validators.py
View File

@@ -533,13 +533,20 @@ def test_check_reply_to_letter_type(sample_service):
def test_check_if_service_can_send_files_by_email_raises_if_no_contact_link_set(sample_service): def test_check_if_service_can_send_files_by_email_raises_if_no_contact_link_set(sample_service):
with pytest.raises(BadRequestError) as e: with pytest.raises(BadRequestError) as e:
check_if_service_can_send_files_by_email(sample_service.contact_link) check_if_service_can_send_files_by_email(
service_contact_link=sample_service.contact_link,
service_id=sample_service.id
)
message = "Send files by email has not been set up. Go to your Settings page to manage Send files by email." message = f"Send files by email has not been set up - add contact details for your service at " \
f"http://localhost:6012/services/{sample_service.id}/service-settings/send-files-by-email"
assert e.value.status_code == 400 assert e.value.status_code == 400
assert e.value.message == message assert e.value.message == message
def test_check_if_service_can_send_files_by_email_passes_if_contact_link_set(sample_service): def test_check_if_service_can_send_files_by_email_passes_if_contact_link_set(sample_service):
sample_service.contact_link = 'contact.me@gov.uk' sample_service.contact_link = 'contact.me@gov.uk'
check_if_service_can_send_files_by_email(sample_service.contact_link) check_if_service_can_send_files_by_email(
service_contact_link=sample_service.contact_link,
service_id=sample_service.id
)