diff --git a/app/services/postcode_service.rb b/app/services/postcode_service.rb index db2132e01..762afafcb 100644 --- a/app/services/postcode_service.rb +++ b/app/services/postcode_service.rb @@ -21,10 +21,10 @@ class PostcodeService if postcode_lookup && postcode_lookup.info.present? OpenStruct.new({ location_code: postcode_lookup.codes["admin_district"], - location_admin_district: postcode_lookup&.admin_district, - incode: postcode_lookup&.incode, - outcode: postcode_lookup&.outcode, - result?: postcode_lookup&.outcode&.present?, + location_admin_district: postcode_lookup.admin_district, + incode: postcode_lookup.incode, + outcode: postcode_lookup.outcode, + result?: postcode_lookup.outcode.present?, }) end end diff --git a/spec/features/form/page_routing_spec.rb b/spec/features/form/page_routing_spec.rb index 27f4feaf5..c9dc08ea2 100644 --- a/spec/features/form/page_routing_spec.rb +++ b/spec/features/form/page_routing_spec.rb @@ -64,7 +64,7 @@ RSpec.describe "Form Page Routing" do it "does not show question if the answer could be inferred" do stub_request(:get, /api.postcodes.io/) - .to_return(status: 200, body: "{\"status\":200,\"result\":{\"admin_district\":\"Manchester\", \"codes\":{\"admin_district\": \"E08000003\"}}}", headers: {}) + .to_return(status: 200, body: "{\"status\":200,\"result\":{\"admin_district\":\"Manchester\", \"outcode\": \"M13\", \"incode\": \"1AA\", \"codes\":{\"admin_district\": \"E08000003\"}}}", headers: {}) visit("/lettings-logs/#{id}/property-postcode") fill_in("lettings-log-postcode-full-field", with: "P0 5ST") diff --git a/spec/models/lettings_log_spec.rb b/spec/models/lettings_log_spec.rb index f97711562..fe7427499 100644 --- a/spec/models/lettings_log_spec.rb +++ b/spec/models/lettings_log_spec.rb @@ -1141,7 +1141,7 @@ RSpec.describe LettingsLog do context "when saving addresses" do before do stub_request(:get, /api.postcodes.io/) - .to_return(status: 200, body: "{\"status\":200,\"result\":{\"admin_district\":\"Manchester\",\"codes\":{\"admin_district\": \"E08000003\"}}}", headers: {}) + .to_return(status: 200, body: "{\"status\":200,\"result\":{\"admin_district\":\"Manchester\", \"outcode\": \"M13\", \"incode\": \"1AA\", \"codes\":{\"admin_district\": \"E08000003\"}}}", headers: {}) end let!(:address_lettings_log) do @@ -1229,7 +1229,7 @@ RSpec.describe LettingsLog do context "when saving previous address" do before do stub_request(:get, /api.postcodes.io/) - .to_return(status: 200, body: "{\"status\":200,\"result\":{\"admin_district\":\"Manchester\", \"codes\":{\"admin_district\": \"E08000003\"}}}", headers: {}) + .to_return(status: 200, body: "{\"status\":200,\"result\":{\"admin_district\":\"Manchester\", \"outcode\": \"M13\", \"incode\": \"1AA\", \"codes\":{\"admin_district\": \"E08000003\"}}}", headers: {}) end let!(:address_lettings_log) do @@ -1699,7 +1699,7 @@ RSpec.describe LettingsLog do before do stub_request(:get, /api.postcodes.io/) - .to_return(status: 200, body: "{\"status\":200,\"result\":{\"admin_district\":\"Manchester\",\"codes\":{\"admin_district\": \"E08000003\"}}}", headers: {}) + .to_return(status: 200, body: "{\"status\":200,\"result\":{\"admin_district\":\"Manchester\", \"outcode\": \"M13\", \"incode\": \"1AA\", \"codes\":{\"admin_district\": \"E08000003\"}}}", headers: {}) end it "correctly infers and saves la" do diff --git a/spec/models/location_spec.rb b/spec/models/location_spec.rb index 856575932..f8eb1dd17 100644 --- a/spec/models/location_spec.rb +++ b/spec/models/location_spec.rb @@ -6,7 +6,7 @@ RSpec.describe Location, type: :model do before do stub_request(:get, /api.postcodes.io/) - .to_return(status: 200, body: "{\"status\":200,\"result\":{\"admin_district\":\"Manchester\",\"codes\":{\"admin_district\": \"E08000003\"}}}", headers: {}) + .to_return(status: 200, body: "{\"status\":200,\"result\":{\"admin_district\":\"Manchester\", \"outcode\": \"M13\", \"incode\": \"1AA\", \"codes\":{\"admin_district\": \"E08000003\"}}}", headers: {}) end it "belongs to an organisation" do diff --git a/spec/requests/lettings_logs_controller_spec.rb b/spec/requests/lettings_logs_controller_spec.rb index db4226152..3d21d9c8d 100644 --- a/spec/requests/lettings_logs_controller_spec.rb +++ b/spec/requests/lettings_logs_controller_spec.rb @@ -721,7 +721,7 @@ RSpec.describe LettingsLogsController, type: :request do before do stub_request(:get, /api.postcodes.io/) - .to_return(status: 200, body: "{\"status\":200,\"result\":{\"admin_district\":\"Manchester\", \"codes\":{\"admin_district\": \"E08000003\"}}}", headers: {}) + .to_return(status: 200, body: "{\"status\":200,\"result\":{\"admin_district\":\"Manchester\", \"outcode\": \"M13\", \"incode\": \"1AA\", \"codes\":{\"admin_district\": \"E08000003\"}}}", headers: {}) sign_in user end