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

Merge pull request #1747 from alphagov/add_precompiled_letters

Browse Source 
Fixed bug only where only data being passed to TemplatePreview when JSON is required
This commit is contained in:
Richard Chapman
2018-03-08 09:56:03 +00:00
committed by GitHub
parent ae0113a5de d60e802f35
commit 94dea42f6f
2 changed files with 45 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/template/rest.py
View File

@@ -8,7 +8,6 @@ from flask import (
request)
from requests import post as requests_post
from app.dao.notifications_dao import get_notification_by_id
from app.dao.templates_dao import (
dao_update_template,
@@ -33,7 +32,6 @@ from app.utils import get_template_instance, get_public_notify_type_text
template_blueprint = Blueprint('template', __name__, url_prefix='/service/<uuid:service_id>/template')
register_errors(template_blueprint)
@@ -189,7 +187,6 @@ def redact_template(template, data):
@template_blueprint.route('/preview/<uuid:notification_id>/<file_type>', methods=['GET'])
def preview_letter_template_by_notification_id(service_id, notification_id, file_type):
if file_type not in ('pdf', 'png'):
raise InvalidRequest({'content': ["file_type must be pdf or png"]}, status_code=400)
@@ -206,20 +203,20 @@ def preview_letter_template_by_notification_id(service_id, notification_id, file
pdf_file = get_letter_pdf(notification)
except botocore.exceptions.ClientError:
current_app.logger.info
current_app.logger.exception(
'Error getting letter file from S3 notification id {}'.format(notification_id))
raise InvalidRequest('Error getting letter file from S3 notification id {}'.format(notification_id),
status_code=500)
content = base64.b64encode(pdf_file).decode('utf-8')
if file_type == 'png':
url = '{}/precompiled-preview.png{}'.format(
current_app.config['TEMPLATE_PREVIEW_API_HOST'],
'?page={}'.format(page) if page else ''
)
content = _get_png_preview(url, content, notification.id)
content = _get_png_preview(url, content, notification.id, json=False)
else:
@@ -245,21 +242,38 @@ def preview_letter_template_by_notification_id(service_id, notification_id, file
'?page={}'.format(page) if page else ''
)
content = _get_png_preview(url, data, notification.id)
content = _get_png_preview(url, data, notification.id, json=True)
return jsonify({"content": content})
def _get_png_preview(url, data, notification_id):
resp = requests_post(
url,
data=data,
headers={'Authorization': 'Token {}'.format(current_app.config['TEMPLATE_PREVIEW_API_KEY'])}
)
def _get_png_preview(url, data, notification_id, json=True):
if json:
resp = requests_post(
url,
json=data,
headers={'Authorization': 'Token {}'.format(current_app.config['TEMPLATE_PREVIEW_API_KEY'])}
)
else:
resp = requests_post(
url,
data=data,
headers={'Authorization': 'Token {}'.format(current_app.config['TEMPLATE_PREVIEW_API_KEY'])}
)
if resp.status_code != 200:
current_app.logger.exception(
'Error generating preview letter for {} \nStatus code: {}\n{}'.format(
notification_id,
resp.status_code,
resp.content
))
raise InvalidRequest(
'Error generating preview for {}'.format(notification_id), status_code=500
'Error generating preview letter for {}\nStatus code: {}\n{}'.format(
notification_id,
resp.status_code,
resp.content
), status_code=500
)
return base64.b64encode(resp.content).decode('utf-8')