Add letters pdf task

app/celery/tasks.py

@@ -4,6 +4,8 @@ from collections import namedtuple
 
 from celery.signals import worker_process_shutdown
 from flask import current_app
+import requests
+
 from notifications_utils.recipients import (
     RecipientCSV
 )
@@ -18,6 +20,7 @@ from requests import (
     RequestException
 )
 from sqlalchemy.exc import SQLAlchemyError
+from sqlalchemy.orm.exc import NoResultFound
 from botocore.exceptions import ClientError as BotoClientError
 
 from app import (
@@ -44,7 +47,8 @@ from app.dao.notifications_dao import (
     dao_update_notifications_for_job_to_sent_to_dvla,
     dao_update_notifications_by_reference,
     dao_get_last_notification_added_for_job_id,
-    dao_get_notifications_by_references
+    dao_get_notifications_by_references,
+    update_notification_status_by_id
 )
 from app.dao.provider_details_dao import get_current_provider
 from app.dao.service_inbound_api_dao import get_service_inbound_api_for_service
@@ -121,11 +125,17 @@ def process_job(job_id):
 
 
 def job_complete(job, service, template_type, resumed=False, start=None):
-    if template_type == LETTER_TYPE:
+    if (
+        template_type == LETTER_TYPE and
+        'letters_as_pdf' not in [p.permission for p in service.permissions]
+    ):
         if service.research_mode:
             update_job_to_sent_to_dvla.apply_async([str(job.id)], queue=QueueNames.RESEARCH_MODE)
         else:
-            build_dvla_file.apply_async([str(job.id)], queue=QueueNames.JOBS)
+            build_dvla_file.apply_async(
+                [str(job.id)],
+                queue=QueueNames.JOBS
+            )
             current_app.logger.info("send job {} to build-dvla-file in the {} queue".format(job.id, QueueNames.JOBS))
     else:
         job.job_status = JOB_STATUS_FINISHED
@@ -312,6 +322,14 @@ def save_letter(
             reply_to_text=service.get_default_letter_contact()
         )
 
+        if (
+            'letters_as_pdf' in [p.permission for p in service.permissions] and not service.research_mode
+        ):
+            create_letters_pdf.apply_async(
+                [str(saved_notification.id)],
+                queue=QueueNames.JOBS
+            )
+
         current_app.logger.info("Letter {} created at {}".format(saved_notification.id, saved_notification.created_at))
     except SQLAlchemyError as e:
         handle_exception(self, notification, notification_id, e)
@@ -581,3 +599,57 @@ def process_incomplete_job(job_id):
             process_row(row_number, recipient, personalisation, template, job, job.service)
 
     job_complete(job, job.service, template.template_type, resumed=True)
+
+
+@notify_celery.task(bind=True, name="create-letters-pdf", max_retries=15, default_retry_delay=300)
+@statsd(namespace="tasks")
+def create_letters_pdf(self, notification_id):
+    try:
+        notification = get_notification_by_id(notification_id)
+        if not notification:
+            raise NoResultFound()
+
+        pdf_data = get_letters_pdf(
+            notification.template,
+            contact_block=notification.reply_to_text,
+            org_id=notification.service.dvla_organisation.id,
+            values=notification.personalisation
+        )
+        current_app.logger.info("PDF Letter {} reference {} created at {}, {} bytes".format(
+            notification.id, notification.reference, notification.created_at, len(pdf_data)))
+        s3.upload_letters_pdf(reference=notification.reference, crown=True, filedata=pdf_data)
+    except (RequestException, BotoClientError):
+        try:
+            current_app.logger.exception(
+                "Letters PDF notification creation for id: {} failed".format(notification_id)
+            )
+            self.retry(queue=QueueNames.RETRY)
+        except self.MaxRetriesExceededError:
+            current_app.logger.exception(
+                "RETRY FAILED: task create_letters_pdf failed for notification {}".format(notification_id),
+            )
+            update_notification_status_by_id(notification_id, 'technical-failure')
+
+
+def get_letters_pdf(template, contact_block=None, org_id='001', values=None):
+    template_for_letter_print = {
+        "subject": template.subject,
+        "content": template.content
+    }
+
+    data = {
+        'letter_contact_block': contact_block,
+        'template': template_for_letter_print,
+        'values': values,
+        'dvla_org_id': org_id,
+    }
+    resp = requests.post(
+        '{}/print.pdf'.format(
+            current_app.config['TEMPLATE_PREVIEW_API_HOST']
+        ),
+        json=data,
+        headers={'Authorization': 'Token {}'.format(current_app.config['TEMPLATE_PREVIEW_API_KEY'])}
+    )
+    resp.raise_for_status()
+
+    return resp.content

tests/app/celery/test_tasks.py

@@ -1436,7 +1436,6 @@ def test_process_incomplete_job_email(mocker, sample_email_template):
 
 
 def test_process_incomplete_job_letter(mocker, sample_letter_template):
-
     mocker.patch('app.celery.tasks.s3.get_job_from_s3', return_value=load_example_csv('multiple_letter'))
     mock_letter_saver = mocker.patch('app.celery.tasks.save_letter.apply_async')
     mock_build_dvla = mocker.patch('app.celery.tasks.build_dvla_file.apply_async')
@@ -1456,3 +1455,4 @@ def test_process_incomplete_job_letter(mocker, sample_letter_template):
 
     assert mock_build_dvla.called
     assert mock_letter_saver.call_count == 8
+    

tests/app/conftest.py

@@ -299,6 +299,10 @@ def sample_template_without_email_permission(notify_db, notify_db_session):
 
 @pytest.fixture
 def sample_letter_template(sample_service_full_permissions):
+    # remove letters_as_pdf from fixture until we drop building of dvla files
+    from app.dao.service_permissions_dao import dao_remove_service_permission
+    dao_remove_service_permission(sample_service_full_permissions.id, 'letters_as_pdf')
+
     return create_template(sample_service_full_permissions, template_type=LETTER_TYPE)