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

Validate that both polygons and areas have to be updated

Browse Source 
Because areas and polygons for broadcast messages should
be in sync.
This commit is contained in:
Pea Tyczynska
2020-09-07 15:10:04 +01:00
parent 5927aae019
commit b3ff172780
2 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/broadcast_message/rest.py
View File

@@ -132,6 +132,12 @@ def update_broadcast_message(service_id, broadcast_message_id):
status_code=400
)
if ('areas' in data and 'simple_polygons' not in data) or ('areas' not in data and 'simple_polygons' in data):
raise InvalidRequest(
f'Cannot update broadcast_message {broadcast_message.id}, areas or polygons are missing.',
status_code=400
)
if 'personalisation' in data:
broadcast_message.personalisation = data['personalisation']
if 'starts_at' in data:

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

@@ -235,7 +235,10 @@ def test_update_broadcast_message_doesnt_let_you_update_status(admin_request, sa
response = admin_request.post(
'broadcast_message.update_broadcast_message',
_data={'areas': ['glasgow'], 'status': BroadcastStatusType.BROADCASTING},
_data={
'areas': ['glasgow'],
"simple_polygons": [[55.86, -4.25], [55.85, -4.25], [55.87, -4.24]],
'status': BroadcastStatusType.BROADCASTING},
service_id=t.service_id,
broadcast_message_id=bm.id,
_expected_status=400
@@ -247,6 +250,29 @@ def test_update_broadcast_message_doesnt_let_you_update_status(admin_request, sa
}]
@pytest.mark.parametrize("incomplete_area_data", [
{"areas": ["cardiff"]},
{"simple_polygons": [[51.28, -3.11], [51.29, -3.12], [51.27, -3.10]]},
])
def test_update_broadcast_message_doesnt_let_you_update_areas_but_not_polygons(
admin_request, sample_service, incomplete_area_data
):
template = create_template(sample_service, BROADCAST_TYPE)
broadcast_message = create_broadcast_message(template)
response = admin_request.post(
'broadcast_message.update_broadcast_message',
_data=incomplete_area_data,
service_id=template.service_id,
broadcast_message_id=broadcast_message.id,
_expected_status=400
)
assert response[
'message'
] == f'Cannot update broadcast_message {broadcast_message.id}, areas or polygons are missing.'
def test_update_broadcast_message_status(admin_request, sample_service):
t = create_template(sample_service, BROADCAST_TYPE)
bm = create_broadcast_message(t, status=BroadcastStatusType.DRAFT)