diff --git a/app/controllers/locations_controller.rb b/app/controllers/locations_controller.rb index 5ce1c0700..621150bd7 100644 --- a/app/controllers/locations_controller.rb +++ b/app/controllers/locations_controller.rb @@ -165,7 +165,6 @@ private def confirm_deactivation if @location.update(deactivation_date: params[:location][:deactivation_date]) - @location.lettings_logs.filter_by_before_startdate( params[:location][:deactivation_date]).update(location: nil) flash[:notice] = "#{@location.name || @location.postcode} has been deactivated" end redirect_to scheme_location_path(@scheme, @location) diff --git a/spec/requests/locations_controller_spec.rb b/spec/requests/locations_controller_spec.rb index f4ec9f159..75150e692 100644 --- a/spec/requests/locations_controller_spec.rb +++ b/spec/requests/locations_controller_spec.rb @@ -1239,8 +1239,6 @@ RSpec.describe LocationsController, type: :request do let(:user) { FactoryBot.create(:user, :data_coordinator) } let!(:scheme) { FactoryBot.create(:scheme, owning_organisation: user.organisation) } let!(:location) { FactoryBot.create(:location, scheme:) } - let!(:lettings_log_to_deactivate) { FactoryBot.create(:lettings_log, scheme:, location:, startdate: Time.utc(2022, 10, 11) ) } - let!(:active_lettings_log) { FactoryBot.create(:lettings_log, scheme:, location:, startdate: Time.utc(2022, 10, 9) ) } let(:startdate) { Time.utc(2021, 1, 2) } let(:deactivation_date) { Time.utc(2022, 10, 10) } @@ -1278,16 +1276,6 @@ RSpec.describe LocationsController, type: :request do location.reload expect(location.deactivation_date).to eq(deactivation_date) end - - it "updates lettings logs with a startdate later than deactivation_date" do - lettings_log_to_deactivate.reload - expect(lettings_log_to_deactivate.location).to eq(nil) - end - - it "does not update lettings logs with a startdate earlier than deactivation_date" do - active_lettings_log.reload - expect(active_lettings_log.location).to eq(location) - end end context "when the date is not selected" do