Merge remote-tracking branch 'origin/CLDC-3760-sales-staircasing-section-validations' into CLDC-3760-sales-staircasing-section-validations

# Conflicts:
#	app/models/derived_variables/sales_log_variables.rb

app/models/derived_variables/sales_log_variables.rb

@@ -75,8 +75,8 @@ module DerivedVariables::SalesLogVariables
     self.nationality_all = nationality_all_group if nationality_uk_or_prefers_not_to_say?
     self.nationality_all_buyer2 = nationality_all_buyer2_group if nationality2_uk_or_prefers_not_to_say?
 
-    self.numstair = nil if firststair == 1
-    self.mrent = 0 if stairowned == 100
+    self.numstair = nil if is_firststair?
+    self.mrent = 0 if stairowned_100?
 
     set_encoded_derived_values!(DEPENDENCIES)
   end

app/models/form/sales/pages/staircase_first_time.rb

@@ -10,6 +10,6 @@ class Form::Sales::Pages::StaircaseFirstTime < ::Form::Page
   def questions
     @questions ||= [
       Form::Sales::Questions::StaircaseFirstTime.new(nil, nil, self),
-    ].compact
+    ]
   end
 end

app/models/form/sales/pages/staircase_initial_date.rb

@@ -10,6 +10,6 @@ class Form::Sales::Pages::StaircaseInitialDate < ::Form::Page
   def questions
     @questions ||= [
       Form::Sales::Questions::StaircaseInitialDate.new(nil, nil, self),
-    ].compact
+    ]
   end
 end

app/models/form/sales/pages/staircase_previous.rb

@@ -13,6 +13,6 @@ class Form::Sales::Pages::StaircasePrevious < ::Form::Page
       Form::Sales::Questions::StaircaseCount.new(nil, nil, self),
       Form::Sales::Questions::StaircaseLastDate.new(nil, nil, self),
       Form::Sales::Questions::StaircaseInitialDate.new(nil, nil, self),
-    ].compact
+    ]
   end
 end

app/models/form/sales/pages/staircase_sale.rb

@@ -12,6 +12,6 @@ class Form::Sales::Pages::StaircaseSale < ::Form::Page
   def questions
     @questions ||= [
       Form::Sales::Questions::StaircaseSale.new(nil, nil, self),
-    ].compact
+    ]
   end
 end

app/models/form/sales/subsections/shared_ownership_staircasing_transaction.rb

@@ -30,6 +30,6 @@ class Form::Sales::Subsections::SharedOwnershipStaircasingTransaction < ::Form::
   end
 
   def displayed_in_tasklist?(log)
-    (log.ownershipsch.nil? || log.ownershipsch == 1) && (log.staircase.nil? || log.staircase == 1)
+    log.staircase == 1 && (log.ownershipsch.nil? || log.ownershipsch == 1)
   end
 end

spec/models/form/sales/pages/monthly_rent_staircasing_owned_spec.rb

@@ -0,0 +1,31 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::MonthlyRentStaircasingOwned, type: :model do
+  subject(:page) { described_class.new(page_id, page_definition, subsection) }
+
+  let(:page_id) { nil }
+  let(:page_definition) { nil }
+  let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2025, 4, 1))) }
+
+  it "has correct subsection" do
+    expect(page.subsection).to eq(subsection)
+  end
+
+  it "has correct questions" do
+    expect(page.questions.map(&:id)).to eq(%w[mrentprestaircasing])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq("monthly_rent_staircasing_owned")
+  end
+
+  it "has the correct description" do
+    expect(page.description).to be_nil
+  end
+
+  it "has correct depends_on" do
+    expect(page.depends_on).to eq([
+      { "stairowned_100?" => true },
+    ])
+  end
+end

spec/models/form/sales/pages/monthly_rent_staircasing_spec.rb

@@ -0,0 +1,31 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::MonthlyRentStaircasing, type: :model do
+  subject(:page) { described_class.new(page_id, page_definition, subsection) }
+
+  let(:page_id) { nil }
+  let(:page_definition) { nil }
+  let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2025, 4, 1))) }
+
+  it "has correct subsection" do
+    expect(page.subsection).to eq(subsection)
+  end
+
+  it "has correct questions" do
+    expect(page.questions.map(&:id)).to eq(%w[mrentprestaircasing mrent])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq("monthly_rent_staircasing")
+  end
+
+  it "has the correct description" do
+    expect(page.description).to be_nil
+  end
+
+  it "has correct depends_on" do
+    expect(page.depends_on).to eq([
+      { "stairowned_100?" => false },
+    ])
+  end
+end

