diff --git a/app/broadcast_message/rest.py b/app/broadcast_message/rest.py index 1af62e0dd..e0c5d2e68 100644 --- a/app/broadcast_message/rest.py +++ b/app/broadcast_message/rest.py @@ -210,5 +210,5 @@ def _create_broadcast_event(broadcast_message): send_broadcast_event.apply_async( kwargs={'broadcast_event_id': str(event.id)}, - queue=QueueNames.NOTIFY + queue=QueueNames.BROADCASTS ) diff --git a/app/celery/broadcast_message_tasks.py b/app/celery/broadcast_message_tasks.py index 4d7351945..652644636 100644 --- a/app/celery/broadcast_message_tasks.py +++ b/app/celery/broadcast_message_tasks.py @@ -23,7 +23,7 @@ def send_broadcast_event(broadcast_event_id): for provider in broadcast_event.service.get_available_broadcast_providers(): send_broadcast_provider_message.apply_async( kwargs={'broadcast_event_id': broadcast_event_id, 'provider': provider}, - queue=QueueNames.NOTIFY + queue=QueueNames.BROADCASTS ) diff --git a/app/celery/scheduled_tasks.py b/app/celery/scheduled_tasks.py index 6ce5d4c7d..1acc807e3 100644 --- a/app/celery/scheduled_tasks.py +++ b/app/celery/scheduled_tasks.py @@ -309,4 +309,4 @@ def send_canary_to_cbc_proxy(): def trigger_link_tests(): if current_app.config['CBC_PROXY_ENABLED']: for cbc_name in current_app.config['ENABLED_CBCS']: - trigger_link_test.apply_async(kwargs={'provider': cbc_name}, queue=QueueNames.NOTIFY) + trigger_link_test.apply_async(kwargs={'provider': cbc_name}, queue=QueueNames.BROADCASTS) diff --git a/tests/app/broadcast_message/test_rest.py b/tests/app/broadcast_message/test_rest.py index f1dfb0d03..0ee72b94d 100644 --- a/tests/app/broadcast_message/test_rest.py +++ b/tests/app/broadcast_message/test_rest.py @@ -392,7 +392,7 @@ def test_update_broadcast_message_status_stores_cancelled_by_and_cancelled_at( cancel_id = str(cancel_event.id) - mock_task.assert_called_once_with(kwargs={'broadcast_event_id': cancel_id}, queue='notify-internal-tasks') + mock_task.assert_called_once_with(kwargs={'broadcast_event_id': cancel_id}, queue='broadcast-tasks') assert response['status'] == BroadcastStatusType.CANCELLED assert response['cancelled_at'] is not None assert response['cancelled_by_id'] == str(canceller.id) @@ -434,7 +434,7 @@ def test_update_broadcast_message_status_stores_approved_by_and_approved_at_and_ assert len(bm.events) == 1 alert_event = bm.events[0] - mock_task.assert_called_once_with(kwargs={'broadcast_event_id': str(alert_event.id)}, queue='notify-internal-tasks') + mock_task.assert_called_once_with(kwargs={'broadcast_event_id': str(alert_event.id)}, queue='broadcast-tasks') assert alert_event.service_id == sample_broadcast_service.id assert alert_event.transmitted_areas == bm.areas @@ -472,7 +472,7 @@ def test_update_broadcast_message_status_creates_event_with_correct_content_if_b assert len(bm.events) == 1 alert_event = bm.events[0] - mock_task.assert_called_once_with(kwargs={'broadcast_event_id': str(alert_event.id)}, queue='notify-internal-tasks') + mock_task.assert_called_once_with(kwargs={'broadcast_event_id': str(alert_event.id)}, queue='broadcast-tasks') assert alert_event.transmitted_content == {"body": "tailor made emergency broadcast content"} @@ -553,7 +553,7 @@ def test_update_broadcast_message_status_allows_platform_admin_to_approve_own_me assert response['approved_by_id'] == str(user.id) mock_task.assert_called_once_with( kwargs={'broadcast_event_id': str(bm.events[0].id)}, - queue='notify-internal-tasks' + queue='broadcast-tasks' ) @@ -584,7 +584,7 @@ def test_update_broadcast_message_status_allows_trial_mode_services_to_approve_o assert response['approved_at'] is not None assert response['created_by_id'] == str(t.created_by_id) assert response['approved_by_id'] == str(t.created_by_id) - mock_task.assert_called_once_with(kwargs={'broadcast_event_id': ANY}, queue='notify-internal-tasks') + mock_task.assert_called_once_with(kwargs={'broadcast_event_id': ANY}, queue='broadcast-tasks') def test_update_broadcast_message_status_rejects_approval_from_user_not_on_that_service( diff --git a/tests/app/celery/test_broadcast_message_tasks.py b/tests/app/celery/test_broadcast_message_tasks.py index cee968bb4..16adcc5a6 100644 --- a/tests/app/celery/test_broadcast_message_tasks.py +++ b/tests/app/celery/test_broadcast_message_tasks.py @@ -35,8 +35,8 @@ def test_send_broadcast_event_queues_up_for_active_providers(mocker, notify_api, send_broadcast_event(event.id) assert mock_send_broadcast_provider_message.apply_async.call_args_list == [ - call(kwargs={'broadcast_event_id': event.id, 'provider': 'ee'}, queue='notify-internal-tasks'), - call(kwargs={'broadcast_event_id': event.id, 'provider': 'vodafone'}, queue='notify-internal-tasks') + call(kwargs={'broadcast_event_id': event.id, 'provider': 'ee'}, queue='broadcast-tasks'), + call(kwargs={'broadcast_event_id': event.id, 'provider': 'vodafone'}, queue='broadcast-tasks') ] @@ -63,7 +63,7 @@ def test_send_broadcast_event_only_sends_to_one_provider_if_set_on_service( send_broadcast_event(event.id) assert mock_send_broadcast_provider_message.apply_async.call_args_list == [ - call(kwargs={'broadcast_event_id': event.id, 'provider': 'vodafone'}, queue='notify-internal-tasks') + call(kwargs={'broadcast_event_id': event.id, 'provider': 'vodafone'}, queue='broadcast-tasks') ] diff --git a/tests/app/celery/test_scheduled_tasks.py b/tests/app/celery/test_scheduled_tasks.py index f31e2fc60..7bfd22eba 100644 --- a/tests/app/celery/test_scheduled_tasks.py +++ b/tests/app/celery/test_scheduled_tasks.py @@ -603,8 +603,8 @@ def test_trigger_link_tests_calls_for_all_providers( trigger_link_tests() assert mock_trigger_link_test.apply_async.call_args_list == [ - call(kwargs={'provider': 'ee'}, queue='notify-internal-tasks'), - call(kwargs={'provider': 'vodafone'}, queue='notify-internal-tasks') + call(kwargs={'provider': 'ee'}, queue='broadcast-tasks'), + call(kwargs={'provider': 'vodafone'}, queue='broadcast-tasks') ]