From 3a0bf2b23ef14a3bfe0342dc5a0b1fc9e54edd42 Mon Sep 17 00:00:00 2001
From: Leo Hemsted <leo.hemsted@digital.cabinet-office.gov.uk>
Date: Thu, 15 Aug 2019 15:21:00 +0100
Subject: [PATCH] Add reporting worker

also remove references to unused statistics queue
---
 app/config.py               | 8 ++++----
 manifest.yml.j2             | 1 +
 scripts/paas_app_wrapper.sh | 6 +++++-
 tests/app/test_config.py    | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/config.py b/app/config.py
index 46b8c48c0..5dd500723 100644
--- a/app/config.py
+++ b/app/config.py
@@ -20,7 +20,7 @@ class QueueNames(object):
     SEND_SMS = 'send-sms-tasks'
     SEND_EMAIL = 'send-email-tasks'
     RESEARCH_MODE = 'research-mode-tasks'
-    STATISTICS = 'statistics-tasks'
+    REPORTING = 'reporting-tasks'
     JOBS = 'job-tasks'
     RETRY = 'retry-tasks'
     NOTIFY = 'notify-internal-tasks'
@@ -39,7 +39,7 @@ class QueueNames(object):
             QueueNames.SEND_SMS,
             QueueNames.SEND_EMAIL,
             QueueNames.RESEARCH_MODE,
-            QueueNames.STATISTICS,
+            QueueNames.REPORTING,
             QueueNames.JOBS,
             QueueNames.RETRY,
             QueueNames.NOTIFY,
@@ -215,12 +215,12 @@ class Config(object):
         'create-nightly-billing': {
             'task': 'create-nightly-billing',
             'schedule': crontab(hour=0, minute=15),
-            'options': {'queue': QueueNames.PERIODIC}
+            'options': {'queue': QueueNames.REPORTING}
         },
         'create-nightly-notification-status': {
             'task': 'create-nightly-notification-status',
             'schedule': crontab(hour=0, minute=30),  # after 'timeout-sending-notifications'
-            'options': {'queue': QueueNames.PERIODIC}
+            'options': {'queue': QueueNames.REPORTING}
         },
         'delete-sms-notifications': {
             'task': 'delete-sms-notifications',
diff --git a/manifest.yml.j2 b/manifest.yml.j2
index 66600a23b..f2be6be71 100644
--- a/manifest.yml.j2
+++ b/manifest.yml.j2
@@ -13,6 +13,7 @@
   'notify-delivery-worker-research': {},
   'notify-delivery-worker-sender': {'disk_quota': '2G', 'memory': '3G'},
   'notify-delivery-worker-periodic': {},
+  'notify-delivery-worker-reporting': {},
   'notify-delivery-worker-priority': {},
   'notify-delivery-worker-letters': {},
   'notify-delivery-worker-retry-tasks': {},
diff --git a/scripts/paas_app_wrapper.sh b/scripts/paas_app_wrapper.sh
index 730186b69..18311fac1 100755
--- a/scripts/paas_app_wrapper.sh
+++ b/scripts/paas_app_wrapper.sh
@@ -26,7 +26,11 @@ case $NOTIFY_APP_NAME in
     ;;
   delivery-worker-periodic)
     scripts/run_app_paas.sh celery -A run_celery.notify_celery worker --loglevel=INFO --concurrency=2 \
-    -Q periodic-tasks,statistics-tasks 2> /dev/null
+    -Q periodic-tasks 2> /dev/null
+    ;;
+  delivery-worker-reporting)
+    scripts/run_app_paas.sh celery -A run_celery.notify_celery worker --loglevel=INFO --concurrency=11 \
+    -Q reporting-tasks 2> /dev/null
     ;;
   delivery-worker-priority)
     scripts/run_app_paas.sh celery -A run_celery.notify_celery worker --loglevel=INFO --concurrency=5 \
diff --git a/tests/app/test_config.py b/tests/app/test_config.py
index 4e17390de..7cde54486 100644
--- a/tests/app/test_config.py
+++ b/tests/app/test_config.py
@@ -71,7 +71,7 @@ def test_queue_names_all_queues_correct():
         QueueNames.SEND_SMS,
         QueueNames.SEND_EMAIL,
         QueueNames.RESEARCH_MODE,
-        QueueNames.STATISTICS,
+        QueueNames.REPORTING,
         QueueNames.JOBS,
         QueueNames.RETRY,
         QueueNames.NOTIFY,