Reinstating the 2 task model for API submitted notifications.

This is being done for the PaaS migration to allow us to keep traffic coming in whilst we migrate the database.

uses the same tasks as the CSV uploaded notifications. Simple changes to not persist the notification, and call into a different task.

app/notifications/process_notifications.py

@@ -5,6 +5,7 @@ from flask import current_app
 from app import redis_store
 from app.celery import provider_tasks
 from notifications_utils.clients import redis
+
 from app.dao.notifications_dao import dao_create_notification, dao_delete_notifications_and_history_by_id
 from app.models import SMS_TYPE, Notification, KEY_TYPE_TEST, EMAIL_TYPE
 from app.v2.errors import BadRequestError, SendNotificationToQueueError
@@ -37,7 +38,9 @@ def persist_notification(template_id,
                          job_row_number=None,
                          reference=None,
                          notification_id=None,
-                         simulated=False):
+                         simulated=False,
+                         persist=True):
+
     # if simulated create a Notification model to return but do not persist the Notification to the dB
     notification = Notification(
         id=notification_id,
@@ -56,7 +59,8 @@ def persist_notification(template_id,
         client_reference=reference
     )
     if not simulated:
-        dao_create_notification(notification)
+        if persist:
+            dao_create_notification(notification)
         if redis_store.get(redis.daily_limit_cache_key(service.id)):
             redis_store.incr(redis.daily_limit_cache_key(service.id))
         if redis_store.get_all_from_hash(cache_key_for_service_template_counter(service.id)):

app/notifications/rest.py

@@ -6,13 +6,14 @@ from flask import (
     json
 )
 
-from app import api_user
+from app import api_user, encryption, create_uuid
+from app.celery import tasks
 from app.dao import (
     templates_dao,
     services_dao,
     notifications_dao
 )
-from app.models import KEY_TYPE_TEAM, PRIORITY
+from app.models import KEY_TYPE_TEAM, PRIORITY, KEY_TYPE_TEST
 from app.models import SMS_TYPE
 from app.notifications.process_client_response import (
     validate_callback_data,
@@ -42,7 +43,6 @@ from app.errors import (
     InvalidRequest
 )
 
-
 register_errors(notifications)
 
 
@@ -95,7 +95,6 @@ def get_notification_statistics_for_day():
 
 @notifications.route('/notifications/<string:notification_type>', methods=['POST'])
 def send_notification(notification_type):
-
     if notification_type not in ['sms', 'email']:
         assert False
 
@@ -121,20 +120,44 @@ def send_notification(notification_type):
 
     # Do not persist or send notification to the queue if it is a simulated recipient
     simulated = simulated_recipient(notification_form['to'], notification_type)
-    notification_model = persist_notification(template_id=template.id,
-                                              template_version=template.version,
-                                              recipient=notification_form['to'],
-                                              service=service,
-                                              personalisation=notification_form.get('personalisation', None),
-                                              notification_type=notification_type,
-                                              api_key_id=api_user.id,
-                                              key_type=api_user.key_type,
-                                              simulated=simulated)
+    notification_model = persist_notification(
+        notification_id=create_uuid(),
+        template_id=template.id,
+        template_version=template.version,
+        recipient=notification_form['to'],
+        service=service,
+        personalisation=notification_form.get('personalisation', None),
+        notification_type=notification_type,
+        api_key_id=api_user.id,
+        key_type=api_user.key_type,
+        simulated=simulated,
+        persist=False)
+
+    notification_data = {
+        'template': str(template.id),
+        'template_version': template.version,
+        'to': notification_form['to']
+    }
+
+    if notification_model.personalisation:
+        notification_data.update({
+            'personalisation': dict(notification_model.personalisation)
+        })
+    encrypted = encryption.encrypt(notification_data)
+
     if not simulated:
-        queue_name = 'notify' if template.process_type == PRIORITY else None
-        send_notification_to_queue(notification=notification_model,
-                                   research_mode=service.research_mode,
-                                   queue=queue_name)
+        tasks.send_notification_to_persist_queue(
+            notification_model.id,
+            service,
+            template.template_type,
+            encrypted,
+            template.process_type == PRIORITY,
+            service.research_mode or api_user.key_type == KEY_TYPE_TEST
+        )
+        # queue_name = 'notify' if template.process_type == PRIORITY else None
+        # send_notification_to_queue(notification=notification_model,
+        #                            research_mode=service.research_mode,
+        #                            queue=queue_name)
     else:
         current_app.logger.info("POST simulated notification for id: {}".format(notification_model.id))
     notification_form.update({"template_version": template.version})