darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-17 21:20:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4006 from alphagov/continue-areas-migration-178986763

Browse Source 
Complete migration to new "areas" API format
This commit is contained in:
Ben Thorner
2021-09-01 17:10:47 +01:00
committed by GitHub
parent c406f64bd3 cfdd244325
commit 51b786e544
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/models/broadcast_message.py
View File

@@ -88,7 +88,7 @@ class BroadcastMessage(JSONModel):
@property
def areas(self):
polygons = self._dict['areas_2']['simple_polygons']
polygons = self._dict['areas']['simple_polygons']
library_areas = self.get_areas(self.area_ids)
if library_areas:
@@ -106,11 +106,11 @@ class BroadcastMessage(JSONModel):
@property
def area_ids(self):
return self._dict['areas_2']['ids']
return self._dict['areas']['ids']
@area_ids.setter
def area_ids(self, value):
self._dict['areas_2']['ids'] = value
self._dict['areas']['ids'] = value
@property
def ancestor_areas(self):
@@ -230,7 +230,7 @@ class BroadcastMessage(JSONModel):
self._update_areas()
def remove_area(self, area_id):
self.area_ids = list(set(self._dict['areas_2']['ids']) - {area_id})
self.area_ids = list(set(self._dict['areas']['ids']) - {area_id})
self._update_areas()
def _set_status_to(self, status):
@@ -241,13 +241,13 @@ class BroadcastMessage(JSONModel):
)
def _update_areas(self, force_override=False):
areas_2 = {
areas = {
'ids': self.area_ids,
'names': [area.name for area in self.areas],
'simple_polygons': self.simple_polygons.as_coordinate_pairs_lat_long
}
data = {'areas_2': areas_2}
data = {'areas': areas}
# TEMPORARY: while we migrate to a new format for "areas"
if force_override:

2
tests/__init__.py
View File

@@ -696,7 +696,7 @@ def broadcast_message_json(
'reference': reference,
'personalisation': {},
'areas_2': {
'areas': {
'ids': area_ids or ['ctry19-E92000001', 'ctry19-S92000003'],
'simple_polygons': simple_polygons or [],
},

8
tests/app/main/views/test_broadcast.py
View File

@@ -1395,7 +1395,7 @@ def test_add_broadcast_area(
service_id=SERVICE_ONE_ID,
broadcast_message_id=fake_uuid,
data={
'areas_2': {
'areas': {
'ids': ['ctry19-E92000001', 'ctry19-S92000003', 'ctry19-W92000004'],
'names': ['England', 'Scotland', 'Wales'],
'simple_polygons': coordinates
@@ -1459,7 +1459,7 @@ def test_add_broadcast_sub_area_district_view(
service_id=SERVICE_ONE_ID,
broadcast_message_id=fake_uuid,
data={
'areas_2': {
'areas': {
'simple_polygons': coordinates,
**expected_data,
}
@@ -1495,7 +1495,7 @@ def test_add_broadcast_sub_area_county_view(
service_id=SERVICE_ONE_ID,
broadcast_message_id=fake_uuid,
data={
'areas_2': {
'areas': {
'simple_polygons': coordinates,
'ids': [
# These two areas are on the broadcast already
@@ -1542,7 +1542,7 @@ def test_remove_broadcast_area_page(
service_id=SERVICE_ONE_ID,
broadcast_message_id=fake_uuid,
data={
'areas_2': {
'areas': {
'simple_polygons': coordinates,
'names': ['Scotland'],
'ids': ['ctry19-S92000003']