diff --git a/app/celery/broadcast_message_tasks.py b/app/celery/broadcast_message_tasks.py index 6638fb197..a319027ec 100644 --- a/app/celery/broadcast_message_tasks.py +++ b/app/celery/broadcast_message_tasks.py @@ -112,7 +112,10 @@ def send_broadcast_event(broadcast_event_id): broadcast_event = dao_get_broadcast_event_by_id(broadcast_event_id) - if current_app.config['NOTIFY_ENVIRONMENT'] == 'live': + if ( + current_app.config['NOTIFY_ENVIRONMENT'] == 'live' and + broadcast_event.message_type == BroadcastEventMessageType.ALERT + ): broadcast_message = broadcast_event.broadcast_message # raise a P1 to alert team that broadcast is going out. message = '\n'.join([ diff --git a/tests/app/celery/test_broadcast_message_tasks.py b/tests/app/celery/test_broadcast_message_tasks.py index 848ef19ce..9cbf2e6ac 100644 --- a/tests/app/celery/test_broadcast_message_tasks.py +++ b/tests/app/celery/test_broadcast_message_tasks.py @@ -137,6 +137,25 @@ def test_send_broadcast_event_creates_zendesk_p1(mocker, notify_api, sample_broa assert "Dear Sir/Madam" in zendesk_args['message'] +def test_send_broadcast_event_doesnt_p1_when_cancelling(mocker, notify_api, sample_broadcast_service): + template = create_template(sample_broadcast_service, BROADCAST_TYPE) + broadcast_message = create_broadcast_message( + template, + status=BroadcastStatusType.BROADCASTING, + areas={'areas': ['wd20-S13002775', 'wd20-S13002773'], 'simple_polygons': []}, + ) + create_broadcast_event(broadcast_message, message_type=BroadcastEventMessageType.ALERT) + cancel_event = create_broadcast_event(broadcast_message, message_type=BroadcastEventMessageType.CANCEL) + mock_create_ticket = mocker.patch("app.celery.broadcast_message_tasks.zendesk_client.create_ticket") + + mocker.patch('app.celery.broadcast_message_tasks.send_broadcast_provider_message') + + with set_config(notify_api, 'NOTIFY_ENVIRONMENT', 'live'): + send_broadcast_event(cancel_event.id) + + assert mock_create_ticket.called is False + + def test_send_broadcast_event_doesnt_create_zendesk_on_staging(mocker, notify_api, sample_broadcast_service): template = create_template(sample_broadcast_service, BROADCAST_TYPE) broadcast_message = create_broadcast_message(template, status=BroadcastStatusType.BROADCASTING)