darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-02 17:31:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2437 from alphagov/precompiled-overlay-failed-validation

Browse Source 
Precompiled request preview with overlay when validation fails
This commit is contained in:
Pea (Malgorzata Tyczynska)
2019-04-12 16:14:56 +01:00
committed by GitHub
parent a39ed098b8 2d71aea7a1
commit 88b31c51f5
3 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/letters/utils.py
View File

@@ -136,7 +136,6 @@ def get_letter_pdf(notification):
s3 = boto3.resource('s3')
bucket = s3.Bucket(bucket_name)
item = next(x for x in bucket.objects.filter(Prefix=prefix))
obj = s3.Object(

32
app/template/rest.py
View File

@@ -235,13 +235,22 @@ def preview_letter_template_by_notification_id(service_id, notification_id, file
)
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)
content = pdf_file
elif file_type == 'png':
query_string = '?hide_notify=true' if page_number == '1' else ''
path = '/precompiled-preview.png' + query_string
else:
path = None
if file_type == 'png':
try:
page_number = page if page else "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:
raise InvalidRequest(
'Error extracting requested page from PDF file for notification_id {} type {} {}'.format(
@@ -249,12 +258,11 @@ def preview_letter_template_by_notification_id(service_id, notification_id, file
status_code=500
)
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)
if path:
url = current_app.config['TEMPLATE_PREVIEW_API_HOST'] + path
response_content = _get_png_preview_or_overlaid_pdf(url, content, notification.id, json=False)
else:
response_content = content
else:
template_for_letter_print = {
@@ -279,12 +287,12 @@ def preview_letter_template_by_notification_id(service_id, notification_id, file
file_type,
'?page={}'.format(page) if page else ''
)
content = _get_png_preview(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(url, data, notification_id, json=True):
def _get_png_preview_or_overlaid_pdf(url, data, notification_id, json=True):
if json:
resp = requests_post(
url,