fix for incorrect lsoa displaying on the page

Author: drkane

findthatpostcode/controllers/postcodes.py

@@ -122,6 +122,12 @@ def get_area(self, areatype):
         """
         Get the area for this postcode based on the type
         """
+        area_id = self.attributes.get(areatype)
+        if area_id:
+            for a in self.relationships["areas"]:
+                if a.id == area_id:
+                    return a
+
         for a in self.relationships["areas"]:
             if a.relationships["areatype"].id == areatype:
                 return a

tests/blueprints/test_areatypes.py

@@ -1,7 +1,6 @@
 import html
 
-
-AREATYPE_CODE = "lsoa11"
+AREATYPE_CODE = "lsoa21"
 
 
 def test_areatype_json(client):
@@ -11,9 +10,9 @@ def test_areatype_json(client):
     assert rv.headers["Access-Control-Allow-Origin"] == "*"
     assert (
         data.get("data", {}).get("attributes", {}).get("full_name")
-        == "2011 Census Lower Layer Super Output Area (LSOA)/ Data Zone (DZ)/ SOA"
+        == "2021 Census Lower Layer Super Output Area (LSOA)/ Data Zone (DZ)/ SOA"
     )
-    assert len(data.get("included", [])) == 8
+    assert len(data.get("included", [])) == 9
 
 
 def test_areatype_json_missing(client):

tests/blueprints/test_extend.py

@@ -32,7 +32,7 @@ def test_reconcile_spec(client):
 
 
 extend_q = {
-    "extend": json.dumps({"ids": ["EX36 4AT"], "properties": [{"id": "lsoa11"}]})
+    "extend": json.dumps({"ids": ["EX36 4AT"], "properties": [{"id": "lsoa21"}]})
 }
 
 
@@ -42,7 +42,8 @@ def test_reconcile_extend(client):
     assert rv.headers["Access-Control-Allow-Origin"] == "*"
     assert "meta" in result
     assert "EX36 4AT" in result["rows"]
-    assert result["rows"]["EX36 4AT"]["lsoa11"] == "E01020135"
+    assert "lsoa11" not in result["rows"]["EX36 4AT"]
+    assert result["rows"]["EX36 4AT"]["lsoa21"] == "E01020135"
 
 
 def test_reconcile_extend_jsonp(client):
@@ -54,7 +55,8 @@ def test_reconcile_extend_jsonp(client):
     result = json.loads(data[len(extend_q["callback"]) + 1 : -1])
     assert "meta" in result
     assert "EX36 4AT" in result["rows"]
-    assert result["rows"]["EX36 4AT"]["lsoa11"] == "E01020135"
+    assert "lsoa11" not in result["rows"]["EX36 4AT"]
+    assert result["rows"]["EX36 4AT"]["lsoa21"] == "E01020135"
 
 
 def test_reconcile_extend_post(client):
@@ -63,7 +65,8 @@ def test_reconcile_extend_post(client):
     assert rv.headers["Access-Control-Allow-Origin"] == "*"
     assert "meta" in result
     assert "EX36 4AT" in result["rows"]
-    assert result["rows"]["EX36 4AT"]["lsoa11"] == "E01020135"
+    assert "lsoa11" not in result["rows"]["EX36 4AT"]
+    assert result["rows"]["EX36 4AT"]["lsoa21"] == "E01020135"
 
 
 def test_reconcile_extend_post_jsonp(client):
@@ -74,7 +77,8 @@ def test_reconcile_extend_post_jsonp(client):
     result = json.loads(data[len("testCallback") + 1 : -1])
     assert "meta" in result
     assert "EX36 4AT" in result["rows"]
-    assert result["rows"]["EX36 4AT"]["lsoa11"] == "E01020135"
+    assert "lsoa11" not in result["rows"]["EX36 4AT"]
+    assert result["rows"]["EX36 4AT"]["lsoa21"] == "E01020135"
 
 
 recon_q = {

tests/blueprints/test_points.py

@@ -27,6 +27,7 @@ def test_point_html(client):
     content = rv.data.decode("utf8")
     assert "EX36 4AT" in content
     assert "E01020135" in content
+    assert "E01020122" not in content
     assert "69.0" in content
 
 

tests/blueprints/test_postcodes.py

@@ -33,6 +33,7 @@ def test_postcode_html(client):
     content = rv.data.decode("utf8")
     assert "EX36 4AT" in content
     assert "E01020135" in content
+    assert "E01020122" not in content
 
 
 def test_postcode_missing_html(client):

tests/mock_data/geo_area.json

@@ -237,6 +237,216 @@
       }
     }
   },