spec/models/form/sales/pages/staircase_first_time_spec.rb

@@ -0,0 +1,31 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::StaircaseFirstTime, type: :model do
+  subject(:page) { described_class.new(page_id, page_definition, subsection) }
+
+  let(:page_id) { nil }
+  let(:page_definition) { nil }
+  let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2025, 4, 1))) }
+
+  it "has correct subsection" do
+    expect(page.subsection).to eq(subsection)
+  end
+
+  it "has correct questions" do
+    expect(page.questions.map(&:id)).to eq(%w[firststair])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq("staircase_first_time")
+  end
+
+  it "has the correct description" do
+    expect(page.description).to be_nil
+  end
+
+  it "has correct depends_on" do
+    expect(page.depends_on).to eq([
+      { "staircase" => 1 },
+    ])
+  end
+end

spec/models/form/sales/pages/staircase_initial_date_spec.rb

@@ -0,0 +1,31 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::StaircaseInitialDate, type: :model do
+  subject(:page) { described_class.new(page_id, page_definition, subsection) }
+
+  let(:page_id) { nil }
+  let(:page_definition) { nil }
+  let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2025, 4, 1))) }
+
+  it "has correct subsection" do
+    expect(page.subsection).to eq(subsection)
+  end
+
+  it "has correct questions" do
+    expect(page.questions.map(&:id)).to eq(%w[initialpurchase])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq("staircase_initial_date")
+  end
+
+  it "has the correct description" do
+    expect(page.description).to be_nil
+  end
+
+  it "has correct depends_on" do
+    expect(page.depends_on).to eq([
+      { "is_firststair?" => true },
+    ])
+  end
+end

spec/models/form/sales/pages/staircase_previous_spec.rb

@@ -0,0 +1,31 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::StaircasePrevious, type: :model do
+  subject(:page) { described_class.new(page_id, page_definition, subsection) }
+
+  let(:page_id) { nil }
+  let(:page_definition) { nil }
+  let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2025, 4, 1))) }
+
+  it "has correct subsection" do
+    expect(page.subsection).to eq(subsection)
+  end
+
+  it "has correct questions" do
+    expect(page.questions.map(&:id)).to eq(%w[numstair lasttransaction initialpurchase])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq("staircase_previous")
+  end
+
+  it "has the correct description" do
+    expect(page.description).to be_nil
+  end
+
+  it "has correct depends_on" do
+    expect(page.depends_on).to eq([
+      { "is_firststair?" => false },
+    ])
+  end
+end

spec/models/form/sales/pages/staircase_sale_spec.rb

@@ -0,0 +1,38 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::StaircaseSale, type: :model do
+  subject(:page) { described_class.new(page_id, page_definition, subsection) }
+
+  let(:page_id) { nil }
+  let(:page_definition) { nil }
+  let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2025, 4, 1))) }
+
+  before do
+    allow(subsection.form).to receive(:start_year_2025_or_later?).and_return(true)
+  end
+
+  it "has correct subsection" do
+    expect(page.subsection).to eq(subsection)
+  end
+
+  it "has correct questions" do
+    expect(page.questions.map(&:id)).to eq(%w[staircasesale])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq("staircase_sale")
+  end
+
+  it "has the correct description" do
+    expect(page.description).to be_nil
+  end
+
+  it "has correct depends_on" do
+    expect(page.depends_on).to eq([
+      {
+        "staircase" => 1,
+        "stairowned" => 100,
+      },
+    ])
+  end
+end

spec/models/form/sales/questions/monthly_rent_after_staircasing_spec.rb

@@ -0,0 +1,37 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::MonthlyRentAfterStaircasing, type: :model do
+  subject(:question) { described_class.new(question_id, question_definition, page) }
+
+  let(:question_id) { nil }
+  let(:question_definition) { nil }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
+
+  it "has correct page" do
+    expect(question.page).to eq(page)
+  end
+
+  it "has the correct id" do
+    expect(question.id).to eq("mrent")
+  end
+
+  it "has the correct type" do
+    expect(question.type).to eq("numeric")
+  end
+
+  it "is not marked as derived" do
+    expect(question.derived?(nil)).to be false
+  end
+
+  it "has correct width" do
+    expect(question.width).to eq(5)
+  end
+
+  it "has correct prefix" do
+    expect(question.prefix).to eq("£")
+  end
+
+  it "has correct min" do
+    expect(question.min).to eq(0)
+  end
+end

spec/models/form/sales/questions/monthly_rent_before_staircasing_spec.rb

