From e640e048e5b89f6437a005b02088f953dbd8e6d0 Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Tue, 30 Aug 2016 17:27:01 +0100 Subject: [PATCH] Pushed the notifications from the CSV in the DB queue --- app/celery/tasks.py | 4 ++-- tests/app/celery/test_tasks.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/celery/tasks.py b/app/celery/tasks.py index 0ad308e49..a03df1878 100644 --- a/app/celery/tasks.py +++ b/app/celery/tasks.py @@ -84,7 +84,7 @@ def process_job(job_id): create_uuid(), encrypted, datetime.utcnow().strftime(DATETIME_FORMAT)), - queue='bulk-sms' + queue='db-sms' ) if template.template_type == EMAIL_TYPE: @@ -93,7 +93,7 @@ def process_job(job_id): create_uuid(), encrypted, datetime.utcnow().strftime(DATETIME_FORMAT)), - queue='bulk-email') + queue='db-email') finished = datetime.utcnow() job.status = 'finished' diff --git a/tests/app/celery/test_tasks.py b/tests/app/celery/test_tasks.py index d1c4ba18e..798d04b35 100644 --- a/tests/app/celery/test_tasks.py +++ b/tests/app/celery/test_tasks.py @@ -82,7 +82,7 @@ def test_should_process_sms_job(sample_job, mocker, mock_celery_remove_job): "uuid", "something_encrypted", "2016-01-01T11:09:00.061258"), - queue="bulk-sms" + queue="db-sms" ) job = jobs_dao.dao_get_job_by_id(sample_job.id) assert job.status == 'finished' @@ -201,7 +201,7 @@ def test_should_process_email_job_if_exactly_on_send_limits(notify_db, "something_encrypted", "2016-01-01T11:09:00.061258" ), - queue="bulk-email" + queue="db-email" ) mock_celery_remove_job.assert_called_once_with((str(job.id),), queue="remove-job") @@ -245,7 +245,7 @@ def test_should_process_email_job(sample_email_job, mocker, mock_celery_remove_j "something_encrypted", "2016-01-01T11:09:00.061258" ), - queue="bulk-email" + queue="db-email" ) job = jobs_dao.dao_get_job_by_id(sample_email_job.id) assert job.status == 'finished'