darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-23 00:41:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Call overlaid preview for precompiled letters that fail validation

Browse Source 
Also test precompiled letter preview with overlay
This commit is contained in:
Pea Tyczynska
2019-04-04 12:07:08 +01:00
parent 193ff8548c
commit 2f52a8fd64
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/template/rest.py
View File

@@ -249,10 +249,18 @@ def preview_letter_template_by_notification_id(service_id, notification_id, file
status_code=500 status_code=500
) )
url = '{}/precompiled-preview.png{}'.format( if request.args.get('overlay'):
current_app.config['TEMPLATE_PREVIEW_API_HOST'], content = pdf_page
'?hide_notify=true' if page_number == '1' else '' url = '{}/precompiled/overlay.png{}{}'.format(
) current_app.config['TEMPLATE_PREVIEW_API_HOST'],
'?invert=1',
'&hide_notify=true' if page_number == '1' else ''
)
else:
url = '{}/precompiled-preview.png{}'.format(
current_app.config['TEMPLATE_PREVIEW_API_HOST'],
'?hide_notify=true' if page_number == '1' else ''
)
content = _get_png_preview(url, content, notification.id, json=False) content = _get_png_preview(url, content, notification.id, json=False)
else: else:

13
tests/app/template/test_rest.py
View File

@@ -1098,12 +1098,18 @@ def test_preview_letter_template_precompiled_s3_error(
"when calling the GetObject operation: Unauthorized".format(notification.id) "when calling the GetObject operation: Unauthorized".format(notification.id)
@pytest.mark.parametrize(
"post_url, overlay",
[('precompiled-preview.png', None), ('precompiled/overlay.png?invert=1', 1)]
)
def test_preview_letter_template_precompiled_png_file_type( def test_preview_letter_template_precompiled_png_file_type(
notify_api, notify_api,
client, client,
admin_request, admin_request,
sample_service, sample_service,
mocker mocker,
post_url,
overlay
): ):
template = create_template(sample_service, template = create_template(sample_service,
@@ -1128,7 +1134,7 @@ def test_preview_letter_template_precompiled_png_file_type(
mocker.patch('app.template.rest.extract_page_from_pdf', return_value=pdf_content) mocker.patch('app.template.rest.extract_page_from_pdf', return_value=pdf_content)
mock_post = request_mock.post( mock_post = request_mock.post(
'http://localhost/notifications-template-preview/precompiled-preview.png', 'http://localhost/notifications-template-preview/{}'.format(post_url),
content=png_content, content=png_content,
headers={'X-pdf-page-count': '1'}, headers={'X-pdf-page-count': '1'},
status_code=200 status_code=200
@@ -1138,7 +1144,8 @@ def test_preview_letter_template_precompiled_png_file_type(
'template.preview_letter_template_by_notification_id', 'template.preview_letter_template_by_notification_id',
service_id=notification.service_id, service_id=notification.service_id,
notification_id=notification.id, notification_id=notification.id,
file_type='png' file_type='png',
overlay=overlay,
) )
with pytest.raises(ValueError): with pytest.raises(ValueError):