darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-18 13:38:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor preview_letter_template_by_notification_id

Browse Source
This commit is contained in:
Pea Tyczynska
2019-04-10 16:08:08 +01:00
parent 63fe210202
commit dd9e285684
2 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
app/template/rest.py
View File

@@ -235,13 +235,23 @@ def preview_letter_template_by_notification_id(service_id, notification_id, file
) )
content = base64.b64encode(pdf_file).decode('utf-8') content = base64.b64encode(pdf_file).decode('utf-8')
overlay = request.args.get('overlay')
page_number = page if page else "1"
if overlay:
path = '/precompiled/overlay.{}'.format(file_type)
query_string = '?invert=1'
content = pdf_file
elif file_type == 'png':
path = '/precompiled-preview.png'
query_string = '?hide_notify=true' if page_number == '1' else ''
else:
path = None
if file_type == 'png': if file_type == 'png':
try: try:
page_number = page if page else "1"
pdf_page = extract_page_from_pdf(BytesIO(pdf_file), int(page_number) - 1) pdf_page = extract_page_from_pdf(BytesIO(pdf_file), int(page_number) - 1)
content = base64.b64encode(pdf_page).decode('utf-8') content = pdf_page if overlay else base64.b64encode(pdf_page).decode('utf-8')
except PdfReadError as e: except PdfReadError as e:
raise InvalidRequest( raise InvalidRequest(
'Error extracting requested page from PDF file for notification_id {} type {} {}'.format( 'Error extracting requested page from PDF file for notification_id {} type {} {}'.format(
@@ -249,26 +259,11 @@ def preview_letter_template_by_notification_id(service_id, notification_id, file
status_code=500 status_code=500
) )
if request.args.get('overlay'): if path:
content = pdf_page url = current_app.config['TEMPLATE_PREVIEW_API_HOST'] + path + query_string
url = '{}/precompiled/overlay.png{}'.format( response_content = _get_png_preview_or_overlaid_pdf(url, content, notification.id, json=False)
current_app.config['TEMPLATE_PREVIEW_API_HOST'], else:
'?invert=1', response_content = content
)
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_or_overlaid_pdf(url, content, notification.id, json=False)
elif file_type == 'pdf' and request.args.get('overlay'):
content = pdf_file
url = '{}/precompiled/overlay.pdf{}'.format(
current_app.config['TEMPLATE_PREVIEW_API_HOST'],
'?invert=1',
)
content = _get_png_preview_or_overlaid_pdf(url, content, notification.id, json=False)
else: else:
template_for_letter_print = { template_for_letter_print = {
@@ -293,9 +288,9 @@ def preview_letter_template_by_notification_id(service_id, notification_id, file
file_type, file_type,
'?page={}'.format(page) if page else '' '?page={}'.format(page) if page else ''
) )
content = _get_png_preview_or_overlaid_pdf(url, data, notification.id, json=True) response_content = _get_png_preview_or_overlaid_pdf(url, data, notification.id, json=True)
return jsonify({"content": content}) return jsonify({"content": response_content})
def _get_png_preview_or_overlaid_pdf(url, data, notification_id, json=True): def _get_png_preview_or_overlaid_pdf(url, data, notification_id, json=True):

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

@@ -1192,7 +1192,7 @@ def test_preview_letter_template_precompiled_png_file_type_hide_notify_tag_only_
mocker.patch('app.template.rest.get_letter_pdf', return_value=pdf_content) mocker.patch('app.template.rest.get_letter_pdf', return_value=pdf_content)
mocker.patch('app.template.rest.extract_page_from_pdf', return_value=png_content) mocker.patch('app.template.rest.extract_page_from_pdf', return_value=png_content)
mock_get_png_preview = mocker.patch('app.template.rest._get_png_preview', return_value=encoded) mock_get_png_preview = mocker.patch('app.template.rest._get_png_preview_or_overlaid_pdf', return_value=encoded)
admin_request.get( admin_request.get(
'template.preview_letter_template_by_notification_id', 'template.preview_letter_template_by_notification_id',