diff --git a/app/main/views/send.py b/app/main/views/send.py index afdda5abe..6e9f83970 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -942,6 +942,18 @@ def preview_notification(service_id, template_id): ) @user_has_permissions("send_messages", restrict_admin_usage=True) def send_notification(service_id, template_id): + print("GOING TO GET RECIPIENT") # noqa + recipient = get_recipient() + print(f"RECIPIENT IS {recipient}, redirecting if None") # noqa + + if not recipient: + return redirect( + url_for( + ".send_one_off", + service_id=service_id, + template_id=template_id, + ) + ) upload_id = _send_notification(service_id, template_id) session.pop("recipient", "") @@ -995,18 +1007,7 @@ def send_notification(service_id, template_id): def _send_notification(service_id, template_id): scheduled_for = session.pop("scheduled_for", "") - print("GOING TO GET RECIPIENT") # noqa - recipient = get_recipient() - print(f"RECIPIENT IS {recipient}, redirecting if None") # noqa - if not recipient: - return redirect( - url_for( - ".send_one_off", - service_id=service_id, - template_id=template_id, - ) - ) keys = [] values = [] diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py index 9da3c1333..1d8e696f8 100644 --- a/tests/app/main/views/test_send.py +++ b/tests/app/main/views/test_send.py @@ -2820,7 +2820,6 @@ def test_send_notification_redirects_if_missing_data( with client_request.session_transaction() as session: session.update(session_data) - mocker.patch("app.main.views.send.s3upload", return_value=sample_uuid()) client_request.post( "main.send_notification", service_id=SERVICE_ONE_ID,