mirror of
https://github.com/GSA/notifications-api.git
synced 2025-12-20 23:41:17 -05:00
Remove letters-related code (#175)
This deletes a big ol' chunk of code related to letters. It's not everything—there are still a few things that might be tied to sms/email—but it's the the heart of letters function. SMS and email function should be untouched by this. Areas affected: - Things obviously about letters - PDF tasks, used for precompiling letters - Virus scanning, used for those PDFs - FTP, used to send letters to the printer - Postage stuff
This commit is contained in:
@@ -1,16 +1,8 @@
|
||||
import base64
|
||||
from io import BytesIO
|
||||
|
||||
import botocore
|
||||
from flask import Blueprint, current_app, jsonify, request
|
||||
from flask import Blueprint, jsonify, request
|
||||
from notifications_utils import SMS_CHAR_COUNT_LIMIT
|
||||
from notifications_utils.pdf import extract_page_from_pdf
|
||||
from notifications_utils.template import SMSMessageTemplate
|
||||
from PyPDF2.errors import PdfReadError
|
||||
from requests import post as requests_post
|
||||
from sqlalchemy.orm.exc import NoResultFound
|
||||
|
||||
from app.dao.notifications_dao import get_notification_by_id
|
||||
from app.dao.services_dao import dao_fetch_service_by_id
|
||||
from app.dao.template_folder_dao import (
|
||||
dao_get_template_folder_by_id_and_service_id,
|
||||
@@ -18,17 +10,13 @@ from app.dao.template_folder_dao import (
|
||||
from app.dao.templates_dao import (
|
||||
dao_create_template,
|
||||
dao_get_all_templates_for_service,
|
||||
dao_get_template_by_id,
|
||||
dao_get_template_by_id_and_service_id,
|
||||
dao_get_template_versions,
|
||||
dao_redact_template,
|
||||
dao_update_template,
|
||||
dao_update_template_reply_to,
|
||||
get_precompiled_letter_template,
|
||||
)
|
||||
from app.errors import InvalidRequest, register_errors
|
||||
from app.letters.utils import get_letter_pdf_and_metadata
|
||||
from app.models import LETTER_TYPE, SECOND_CLASS, SMS_TYPE, Template
|
||||
from app.models import SMS_TYPE, Template
|
||||
from app.notifications.validators import check_reply_to, service_has_permission
|
||||
from app.schema_validation import validate
|
||||
from app.schemas import (
|
||||
@@ -84,9 +72,6 @@ def create_template(service_id):
|
||||
errors = {'template_type': [message]}
|
||||
raise InvalidRequest(errors, 403)
|
||||
|
||||
if not new_template.postage and new_template.template_type == LETTER_TYPE:
|
||||
new_template.postage = SECOND_CLASS
|
||||
|
||||
new_template.service = fetched_service
|
||||
|
||||
over_limit = _content_count_greater_than_limit(new_template.content, new_template.template_type)
|
||||
@@ -125,11 +110,6 @@ def update_template(service_id, template_id):
|
||||
if data.get('redact_personalisation') is True:
|
||||
return redact_template(fetched_template, data)
|
||||
|
||||
if "reply_to" in data:
|
||||
check_reply_to(service_id, data.get("reply_to"), fetched_template.template_type)
|
||||
updated = dao_update_template_reply_to(template_id=template_id, reply_to=data.get("reply_to"))
|
||||
return jsonify(data=template_schema.dump(updated)), 200
|
||||
|
||||
current_data = dict(template_schema.dump(fetched_template).items())
|
||||
updated_template = dict(template_schema.dump(fetched_template).items())
|
||||
updated_template.update(data)
|
||||
@@ -151,14 +131,6 @@ def update_template(service_id, template_id):
|
||||
return jsonify(data=template_schema.dump(update_dict)), 200
|
||||
|
||||
|
||||
@template_blueprint.route('/precompiled', methods=['GET'])
|
||||
def get_precompiled_template_for_service(service_id):
|
||||
template = get_precompiled_letter_template(service_id)
|
||||
template_dict = template_schema.dump(template)
|
||||
|
||||
return jsonify(template_dict), 200
|
||||
|
||||
|
||||
@template_blueprint.route('', methods=['GET'])
|
||||
def get_all_templates_for_service(service_id):
|
||||
templates = dao_get_all_templates_for_service(service_id=service_id)
|
||||
@@ -221,7 +193,7 @@ def get_template_versions(service_id, template_id):
|
||||
def _template_has_not_changed(current_data, updated_template):
|
||||
return all(
|
||||
current_data[key] == updated_template[key]
|
||||
for key in ('name', 'content', 'subject', 'archived', 'process_type', 'postage')
|
||||
for key in ('name', 'content', 'subject', 'archived', 'process_type')
|
||||
)
|
||||
|
||||
|
||||
@@ -236,116 +208,3 @@ def redact_template(template, data):
|
||||
if not template.redact_personalisation:
|
||||
dao_redact_template(template, data['created_by'])
|
||||
return 'null', 200
|
||||
|
||||
|
||||
@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)
|
||||
|
||||
page = request.args.get('page')
|
||||
|
||||
notification = get_notification_by_id(notification_id)
|
||||
template = dao_get_template_by_id(notification.template_id, notification.template_version)
|
||||
metadata = {}
|
||||
|
||||
if template.is_precompiled_letter:
|
||||
try:
|
||||
|
||||
pdf_file, metadata = get_letter_pdf_and_metadata(notification)
|
||||
|
||||
except botocore.exceptions.ClientError as e:
|
||||
raise InvalidRequest(
|
||||
'Error extracting requested page from PDF file for notification_id {} type {} {}'.format(
|
||||
notification_id, type(e), e),
|
||||
status_code=500
|
||||
)
|
||||
|
||||
page_number = page if page else "1"
|
||||
content = base64.b64encode(pdf_file).decode('utf-8')
|
||||
content_outside_printable_area = metadata.get("message") == "content-outside-printable-area"
|
||||
page_is_in_invalid_pages = page_number in metadata.get('invalid_pages', '[]')
|
||||
|
||||
if content_outside_printable_area and (file_type == "pdf" or page_is_in_invalid_pages):
|
||||
path = '/precompiled/overlay.{}'.format(file_type)
|
||||
query_string = '?page_number={}'.format(page_number) if file_type == 'png' else ''
|
||||
content = pdf_file
|
||||
elif file_type == 'png':
|
||||
query_string = '?hide_notify=true' if page_number == '1' else ''
|
||||
path = '/precompiled-preview.png'
|
||||
else:
|
||||
path = None
|
||||
|
||||
if file_type == 'png':
|
||||
try:
|
||||
pdf_page = extract_page_from_pdf(BytesIO(pdf_file), int(page_number) - 1)
|
||||
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:
|
||||
raise InvalidRequest(
|
||||
'Error extracting requested page from PDF file for notification_id {} type {} {}'.format(
|
||||
notification_id, type(e), e),
|
||||
status_code=500
|
||||
)
|
||||
|
||||
if path:
|
||||
url = current_app.config['TEMPLATE_PREVIEW_API_HOST'] + path + query_string
|
||||
response_content = _get_png_preview_or_overlaid_pdf(url, content, notification.id, json=False)
|
||||
else:
|
||||
response_content = content
|
||||
else:
|
||||
|
||||
template_for_letter_print = {
|
||||
"id": str(notification.template_id),
|
||||
"subject": template.subject,
|
||||
"content": template.content,
|
||||
"version": str(template.version),
|
||||
"template_type": template.template_type
|
||||
}
|
||||
|
||||
service = dao_fetch_service_by_id(service_id)
|
||||
letter_logo_filename = service.letter_branding and service.letter_branding.filename
|
||||
data = {
|
||||
'letter_contact_block': notification.reply_to_text,
|
||||
'template': template_for_letter_print,
|
||||
'values': notification.personalisation,
|
||||
'date': notification.created_at.isoformat(),
|
||||
'filename': letter_logo_filename,
|
||||
}
|
||||
|
||||
url = '{}/preview.{}{}'.format(
|
||||
current_app.config['TEMPLATE_PREVIEW_API_HOST'],
|
||||
file_type,
|
||||
'?page={}'.format(page) if page else ''
|
||||
)
|
||||
response_content = _get_png_preview_or_overlaid_pdf(url, data, notification.id, json=True)
|
||||
|
||||
return jsonify({"content": response_content, "metadata": metadata})
|
||||
|
||||
|
||||
def _get_png_preview_or_overlaid_pdf(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:
|
||||
raise InvalidRequest(
|
||||
'Error generating preview letter for {} Status code: {} {}'.format(
|
||||
notification_id,
|
||||
resp.status_code,
|
||||
resp.content
|
||||
), status_code=500
|
||||
)
|
||||
|
||||
return base64.b64encode(resp.content).decode('utf-8')
|
||||
|
||||
Reference in New Issue
Block a user