Browse Source

rename column

pull/1035/head
Kat 4 years ago
parent
commit
5cd4f3470d
  1. 4
      app/controllers/lettings_logs_controller.rb
  2. 2
      app/controllers/locations_controller.rb
  3. 2
      app/models/form.rb
  4. 2
      db/migrate/20221125102013_add_impacted_by_deactivation_column.rb
  5. 2
      db/schema.rb
  6. 4
      spec/requests/lettings_logs_controller_spec.rb
  7. 8
      spec/requests/locations_controller_spec.rb

4
app/controllers/lettings_logs_controller.rb

@ -51,7 +51,7 @@ class LettingsLogsController < LogsController
def edit def edit
@log = current_user.lettings_logs.find_by(id: params[:id]) @log = current_user.lettings_logs.find_by(id: params[:id])
if @log 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)) redirect_to(send("lettings_log_#{@log.form.get_question('startdate', @log).page.id}_path", @log))
else else
render("logs/edit", locals: { current_user: }) render("logs/edit", locals: { current_user: })
@ -90,7 +90,7 @@ class LettingsLogsController < LogsController
def update_logs def update_logs
respond_to do |format| respond_to do |format|
format.html do 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) @pagy, @logs = pagy(impacted_logs)
@total_count = impacted_logs.size @total_count = impacted_logs.size

2
app/controllers/locations_controller.rb

@ -219,7 +219,7 @@ private
end end
def reset_location_and_scheme_for_logs! 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 end
def toggle_date(key) def toggle_date(key)

2
app/models/form.rb

@ -72,7 +72,7 @@ class Form
end end
def next_page_redirect_path(page, log, current_user) def next_page_redirect_path(page, log, current_user)
if log.impacted_by_deactivation if log.unresolved
case page.id case page.id
when "tenancy_start_date" when "tenancy_start_date"
"lettings_log_scheme_path" "lettings_log_scheme_path"

2
db/migrate/20221125102013_add_impacted_by_deactivation_column.rb

@ -1,7 +1,7 @@
class AddImpactedByDeactivationColumn < ActiveRecord::Migration[7.0] class AddImpactedByDeactivationColumn < ActiveRecord::Migration[7.0]
def change def change
change_table :lettings_logs, bulk: true do |t| change_table :lettings_logs, bulk: true do |t|
t.column :impacted_by_deactivation, :boolean t.column :unresolved, :boolean
end end
end end
end end

2
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 "void_date_value_check"
t.integer "housingneeds_type" t.integer "housingneeds_type"
t.integer "housingneeds_other" 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 ["created_by_id"], name: "index_lettings_logs_on_created_by_id"
t.index ["location_id"], name: "index_lettings_logs_on_location_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" t.index ["managing_organisation_id"], name: "index_lettings_logs_on_managing_organisation_id"

4
spec/requests/lettings_logs_controller_spec.rb

@ -791,7 +791,7 @@ RSpec.describe LettingsLogsController, type: :request do
end end
context "when viewing a collection of logs affected by deactivated location" do 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!(:non_affected_lettings_logs) { FactoryBot.create_list(:lettings_log, 4, created_by: user) }
let(:other_user) { FactoryBot.create(:user, organisation: user.organisation) } let(:other_user) { FactoryBot.create(:user, organisation: user.organisation) }
let(:headers) { { "Accept" => "text/html" } } let(:headers) { { "Accept" => "text/html" } }
@ -831,7 +831,7 @@ RSpec.describe LettingsLogsController, type: :request do
end end
context "when viewing a specific log affected by deactivated location" do 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" } } let(:headers) { { "Accept" => "text/html" } }
before do before do

8
spec/requests/locations_controller_spec.rb

@ -1366,9 +1366,9 @@ RSpec.describe LocationsController, type: :request do
end end
it "marks log as needing attention" do 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 lettings_log.reload
expect(lettings_log.impacted_by_deactivation).to eq(true) expect(lettings_log.unresolved).to eq(true)
end end
end end
@ -1384,9 +1384,9 @@ RSpec.describe LocationsController, type: :request do
end end
it "does not mark log as needing attention" do 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 lettings_log.reload
expect(lettings_log.impacted_by_deactivation).to eq(nil) expect(lettings_log.unresolved).to eq(nil)
end end
end end
end end

Loading…
Cancel
Save