darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-24 16:24:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Send postage value to API when sending pre compiled letter

Browse Source
This commit is contained in:
David McDonald
2019-10-09 14:50:06 +01:00
parent 9ba1dbfffa
commit 2b8b4c25aa
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/main/views/uploads.py
View File

@@ -202,13 +202,14 @@ def send_uploaded_letter(service_id):
abort(403) abort(403)
file_id = request.form['file_id'] file_id = request.form['file_id']
postage = request.form['postage']
metadata = get_letter_metadata(service_id, file_id) metadata = get_letter_metadata(service_id, file_id)
filename = metadata.get('filename') filename = metadata.get('filename')
if metadata.get('status') != 'valid': if metadata.get('status') != 'valid':
abort(403) 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( return redirect(url_for(
'.view_notification', '.view_notification',

4
app/notify_client/notification_api_client.py
View File

@@ -59,11 +59,11 @@ class NotificationApiClient(NotifyAdminAPIClient):
data = _attach_current_user(data) data = _attach_current_user(data)
return self.post(url='/service/{}/send-notification'.format(service_id), data=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 = { data = {
'filename': filename, 'filename': filename,
'file_id': file_id, 'file_id': file_id,
'postage': 'second', 'postage': postage,
} }
data = _attach_current_user(data) data = _attach_current_user(data)
return self.post(url='/service/{}/send-pdf-letter'.format(service_id), data=data) return self.post(url='/service/{}/send-pdf-letter'.format(service_id), data=data)

6
tests/app/main/views/test_uploads.py
View File

@@ -417,7 +417,7 @@ def test_send_uploaded_letter_sends_letter_and_redirects_to_notification_page(mo
client_request.post( client_request.post(
'main.send_uploaded_letter', 'main.send_uploaded_letter',
service_id=SERVICE_ONE_ID, 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( _expected_redirect=url_for(
'main.view_notification', 'main.view_notification',
service_id=SERVICE_ONE_ID, service_id=SERVICE_ONE_ID,
@@ -425,7 +425,7 @@ def test_send_uploaded_letter_sends_letter_and_redirects_to_notification_page(mo
_external=True _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', [ @pytest.mark.parametrize('permissions', [
@@ -448,7 +448,7 @@ def test_send_uploaded_letter_when_service_does_not_have_correct_permissions(
client_request.post( client_request.post(
'main.send_uploaded_letter', 'main.send_uploaded_letter',
service_id=SERVICE_ONE_ID, 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 _expected_status=403
) )
assert not mock_send.called assert not mock_send.called

3
tests/app/notify_client/test_notification_client.py
View File

@@ -64,7 +64,8 @@ def test_send_precompiled_letter(mocker, logged_in_client, active_user_with_perm
NotificationApiClient().send_precompiled_letter( NotificationApiClient().send_precompiled_letter(
'abcd-1234', 'abcd-1234',
'my_file.pdf', 'my_file.pdf',
'file-ID' 'file-ID',
'second'
) )
mock_post.assert_called_once_with( mock_post.assert_called_once_with(
url='/service/abcd-1234/send-pdf-letter', url='/service/abcd-1234/send-pdf-letter',