From 3378dfe2589fbc5d5068d5cbf48b403e87834a18 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 19 May 2020 18:19:07 +0100 Subject: [PATCH 1/6] Remove letter sending route without file_id All instances of the app will be posting to the URL with the `file_id` parameter now, so we can remove the old route without the ID now. --- app/main/forms.py | 3 -- app/main/views/uploads.py | 4 +- tests/app/main/views/test_uploads.py | 71 ++++------------------------ 3 files changed, 11 insertions(+), 67 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index 0312537ef..04c51202f 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -859,9 +859,6 @@ class LetterUploadPostageForm(StripWhitespaceForm): default='second', validators=[DataRequired()] ) - file_id = HiddenField( - validators=[DataRequired()] - ) class ForgotPasswordForm(StripWhitespaceForm): diff --git a/app/main/views/uploads.py b/app/main/views/uploads.py index 672f5b83c..af375dc8f 100644 --- a/app/main/views/uploads.py +++ b/app/main/views/uploads.py @@ -338,15 +338,13 @@ def view_letter_upload_as_preview(service_id, file_id): return TemplatePreview.from_valid_pdf_file(pdf_file, page) -@main.route("/services//upload-letter/send", methods=['POST']) @main.route("/services//upload-letter/send/", methods=['POST']) @user_has_permissions('send_messages', restrict_admin_usage=True) def send_uploaded_letter(service_id, file_id=None): if not (current_service.has_permission('letter') and current_service.has_permission('upload_letters')): abort(403) - form = LetterUploadPostageForm(file_id=file_id) - file_id = file_id or form.file_id.data + form = LetterUploadPostageForm() if not form.validate_on_submit(): return uploaded_letter_preview(service_id, file_id) diff --git a/tests/app/main/views/test_uploads.py b/tests/app/main/views/test_uploads.py index 163a6bee2..24614b6f8 100644 --- a/tests/app/main/views/test_uploads.py +++ b/tests/app/main/views/test_uploads.py @@ -766,40 +766,11 @@ def test_uploaded_letter_preview_image_400s_for_bad_page_type( ) -def test_send_uploaded_letter_sends_letter_and_redirects_to_notification_page(mocker, service_one, client_request): - metadata = LetterMetadata({'filename': 'my_file.pdf', 'page_count': '1', 'status': 'valid', 'recipient': 'address'}) - - mocker.patch('app.main.views.uploads.get_letter_pdf_and_metadata', return_value=('file', metadata)) - mock_send = mocker.patch('app.main.views.uploads.notification_api_client.send_precompiled_letter') - mocker.patch('app.main.views.uploads.get_letter_metadata', return_value=metadata) - - service_one['permissions'] = ['letter', 'upload_letters'] - file_id = 'abcd-1234' - - client_request.post( - 'main.send_uploaded_letter', - service_id=SERVICE_ONE_ID, - _data={'filename': 'my_file.pdf', 'file_id': file_id, 'postage': 'first'}, - _expected_redirect=url_for( - 'main.view_notification', - service_id=SERVICE_ONE_ID, - notification_id=file_id, - _external=True - ) - ) - mock_send.assert_called_once_with(SERVICE_ONE_ID, 'my_file.pdf', file_id, 'first', 'address') - - -@pytest.mark.parametrize('form_data', ( - {'filename': 'my_file.pdf', 'postage': 'first'}, - {'filename': 'my_file.pdf', 'postage': 'first', 'file_id': 'Ignored in favour of URL'}, -)) -def test_send_uploaded_letter_accepts_file_id_in_url( +def test_send_uploaded_letter_sends_letter_and_redirects_to_notification_page( mocker, service_one, client_request, fake_uuid, - form_data, ): metadata = LetterMetadata({'filename': 'my_file.pdf', 'page_count': '1', 'status': 'valid', 'recipient': 'address'}) @@ -813,7 +784,7 @@ def test_send_uploaded_letter_accepts_file_id_in_url( 'main.send_uploaded_letter', service_id=SERVICE_ONE_ID, file_id=fake_uuid, - _data=form_data, + _data={'filename': 'my_file.pdf', 'postage': 'first'}, _expected_redirect=url_for( 'main.view_notification', service_id=SERVICE_ONE_ID, @@ -824,31 +795,6 @@ def test_send_uploaded_letter_accepts_file_id_in_url( mock_send.assert_called_once_with(SERVICE_ONE_ID, 'my_file.pdf', fake_uuid, 'first', 'address') -def test_send_uploaded_letter_needs_file_id_in_form_if_not_in_url( - mocker, - service_one, - client_request, - mock_template_preview, - fake_uuid, -): - metadata = LetterMetadata({'filename': 'my_file.pdf', 'page_count': '1', 'status': 'valid', 'recipient': 'address'}) - - mock_send = mocker.patch('app.main.views.uploads.notification_api_client.send_precompiled_letter') - mocker.patch('app.main.views.uploads.get_letter_metadata', return_value=metadata) - mocker.patch('app.main.views.uploads.service_api_client.get_precompiled_template') - - service_one['permissions'] = ['letter', 'upload_letters'] - - client_request.post( - 'main.send_uploaded_letter', - service_id=SERVICE_ONE_ID, - _data={'filename': 'my_file.pdf', 'postage': 'first'}, - _expected_status=200, - _expected_redirect=None, - ) - assert mock_send.called is False - - @pytest.mark.parametrize('permissions', [ ['email'], ['letter'], @@ -859,23 +805,26 @@ def test_send_uploaded_letter_when_service_does_not_have_correct_permissions( service_one, client_request, permissions, + fake_uuid, ): mocker.patch('app.main.views.uploads.get_letter_pdf_and_metadata', return_value=('file', {'status': 'valid'})) mock_send = mocker.patch('app.main.views.uploads.notification_api_client.send_precompiled_letter') service_one['permissions'] = permissions - file_id = 'abcd-1234' client_request.post( 'main.send_uploaded_letter', service_id=SERVICE_ONE_ID, - _data={'filename': 'my_file.pdf', 'file_id': file_id, 'postage': 'first'}, + file_id=fake_uuid, + _data={'filename': 'my_file.pdf', 'postage': 'first'}, _expected_status=403 ) assert not mock_send.called -def test_send_uploaded_letter_when_metadata_states_pdf_is_invalid(mocker, service_one, client_request): +def test_send_uploaded_letter_when_metadata_states_pdf_is_invalid( + mocker, service_one, client_request, fake_uuid, +): mock_send = mocker.patch('app.main.views.uploads.notification_api_client.send_precompiled_letter') mocker.patch( 'app.main.views.uploads.get_letter_metadata', @@ -888,12 +837,12 @@ def test_send_uploaded_letter_when_metadata_states_pdf_is_invalid(mocker, servic ) service_one['permissions'] = ['letter', 'upload_letters'] - file_id = 'abcd-1234' client_request.post( 'main.send_uploaded_letter', service_id=SERVICE_ONE_ID, - _data={'filename': 'my_file.pdf', 'file_id': file_id}, + file_id=fake_uuid, + _data={'filename': 'my_file.pdf'}, _expected_status=403 ) assert not mock_send.called From 08a701b70cca75f3e4f60a6f5cd60551f5b2be0e Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Wed, 20 May 2020 10:17:48 +0100 Subject: [PATCH 2/6] Refactor to get metadata before validating form Because we no longer need the form to get the `file_id`, we can get the metadata before building the form. This will, in subsequent commits, let us build the form differently based on the recipient metadata. Also removed some variables that were assigned to then only used once and reformatted arguments for readability. --- app/main/views/uploads.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/app/main/views/uploads.py b/app/main/views/uploads.py index af375dc8f..8a4a25034 100644 --- a/app/main/views/uploads.py +++ b/app/main/views/uploads.py @@ -344,20 +344,25 @@ def send_uploaded_letter(service_id, file_id=None): if not (current_service.has_permission('letter') and current_service.has_permission('upload_letters')): abort(403) + metadata = get_letter_metadata(service_id, file_id) + + if metadata.get('status') != 'valid': + abort(403) + + recipient_address = metadata.get('recipient') + form = LetterUploadPostageForm() if not form.validate_on_submit(): return uploaded_letter_preview(service_id, file_id) - postage = form.postage.data - metadata = get_letter_metadata(service_id, file_id) - filename = metadata.get('filename') - recipient_address = metadata.get('recipient') - - if metadata.get('status') != 'valid': - abort(403) - - notification_api_client.send_precompiled_letter(service_id, filename, file_id, postage, recipient_address) + notification_api_client.send_precompiled_letter( + service_id, + metadata.get('filename'), + file_id, + form.postage.data, + recipient_address, + ) return redirect(url_for( '.view_notification', From 68191a93ef0005b5f77b60ac43e901017deabb83 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Wed, 20 May 2020 11:12:33 +0100 Subject: [PATCH 3/6] =?UTF-8?q?Don=E2=80=99t=20show=20postage=20choice=20f?= =?UTF-8?q?or=20international=20letters?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit International letters don’t have a choice of postage. Under the hood they are either `europe` or `rest-of-world`. So, for letters that we detect are international, this commit: - removes the radios buttons that give users the choice of postage - passes through either `europe` or `rest-of-world` to the API, depending on what address we find in the letter This will cause the API to 500 until it can accept `europe` or `rest-of-world` as postage types, but this is probably OK because it’s only our services that have international letters switched on at the moment. --- app/main/forms.py | 14 +++ app/main/views/uploads.py | 18 ++-- app/templates/views/uploads/preview.html | 9 +- tests/app/main/views/test_uploads.py | 105 ++++++++++++++++++++++- 4 files changed, 136 insertions(+), 10 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index 04c51202f..ed27caa81 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -9,6 +9,7 @@ from flask_wtf import FlaskForm as Form from flask_wtf.file import FileAllowed from flask_wtf.file import FileField as FileField_wtf from notifications_utils.columns import Columns +from notifications_utils.countries.data import Postage from notifications_utils.formatters import strip_whitespace from notifications_utils.postal_address import PostalAddress from notifications_utils.recipients import ( @@ -850,6 +851,19 @@ class LetterTemplatePostageForm(StripWhitespaceForm): class LetterUploadPostageForm(StripWhitespaceForm): + + def __init__(self, *args, postage_zone, **kwargs): + + super().__init__(*args, **kwargs) + + if postage_zone != Postage.UK: + self.postage.choices = [(postage_zone, '')] + self.postage.data = postage_zone + + @property + def show_postage(self): + return len(self.postage.choices) > 1 + postage = RadioField( 'Choose the postage for this letter', choices=[ diff --git a/app/main/views/uploads.py b/app/main/views/uploads.py index 8a4a25034..d72baf691 100644 --- a/app/main/views/uploads.py +++ b/app/main/views/uploads.py @@ -19,6 +19,7 @@ from flask import ( ) from notifications_utils.columns import Columns from notifications_utils.pdf import pdf_page_count +from notifications_utils.postal_address import PostalAddress from notifications_utils.recipients import RecipientCSV from notifications_utils.sanitise_text import SanitiseASCII from PyPDF2.utils import PdfReadError @@ -279,7 +280,7 @@ def uploaded_letter_preview(service_id, file_id): status = metadata.get('status') error_shortcode = metadata.get('message') invalid_pages = metadata.get('invalid_pages') - recipient = format_recipient(metadata.get('recipient', '')) + postal_address = PostalAddress(metadata.get('recipient', '')) if invalid_pages: invalid_pages = json.loads(invalid_pages) @@ -291,7 +292,9 @@ def uploaded_letter_preview(service_id, file_id): # a non null value of postage for letter templates template_dict['postage'] = None - form = LetterUploadPostageForm() + form = LetterUploadPostageForm( + postage_zone=postal_address.postage + ) template = get_template( template_dict, @@ -313,7 +316,8 @@ def uploaded_letter_preview(service_id, file_id): message=error_message, error_code=error_shortcode, form=form, - recipient=recipient, + recipient=format_recipient(postal_address.raw_address), + international=postal_address.international, re_upload_form=re_upload_form ) @@ -349,9 +353,11 @@ def send_uploaded_letter(service_id, file_id=None): if metadata.get('status') != 'valid': abort(403) - recipient_address = metadata.get('recipient') + postal_address = PostalAddress(metadata.get('recipient')) - form = LetterUploadPostageForm() + form = LetterUploadPostageForm( + postage_zone=postal_address.postage + ) if not form.validate_on_submit(): return uploaded_letter_preview(service_id, file_id) @@ -361,7 +367,7 @@ def send_uploaded_letter(service_id, file_id=None): metadata.get('filename'), file_id, form.postage.data, - recipient_address, + postal_address.raw_address, ) return redirect(url_for( diff --git a/app/templates/views/uploads/preview.html b/app/templates/views/uploads/preview.html index fb11980c9..602705559 100644 --- a/app/templates/views/uploads/preview.html +++ b/app/templates/views/uploads/preview.html @@ -52,12 +52,19 @@

{% if current_service.live %} + {% if international %} +

+ Postage: international +

+ {% endif %}
- {{ radios(form.postage, hide_legend=true, inline=True) }} + {% if form.show_postage %} + {{ radios(form.postage, hide_legend=true, inline=True) }} + {% endif %} {{ page_footer("Send 1 letter") }}
{% endif %} diff --git a/tests/app/main/views/test_uploads.py b/tests/app/main/views/test_uploads.py index 24614b6f8..69fb54481 100644 --- a/tests/app/main/views/test_uploads.py +++ b/tests/app/main/views/test_uploads.py @@ -435,6 +435,64 @@ def test_post_upload_letter_shows_letter_preview_for_valid_file( page=page_no) +def test_upload_international_letter_shows_preview_with_no_choice_of_postage( + mocker, + active_user_with_permissions, + service_one, + client_request, + fake_uuid, +): + letter_template = { + 'template_type': 'letter', + 'reply_to_text': '', + 'postage': 'second', + 'subject': 'hi', + 'content': 'my letter', + } + + mocker.patch('uuid.uuid4', return_value=fake_uuid) + mocker.patch('app.main.views.uploads.antivirus_client.scan', return_value=True) + mocker.patch('app.main.views.uploads.sanitise_letter', return_value=Mock( + content='The sanitised content', + json=lambda: {'file': 'VGhlIHNhbml0aXNlZCBjb250ZW50', 'recipient_address': 'The Queen'} + )) + mocker.patch('app.main.views.uploads.upload_letter_to_s3') + mocker.patch('app.main.views.uploads.pdf_page_count', return_value=3) + mocker.patch('app.main.views.uploads.get_letter_metadata', return_value=LetterMetadata({ + 'filename': 'tests/test_pdf_files/one_page_pdf.pdf', + 'page_count': '3', + 'status': 'valid', + 'recipient': ( + '123 Example Street\n' + 'Andorra la Vella\n' + 'Andorra' + ), + })) + mocker.patch('app.main.views.uploads.service_api_client.get_precompiled_template', return_value=letter_template) + + service_one['restricted'] = False + client_request.login(active_user_with_permissions, service=service_one) + + with open('tests/test_pdf_files/one_page_pdf.pdf', 'rb') as file: + page = client_request.post( + 'main.upload_letter', + service_id=SERVICE_ONE_ID, + _data={'file': file}, + _follow_redirects=True, + ) + + assert page.find('h1').text == 'tests/test_pdf_files/one_page_pdf.pdf' + assert not page.select('.letter-postage') + assert not page.select('input[type=radio]') + assert normalize_spaces( + page.select_one('.js-stick-at-bottom-when-scrolling').text + ) == ( + 'Recipient: 123 Example Street, Andorra la Vella, Andorra ' + 'Postage: international ' + 'Send 1 letter' + ) + + def test_post_upload_letter_shows_error_when_file_is_not_a_pdf(client_request): with open('tests/non_spreadsheet_files/actually_a_png.csv', 'rb') as file: page = client_request.post( @@ -766,13 +824,48 @@ def test_uploaded_letter_preview_image_400s_for_bad_page_type( ) +@pytest.mark.parametrize('address, post_data, expected_postage', ( + ( + 'address', + {'filename': 'my_file.pdf', 'postage': 'first'}, + 'first', + ), + ( + 'address', + {'filename': 'my_file.pdf'}, + 'second', + ), + ( + '123 Example Street\nLiechtenstein', + {'filename': 'my_file.pdf', 'postage': 'first'}, + 'europe', + ), + ( + '123 Example Street\nLiechtenstein', + {'filename': 'my_file.pdf'}, + 'europe', + ), + ( + '123 Example Street\nLesotho', + {'filename': 'my_file.pdf'}, + 'rest-of-world', + ), +)) def test_send_uploaded_letter_sends_letter_and_redirects_to_notification_page( mocker, service_one, client_request, fake_uuid, + address, + post_data, + expected_postage, ): - metadata = LetterMetadata({'filename': 'my_file.pdf', 'page_count': '1', 'status': 'valid', 'recipient': 'address'}) + metadata = LetterMetadata({ + 'filename': 'my_file.pdf', + 'page_count': '1', + 'status': 'valid', + 'recipient': address, + }) mocker.patch('app.main.views.uploads.get_letter_pdf_and_metadata', return_value=('file', metadata)) mock_send = mocker.patch('app.main.views.uploads.notification_api_client.send_precompiled_letter') @@ -784,7 +877,7 @@ def test_send_uploaded_letter_sends_letter_and_redirects_to_notification_page( 'main.send_uploaded_letter', service_id=SERVICE_ONE_ID, file_id=fake_uuid, - _data={'filename': 'my_file.pdf', 'postage': 'first'}, + _data=post_data, _expected_redirect=url_for( 'main.view_notification', service_id=SERVICE_ONE_ID, @@ -792,7 +885,13 @@ def test_send_uploaded_letter_sends_letter_and_redirects_to_notification_page( _external=True ) ) - mock_send.assert_called_once_with(SERVICE_ONE_ID, 'my_file.pdf', fake_uuid, 'first', 'address') + mock_send.assert_called_once_with( + SERVICE_ONE_ID, + 'my_file.pdf', + fake_uuid, + expected_postage, + address, + ) @pytest.mark.parametrize('permissions', [ From b2ad7ff3cb61ed3fdbd6e349ae3aad5003e5a744 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Wed, 20 May 2020 11:18:15 +0100 Subject: [PATCH 4/6] Replace `format_recipient` with `PostalAddress.as_single_line` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We’ve refactored the code to display an address on a single line with commas into utils now. --- app/main/views/uploads.py | 19 +------------------ requirements-app.txt | 2 +- requirements.txt | 8 ++++---- tests/app/main/views/test_uploads.py | 13 ------------- 4 files changed, 6 insertions(+), 36 deletions(-) diff --git a/app/main/views/uploads.py b/app/main/views/uploads.py index d72baf691..0e29c13c2 100644 --- a/app/main/views/uploads.py +++ b/app/main/views/uploads.py @@ -252,23 +252,6 @@ def _get_error_from_upload_form(form_errors): return error -def format_recipient(address): - ''' - To format the recipient we need to: - - remove new line characters - - remove whitespace around the lines - - join the address lines, separated by a comma - ''' - if not address: - return address - stripped_address_lines_no_trailing_commas = [ - line.lstrip().rstrip(' ,') - for line in address.splitlines() if line - ] - one_line_address = ', '.join(stripped_address_lines_no_trailing_commas) - return one_line_address - - @main.route("/services//preview-letter/") @user_has_permissions('send_messages') def uploaded_letter_preview(service_id, file_id): @@ -316,7 +299,7 @@ def uploaded_letter_preview(service_id, file_id): message=error_message, error_code=error_shortcode, form=form, - recipient=format_recipient(postal_address.raw_address), + recipient=postal_address.as_single_line, international=postal_address.international, re_upload_form=re_upload_form ) diff --git a/requirements-app.txt b/requirements-app.txt index 0aad711d9..80a3f30f7 100644 --- a/requirements-app.txt +++ b/requirements-app.txt @@ -23,5 +23,5 @@ notifications-python-client==5.5.1 awscli-cwlogs>=1.4,<1.5 itsdangerous==1.1.0 -git+https://github.com/alphagov/notifications-utils.git@39.2.0#egg=notifications-utils==39.2.0 +git+https://github.com/alphagov/notifications-utils.git@39.3.0#egg=notifications-utils==39.3.0 git+https://github.com/alphagov/govuk-frontend-jinja.git@v0.5.1-alpha#egg=govuk-frontend-jinja==0.5.1-alpha diff --git a/requirements.txt b/requirements.txt index 810a6e2b0..f5d52fee8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -25,14 +25,14 @@ notifications-python-client==5.5.1 awscli-cwlogs>=1.4,<1.5 itsdangerous==1.1.0 -git+https://github.com/alphagov/notifications-utils.git@39.2.0#egg=notifications-utils==39.2.0 +git+https://github.com/alphagov/notifications-utils.git@39.3.0#egg=notifications-utils==39.3.0 git+https://github.com/alphagov/govuk-frontend-jinja.git@v0.5.1-alpha#egg=govuk-frontend-jinja==0.5.1-alpha ## The following requirements were added by pip freeze: -awscli==1.18.61 +awscli==1.18.63 bleach==3.1.4 boto3==1.10.38 -botocore==1.16.11 +botocore==1.16.13 certifi==2020.4.5.1 chardet==3.0.4 click==7.1.2 @@ -49,7 +49,7 @@ jdcal==1.4.1 Jinja2==2.11.2 jmespath==0.10.0 lml==0.0.9 -lxml==4.5.0 +lxml==4.5.1 MarkupSafe==1.1.1 mistune==0.8.4 monotonic==1.5 diff --git a/tests/app/main/views/test_uploads.py b/tests/app/main/views/test_uploads.py index 69fb54481..941321500 100644 --- a/tests/app/main/views/test_uploads.py +++ b/tests/app/main/views/test_uploads.py @@ -8,7 +8,6 @@ from flask import make_response, url_for from freezegun import freeze_time from requests import RequestException -from app.main.views.uploads import format_recipient from app.s3_client.s3_letter_upload_client import LetterMetadata from app.utils import normalize_spaces from tests.conftest import ( @@ -947,18 +946,6 @@ def test_send_uploaded_letter_when_metadata_states_pdf_is_invalid( assert not mock_send.called -@pytest.mark.parametrize('original_address,expected_address', [ - ('The Queen, Buckingham Palace, SW1 1AA', 'The Queen, Buckingham Palace, SW1 1AA'), - ('The Queen Buckingham Palace SW1 1AA', 'The Queen Buckingham Palace SW1 1AA'), - ('The Queen,\nBuckingham Palace,\r\nSW1 1AA', 'The Queen, Buckingham Palace, SW1 1AA'), - ('The Queen ,,\nBuckingham Palace,\rSW1 1AA,', 'The Queen, Buckingham Palace, SW1 1AA'), - (' The Queen\n Buckingham Palace\n SW1 1AA', 'The Queen, Buckingham Palace, SW1 1AA'), - ('', ''), -]) -def test_format_recipient(original_address, expected_address): - assert format_recipient(original_address) == expected_address - - @pytest.mark.parametrize('user', ( create_active_caseworking_user(), create_active_user_with_permissions(), From 782f43059d44e60f5bb94e1f2c0e33fa81bc8c41 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Wed, 20 May 2020 11:25:09 +0100 Subject: [PATCH 5/6] Refactor to pass through whole postal address MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s a bit cleaner to not be passing through multiple variables which are properties of the same object. --- app/main/views/uploads.py | 3 +-- app/templates/views/uploads/preview.html | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/main/views/uploads.py b/app/main/views/uploads.py index 0e29c13c2..67b0f606c 100644 --- a/app/main/views/uploads.py +++ b/app/main/views/uploads.py @@ -299,8 +299,7 @@ def uploaded_letter_preview(service_id, file_id): message=error_message, error_code=error_shortcode, form=form, - recipient=postal_address.as_single_line, - international=postal_address.international, + postal_address=postal_address, re_upload_form=re_upload_form ) diff --git a/app/templates/views/uploads/preview.html b/app/templates/views/uploads/preview.html index 602705559..5e9538a98 100644 --- a/app/templates/views/uploads/preview.html +++ b/app/templates/views/uploads/preview.html @@ -48,11 +48,11 @@ {% if status == 'valid' %}

- Recipient: {{ recipient }} + Recipient: {{ postal_address.as_single_line }}

{% if current_service.live %} - {% if international %} + {% if postal_address.international %}

Postage: international

From 04ce13ebfc1229bc363b935e1d0aed6c00e6608d Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Fri, 22 May 2020 14:50:33 +0100 Subject: [PATCH 6/6] Remove default argument for file_id MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s always provided now. --- app/main/views/uploads.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/main/views/uploads.py b/app/main/views/uploads.py index 67b0f606c..e1093f708 100644 --- a/app/main/views/uploads.py +++ b/app/main/views/uploads.py @@ -326,7 +326,7 @@ def view_letter_upload_as_preview(service_id, file_id): @main.route("/services//upload-letter/send/", methods=['POST']) @user_has_permissions('send_messages', restrict_admin_usage=True) -def send_uploaded_letter(service_id, file_id=None): +def send_uploaded_letter(service_id, file_id): if not (current_service.has_permission('letter') and current_service.has_permission('upload_letters')): abort(403)