+  {
+    "_index": "geo_area",
+    "_type": "_doc",
+    "_id": "E01020122",
+    "_score": 0.9999991,
+    "_source": {
+      "code": "E01020122",
+      "name": "North Devon 013C",
+      "name_welsh": null,
+      "statutory_instrument_id": null,
+      "statutory_instrument_title": null,
+      "date_start": "2004-02-01T00:00:00",
+      "date_end": null,
+      "parent": "E02004187",
+      "entity": "E01",
+      "owner": "ONS",
+      "active": true,
+      "areaehect": 61.02,
+      "areachect": 61.02,
+      "areaihect": 0,
+      "arealhect": 61.02,
+      "sort_order": "E01020122",
+      "predecessor": [],
+      "successor": [],
+      "equivalents": {},
+      "type": "lsoa21",
+      "stats": {
+        "imd2015": {
+          "imd_education_adults_score": 0.385,
+          "imd_income_decile": 4,
+          "imd_health_score": 0.716,
+          "imd_education_score": 34.489,
+          "imd_employment_rank": 10031,
+          "imd_education_rank": 7020,
+          "imd_housing_wider_rank": 12794,
+          "imd_environment_outdoors_score": -1.446,
+          "imd_housing_rank": 23596,
+          "imd_housing_geographical_rank": 23152,
+          "imd_environment_indoors_rank": 10474,
+          "imd_income_rank": 11103,
+          "imd_environment_indoors_decile": 4,
+          "imd_employment_score": 0.14,
+          "imd_housing_geographical_score": -0.431,
+          "imd_crime_score": -0.473,
+          "imd_housing_score": 14.572,
+          "imd_score": 23.636,
+          "imd_crime_decile": 8,
+          "imd_education_adults_rank": 7793,
+          "imd_income_score": 0.164,
+          "imd_environment_score": 17.411,
+          "imd_education_children_rank": 6281,
+          "imd_environment_decile": 6,
+          "imd_housing_wider_decile": 4,
+          "imd_health_rank": 6948,
+          "imd_education_children_decile": 2,
+          "imd_environment_indoors_score": 0.413,
+          "imd_crime_rank": 23534,
+          "imd_education_adults_decile": 3,
+          "imd_environment_outdoors_rank": 10,
+          "imd_health_decile": 3,
+          "imd_environment_rank": 16535,
+          "imd_decile": 4,
+          "imd_housing_decile": 8,
+          "imd_education_decile": 3,
+          "imd_rank": 11666,
+          "imd_employment_decile": 4,
+          "imd_housing_geographical_decile": 8,
+          "imd_education_children_score": 0.72,
+          "imd_housing_wider_score": 0.529
+        },
+        "population2012": {
+          "population_60_plus": 493,
+          "population_total": 1615,
+          "population_0_15": 310,
+          "population_16_59": 812,
+          "population_workingage": 815
+        },
+        "idaopi2015": {
+          "idaopi_score": 0.225,
+          "idaopi_rank": 10020,
+          "idaopi_decile": 4
+        },
+        "idaci2015": {
+          "idaci_score": 0.159,
+          "idaci_decile": 5,
+          "idaci_rank": 15523
+        },
+        "idaci2019": {
+          "idaci_score": 0.214,
+          "idaci_decile": 3,
+          "idaci_rank": 9149
+        },
+        "imd2019": {
+          "imd_education_adults_score": 0.385,
+          "imd_income_decile": 3,
+          "imd_health_score": 0.807,
+          "imd_education_score": 31.279,
+          "imd_employment_rank": 8412,
+          "imd_education_rank": 8076,
+          "imd_housing_wider_rank": 10625,
+          "imd_environment_outdoors_score": -1.529,
+          "imd_housing_rank": 20430,
+          "imd_housing_geographical_rank": 22408,
+          "imd_environment_indoors_rank": 19846,
+          "imd_income_rank": 8086,
+          "imd_environment_indoors_decile": 7,
+          "imd_employment_score": 0.131,
+          "imd_housing_geographical_score": -0.393,
+          "imd_crime_score": -0.767,
+          "imd_housing_score": 17.001,
+          "imd_score": 25.2,
+          "imd_crime_decile": 9,
+          "imd_education_adults_rank": 7793,
+          "imd_income_score": 0.179,
+          "imd_environment_score": 7.729,
+          "imd_education_children_rank": 8442,
+          "imd_environment_decile": 9,
+          "imd_housing_wider_decile": 4,
+          "imd_health_rank": 5838,
+          "imd_education_children_decile": 3,
+          "imd_environment_indoors_score": -0.215,
+          "imd_crime_rank": 26965,
+          "imd_education_adults_decile": 3,
+          "imd_environment_outdoors_rank": 10,
+          "imd_health_decile": 2,
+          "imd_environment_rank": 26471,
+          "imd_decile": 4,
+          "imd_housing_decile": 7,
+          "imd_education_decile": 3,
+          "imd_rank": 10643,
+          "imd_employment_decile": 3,
+          "imd_housing_geographical_decile": 7,
+          "imd_education_children_score": 0.533,
+          "imd_housing_wider_score": 0.981
+        },
+        "idaopi2019": {
+          "idaopi_score": 0.214,
+          "idaopi_rank": 9035,
+          "idaopi_decile": 3
+        },
+        "population2015": {
+          "population_60_plus": 493,
+          "population_total": 1534,
+          "population_0_15": 301,
+          "population_16_59": 740,
+          "population_workingage": 748
+        },
+        "idaci2025": {
+          "idaci_score": 0.214,
+          "idaci_decile": 3,
+          "idaci_rank": 9149
+        },
+        "imd2025": {
+          "imd_education_adults_score": 0.385,
+          "imd_income_decile": 3,
+          "imd_health_score": 0.807,
+          "imd_education_score": 31.279,
+          "imd_employment_rank": 8412,
+          "imd_education_rank": 8076,
+          "imd_housing_wider_rank": 10625,
+          "imd_environment_outdoors_score": -1.529,
+          "imd_housing_rank": 20430,
+          "imd_housing_geographical_rank": 22408,
+          "imd_environment_indoors_rank": 19846,
+          "imd_income_rank": 8086,
+          "imd_environment_indoors_decile": 7,
+          "imd_employment_score": 0.131,
+          "imd_housing_geographical_score": -0.393,
+          "imd_crime_score": -0.767,
+          "imd_housing_score": 17.001,
+          "imd_score": 25.2,
+          "imd_crime_decile": 9,
+          "imd_education_adults_rank": 7793,
+          "imd_income_score": 0.179,
+          "imd_environment_score": 7.729,
+          "imd_education_children_rank": 8442,
+          "imd_environment_decile": 9,
+          "imd_housing_wider_decile": 4,
+          "imd_health_rank": 5838,
+          "imd_education_children_decile": 3,
+          "imd_environment_indoors_score": -0.215,
+          "imd_crime_rank": 26965,
+          "imd_education_adults_decile": 3,
+          "imd_environment_outdoors_rank": 10,
+          "imd_health_decile": 2,
+          "imd_environment_rank": 26471,
+          "imd_decile": 4,
+          "imd_housing_decile": 7,
+          "imd_education_decile": 3,
+          "imd_rank": 10643,
+          "imd_employment_decile": 3,
+          "imd_housing_geographical_decile": 7,
+          "imd_education_children_score": 0.533,
+          "imd_housing_wider_score": 0.981
+        },
+        "idaopi2025": {
+          "idaopi_score": 0.214,
+          "idaopi_rank": 9035,
+          "idaopi_decile": 3
+        },
+        "population2023": {
+          "population_60_plus": 493,
+          "population_total": 1534,
+          "population_0_15": 301,
+          "population_16_59": 740,
+          "population_workingage": 748
+        }
+      }
+    }
+  },
   {
     "_index": "geo_area",
     "_type": "_doc",

tests/mock_data/geo_postcode.json

@@ -30,8 +30,8 @@
       "pct": "E16000145",
       "nuts": "E05012435",
       "park": null,
-      "lsoa11": "E01020135",
-      "msoa11": "E02004187",
+      "lsoa11": "E01020122",
+      "msoa11": "E02004122",
       "lsoa21": "E01020135",
       "msoa21": "E02004187",
       "wz11": "E33049068",