Trigger collate-letter-pdfs-for-day task if notis to process

app/celery/scheduled_tasks.py

@@ -1,4 +1,5 @@
 from datetime import (
+    date,
     datetime,
     timedelta
 )
@@ -33,6 +34,7 @@ from app.dao.notifications_dao import (
     dao_timeout_notifications,
     is_delivery_slow_for_provider,
     delete_notifications_created_more_than_a_week_ago_by_type,
+    dao_get_count_of_letters_to_process_for_date,
     dao_get_scheduled_notifications,
     set_scheduled_notification_to_processed,
     dao_set_created_live_letter_api_notifications_to_pending,
@@ -355,6 +357,20 @@ def run_letter_jobs():
         current_app.logger.info("Queued {} ready letter job ids onto {}".format(len(job_ids), QueueNames.PROCESS_FTP))
 
 
+@notify_celery.task(name="run-letter-pdfs")
+@statsd(namespace="tasks")
+def run_letter_pdfs():
+    letter_pdfs_count = dao_get_count_of_letters_to_process_for_date()
+    if letter_pdfs_count:
+        notify_celery.send_task(
+            name='collate-letter-pdfs-for-day',
+            args=(date.today().strftime("%Y-%m-%d"),),
+            queue=QueueNames.LETTERS
+        )
+    current_app.logger.info("{} letter pdfs to be process by {} task".format(
+        letter_pdfs_count, 'collate-letter-pdfs-for-day'))
+
+
 @notify_celery.task(name="run-letter-api-notifications")
 @statsd(namespace="tasks")
 def run_letter_api_notifications():

tests/app/celery/test_scheduled_tasks.py

@@ -24,6 +24,7 @@ from app.celery.scheduled_tasks import (
     remove_transformed_dvla_files,
     run_scheduled_jobs,
     run_letter_jobs,
+    run_letter_pdfs,
     run_letter_api_notifications,
     populate_monthly_billing,
     s3,
@@ -43,6 +44,7 @@ from app.dao.provider_details_dao import (
     dao_update_provider_details,
     get_current_provider
 )
+from app.dao.service_permissions_dao import dao_add_service_permission
 from app.models import (
     MonthlyBilling,
     NotificationHistory,
@@ -713,6 +715,35 @@ def test_run_letter_jobs(client, mocker, sample_letter_template):
                                         queue=QueueNames.PROCESS_FTP)
 
 
+@freeze_time("2017-12-18 17:50")
+def test_run_letter_pdfs(client, mocker, sample_letter_template):
+    dao_add_service_permission(sample_letter_template.service.id, 'letters_as_pdf')
+
+    create_notification(template=sample_letter_template, created_at='2017-12-17 17:30:00')
+    create_notification(template=sample_letter_template, created_at='2017-12-18 17:29:59')
+
+    mock_celery = mocker.patch("app.celery.tasks.notify_celery.send_task")
+
+    run_letter_pdfs()
+
+    mock_celery.assert_called_once_with(name='collate-letter-pdfs-for-day',
+                                        args=('2017-12-18',),
+                                        queue=QueueNames.LETTERS)
+
+
+@freeze_time("2017-12-18 17:50")
+def test_run_letter_pdfs_send_task_not_called_if_no_notis_for_day(client, mocker, sample_letter_template):
+    dao_add_service_permission(sample_letter_template.service.id, 'letters_as_pdf')
+
+    create_notification(template=sample_letter_template, created_at='2017-12-15 17:30:00')
+
+    mock_celery = mocker.patch("app.celery.tasks.notify_celery.send_task")
+
+    run_letter_pdfs()
+
+    assert not mock_celery.called
+
+
 def test_run_letter_jobs_does_nothing_if_no_ready_jobs(client, mocker, sample_letter_template):
     create_job(sample_letter_template, job_status=JOB_STATUS_IN_PROGRESS)
     create_job(sample_letter_template, job_status=JOB_STATUS_SENT_TO_DVLA)