From 2b8b4c25aab7a4caa7123aa93e9d66e396fc8ff1 Mon Sep 17 00:00:00 2001 From: David McDonald Date: Wed, 9 Oct 2019 14:50:06 +0100 Subject: [PATCH] Send postage value to API when sending pre compiled letter --- app/main/views/uploads.py | 3 ++- app/notify_client/notification_api_client.py | 4 ++-- tests/app/main/views/test_uploads.py | 6 +++--- tests/app/notify_client/test_notification_client.py | 3 ++- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/main/views/uploads.py b/app/main/views/uploads.py index f39ccf402..3fe4e30ab 100644 --- a/app/main/views/uploads.py +++ b/app/main/views/uploads.py @@ -202,13 +202,14 @@ def send_uploaded_letter(service_id): abort(403) file_id = request.form['file_id'] + postage = request.form['postage'] metadata = get_letter_metadata(service_id, file_id) filename = metadata.get('filename') if metadata.get('status') != 'valid': abort(403) - notification_api_client.send_precompiled_letter(service_id, filename, file_id) + notification_api_client.send_precompiled_letter(service_id, filename, file_id, postage) return redirect(url_for( '.view_notification', diff --git a/app/notify_client/notification_api_client.py b/app/notify_client/notification_api_client.py index 793af02ef..0ce251f6b 100644 --- a/app/notify_client/notification_api_client.py +++ b/app/notify_client/notification_api_client.py @@ -59,11 +59,11 @@ class NotificationApiClient(NotifyAdminAPIClient): data = _attach_current_user(data) return self.post(url='/service/{}/send-notification'.format(service_id), data=data) - def send_precompiled_letter(self, service_id, filename, file_id): + def send_precompiled_letter(self, service_id, filename, file_id, postage): data = { 'filename': filename, 'file_id': file_id, - 'postage': 'second', + 'postage': postage, } data = _attach_current_user(data) return self.post(url='/service/{}/send-pdf-letter'.format(service_id), data=data) diff --git a/tests/app/main/views/test_uploads.py b/tests/app/main/views/test_uploads.py index a9f89bd3d..d99efa3be 100644 --- a/tests/app/main/views/test_uploads.py +++ b/tests/app/main/views/test_uploads.py @@ -417,7 +417,7 @@ def test_send_uploaded_letter_sends_letter_and_redirects_to_notification_page(mo client_request.post( 'main.send_uploaded_letter', service_id=SERVICE_ONE_ID, - _data={'filename': 'my_file.pdf', 'file_id': file_id}, + _data={'filename': 'my_file.pdf', 'file_id': file_id, 'postage': 'first'}, _expected_redirect=url_for( 'main.view_notification', service_id=SERVICE_ONE_ID, @@ -425,7 +425,7 @@ def test_send_uploaded_letter_sends_letter_and_redirects_to_notification_page(mo _external=True ) ) - mock_send.assert_called_once_with(SERVICE_ONE_ID, 'my_file.pdf', file_id) + mock_send.assert_called_once_with(SERVICE_ONE_ID, 'my_file.pdf', file_id, 'first') @pytest.mark.parametrize('permissions', [ @@ -448,7 +448,7 @@ def test_send_uploaded_letter_when_service_does_not_have_correct_permissions( client_request.post( 'main.send_uploaded_letter', service_id=SERVICE_ONE_ID, - _data={'filename': 'my_file.pdf', 'file_id': file_id}, + _data={'filename': 'my_file.pdf', 'file_id': file_id, 'postage': 'first'}, _expected_status=403 ) assert not mock_send.called diff --git a/tests/app/notify_client/test_notification_client.py b/tests/app/notify_client/test_notification_client.py index eee76a981..5df1a97b1 100644 --- a/tests/app/notify_client/test_notification_client.py +++ b/tests/app/notify_client/test_notification_client.py @@ -64,7 +64,8 @@ def test_send_precompiled_letter(mocker, logged_in_client, active_user_with_perm NotificationApiClient().send_precompiled_letter( 'abcd-1234', 'my_file.pdf', - 'file-ID' + 'file-ID', + 'second' ) mock_post.assert_called_once_with( url='/service/abcd-1234/send-pdf-letter',