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

Update for new template preview sanitise response

Browse Source
This commit is contained in:
Katie Smith
2019-09-09 16:05:00 +01:00
parent 79053dec93
commit 81da8e762d
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,3 +1,4 @@
import base64
import uuid import uuid
from io import BytesIO from io import BytesIO
@@ -51,6 +52,7 @@ def upload_letter(service_id):
return invalid_upload_error('Your file must be smaller than 2MB') return invalid_upload_error('Your file must be smaller than 2MB')
try: try:
# TODO: get page count from the sanitise response once template preview handles malformed files nicely
page_count = pdf_page_count(BytesIO(pdf_file_bytes)) page_count = pdf_page_count(BytesIO(pdf_file_bytes))
except PdfReadError: except PdfReadError:
current_app.logger.info('Invalid PDF uploaded for service_id: {}'.format(service_id)) current_app.logger.info('Invalid PDF uploaded for service_id: {}'.format(service_id))
@@ -70,7 +72,8 @@ def upload_letter(service_id):
raise ex raise ex
else: else:
status = 'valid' status = 'valid'
upload_letter_to_s3(response.content, file_location, status) file_contents = base64.b64decode(response.json()['file'].encode())
upload_letter_to_s3(file_contents, file_location, status)
return redirect( return redirect(
url_for( url_for(

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

@@ -28,7 +28,10 @@ def test_get_upload_letter(client_request):
def test_post_upload_letter_redirects_for_valid_file(mocker, client_request): def test_post_upload_letter_redirects_for_valid_file(mocker, client_request):
mocker.patch('uuid.uuid4', return_value='fake-uuid') mocker.patch('uuid.uuid4', return_value='fake-uuid')
antivirus_mock = mocker.patch('app.main.views.uploads.antivirus_client.scan', return_value=True) antivirus_mock = 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')) mocker.patch(
'app.main.views.uploads.sanitise_letter',
return_value=Mock(content='The sanitised content', json=lambda: {'file': 'VGhlIHNhbml0aXNlZCBjb250ZW50'})
)
mock_s3 = mocker.patch('app.main.views.uploads.upload_letter_to_s3') mock_s3 = mocker.patch('app.main.views.uploads.upload_letter_to_s3')
mocker.patch('app.main.views.uploads.service_api_client.get_precompiled_template') mocker.patch('app.main.views.uploads.service_api_client.get_precompiled_template')
@@ -42,7 +45,7 @@ def test_post_upload_letter_redirects_for_valid_file(mocker, client_request):
assert antivirus_mock.called assert antivirus_mock.called
mock_s3.assert_called_once_with( mock_s3.assert_called_once_with(
'The sanitised content', b'The sanitised content',
'service-{}/fake-uuid.pdf'.format(SERVICE_ONE_ID), 'service-{}/fake-uuid.pdf'.format(SERVICE_ONE_ID),
'valid', 'valid',
) )
@@ -64,7 +67,10 @@ def test_post_upload_letter_shows_letter_preview_for_valid_file(mocker, client_r
mocker.patch('uuid.uuid4', return_value='fake-uuid') 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.antivirus_client.scan', return_value=True)
mocker.patch('app.main.views.uploads.sanitise_letter', return_value=Mock(content='The sanitised content')) mocker.patch(
'app.main.views.uploads.sanitise_letter',
return_value=Mock(content='The sanitised content', json=lambda: {'file': 'VGhlIHNhbml0aXNlZCBjb250ZW50'})
)
mocker.patch('app.main.views.uploads.upload_letter_to_s3') 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.pdf_page_count', return_value=3)
mocker.patch('app.main.views.uploads.service_api_client.get_precompiled_template', return_value=letter_template) mocker.patch('app.main.views.uploads.service_api_client.get_precompiled_template', return_value=letter_template)