WIP enforce letter page limit

app/celery/letters_pdf_tasks.py

@@ -38,7 +38,7 @@ from app.letters.utils import (
     move_scan_to_invalid_pdf_bucket,
     move_error_pdf_to_scan_bucket,
     get_file_names_from_error_bucket,
-    get_page_count,
+    get_billable_units_for_pdf,
 )
 from app.models import (
     KEY_TYPE_TEST,
@@ -211,7 +211,7 @@ def process_virus_scan_passed(self, filename):
     old_pdf = scan_pdf_object.get()['Body'].read()
 
     try:
-        billable_units = get_page_count(old_pdf)
+        billable_units = get_billable_units_for_pdf(old_pdf)
     except PdfReadError:
         current_app.logger.exception(msg='Invalid PDF received for notification_id: {}'.format(notification.id))
         _move_invalid_letter_and_update_status(notification, filename, scan_pdf_object)

app/letters/utils.py

@@ -211,8 +211,12 @@ def letter_print_day(created_at):
         return 'on {}'.format(print_date)
 
 
-def get_page_count(pdf):
+def get_page_count_for_pdf(pdf):
-    pages = pdf_page_count(io.BytesIO(pdf))
+    return pdf_page_count(io.BytesIO(pdf))
+
+
+def get_billable_units_for_pdf(pdf):
+    pages = get_page_count_for_pdf(pdf)
     pages_per_sheet = 2
     billable_units = math.ceil(pages / pages_per_sheet)
     return billable_units

app/service/send_notification.py

@@ -31,7 +31,7 @@ from app.dao.templates_dao import dao_get_template_by_id_and_service_id, get_pre
 from app.dao.users_dao import get_user_by_id
 from app.letters.utils import (
     get_letter_pdf_filename,
-    get_page_count,
+    get_billable_units_for_pdf,
     move_uploaded_pdf_to_letters_bucket,
 )
 from app.v2.errors import BadRequestError
@@ -152,7 +152,7 @@ def send_pdf_letter_notification(service_id, post_data):
         raise e
 
     # Getting the page count won't raise an error since admin has already checked the PDF is valid
-    billable_units = get_page_count(letter.read())
+    billable_units = get_billable_units_for_pdf(letter.read())
 
     personalisation = {
         'address_line_1': post_data['filename']

app/v2/notifications/post_notifications.py

@@ -12,7 +12,7 @@ from app.clients.document_download import DocumentDownloadError
 from app.config import QueueNames, TaskNames
 from app.dao.notifications_dao import update_notification_status_by_reference
 from app.dao.templates_dao import get_precompiled_letter_template
-from app.letters.utils import upload_letter_pdf
+from app.letters.utils import upload_letter_pdf, get_page_count_for_pdf
 from app.models import (
     SMS_TYPE,
     EMAIL_TYPE,

tests/app/celery/test_letters_pdf_tasks.py

@@ -426,7 +426,7 @@ def test_process_letter_task_check_virus_scan_passed(
     s3 = boto3.client('s3', region_name='eu-west-1')
     s3.put_object(Bucket=source_bucket_name, Key=filename, Body=b'old_pdf')
 
-    mock_get_page_count = mocker.patch('app.celery.letters_pdf_tasks.get_page_count', return_value=1)
+    mock_get_billable_units_for_pdf = mocker.patch('app.celery.letters_pdf_tasks.get_billable_units_for_pdf', return_value=1)
     mock_s3upload = mocker.patch('app.celery.letters_pdf_tasks.s3upload')
     endpoint = 'http://localhost:9999/precompiled/sanitise'
     with requests_mock.mock() as rmock:
@@ -456,7 +456,7 @@ def test_process_letter_task_check_virus_scan_passed(
         file_location=destination_folder + filename,
         region='eu-west-1',
     )
-    mock_get_page_count.assert_called_once_with(b'old_pdf')
+    mock_get_billable_units_for_pdf.assert_called_once_with(b'old_pdf')
 
 
 @freeze_time('2018-01-01 18:00')
@@ -480,7 +480,7 @@ def test_process_letter_task_check_virus_scan_passed_when_sanitise_fails(
     sample_letter_notification.key_type = key_type
     mock_move_s3 = mocker.patch('app.letters.utils._move_s3_object')
     mock_sanitise = mocker.patch('app.celery.letters_pdf_tasks._sanitise_precompiled_pdf', return_value=None)
-    mock_get_page_count = mocker.patch('app.celery.letters_pdf_tasks.get_page_count', return_value=2)
+    mock_get_billable_units_for_pdf = mocker.patch('app.celery.letters_pdf_tasks.get_billable_units_for_pdf', return_value=2)
 
     process_virus_scan_passed(filename)
 
@@ -496,7 +496,7 @@ def test_process_letter_task_check_virus_scan_passed_when_sanitise_fails(
         target_bucket_name, filename
     )
 
-    mock_get_page_count.assert_called_once_with(b'pdf_content')
+    mock_get_billable_units_for_pdf.assert_called_once_with(b'pdf_content')
 
 
 @freeze_time('2018-01-01 18:00')
@@ -522,7 +522,7 @@ def test_process_letter_task_check_virus_scan_passed_when_redaction_fails(
     sample_letter_notification.status = NOTIFICATION_PENDING_VIRUS_CHECK
     sample_letter_notification.key_type = key_type
     mock_copy_s3 = mocker.patch('app.letters.utils._copy_s3_object')
-    mocker.patch('app.celery.letters_pdf_tasks.get_page_count', return_value=2)
+    mocker.patch('app.celery.letters_pdf_tasks.get_billable_units_for_pdf', return_value=2)
 
     endpoint = 'http://localhost:9999/precompiled/sanitise'
     with requests_mock.mock() as rmock:
@@ -574,13 +574,13 @@ def test_process_letter_task_check_virus_scan_passed_when_file_cannot_be_opened(
     sample_letter_notification.key_type = key_type
     mock_move_s3 = mocker.patch('app.letters.utils._move_s3_object')
 
-    mock_get_page_count = mocker.patch('app.celery.letters_pdf_tasks.get_page_count', side_effect=PdfReadError)
+    mock_get_billable_units_for_pdf = mocker.patch('app.celery.letters_pdf_tasks.get_billable_units_for_pdf', side_effect=PdfReadError)
     mock_sanitise = mocker.patch('app.celery.letters_pdf_tasks._sanitise_precompiled_pdf')
 
     process_virus_scan_passed(filename)
 
     mock_sanitise.assert_not_called()
-    mock_get_page_count.assert_called_once_with(b'pdf_content')
+    mock_get_billable_units_for_pdf.assert_called_once_with(b'pdf_content')
     mock_move_s3.assert_called_once_with(
         source_bucket_name, filename,
         target_bucket_name, filename
@@ -606,7 +606,7 @@ def test_process_virus_scan_passed_logs_error_and_sets_tech_failure_if_s3_error_
     s3 = boto3.client('s3', region_name='eu-west-1')
     s3.put_object(Bucket=source_bucket_name, Key=filename, Body=b'pdf_content')
 
-    mocker.patch('app.celery.letters_pdf_tasks.get_page_count', return_value=1)
+    mocker.patch('app.celery.letters_pdf_tasks.get_billable_units_for_pdf', return_value=1)
 
     error_response = {
         'Error': {

tests/app/service/test_rest.py

@@ -2275,7 +2275,7 @@ def test_send_one_off_notification(sample_service, admin_request, mocker):
 
 def test_create_pdf_letter(mocker, sample_service_full_permissions, client, fake_uuid, notify_user):
     mocker.patch('app.service.send_notification.utils_s3download')
-    mocker.patch('app.service.send_notification.get_page_count', return_value=1)
+    mocker.patch('app.service.send_notification.get_billable_units_for_pdf', return_value=1)
     mocker.patch('app.service.send_notification.move_uploaded_pdf_to_letters_bucket')
 
     user = sample_service_full_permissions.users[0]

tests/app/service/test_send_pdf_letter_notification.py

@@ -77,7 +77,7 @@ def test_send_pdf_letter_notification_creates_notification_and_moves_letter(
     post_data = {'filename': filename, 'created_by': user.id, 'file_id': file_id}
 
     mocker.patch('app.service.send_notification.utils_s3download')
-    mocker.patch('app.service.send_notification.get_page_count', return_value=1)
+    mocker.patch('app.service.send_notification.get_billable_units_for_pdf', return_value=1)
     s3_mock = mocker.patch('app.service.send_notification.move_uploaded_pdf_to_letters_bucket')
 
     result = send_pdf_letter_notification(sample_service_full_permissions.id, post_data)