mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-09-09 15:09:48 -04:00
Merge pull request #3202 from alphagov/more-letter-validation-clean-up
Clean up more things to do with letter validation
This commit is contained in:
@@ -5,8 +5,6 @@ from datetime import datetime
|
|||||||
|
|
||||||
from flask import abort, flash, redirect, render_template, request, url_for
|
from flask import abort, flash, redirect, render_template, request, url_for
|
||||||
from notifications_python_client.errors import HTTPError
|
from notifications_python_client.errors import HTTPError
|
||||||
from notifications_utils import LETTER_MAX_PAGE_COUNT
|
|
||||||
from requests import RequestException
|
|
||||||
|
|
||||||
from app import (
|
from app import (
|
||||||
billing_api_client,
|
billing_api_client,
|
||||||
@@ -17,12 +15,11 @@ from app import (
|
|||||||
platform_stats_api_client,
|
platform_stats_api_client,
|
||||||
service_api_client,
|
service_api_client,
|
||||||
)
|
)
|
||||||
from app.extensions import antivirus_client, redis_client
|
from app.extensions import redis_client
|
||||||
from app.main import main
|
from app.main import main
|
||||||
from app.main.forms import (
|
from app.main.forms import (
|
||||||
ClearCacheForm,
|
ClearCacheForm,
|
||||||
DateFilterForm,
|
DateFilterForm,
|
||||||
PDFUploadForm,
|
|
||||||
RequiredDateFilterForm,
|
RequiredDateFilterForm,
|
||||||
ReturnedLettersForm,
|
ReturnedLettersForm,
|
||||||
)
|
)
|
||||||
@@ -30,14 +27,11 @@ from app.statistics_utils import (
|
|||||||
get_formatted_percentage,
|
get_formatted_percentage,
|
||||||
get_formatted_percentage_two_dp,
|
get_formatted_percentage_two_dp,
|
||||||
)
|
)
|
||||||
from app.template_previews import validate_letter
|
|
||||||
from app.utils import (
|
from app.utils import (
|
||||||
Spreadsheet,
|
Spreadsheet,
|
||||||
generate_next_dict,
|
generate_next_dict,
|
||||||
generate_previous_dict,
|
generate_previous_dict,
|
||||||
get_letter_validation_error,
|
|
||||||
get_page_from_request,
|
get_page_from_request,
|
||||||
user_has_permissions,
|
|
||||||
user_is_platform_admin,
|
user_is_platform_admin,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -94,14 +94,6 @@ def get_page_count_for_letter(template, values=None):
|
|||||||
return page_count
|
return page_count
|
||||||
|
|
||||||
|
|
||||||
def validate_letter(pdf_file):
|
|
||||||
return requests.post(
|
|
||||||
'{}/precompiled/validate?include_preview=true'.format(current_app.config['TEMPLATE_PREVIEW_API_HOST']),
|
|
||||||
data=pdf_file,
|
|
||||||
headers={'Authorization': 'Token {}'.format(current_app.config['TEMPLATE_PREVIEW_API_KEY'])}
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def sanitise_letter(pdf_file):
|
def sanitise_letter(pdf_file):
|
||||||
return requests.post(
|
return requests.post(
|
||||||
'{}/precompiled/sanitise'.format(current_app.config['TEMPLATE_PREVIEW_API_HOST']),
|
'{}/precompiled/sanitise'.format(current_app.config['TEMPLATE_PREVIEW_API_HOST']),
|
||||||
|
|||||||
Reference in New Issue
Block a user