From 66392092294871229294cfa04c40b75a7f6ac022 Mon Sep 17 00:00:00 2001
From: Pea Tyczynska <pea.tyczynska@digital.cabinet-office.gov.uk>
Date: Tue, 8 Oct 2019 14:56:00 +0100
Subject: [PATCH] Check page count of actual notification not of template

But for jobs we are only checking preview row, otherwise it would
be too slow. We will check other row when creating the pdf
---
 app/main/views/send.py      | 13 +++++++++----
 app/main/views/templates.py |  2 ++
 app/main/views/uploads.py   |  8 +++++++-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/main/views/send.py b/app/main/views/send.py
index a11a70ba7..e8805e80e 100644
--- a/app/main/views/send.py
+++ b/app/main/views/send.py
@@ -48,6 +48,7 @@ from app.s3_client.s3_csv_client import (
 )
 from app.template_previews import TemplatePreview, get_page_count_for_letter
 from app.utils import (
+    LETTER_MAX_PAGES,
     PermanentRedirect,
     Spreadsheet,
     email_or_sms_not_enabled,
@@ -523,7 +524,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_
         email_reply_to = get_email_reply_to_address_from_session()
     elif db_template['template_type'] == 'sms':
         sms_sender = get_sms_sender_from_session()
-    page_count = get_page_count_for_letter(db_template)
+
     template = get_template(
         db_template,
         current_service,
@@ -538,7 +539,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_
         ) if not letters_as_pdf else None,
         email_reply_to=email_reply_to,
         sms_sender=sms_sender,
-        page_count=page_count,
+        page_count=get_page_count_for_letter(db_template),
     )
     recipients = RecipientCSV(
         contents,
@@ -569,6 +570,8 @@ def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_
     elif preview_row > 2:
         abort(404)
 
+    page_count = get_page_count_for_letter(db_template, template.values)
+
     return dict(
         recipients=recipients,
         template=template,
@@ -593,6 +596,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_
             service_id, template.id, db_template['version'], request.args.get('original_file_name', '')
         ),
         letter_too_long=is_letter_too_long(page_count),
+        letter_max_pages=LETTER_MAX_PAGES,
     )
 
 
@@ -853,7 +857,6 @@ def _check_notification(service_id, template_id, exception=None):
         email_reply_to = get_email_reply_to_address_from_session()
     elif db_template['template_type'] == 'sms':
         sms_sender = get_sms_sender_from_session()
-    page_count = get_page_count_for_letter(db_template)
     template = get_template(
         db_template,
         current_service,
@@ -866,7 +869,7 @@ def _check_notification(service_id, template_id, exception=None):
             template_id=template_id,
             filetype='png',
         ),
-        page_count=page_count,
+        page_count=get_page_count_for_letter(db_template),
     )
 
     back_link = get_back_link(service_id, template, len(fields_to_fill_in(template)))
@@ -881,11 +884,13 @@ def _check_notification(service_id, template_id, exception=None):
         raise PermanentRedirect(back_link)
 
     template.values = get_recipient_and_placeholders_from_session(template.template_type)
+    page_count = get_page_count_for_letter(db_template, template.values)
     return dict(
         template=template,
         back_link=back_link,
         help=get_help_argument(),
         letter_too_long=is_letter_too_long(page_count),
+        letter_max_pages=LETTER_MAX_PAGES,
         **(get_template_error_dict(exception) if exception else {}),
     )
 
diff --git a/app/main/views/templates.py b/app/main/views/templates.py
index 5bb34deb4..afb57deb7 100644
--- a/app/main/views/templates.py
+++ b/app/main/views/templates.py
@@ -31,6 +31,7 @@ from app.models.service import Service
 from app.models.template_list import TemplateList, TemplateLists
 from app.template_previews import TemplatePreview, get_page_count_for_letter
 from app.utils import (
+    LETTER_MAX_PAGES,
     email_or_sms_not_enabled,
     get_template,
     is_letter_too_long,
@@ -76,6 +77,7 @@ def view_template(service_id, template_id):
         template_postage=template["postage"],
         user_has_template_permission=user_has_template_permission,
         letter_too_long=is_letter_too_long(get_page_count_for_letter(template)),
+        letter_max_pages=LETTER_MAX_PAGES,
     )
 
 
diff --git a/app/main/views/uploads.py b/app/main/views/uploads.py
index 1d010a224..346226843 100644
--- a/app/main/views/uploads.py
+++ b/app/main/views/uploads.py
@@ -26,7 +26,12 @@ from app.s3_client.s3_letter_upload_client import (
     upload_letter_to_s3,
 )
 from app.template_previews import TemplatePreview, sanitise_letter
-from app.utils import get_template, is_letter_too_long, user_has_permissions
+from app.utils import (
+    LETTER_MAX_PAGES,
+    get_template,
+    is_letter_too_long,
+    user_has_permissions,
+)
 
 MAX_FILE_UPLOAD_SIZE = 2 * 1024 * 1024  # 2MB
 
@@ -132,6 +137,7 @@ def uploaded_letter_preview(service_id, file_id):
         status=status,
         file_id=file_id,
         letter_too_long=letter_too_long,
+        letter_max_pages=LETTER_MAX_PAGES,
     )