Rationalised the queues.

- the internal notify activites (send sms code, forgotten passwords etc) all not in a "notify" queue.
- deleted all unused queues

app/invite/rest.py

@@ -44,7 +44,7 @@ def create_invited_user(service_id):
         str(uuid.uuid4()),
         encryption.encrypt(message),
         datetime.utcnow().strftime(DATETIME_FORMAT)
-    ), queue="email-invited-user")
+    ), queue="notify")
 
     return jsonify(data=invited_user_schema.dump(invited_user).data), 201
 

app/user/rest.py

@@ -142,7 +142,7 @@ def send_user_sms_code(user_id):
                           str(uuid.uuid4()),
                           verification_message,
                           datetime.utcnow().strftime(DATETIME_FORMAT)
-                          ], queue='sms-code')
+                          ], queue='notify')
 
     return jsonify({}), 204
 
@@ -168,7 +168,7 @@ def send_user_email_verification(user_id):
         str(uuid.uuid4()),
         encryption.encrypt(message),
         datetime.utcnow().strftime(DATETIME_FORMAT)
-    ), queue='email-registration-verification')
+    ), queue='notify')
 
     return jsonify({}), 204
 
@@ -193,7 +193,7 @@ def send_already_registered_email(user_id):
         str(uuid.uuid4()),
         encryption.encrypt(message),
         datetime.utcnow().strftime(DATETIME_FORMAT)
-    ), queue='email-already-registered')
+    ), queue='notify')
 
     return jsonify({}), 204
 
@@ -252,7 +252,7 @@ def send_user_reset_password():
     send_email.apply_async([current_app.config['NOTIFY_SERVICE_ID'],
                             str(uuid.uuid4()),
                             encryption.encrypt(message),
-                            datetime.utcnow().strftime(DATETIME_FORMAT)], queue='email-reset-password')
+                            datetime.utcnow().strftime(DATETIME_FORMAT)], queue='notify')
 
     return jsonify({}), 204
 

config.py

@@ -116,20 +116,10 @@ class Config(object):
     }
     CELERY_QUEUES = [
         Queue('periodic', Exchange('default'), routing_key='periodic'),
-        Queue('sms', Exchange('default'), routing_key='sms'),
-        Queue('email', Exchange('default'), routing_key='email'),
-        Queue('sms-code', Exchange('default'), routing_key='sms-code'),
-        Queue('email-code', Exchange('default'), routing_key='email-code'),
-        Queue('email-reset-password', Exchange('default'), routing_key='email-reset-password'),
         Queue('process-job', Exchange('default'), routing_key='process-job'),
-        Queue('remove-job', Exchange('default'), routing_key='remove-job'),
-        Queue('bulk-sms', Exchange('default'), routing_key='bulk-sms'),
-        Queue('bulk-email', Exchange('default'), routing_key='bulk-email'),
-        Queue('email-invited-user', Exchange('default'), routing_key='email-invited-user'),
-        Queue('email-registration-verification', Exchange('default'), routing_key='email-registration-verification'),
         Queue('research-mode', Exchange('default'), routing_key='research-mode'),
         Queue('retry', Exchange('default'), routing_key='retry'),
-        Queue('email-already-registered', Exchange('default'), routing_key='email-already-registered')
+        Queue('notify', Exchange('default'), routing_key='notify')
     ]
     API_HOST_NAME = "http://localhost:6011"
 

tests/app/invite/test_invite_rest.py

@@ -56,7 +56,7 @@ def test_create_invited_user(notify_api, sample_service, mocker, invitation_emai
                  'some_uuid',
                  encryption.encrypt(message),
                  "2016-01-01T11:09:00.061258"),
-                queue="email-invited-user")
+                queue="notify")
 
 
 def test_create_invited_user_invalid_email(notify_api, sample_service, mocker):

tests/app/user/test_rest.py

@@ -421,7 +421,7 @@ def test_send_user_reset_password_should_send_reset_password_link(notify_api,
                  'some_uuid',
                  app.encryption.encrypt(message),
                  "2016-01-01T11:09:00.061258"],
-                queue="email-reset-password")
+                queue="notify")
 
 
 def test_send_user_reset_password_should_return_400_when_email_is_missing(notify_api):
@@ -501,7 +501,7 @@ def test_send_already_registered_email(notify_api, sample_user, already_register
                  'some_uuid',
                  app.encryption.encrypt(message),
                  "2016-01-01T11:09:00.061258"),
-                queue="email-already-registered")
+                queue="notify")
 
 
 def test_send_already_registered_email_returns_400_when_data_is_missing(notify_api, sample_user):

tests/app/user/test_rest_verify.py

@@ -249,7 +249,7 @@ def test_send_user_sms_code(notify_api,
                   "some_uuid",
                   encrypted,
                   "2016-01-01T11:09:00.061258"]),
-                queue="sms-code"
+                queue="notify"
             )
 
 
@@ -289,7 +289,7 @@ def test_send_user_code_for_sms_with_optional_to_field(notify_api,
                   "some_uuid",
                   encrypted,
                   "2016-01-01T11:09:00.061258"]),
-                queue="sms-code"
+                queue="notify"
             )
 
 
@@ -344,7 +344,7 @@ def test_send_user_email_verification(notify_api,
                  'some_uuid',
                  encryption.encrypt(message),
                  "2016-01-01T11:09:00.061258"),
-                queue="email-registration-verification")
+                queue="notify")
 
 
 def test_send_email_verification_returns_404_for_bad_input_data(notify_api, notify_db, notify_db_session):