Merge pull request #1724 from alphagov/revert-1722-priority-one-off-2

Revert "Send one-off messages as fast as possible"

app/service/send_notification.py

@@ -12,6 +12,7 @@ from app.notifications.process_notifications import (
 )
 from app.models import (
     KEY_TYPE_NORMAL,
+    PRIORITY,
     SMS_TYPE,
     EMAIL_TYPE,
 )
@@ -74,10 +75,11 @@ def send_one_off_notification(service_id, post_data):
         reply_to_text=reply_to
     )
 
+    queue_name = QueueNames.PRIORITY if template.process_type == PRIORITY else None
     send_notification_to_queue(
         notification=notification,
         research_mode=service.research_mode,
-        queue=QueueNames.PRIORITY
+        queue=queue_name
     )
 
     return {'id': str(notification.id)}

tests/app/service/test_send_one_off_notification.py

@@ -60,7 +60,7 @@ def test_send_one_off_notification_calls_celery_correctly(persist_mock, celery_m
     celery_mock.assert_called_once_with(
         notification=persist_mock.return_value,
         research_mode=False,
-        queue=QueueNames.PRIORITY,
+        queue=None
     )
 
 
@@ -110,7 +110,7 @@ def test_send_one_off_notification_honors_research_mode(notify_db_session, persi
     assert celery_mock.call_args[1]['research_mode'] is True
 
 
-def test_send_one_off_notification_maintains_priority(notify_db_session, persist_mock, celery_mock):
+def test_send_one_off_notification_honors_priority(notify_db_session, persist_mock, celery_mock):
     service = create_service()
     template = create_template(service=service)
     template.process_type = PRIORITY
@@ -231,7 +231,7 @@ def test_send_one_off_notification_should_add_email_reply_to_text_for_notificati
     celery_mock.assert_called_once_with(
         notification=notification,
         research_mode=False,
-        queue=QueueNames.PRIORITY,
+        queue=None
     )
     assert notification.reply_to_text == reply_to_email.email_address
 
@@ -251,7 +251,7 @@ def test_send_one_off_letter_notification_should_use_template_reply_to_text(samp
     celery_mock.assert_called_once_with(
         notification=notification,
         research_mode=False,
-        queue=QueueNames.PRIORITY,
+        queue=None
     )
 
     assert notification.reply_to_text == "Edinburgh, ED1 1AA"
@@ -277,7 +277,7 @@ def test_send_one_off_sms_notification_should_use_sms_sender_reply_to_text(sampl
     celery_mock.assert_called_once_with(
         notification=notification,
         research_mode=False,
-        queue=QueueNames.PRIORITY,
+        queue=None
     )
 
     assert notification.reply_to_text == "447123123123"
@@ -303,7 +303,7 @@ def test_send_one_off_sms_notification_should_use_default_service_reply_to_text(
     celery_mock.assert_called_once_with(
         notification=notification,
         research_mode=False,
-        queue=QueueNames.PRIORITY,
+        queue=None
     )
 
     assert notification.reply_to_text == "447123123456"