darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-25 08:43:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3313 from alphagov/force-override-broadcast-178986763

Browse Source 
Allow old broadcasts to be overridden
This commit is contained in:
Ben Thorner
2021-08-26 14:25:41 +01:00
committed by GitHub
parent 6edc6c70aa 44b388dc69
commit 277db4e6c7
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/broadcast_message/rest.py
View File

@@ -157,11 +157,14 @@ def create_broadcast_message(service_id):
def update_broadcast_message(service_id, broadcast_message_id): def update_broadcast_message(service_id, broadcast_message_id):
data = request.get_json() data = request.get_json()
# TEMPORARY: while we migrate and backfill "areas"
force_override = data.pop("force_override", False)
validate(data, update_broadcast_message_schema) validate(data, update_broadcast_message_schema)
broadcast_message = dao_get_broadcast_message_by_id_and_service_id(broadcast_message_id, service_id) broadcast_message = dao_get_broadcast_message_by_id_and_service_id(broadcast_message_id, service_id)
if broadcast_message.status not in BroadcastStatusType.PRE_BROADCAST_STATUSES: if not force_override and broadcast_message.status not in BroadcastStatusType.PRE_BROADCAST_STATUSES:
raise InvalidRequest( raise InvalidRequest(
f'Cannot update broadcast_message {broadcast_message.id} while it has status {broadcast_message.status}', f'Cannot update broadcast_message {broadcast_message.id} while it has status {broadcast_message.status}',
status_code=400 status_code=400

11
tests/app/broadcast_message/test_rest.py
View File

@@ -385,6 +385,10 @@ def test_update_broadcast_message_allows_edit_while_not_yet_live(admin_request,
assert response['updated_at'] is not None assert response['updated_at'] is not None
@pytest.mark.parametrize('force_override', [
False,
pytest.param(True, marks=pytest.mark.xfail)
])
@pytest.mark.parametrize('status', [ @pytest.mark.parametrize('status', [
BroadcastStatusType.BROADCASTING, BroadcastStatusType.BROADCASTING,
BroadcastStatusType.CANCELLED, BroadcastStatusType.CANCELLED,
@@ -392,14 +396,17 @@ def test_update_broadcast_message_allows_edit_while_not_yet_live(admin_request,
BroadcastStatusType.TECHNICAL_FAILURE, BroadcastStatusType.TECHNICAL_FAILURE,
]) ])
def test_update_broadcast_message_doesnt_allow_edits_after_broadcast_goes_live( def test_update_broadcast_message_doesnt_allow_edits_after_broadcast_goes_live(
admin_request, sample_broadcast_service, status admin_request,
force_override,
sample_broadcast_service,
status
): ):
t = create_template(sample_broadcast_service, BROADCAST_TYPE) t = create_template(sample_broadcast_service, BROADCAST_TYPE)
bm = create_broadcast_message(t, areas=['manchester'], status=status) bm = create_broadcast_message(t, areas=['manchester'], status=status)
response = admin_request.post( response = admin_request.post(
'broadcast_message.update_broadcast_message', 'broadcast_message.update_broadcast_message',
_data={'areas': ['london', 'glasgow']}, _data={'areas': ['london', 'glasgow'], 'force_override': force_override},
service_id=t.service_id, service_id=t.service_id,
broadcast_message_id=bm.id, broadcast_message_id=bm.id,
_expected_status=400 _expected_status=400