Browse Source

Return correct type if no LAs found for location (#1439)

* Default to location code if LocalAuthority is not found by location code

* Set local authority before validation
pull/1447/head
kosiakkatrina 2 years ago committed by GitHub
parent
commit
0a74ee7562
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      app/models/lettings_log.rb
  2. 4
      app/models/location.rb
  3. 6
      spec/features/schemes_helpers.rb
  4. 6
      spec/features/schemes_spec.rb
  5. 13
      spec/models/lettings_log_spec.rb
  6. 13
      spec/models/location_spec.rb
  7. 4
      spec/requests/locations_controller_spec.rb

2
app/models/lettings_log.rb

@ -84,7 +84,7 @@ class LettingsLog < Log
def la def la
if location if location
location.linked_local_authorities.active(form.start_date).first&.code location.linked_local_authorities.active(form.start_date).first&.code || location.location_code
else else
super super
end end

4
app/models/location.rb

@ -14,7 +14,7 @@ class Location < ApplicationRecord
has_paper_trail has_paper_trail
before_save :lookup_postcode!, if: :postcode_changed? before_validation :lookup_postcode!, if: :postcode_changed?
auto_strip_attributes :name auto_strip_attributes :name
@ -132,7 +132,7 @@ class Location < ApplicationRecord
def linked_local_authorities def linked_local_authorities
la = LocalAuthority.find_by(code: location_code) la = LocalAuthority.find_by(code: location_code)
return [] unless la return LocalAuthority.none unless la
LocalAuthority.where(id: [la.id] + la.linked_local_authority_ids) LocalAuthority.where(id: [la.id] + la.linked_local_authority_ids)
end end

6
spec/features/schemes_helpers.rb

@ -64,7 +64,8 @@ module SchemesHelpers
click_button "Add a location" click_button "Add a location"
fill_in with: "AA11AA" fill_in with: "AA11AA"
click_button "Save and continue" click_button "Save and continue"
fill_in with: "Adur" select "Adur"
click_button "Save and continue"
fill_in with: "Some name" fill_in with: "Some name"
click_button "Save and continue" click_button "Save and continue"
fill_in with: 5 fill_in with: 5
@ -84,7 +85,8 @@ module SchemesHelpers
click_button "Add a location" click_button "Add a location"
fill_in with: "AA12AA" fill_in with: "AA12AA"
click_button "Save and continue" click_button "Save and continue"
fill_in with: "Adur" select "Adur"
click_button "Save and continue"
fill_in with: "Other name" fill_in with: "Other name"
click_button "Save and continue" click_button "Save and continue"
fill_in with: 2 fill_in with: 2

6
spec/features/schemes_spec.rb

@ -284,7 +284,8 @@ RSpec.describe "Schemes scheme Features" do
before do before do
fill_in with: "AA12AA" fill_in with: "AA12AA"
click_button "Save and continue" click_button "Save and continue"
fill_in with: "Adur" select "Adur"
click_button "Save and continue"
fill_in with: location_name fill_in with: location_name
click_button "Save and continue" click_button "Save and continue"
fill_in with: 1 fill_in with: 1
@ -904,7 +905,8 @@ RSpec.describe "Schemes scheme Features" do
before do before do
fill_in with: "AA12AA" fill_in with: "AA12AA"
click_button "Save and continue" click_button "Save and continue"
fill_in with: "Adur" select "Adur"
click_button "Save and continue"
fill_in with: location_name fill_in with: location_name
click_button "Save and continue" click_button "Save and continue"
fill_in with: 1 fill_in with: 1

13
spec/models/lettings_log_spec.rb

@ -2033,6 +2033,19 @@ RSpec.describe LettingsLog do
end end
end end
end end
context "and the location no local authorities associated with the location_code" do
before do
location.update!(location_code: "E01231231")
lettings_log.update!(location:)
end
it "returns the correct la" do
expect(location.location_code).to eq("E01231231")
expect(lettings_log["location_id"]).to eq(location.id)
expect(lettings_log.la).to eq("E01231231")
end
end
end end
context "and not renewal" do context "and not renewal" do

13
spec/models/location_spec.rb

@ -32,6 +32,19 @@ RSpec.describe Location, type: :model do
expect(location.linked_local_authorities.active(Time.zone.local(2022, 4, 1)).first.code).to eq("E07000030") expect(location.linked_local_authorities.active(Time.zone.local(2022, 4, 1)).first.code).to eq("E07000030")
expect(location.linked_local_authorities.active(Time.zone.local(2023, 4, 1)).first.code).to eq("E06000063") expect(location.linked_local_authorities.active(Time.zone.local(2023, 4, 1)).first.code).to eq("E06000063")
end end
context "when location_code is no in LocalAuthorities table" do
before do
stub_request(:get, /api.postcodes.io\/postcodes\/CA101AA/)
.to_return(status: 200, body: '{"status":200,"result":{"admin_district":"Eden","codes":{"admin_district":"E01231231"}}}', headers: {})
end
it "defaults for location code for la" do
location.update!(postcode: "CA10 1AA")
expect(location.linked_local_authorities.count).to eq(0)
expect(location.location_code).to eq("E01231231")
end
end
end end
describe "#postcode" do describe "#postcode" do

4
spec/requests/locations_controller_spec.rb

@ -417,7 +417,7 @@ RSpec.describe LocationsController, type: :request do
it "redirects correctly when postcodes.io does return a local authority" do it "redirects correctly when postcodes.io does return a local authority" do
follow_redirect! follow_redirect!
expect(page).to have_content("What is the name of this location?") expect(page).to have_content("What is the local authority")
end end
end end
@ -478,7 +478,7 @@ RSpec.describe LocationsController, type: :request do
it "redirects correctly when postcodes.io does return a local authority" do it "redirects correctly when postcodes.io does return a local authority" do
follow_redirect! follow_redirect!
expect(page).to have_content("What is the name of this location?") expect(page).to have_content("What is the local authority")
end end
end end

Loading…
Cancel
Save