darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-20 23:41:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3202 from alphagov/env-fix

Browse Source 
fix environment var checking
This commit is contained in:
Leo Hemsted
2021-04-08 13:44:28 +01:00
committed by GitHub
parent dea5828d0e 4a5b1c23bd
commit 4a2e47b118
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/celery/broadcast_message_tasks.py
View File

@@ -112,7 +112,10 @@ def send_broadcast_event(broadcast_event_id):
broadcast_event = dao_get_broadcast_event_by_id(broadcast_event_id) broadcast_event = dao_get_broadcast_event_by_id(broadcast_event_id)
if current_app.config['NOTIFY_ENVIRONMENT'] == 'production': if (
current_app.config['NOTIFY_ENVIRONMENT'] == 'live' and
broadcast_event.message_type == BroadcastEventMessageType.ALERT
):
broadcast_message = broadcast_event.broadcast_message broadcast_message = broadcast_event.broadcast_message
# raise a P1 to alert team that broadcast is going out. # raise a P1 to alert team that broadcast is going out.
message = '\n'.join([ message = '\n'.join([

21
tests/app/celery/test_broadcast_message_tasks.py
View File

@@ -122,7 +122,7 @@ def test_send_broadcast_event_creates_zendesk_p1(mocker, notify_api, sample_broa
mocker.patch('app.celery.broadcast_message_tasks.send_broadcast_provider_message') mocker.patch('app.celery.broadcast_message_tasks.send_broadcast_provider_message')
with set_config(notify_api, 'NOTIFY_ENVIRONMENT', 'production'): with set_config(notify_api, 'NOTIFY_ENVIRONMENT', 'live'):
send_broadcast_event(event.id) send_broadcast_event(event.id)
assert mock_create_ticket.call_count == 1 assert mock_create_ticket.call_count == 1
@@ -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'] 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): def test_send_broadcast_event_doesnt_create_zendesk_on_staging(mocker, notify_api, sample_broadcast_service):
template = create_template(sample_broadcast_service, BROADCAST_TYPE) template = create_template(sample_broadcast_service, BROADCAST_TYPE)
broadcast_message = create_broadcast_message(template, status=BroadcastStatusType.BROADCASTING) broadcast_message = create_broadcast_message(template, status=BroadcastStatusType.BROADCASTING)