Merge pull request #3418 from alphagov/letters-too-long

Mark letters as validation-failed if the templated letter is too long.

app/celery/letters_pdf_tasks.py

@@ -116,6 +116,16 @@ def update_billable_units_for_letter(self, notification_id, page_count):
         )
 
 
+@notify_celery.task(
+    bind=True, name="update-validation-failed-for-templated-letter", max_retries=15, default_retry_delay=300
+)
+def update_validation_failed_for_templated_letter(self, notification_id, page_count):
+    notification = get_notification_by_id(notification_id, _raise=True)
+    notification.status = NOTIFICATION_VALIDATION_FAILED
+    dao_update_notification(notification)
+    current_app.logger.info(f"Validation failed: letter is too long {page_count} for letter with id: {notification_id}")
+
+
 @notify_celery.task(name='collate-letter-pdfs-to-be-sent')
 @cronitor("collate-letter-pdfs-to-be-sent")
 def collate_letter_pdfs_to_be_sent():

app/dao/notifications_dao.py

@@ -711,7 +711,8 @@ def dao_get_letters_to_be_printed(print_run_deadline, postage, query_limit=10000
         Notification.notification_type == LETTER_TYPE,
         Notification.status == NOTIFICATION_CREATED,
         Notification.key_type == KEY_TYPE_NORMAL,
-        Notification.postage == postage
+        Notification.postage == postage,
+        Notification.billable_units > 0
     ).order_by(
         Notification.service_id,
         Notification.created_at
@@ -729,6 +730,7 @@ def dao_get_letters_and_sheets_volume_by_postage(print_run_deadline):
         Notification.notification_type == LETTER_TYPE,
         Notification.status == NOTIFICATION_CREATED,
         Notification.key_type == KEY_TYPE_NORMAL,
+        Notification.billable_units > 0
     ).group_by(
         Notification.postage
     ).order_by(

app/v2/notifications/post_notifications.py

@@ -394,6 +394,7 @@ def process_letter_notification(
             (notification.reference,),
             queue=queue
         )
+
     resp = create_response_for_post_notification(
         notification_id=notification.id,
         client_reference=notification.client_reference,