@@ -0,0 +1,37 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::MonthlyRentBeforeStaircasing, type: :model do
+  subject(:question) { described_class.new(question_id, question_definition, page) }
+
+  let(:question_id) { nil }
+  let(:question_definition) { nil }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
+
+  it "has correct page" do
+    expect(question.page).to eq(page)
+  end
+
+  it "has the correct id" do
+    expect(question.id).to eq("mrentprestaircasing")
+  end
+
+  it "has the correct type" do
+    expect(question.type).to eq("numeric")
+  end
+
+  it "is not marked as derived" do
+    expect(question.derived?(nil)).to be false
+  end
+
+  it "has correct width" do
+    expect(question.width).to eq(5)
+  end
+
+  it "has correct prefix" do
+    expect(question.prefix).to eq("£")
+  end
+
+  it "has correct min" do
+    expect(question.min).to eq(0)
+  end
+end

spec/models/form/sales/questions/staircase_count_spec.rb

@@ -0,0 +1,33 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::StaircaseCount, type: :model do
+  subject(:question) { described_class.new(question_id, question_definition, page) }
+
+  let(:question_id) { nil }
+  let(:question_definition) { nil }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2025, 4, 1)))) }
+
+  before do
+    allow(page.subsection.form).to receive(:start_year_2025_or_later?).and_return(true)
+  end
+
+  it "has correct page" do
+    expect(question.page).to eq(page)
+  end
+
+  it "has the correct id" do
+    expect(question.id).to eq("numstair")
+  end
+
+  it "has the correct type" do
+    expect(question.type).to eq("numeric")
+  end
+
+  it "is not marked as derived" do
+    expect(question.derived?(nil)).to be false
+  end
+
+  it "has correct conditional for" do
+    expect(question.conditional_for).to eq(nil)
+  end
+end

spec/models/form/sales/questions/staircase_first_time_spec.rb

@@ -0,0 +1,40 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::StaircaseFirstTime, type: :model do
+  subject(:question) { described_class.new(question_id, question_definition, page) }
+
+  let(:question_id) { nil }
+  let(:question_definition) { nil }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2025, 4, 1)))) }
+
+  before do
+    allow(page.subsection.form).to receive(:start_year_2025_or_later?).and_return(true)
+  end
+
+  it "has correct page" do
+    expect(question.page).to eq(page)
+  end
+
+  it "has the correct id" do
+    expect(question.id).to eq("firststair")
+  end
+
+  it "has the correct type" do
+    expect(question.type).to eq("radio")
+  end
+
+  it "is not marked as derived" do
+    expect(question.derived?(nil)).to be false
+  end
+
+  it "has the correct answer_options" do
+    expect(question.answer_options).to eq({
+      "1" => { "value" => "Yes" },
+      "2" => { "value" => "No" },
+    })
+  end
+
+  it "has correct conditional for" do
+    expect(question.conditional_for).to eq(nil)
+  end
+end

spec/models/form/sales/questions/staircase_initial_date_spec.rb

@@ -0,0 +1,33 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::StaircaseInitialDate, type: :model do
+  subject(:question) { described_class.new(question_id, question_definition, page) }
+
+  let(:question_id) { nil }
+  let(:question_definition) { nil }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2025, 4, 1)))) }
+
+  before do
+    allow(page.subsection.form).to receive(:start_year_2025_or_later?).and_return(true)
+  end
+
+  it "has correct page" do
+    expect(question.page).to eq(page)
+  end
+
+  it "has the correct id" do
+    expect(question.id).to eq("initialpurchase")
+  end
+
+  it "has the correct type" do
+    expect(question.type).to eq("date")
+  end
+
+  it "is not marked as derived" do
+    expect(question.derived?(nil)).to be false
+  end
+
+  it "has correct conditional for" do
+    expect(question.conditional_for).to eq(nil)
+  end
+end

spec/models/form/sales/questions/staircase_last_date_spec.rb

@@ -0,0 +1,33 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::StaircaseLastDate, type: :model do
+  subject(:question) { described_class.new(question_id, question_definition, page) }
+
+  let(:question_id) { nil }
+  let(:question_definition) { nil }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2025, 4, 1)))) }
+
+  before do
+    allow(page.subsection.form).to receive(:start_year_2025_or_later?).and_return(true)
+  end
+
+  it "has correct page" do
+    expect(question.page).to eq(page)
+  end
+
+  it "has the correct id" do
+    expect(question.id).to eq("lasttransaction")
+  end
+
+  it "has the correct type" do
+    expect(question.type).to eq("date")
+  end
+
+  it "is not marked as derived" do
+    expect(question.derived?(nil)).to be false
+  end
+
+  it "has correct conditional for" do
+    expect(question.conditional_for).to eq(nil)
+  end
+end