diff --git a/app/controllers/lettings_logs_controller.rb b/app/controllers/lettings_logs_controller.rb index a9d963e1b..621580d28 100644 --- a/app/controllers/lettings_logs_controller.rb +++ b/app/controllers/lettings_logs_controller.rb @@ -51,7 +51,7 @@ class LettingsLogsController < LogsController def edit @log = current_user.lettings_logs.find_by(id: params[:id]) if @log - if @log.impacted_by_deactivation + if @log.unresolved redirect_to(send("lettings_log_#{@log.form.get_question('startdate', @log).page.id}_path", @log)) else render("logs/edit", locals: { current_user: }) @@ -90,7 +90,7 @@ class LettingsLogsController < LogsController def update_logs respond_to do |format| format.html do - impacted_logs = current_user.lettings_logs.where(impacted_by_deactivation: true, created_by: current_user) + impacted_logs = current_user.lettings_logs.where(unresolved: true, created_by: current_user) @pagy, @logs = pagy(impacted_logs) @total_count = impacted_logs.size diff --git a/app/controllers/locations_controller.rb b/app/controllers/locations_controller.rb index 551241d01..bf812e990 100644 --- a/app/controllers/locations_controller.rb +++ b/app/controllers/locations_controller.rb @@ -219,7 +219,7 @@ private end def reset_location_and_scheme_for_logs! - @location.lettings_logs.filter_by_before_startdate(params[:deactivation_date].to_time).update!(location: nil, scheme: nil, impacted_by_deactivation: true) + @location.lettings_logs.filter_by_before_startdate(params[:deactivation_date].to_time).update!(location: nil, scheme: nil, unresolved: true) end def toggle_date(key) diff --git a/app/models/form.rb b/app/models/form.rb index 3211a95dc..092605bab 100644 --- a/app/models/form.rb +++ b/app/models/form.rb @@ -72,7 +72,7 @@ class Form end def next_page_redirect_path(page, log, current_user) - if log.impacted_by_deactivation + if log.unresolved case page.id when "tenancy_start_date" "lettings_log_scheme_path" diff --git a/db/migrate/20221125102013_add_impacted_by_deactivation_column.rb b/db/migrate/20221125102013_add_impacted_by_deactivation_column.rb index 3be527a13..186b6cc06 100644 --- a/db/migrate/20221125102013_add_impacted_by_deactivation_column.rb +++ b/db/migrate/20221125102013_add_impacted_by_deactivation_column.rb @@ -1,7 +1,7 @@ class AddImpactedByDeactivationColumn < ActiveRecord::Migration[7.0] def change change_table :lettings_logs, bulk: true do |t| - t.column :impacted_by_deactivation, :boolean + t.column :unresolved, :boolean end end end diff --git a/db/schema.rb b/db/schema.rb index 8c5463a37..4f40c8da5 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -237,7 +237,7 @@ ActiveRecord::Schema[7.0].define(version: 2022_11_25_142847) do t.integer "void_date_value_check" t.integer "housingneeds_type" t.integer "housingneeds_other" - t.boolean "impacted_by_deactivation" + t.boolean "unresolved" t.index ["created_by_id"], name: "index_lettings_logs_on_created_by_id" t.index ["location_id"], name: "index_lettings_logs_on_location_id" t.index ["managing_organisation_id"], name: "index_lettings_logs_on_managing_organisation_id" diff --git a/spec/requests/lettings_logs_controller_spec.rb b/spec/requests/lettings_logs_controller_spec.rb index 834b93bd9..3c215b557 100644 --- a/spec/requests/lettings_logs_controller_spec.rb +++ b/spec/requests/lettings_logs_controller_spec.rb @@ -791,7 +791,7 @@ RSpec.describe LettingsLogsController, type: :request do end context "when viewing a collection of logs affected by deactivated location" do - let!(:affected_lettings_logs) { FactoryBot.create_list(:lettings_log, 3, impacted_by_deactivation: true, created_by: user) } + let!(:affected_lettings_logs) { FactoryBot.create_list(:lettings_log, 3, unresolved: true, created_by: user) } let!(:non_affected_lettings_logs) { FactoryBot.create_list(:lettings_log, 4, created_by: user) } let(:other_user) { FactoryBot.create(:user, organisation: user.organisation) } let(:headers) { { "Accept" => "text/html" } } @@ -831,7 +831,7 @@ RSpec.describe LettingsLogsController, type: :request do end context "when viewing a specific log affected by deactivated location" do - let!(:affected_lettings_log) { FactoryBot.create(:lettings_log, impacted_by_deactivation: true, created_by: user, needstype: 2) } + let!(:affected_lettings_log) { FactoryBot.create(:lettings_log, unresolved: true, created_by: user, needstype: 2) } let(:headers) { { "Accept" => "text/html" } } before do diff --git a/spec/requests/locations_controller_spec.rb b/spec/requests/locations_controller_spec.rb index 3c9164e32..9fc1b0257 100644 --- a/spec/requests/locations_controller_spec.rb +++ b/spec/requests/locations_controller_spec.rb @@ -1366,9 +1366,9 @@ RSpec.describe LocationsController, type: :request do end it "marks log as needing attention" do - expect(lettings_log.impacted_by_deactivation).to eq(nil) + expect(lettings_log.unresolved).to eq(nil) lettings_log.reload - expect(lettings_log.impacted_by_deactivation).to eq(true) + expect(lettings_log.unresolved).to eq(true) end end @@ -1384,9 +1384,9 @@ RSpec.describe LocationsController, type: :request do end it "does not mark log as needing attention" do - expect(lettings_log.impacted_by_deactivation).to eq(nil) + expect(lettings_log.unresolved).to eq(nil) lettings_log.reload - expect(lettings_log.impacted_by_deactivation).to eq(nil) + expect(lettings_log.unresolved).to eq(nil) end end end