darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-03 18:01:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove support for "areas_2" field

Browse Source 
The Admin app was only using this temporarily and is now using the
"areas" field instead [1], so we can delete this one.

[1]: https://github.com/alphagov/notifications-admin/pull/4006
This commit is contained in:
Ben Thorner
2021-09-01 17:25:55 +01:00
parent 43ddfe0560
commit d50c563f08
5 changed files with 16 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/broadcast_message/rest.py
View File

@@ -138,7 +138,7 @@ def create_broadcast_message(service_id):
template_id=template_id,
template_version=template.version if template else None,
personalisation=personalisation,
areas=data.get("areas", data.get("areas_2", {})), # TEMPORARY: while we repurpose "areas"
areas=data.get("areas", {}),
status=BroadcastStatusType.DRAFT,
starts_at=_parse_nullable_datetime(data.get('starts_at')),
finishes_at=_parse_nullable_datetime(data.get('finishes_at')),
@@ -170,8 +170,7 @@ def update_broadcast_message(service_id, broadcast_message_id):
status_code=400
)
# TEMPORARY: while we repurpose "areas"
areas = data.get("areas", data.get("areas_2", {}))
areas = data.get("areas", {})
if ('ids' in areas and 'simple_polygons' not in areas) or ('ids' not in areas and 'simple_polygons' in areas):
raise InvalidRequest(