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

Merge pull request #2746 from alphagov/fix-non-content-outside-errors

Browse Source 
Undo bug for previewing precompiled letters
This commit is contained in:
David McDonald
2020-03-11 15:29:10 +00:00
committed by GitHub
parent 87428685fb 483c00b3a2
commit f9751d6ebd
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/template/rest.py
View File

@@ -263,7 +263,10 @@ def preview_letter_template_by_notification_id(service_id, notification_id, file
if file_type == 'png': if file_type == 'png':
try: try:
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 = pdf_page if page_is_in_invalid_pages else base64.b64encode(pdf_page).decode('utf-8') if content_outside_printable_area and page_is_in_invalid_pages:
content = pdf_page
else:
content = 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(

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

@@ -1149,6 +1149,8 @@ def test_preview_letter_template_precompiled_s3_error(
("", "", 'precompiled-preview.png'), ("", "", 'precompiled-preview.png'),
# page is valid, no overlay shown # page is valid, no overlay shown
("1", "", 'precompiled-preview.png'), ("1", "", 'precompiled-preview.png'),
# page is invalid but not because content is outside printable area so no overlay
("1", "letter-not-a4-portrait-oriented", 'precompiled-preview.png'),
# page is invalid, overlay shown # page is invalid, overlay shown
("1", "content-outside-printable-area", 'precompiled/overlay.png?page_number=1'), ("1", "content-outside-printable-area", 'precompiled/overlay.png?page_number=1'),
# page is valid, no overlay shown # page is valid, no overlay shown
@@ -1157,7 +1159,7 @@ def test_preview_letter_template_precompiled_s3_error(
("3", "content-outside-printable-area", 'precompiled/overlay.png?page_number=3'), ("3", "content-outside-printable-area", 'precompiled/overlay.png?page_number=3'),
] ]
) )
def test_preview_letter_template_precompiled_for_png_file_shows_overlay_where_appropriate( def test_preview_letter_template_precompiled_for_png_shows_overlay_on_pages_with_content_outside_printable_area(
notify_api, notify_api,
client, client,
admin_request, admin_request,
@@ -1227,7 +1229,7 @@ def test_preview_letter_template_precompiled_for_png_file_shows_overlay_where_ap
"[2,4]", # it shouldn't make a difference if the error was on the first page or not "[2,4]", # it shouldn't make a difference if the error was on the first page or not
] ]
) )
def test_preview_letter_template_precompiled_for_pdf_file_shows_overlay_if_content_outside_printable_area( def test_preview_letter_template_precompiled_for_pdf_shows_overlay_on_all_pages_if_content_outside_printable_area(
notify_api, notify_api,
client, client,
admin_request, admin_request,