From 8f3bcd21bafe0d16c348c973e0c12cf1cd65eaf9 Mon Sep 17 00:00:00 2001 From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com> Date: Tue, 4 Apr 2023 08:43:17 +0100 Subject: [PATCH] CLDC-1996 Update LAs for 2022/23 (#1488) * Update local authorities * Add and seed 2022 LA links * Update 22/23 LA options for lettings * Fix tests --- config/forms/2022_2023.json | 18 ++++-------------- .../initial_local_authorities.csv | 16 +++++++++------- .../local_authority_links_2022.csv | 15 +++++++++++++++ db/seeds.rb | 8 +++++--- spec/models/form/lettings/questions/la_spec.rb | 9 ++------- .../form/lettings/questions/prevloc_spec.rb | 9 ++------- .../form/sales/questions/prevloc_spec.rb | 18 ++++-------------- .../questions/property_local_authority_spec.rb | 18 ++++-------------- spec/models/location_spec.rb | 18 ++++-------------- 9 files changed, 49 insertions(+), 80 deletions(-) create mode 100644 config/local_authorities_data/local_authority_links_2022.csv diff --git a/config/forms/2022_2023.json b/config/forms/2022_2023.json index 3eb134972..e13ce5516 100644 --- a/config/forms/2022_2023.json +++ b/config/forms/2022_2023.json @@ -145,7 +145,6 @@ "E09000001": "City of London", "E07000071": "Colchester", "E07000029": "Copeland", - "E07000150": "Corby", "E06000052": "Cornwall", "E07000079": "Cotswold", "E06000047": "County Durham", @@ -156,7 +155,6 @@ "E07000096": "Dacorum", "E06000005": "Darlington", "E07000107": "Dartford", - "E07000151": "Daventry", "E06000015": "Derby", "E07000035": "Derbyshire Dales", "E08000017": "Doncaster", @@ -169,7 +167,6 @@ "E07000085": "East Hampshire", "E07000242": "East Hertfordshire", "E07000137": "East Lindsey", - "E07000152": "East Northamptonshire", "E06000011": "East Riding of Yorkshire", "E07000193": "East Staffordshire", "E07000244": "East Suffolk", @@ -225,7 +222,6 @@ "E06000053": "Isles of Scilly", "E09000019": "Islington", "E09000020": "Kensington and Chelsea", - "E07000153": "Kettering", "E07000146": "King’s Lynn and West Norfolk", "E06000010": "Kingston upon Hull, City of", "E09000021": "Kingston upon Thames", @@ -268,11 +264,11 @@ "E07000139": "North Kesteven", "E06000013": "North Lincolnshire", "E07000147": "North Norfolk", + "E06000061": "North Northamptonshire", "E06000024": "North Somerset", "E08000022": "North Tyneside", "E07000218": "North Warwickshire", "E07000134": "North West Leicestershire", - "E07000154": "Northampton", "E06000057": "Northumberland", "E07000148": "Norwich", "E06000018": "Nottingham", @@ -324,7 +320,6 @@ "E07000141": "South Kesteven", "E07000031": "South Lakeland", "E07000149": "South Norfolk", - "E07000155": "South Northamptonshire", "E07000179": "South Oxfordshire", "E07000126": "South Ribble", "E07000189": "South Somerset", @@ -377,12 +372,12 @@ "E07000103": "Watford", "E07000216": "Waverley", "E07000065": "Wealden", - "E07000156": "Wellingborough", "E07000241": "Welwyn Hatfield", "E06000037": "West Berkshire", "E07000047": "West Devon", "E07000127": "West Lancashire", "E07000142": "West Lindsey", + "E06000062": "West Northamptonshire", "E07000181": "West Oxfordshire", "E07000245": "West Suffolk", "E09000033": "Westminster", @@ -6603,7 +6598,6 @@ "E07000071": "Colchester", "W06000003": "Conwy", "E07000029": "Copeland", - "E07000150": "Corby", "E06000052": "Cornwall", "E07000079": "Cotswold", "E06000047": "County Durham", @@ -6614,7 +6608,6 @@ "E07000096": "Dacorum", "E06000005": "Darlington", "E07000107": "Dartford", - "E07000151": "Daventry", "W06000004": "Denbighshire", "E06000015": "Derby", "E07000035": "Derbyshire Dales", @@ -6634,7 +6627,6 @@ "E07000242": "East Hertfordshire", "E07000137": "East Lindsey", "S12000010": "East Lothian", - "E07000152": "East Northamptonshire", "S12000011": "East Renfrewshire", "E06000011": "East Riding of Yorkshire", "E07000193": "East Staffordshire", @@ -6698,7 +6690,6 @@ "E06000053": "Isles of Scilly", "E09000019": "Islington", "E09000020": "Kensington and Chelsea", - "E07000153": "Kettering", "E07000146": "King’s Lynn and West Norfolk", "E06000010": "Kingston upon Hull, City of", "E09000021": "Kingston upon Thames", @@ -6754,11 +6745,11 @@ "S12000050": "North Lanarkshire", "E06000013": "North Lincolnshire", "E07000147": "North Norfolk", + "E06000061": "North Northamptonshire", "E06000024": "North Somerset", "E08000022": "North Tyneside", "E07000218": "North Warwickshire", "E07000134": "North West Leicestershire", - "E07000154": "Northampton", "E06000057": "Northumberland", "E07000148": "Norwich", "E06000018": "Nottingham", @@ -6820,7 +6811,6 @@ "E07000031": "South Lakeland", "S12000029": "South Lanarkshire", "E07000149": "South Norfolk", - "E07000155": "South Northamptonshire", "E07000179": "South Oxfordshire", "E07000126": "South Ribble", "E07000189": "South Somerset", @@ -6877,7 +6867,6 @@ "E07000103": "Watford", "E07000216": "Waverley", "E07000065": "Wealden", - "E07000156": "Wellingborough", "E07000241": "Welwyn Hatfield", "E06000037": "West Berkshire", "E07000047": "West Devon", @@ -6885,6 +6874,7 @@ "E07000127": "West Lancashire", "E07000142": "West Lindsey", "S12000040": "West Lothian", + "E06000062": "West Northamptonshire", "E07000181": "West Oxfordshire", "E07000245": "West Suffolk", "E09000033": "Westminster", diff --git a/config/local_authorities_data/initial_local_authorities.csv b/config/local_authorities_data/initial_local_authorities.csv index f80fbb6f5..f3161be25 100644 --- a/config/local_authorities_data/initial_local_authorities.csv +++ b/config/local_authorities_data/initial_local_authorities.csv @@ -74,7 +74,7 @@ E09000001,City of London,2021, S12000005,Clackmannanshire,2021, E07000071,Colchester,2021, W06000003,Conwy,2021, -E07000150,Corby,2021, +E07000150,Corby,2021,2022 E06000052,Cornwall,2021, E07000079,Cotswold,2021, E06000047,County Durham,2021, @@ -85,7 +85,7 @@ E06000063,Cumberland,2023, E07000096,Dacorum,2021, E06000005,Darlington,2021, E07000107,Dartford,2021, -E07000151,Daventry,2021, +E07000151,Daventry,2021,2022 W06000004,Denbighshire,2021, E06000015,Derby,2021, E07000035,Derbyshire Dales,2021, @@ -105,7 +105,7 @@ E07000085,East Hampshire,2021, E07000242,East Hertfordshire,2021, E07000137,East Lindsey,2021, S12000010,East Lothian,2021, -E07000152,East Northamptonshire,2021, +E07000152,East Northamptonshire,2021,2022, S12000011,East Renfrewshire,2021, E06000011,East Riding of Yorkshire,2021, E07000193,East Staffordshire,2021, @@ -166,7 +166,7 @@ E06000046,Isle of Wight,2021, E06000053,Isles of Scilly,2021, E09000019,Islington,2021, E09000020,Kensington and Chelsea,2021, -E07000153,Kettering,2021, +E07000153,Kettering,2021,2022, E07000146,King’s Lynn and West Norfolk,2021, E06000010,"Kingston upon Hull, City of",2021, E09000021,Kingston upon Thames,2021, @@ -225,7 +225,7 @@ E06000024,North Somerset,2021, E08000022,North Tyneside,2021, E07000218,North Warwickshire,2021, E07000134,North West Leicestershire,2021, -E07000154,Northampton,2021, +E07000154,Northampton,2021,2022, E06000057,Northumberland,2021, E07000148,Norwich,2021, E06000018,Nottingham,2021, @@ -281,7 +281,7 @@ E07000140,South Holland,2021, E07000141,South Kesteven,2021, S12000029,South Lanarkshire,2021, E07000149,South Norfolk,2021, -E07000155,South Northamptonshire,2021, +E07000155,South Northamptonshire,2021,2022, E07000179,South Oxfordshire,2021, E07000126,South Ribble,2021, E07000196,South Staffordshire,2021, @@ -337,7 +337,7 @@ E07000222,Warwick,2021, E07000103,Watford,2021, E07000216,Waverley,2021, E07000065,Wealden,2021, -E07000156,Wellingborough,2021, +E07000156,Wellingborough,2021,2022, E07000241,Welwyn Hatfield,2021, E06000037,West Berkshire,2021, E07000047,West Devon,2021, @@ -386,3 +386,5 @@ E07000187,Mendip,2021,2023, E07000188,Sedgemoor,2021,2023, E07000246,Somerset West and Taunton,2021,2023, E07000189,South Somerset,2021,2023, +E06000061,North Northamptonshire,2022, +E06000062,West Northamptonshire,2022, diff --git a/config/local_authorities_data/local_authority_links_2022.csv b/config/local_authorities_data/local_authority_links_2022.csv new file mode 100644 index 000000000..6656be1a9 --- /dev/null +++ b/config/local_authorities_data/local_authority_links_2022.csv @@ -0,0 +1,15 @@ +local_authority_code,linked_local_authority_code +E06000061,E07000150 +E06000061,E07000152 +E06000061,E07000153 +E06000061,E07000156 +E07000150,E06000061 +E07000152,E06000061 +E07000153,E06000061 +E07000156,E06000061 +E06000062,E07000151 +E06000062,E07000154 +E06000062,E07000155 +E07000151,E06000062 +E07000154,E06000062 +E07000155,E06000062 diff --git a/db/seeds.rb b/db/seeds.rb index bf43d47b1..400308d1c 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -316,9 +316,11 @@ unless Rails.env.test? end if (Rails.env.development? || Rails.env.review?) && LocalAuthorityLink.count.zero? - links_data_path = "config/local_authorities_data/local_authority_links_2023.csv" - service = Imports::LocalAuthorityLinksService.new(path: links_data_path) - service.call + links_data_paths = ["config/local_authorities_data/local_authority_links_2023.csv", "config/local_authorities_data/local_authority_links_2022.csv"] + links_data_paths.each do |path| + service = Imports::LocalAuthorityLinksService.new(path:) + service.call + end pp "Seeded local authority links" end diff --git a/spec/models/form/lettings/questions/la_spec.rb b/spec/models/form/lettings/questions/la_spec.rb index 3b5e30977..8f0008d7e 100644 --- a/spec/models/form/lettings/questions/la_spec.rb +++ b/spec/models/form/lettings/questions/la_spec.rb @@ -175,13 +175,8 @@ RSpec.describe Form::Lettings::Questions::La, type: :model do "E07000147" => "North Norfolk", "E07000148" => "Norwich", "E07000149" => "South Norfolk", - "E07000150" => "Corby", - "E07000151" => "Daventry", - "E07000152" => "East Northamptonshire", - "E07000153" => "Kettering", - "E07000154" => "Northampton", - "E07000155" => "South Northamptonshire", - "E07000156" => "Wellingborough", + "E06000061" => "North Northamptonshire", + "E06000062" => "West Northamptonshire", "E07000170" => "Ashfield", "E07000171" => "Bassetlaw", "E07000172" => "Broxtowe", diff --git a/spec/models/form/lettings/questions/prevloc_spec.rb b/spec/models/form/lettings/questions/prevloc_spec.rb index 7d2b141a2..36582ed23 100644 --- a/spec/models/form/lettings/questions/prevloc_spec.rb +++ b/spec/models/form/lettings/questions/prevloc_spec.rb @@ -87,7 +87,6 @@ RSpec.describe Form::Lettings::Questions::Prevloc, type: :model do "S12000005" => "Clackmannanshire", "E07000071" => "Colchester", "W06000003" => "Conwy", - "E07000150" => "Corby", "E06000052" => "Cornwall", "E07000079" => "Cotswold", "E06000047" => "County Durham", @@ -98,7 +97,6 @@ RSpec.describe Form::Lettings::Questions::Prevloc, type: :model do "E07000096" => "Dacorum", "E06000005" => "Darlington", "E07000107" => "Dartford", - "E07000151" => "Daventry", "W06000004" => "Denbighshire", "E06000015" => "Derby", "E07000035" => "Derbyshire Dales", @@ -118,7 +116,6 @@ RSpec.describe Form::Lettings::Questions::Prevloc, type: :model do "E07000242" => "East Hertfordshire", "E07000137" => "East Lindsey", "S12000010" => "East Lothian", - "E07000152" => "East Northamptonshire", "S12000011" => "East Renfrewshire", "E06000011" => "East Riding of Yorkshire", "E07000193" => "East Staffordshire", @@ -179,7 +176,6 @@ RSpec.describe Form::Lettings::Questions::Prevloc, type: :model do "E06000053" => "Isles of Scilly", "E09000019" => "Islington", "E09000020" => "Kensington and Chelsea", - "E07000153" => "Kettering", "E07000146" => "King’s Lynn and West Norfolk", "E06000010" => "Kingston upon Hull, City of", "E09000021" => "Kingston upon Thames", @@ -234,12 +230,12 @@ RSpec.describe Form::Lettings::Questions::Prevloc, type: :model do "S12000050" => "North Lanarkshire", "E06000013" => "North Lincolnshire", "E07000147" => "North Norfolk", + "E06000061" => "North Northamptonshire", "E06000024" => "North Somerset", "E08000022" => "North Tyneside", "E07000218" => "North Warwickshire", "E06000065" => "North Yorkshire", "E07000134" => "North West Leicestershire", - "E07000154" => "Northampton", "E06000057" => "Northumberland", "E07000148" => "Norwich", "E06000018" => "Nottingham", @@ -295,7 +291,6 @@ RSpec.describe Form::Lettings::Questions::Prevloc, type: :model do "E07000141" => "South Kesteven", "S12000029" => "South Lanarkshire", "E07000149" => "South Norfolk", - "E07000155" => "South Northamptonshire", "E07000179" => "South Oxfordshire", "E07000126" => "South Ribble", "E07000196" => "South Staffordshire", @@ -351,7 +346,6 @@ RSpec.describe Form::Lettings::Questions::Prevloc, type: :model do "E07000103" => "Watford", "E07000216" => "Waverley", "E07000065" => "Wealden", - "E07000156" => "Wellingborough", "E07000241" => "Welwyn Hatfield", "E06000037" => "West Berkshire", "E07000047" => "West Devon", @@ -359,6 +353,7 @@ RSpec.describe Form::Lettings::Questions::Prevloc, type: :model do "E07000127" => "West Lancashire", "E07000142" => "West Lindsey", "S12000040" => "West Lothian", + "E06000062" => "West Northamptonshire", "E07000181" => "West Oxfordshire", "E07000245" => "West Suffolk", "E09000033" => "Westminster", diff --git a/spec/models/form/sales/questions/prevloc_spec.rb b/spec/models/form/sales/questions/prevloc_spec.rb index e27b295be..3e9ae3238 100644 --- a/spec/models/form/sales/questions/prevloc_spec.rb +++ b/spec/models/form/sales/questions/prevloc_spec.rb @@ -118,7 +118,6 @@ RSpec.describe Form::Sales::Questions::Prevloc, type: :model do "E07000071" => "Colchester", "W06000003" => "Conwy", "E07000029" => "Copeland", - "E07000150" => "Corby", "E06000052" => "Cornwall", "E07000079" => "Cotswold", "E06000047" => "County Durham", @@ -129,7 +128,6 @@ RSpec.describe Form::Sales::Questions::Prevloc, type: :model do "E07000096" => "Dacorum", "E06000005" => "Darlington", "E07000107" => "Dartford", - "E07000151" => "Daventry", "W06000004" => "Denbighshire", "E06000015" => "Derby", "E07000035" => "Derbyshire Dales", @@ -149,7 +147,6 @@ RSpec.describe Form::Sales::Questions::Prevloc, type: :model do "E07000242" => "East Hertfordshire", "E07000137" => "East Lindsey", "S12000010" => "East Lothian", - "E07000152" => "East Northamptonshire", "S12000011" => "East Renfrewshire", "E06000011" => "East Riding of Yorkshire", "E07000193" => "East Staffordshire", @@ -213,7 +210,6 @@ RSpec.describe Form::Sales::Questions::Prevloc, type: :model do "E06000053" => "Isles of Scilly", "E09000019" => "Islington", "E09000020" => "Kensington and Chelsea", - "E07000153" => "Kettering", "E07000146" => "King’s Lynn and West Norfolk", "E06000010" => "Kingston upon Hull, City of", "E09000021" => "Kingston upon Thames", @@ -269,11 +265,11 @@ RSpec.describe Form::Sales::Questions::Prevloc, type: :model do "S12000050" => "North Lanarkshire", "E06000013" => "North Lincolnshire", "E07000147" => "North Norfolk", + "E06000061" => "North Northamptonshire", "E06000024" => "North Somerset", "E08000022" => "North Tyneside", "E07000218" => "North Warwickshire", "E07000134" => "North West Leicestershire", - "E07000154" => "Northampton", "E06000057" => "Northumberland", "E07000148" => "Norwich", "E06000018" => "Nottingham", @@ -335,7 +331,6 @@ RSpec.describe Form::Sales::Questions::Prevloc, type: :model do "E07000031" => "South Lakeland", "S12000029" => "South Lanarkshire", "E07000149" => "South Norfolk", - "E07000155" => "South Northamptonshire", "E07000179" => "South Oxfordshire", "E07000126" => "South Ribble", "E07000189" => "South Somerset", @@ -392,7 +387,6 @@ RSpec.describe Form::Sales::Questions::Prevloc, type: :model do "E07000103" => "Watford", "E07000216" => "Waverley", "E07000065" => "Wealden", - "E07000156" => "Wellingborough", "E07000241" => "Welwyn Hatfield", "E06000037" => "West Berkshire", "E07000047" => "West Devon", @@ -400,6 +394,7 @@ RSpec.describe Form::Sales::Questions::Prevloc, type: :model do "E07000127" => "West Lancashire", "E07000142" => "West Lindsey", "S12000040" => "West Lothian", + "E06000062" => "West Northamptonshire", "E07000181" => "West Oxfordshire", "E07000245" => "West Suffolk", "E09000033" => "Westminster", @@ -507,7 +502,6 @@ RSpec.describe Form::Sales::Questions::Prevloc, type: :model do "S12000005" => "Clackmannanshire", "E07000071" => "Colchester", "W06000003" => "Conwy", - "E07000150" => "Corby", "E06000052" => "Cornwall", "E07000079" => "Cotswold", "E06000047" => "County Durham", @@ -518,7 +512,6 @@ RSpec.describe Form::Sales::Questions::Prevloc, type: :model do "E07000096" => "Dacorum", "E06000005" => "Darlington", "E07000107" => "Dartford", - "E07000151" => "Daventry", "W06000004" => "Denbighshire", "E06000015" => "Derby", "E07000035" => "Derbyshire Dales", @@ -538,7 +531,6 @@ RSpec.describe Form::Sales::Questions::Prevloc, type: :model do "E07000242" => "East Hertfordshire", "E07000137" => "East Lindsey", "S12000010" => "East Lothian", - "E07000152" => "East Northamptonshire", "S12000011" => "East Renfrewshire", "E06000011" => "East Riding of Yorkshire", "E07000193" => "East Staffordshire", @@ -599,7 +591,6 @@ RSpec.describe Form::Sales::Questions::Prevloc, type: :model do "E06000053" => "Isles of Scilly", "E09000019" => "Islington", "E09000020" => "Kensington and Chelsea", - "E07000153" => "Kettering", "E07000146" => "King’s Lynn and West Norfolk", "E06000010" => "Kingston upon Hull, City of", "E09000021" => "Kingston upon Thames", @@ -654,12 +645,12 @@ RSpec.describe Form::Sales::Questions::Prevloc, type: :model do "S12000050" => "North Lanarkshire", "E06000013" => "North Lincolnshire", "E07000147" => "North Norfolk", + "E06000061" => "North Northamptonshire", "E06000024" => "North Somerset", "E08000022" => "North Tyneside", "E07000218" => "North Warwickshire", "E06000065" => "North Yorkshire", "E07000134" => "North West Leicestershire", - "E07000154" => "Northampton", "E06000057" => "Northumberland", "E07000148" => "Norwich", "E06000018" => "Nottingham", @@ -715,7 +706,6 @@ RSpec.describe Form::Sales::Questions::Prevloc, type: :model do "E07000141" => "South Kesteven", "S12000029" => "South Lanarkshire", "E07000149" => "South Norfolk", - "E07000155" => "South Northamptonshire", "E07000179" => "South Oxfordshire", "E07000126" => "South Ribble", "E07000196" => "South Staffordshire", @@ -771,7 +761,6 @@ RSpec.describe Form::Sales::Questions::Prevloc, type: :model do "E07000103" => "Watford", "E07000216" => "Waverley", "E07000065" => "Wealden", - "E07000156" => "Wellingborough", "E07000241" => "Welwyn Hatfield", "E06000037" => "West Berkshire", "E07000047" => "West Devon", @@ -779,6 +768,7 @@ RSpec.describe Form::Sales::Questions::Prevloc, type: :model do "E07000127" => "West Lancashire", "E07000142" => "West Lindsey", "S12000040" => "West Lothian", + "E06000062" => "West Northamptonshire", "E07000181" => "West Oxfordshire", "E07000245" => "West Suffolk", "E09000033" => "Westminster", diff --git a/spec/models/form/sales/questions/property_local_authority_spec.rb b/spec/models/form/sales/questions/property_local_authority_spec.rb index 174a37347..1ebe2b13a 100644 --- a/spec/models/form/sales/questions/property_local_authority_spec.rb +++ b/spec/models/form/sales/questions/property_local_authority_spec.rb @@ -208,13 +208,8 @@ RSpec.describe Form::Sales::Questions::PropertyLocalAuthority, type: :model do "E07000147" => "North Norfolk", "E07000148" => "Norwich", "E07000149" => "South Norfolk", - "E07000150" => "Corby", - "E07000151" => "Daventry", - "E07000152" => "East Northamptonshire", - "E07000153" => "Kettering", - "E07000154" => "Northampton", - "E07000155" => "South Northamptonshire", - "E07000156" => "Wellingborough", + "E06000061" => "North Northamptonshire", + "E06000062" => "West Northamptonshire", "E07000163" => "Craven", "E07000164" => "Hambleton", "E07000165" => "Harrogate", @@ -526,13 +521,8 @@ RSpec.describe Form::Sales::Questions::PropertyLocalAuthority, type: :model do "E07000147" => "North Norfolk", "E07000148" => "Norwich", "E07000149" => "South Norfolk", - "E07000150" => "Corby", - "E07000151" => "Daventry", - "E07000152" => "East Northamptonshire", - "E07000153" => "Kettering", - "E07000154" => "Northampton", - "E07000155" => "South Northamptonshire", - "E07000156" => "Wellingborough", + "E06000061" => "North Northamptonshire", + "E06000062" => "West Northamptonshire", "E07000170" => "Ashfield", "E07000171" => "Bassetlaw", "E07000172" => "Broxtowe", diff --git a/spec/models/location_spec.rb b/spec/models/location_spec.rb index 67a318b6b..3d10ec777 100644 --- a/spec/models/location_spec.rb +++ b/spec/models/location_spec.rb @@ -154,7 +154,6 @@ RSpec.describe Location, type: :model do "E09000001" => "City of London", "E07000071" => "Colchester", "E07000029" => "Copeland", - "E07000150" => "Corby", "E06000052" => "Cornwall", "E07000079" => "Cotswold", "E06000047" => "County Durham", @@ -165,7 +164,6 @@ RSpec.describe Location, type: :model do "E07000096" => "Dacorum", "E06000005" => "Darlington", "E07000107" => "Dartford", - "E07000151" => "Daventry", "E06000015" => "Derby", "E07000035" => "Derbyshire Dales", "E08000017" => "Doncaster", @@ -178,7 +176,6 @@ RSpec.describe Location, type: :model do "E07000085" => "East Hampshire", "E07000242" => "East Hertfordshire", "E07000137" => "East Lindsey", - "E07000152" => "East Northamptonshire", "E06000011" => "East Riding of Yorkshire", "E07000193" => "East Staffordshire", "E07000244" => "East Suffolk", @@ -232,7 +229,6 @@ RSpec.describe Location, type: :model do "E06000053" => "Isles of Scilly", "E09000019" => "Islington", "E09000020" => "Kensington and Chelsea", - "E07000153" => "Kettering", "E07000146" => "King’s Lynn and West Norfolk", "E06000010" => "Kingston upon Hull, City of", "E09000021" => "Kingston upon Thames", @@ -275,11 +271,11 @@ RSpec.describe Location, type: :model do "E07000139" => "North Kesteven", "E06000013" => "North Lincolnshire", "E07000147" => "North Norfolk", + "E06000061" => "North Northamptonshire", "E06000024" => "North Somerset", "E08000022" => "North Tyneside", "E07000218" => "North Warwickshire", "E07000134" => "North West Leicestershire", - "E07000154" => "Northampton", "E06000057" => "Northumberland", "E07000148" => "Norwich", "E06000018" => "Nottingham", @@ -331,7 +327,6 @@ RSpec.describe Location, type: :model do "E07000141" => "South Kesteven", "E07000031" => "South Lakeland", "E07000149" => "South Norfolk", - "E07000155" => "South Northamptonshire", "E07000179" => "South Oxfordshire", "E07000126" => "South Ribble", "E07000189" => "South Somerset", @@ -384,12 +379,12 @@ RSpec.describe Location, type: :model do "E07000103" => "Watford", "E07000216" => "Waverley", "E07000065" => "Wealden", - "E07000156" => "Wellingborough", "E07000241" => "Welwyn Hatfield", "E06000037" => "West Berkshire", "E07000047" => "West Devon", "E07000127" => "West Lancashire", "E07000142" => "West Lindsey", + "E06000062" => "West Northamptonshire", "E07000181" => "West Oxfordshire", "E07000245" => "West Suffolk", "E09000033" => "Westminster", @@ -481,7 +476,6 @@ RSpec.describe Location, type: :model do "E07000118" => "Chorley", "E09000001" => "City of London", "E07000071" => "Colchester", - "E07000150" => "Corby", "E06000052" => "Cornwall", "E07000079" => "Cotswold", "E06000047" => "County Durham", @@ -492,7 +486,6 @@ RSpec.describe Location, type: :model do "E07000096" => "Dacorum", "E06000005" => "Darlington", "E07000107" => "Dartford", - "E07000151" => "Daventry", "E06000015" => "Derby", "E07000035" => "Derbyshire Dales", "E08000017" => "Doncaster", @@ -505,7 +498,6 @@ RSpec.describe Location, type: :model do "E07000085" => "East Hampshire", "E07000242" => "East Hertfordshire", "E07000137" => "East Lindsey", - "E07000152" => "East Northamptonshire", "E06000011" => "East Riding of Yorkshire", "E07000193" => "East Staffordshire", "E07000244" => "East Suffolk", @@ -556,7 +548,6 @@ RSpec.describe Location, type: :model do "E06000053" => "Isles of Scilly", "E09000019" => "Islington", "E09000020" => "Kensington and Chelsea", - "E07000153" => "Kettering", "E07000146" => "King’s Lynn and West Norfolk", "E06000010" => "Kingston upon Hull, City of", "E09000021" => "Kingston upon Thames", @@ -598,12 +589,12 @@ RSpec.describe Location, type: :model do "E07000139" => "North Kesteven", "E06000013" => "North Lincolnshire", "E07000147" => "North Norfolk", + "E06000061" => "North Northamptonshire", "E06000024" => "North Somerset", "E08000022" => "North Tyneside", "E07000218" => "North Warwickshire", "E07000134" => "North West Leicestershire", "E06000065" => "North Yorkshire", - "E07000154" => "Northampton", "E06000057" => "Northumberland", "E07000148" => "Norwich", "E06000018" => "Nottingham", @@ -649,7 +640,6 @@ RSpec.describe Location, type: :model do "E07000140" => "South Holland", "E07000141" => "South Kesteven", "E07000149" => "South Norfolk", - "E07000155" => "South Northamptonshire", "E07000179" => "South Oxfordshire", "E07000126" => "South Ribble", "E07000196" => "South Staffordshire", @@ -701,12 +691,12 @@ RSpec.describe Location, type: :model do "E07000103" => "Watford", "E07000216" => "Waverley", "E07000065" => "Wealden", - "E07000156" => "Wellingborough", "E07000241" => "Welwyn Hatfield", "E06000037" => "West Berkshire", "E07000047" => "West Devon", "E07000127" => "West Lancashire", "E07000142" => "West Lindsey", + "E06000062" => "West Northamptonshire", "E07000181" => "West Oxfordshire", "E07000245" => "West Suffolk", "E09000033" => "Westminster",