Merge branch 'main' into CLDC-1537-details-for-person-x

# Conflicts:
#	app/models/form/sales/subsections/household_characteristics.rb
#	db/schema.rb
#	spec/factories/sales_log.rb

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

@@ -0,0 +1,20 @@
+class Form::Sales::Pages::Person3Age < ::Form::Page
+  def initialize(id, hsh, subsection)
+    super
+    @id = "person_3_age"
+    @header = ""
+    @description = ""
+    @subsection = subsection
+    @depends_on = [
+      { "hholdcount" => 3 },
+      { "hholdcount" => 4 },
+    ]
+  end
+
+  def questions
+    @questions ||= [
+      Form::Sales::Questions::Person3AgeKnown.new(nil, nil, self),
+      Form::Sales::Questions::Person3Age.new(nil, nil, self),
+    ]
+  end
+end

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

@@ -0,0 +1,19 @@
+class Form::Sales::Pages::Person4Age < ::Form::Page
+  def initialize(id, hsh, subsection)
+    super
+    @id = "person_4_age"
+    @header = ""
+    @description = ""
+    @subsection = subsection
+    @depends_on = [
+      { "hholdcount" => 4 },
+    ]
+  end
+
+  def questions
+    @questions ||= [
+      Form::Sales::Questions::Person4AgeKnown.new(nil, nil, self),
+      Form::Sales::Questions::Person4Age.new(nil, nil, self),
+    ]
+  end
+end

app/models/form/sales/questions/person3_age.rb

@@ -0,0 +1,11 @@
+class Form::Sales::Questions::Person3Age < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "age5"
+    @check_answer_label = "Person 3’s age"
+    @header = "Age"
+    @type = "numeric"
+    @page = page
+    @width = 3
+  end
+end

app/models/form/sales/questions/person3_age_known.rb

@@ -0,0 +1,27 @@
+class Form::Sales::Questions::Person3AgeKnown < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "age5_known"
+    @check_answer_label = "Person 3’s age known?"
+    @header = "Do you know person 3’s age?"
+    @type = "radio"
+    @answer_options = ANSWER_OPTIONS
+    @page = page
+    @hint_text = ""
+    @conditional_for = {
+      "age5" => [0],
+    }
+    @hidden_in_check_answers = {
+      "depends_on" => [
+        {
+          "age5_known" => 0,
+        },
+      ],
+    }
+  end
+
+  ANSWER_OPTIONS = {
+    "0" => { "value" => "Yes" },
+    "1" => { "value" => "No" },
+  }.freeze
+end

app/models/form/sales/questions/person4_age.rb

@@ -0,0 +1,11 @@
+class Form::Sales::Questions::Person4Age < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "age6"
+    @check_answer_label = "Person 4’s age"
+    @header = "Age"
+    @type = "numeric"
+    @page = page
+    @width = 3
+  end
+end

app/models/form/sales/questions/person4_age_known.rb

@@ -0,0 +1,27 @@
+class Form::Sales::Questions::Person4AgeKnown < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "age6_known"
+    @check_answer_label = "Person 4’s age known?"
+    @header = "Do you know person 4’s age?"
+    @type = "radio"
+    @answer_options = ANSWER_OPTIONS
+    @page = page
+    @hint_text = ""
+    @conditional_for = {
+      "age6" => [0],
+    }
+    @hidden_in_check_answers = {
+      "depends_on" => [
+        {
+          "age6_known" => 0,
+        },
+      ],
+    }
+  end
+
+  ANSWER_OPTIONS = {
+    "0" => { "value" => "Yes" },
+    "1" => { "value" => "No" },
+  }.freeze
+end

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

@@ -32,6 +32,9 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Sales::Pages::Person2Known.new(nil, nil, self),
       Form::Sales::Pages::Person2Age.new(nil, nil, self),
       Form::Sales::Pages::Person3Known.new(nil, nil, self),
+      Form::Sales::Pages::Person3Age.new(nil, nil, self),
+      Form::Sales::Pages::Person4Known.new(nil, nil, self),
+      Form::Sales::Pages::Person4Age.new(nil, nil, self),
     ]
   end
 end

app/models/validations/date_validations.rb

@@ -41,16 +41,24 @@ module Validations::DateValidations
       record.errors.add :startdate, I18n.t("validations.date.outside_collection_window")
     end
 
-    if FeatureToggle.startdate_two_week_validation_enabled? && (record.startdate > Time.zone.today + 14)
+    if FeatureToggle.startdate_two_week_validation_enabled? && record.startdate > Time.zone.today + 14
       record.errors.add :startdate, I18n.t("validations.setup.startdate.later_than_14_days_after")
     end
 
     if record.scheme_id.present?
       scheme_end_date = record.scheme.end_date
-      if scheme_end_date.present? && (record.startdate > scheme_end_date)
+      if scheme_end_date.present? && record.startdate > scheme_end_date
         record.errors.add :startdate, I18n.t("validations.setup.startdate.before_scheme_end_date")
       end
     end
+
+    if record["voiddate"].present? && record.startdate < record["voiddate"]
+      record.errors.add :startdate, I18n.t("validations.setup.startdate.after_void_date")
+    end
+
+    if record["mrcdate"].present? && record.startdate < record["mrcdate"]
+      record.errors.add :startdate, I18n.t("validations.setup.startdate.after_major_repair_date")
+    end
   end
 
 private

config/locales/en.yml

@@ -118,6 +118,8 @@ en:
       startdate:
         later_than_14_days_after: "The tenancy start date must not be later than 14 days from today’s date"
         before_scheme_end_date: "The tenancy start date must be before the end date for this supported housing scheme"
+        after_void_date: "Enter a tenancy start date that is after the void date"
+        after_major_repair_date: "Enter a tenancy start date that is after the major repair date"
 
     property:
       mrcdate:

db/migrate/20221011094347_add_more_ages_to_sales_log.rb

@@ -0,0 +1,12 @@
+class AddMoreAgesToSalesLog < ActiveRecord::Migration[7.0]
+  def change
+    change_table :sales_logs, bulk: true do |t|
+      t.column :age4, :integer
+      t.column :age4_known, :integer
+      t.column :age5, :integer
+      t.column :age5_known, :integer
+      t.column :age6, :integer
+      t.column :age6_known, :integer
+    end
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2022_10_10_153632) do
+ActiveRecord::Schema[7.0].define(version: 2022_10_11_094347) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -358,11 +358,12 @@ ActiveRecord::Schema[7.0].define(version: 2022_10_10_153632) do
     t.integer "hholdcount"
     t.integer "age3"
     t.integer "age3_known"
-    t.integer "details_known_2"
-    t.integer "details_known_3"
-    t.integer "details_known_4"
     t.integer "age4"
     t.integer "age4_known"
+    t.integer "age5"
+    t.integer "age5_known"
+    t.integer "age6"
+    t.integer "age6_known"
     t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id"
     t.index ["managing_organisation_id"], name: "index_sales_logs_on_managing_organisation_id"
     t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id"

spec/factories/sales_log.rb

@@ -42,6 +42,14 @@ FactoryBot.define do
       age3_known { 0 }
       age3 { 40 }
       person2_known { 1 }
+      age4_known { 0 }
+      age4 { 40 }
+      person3_known { 1 }
+      age5_known { 0 }
+      age5 { 40 }
+      person4_known { 1 }
+      age6_known { 0 }
+      age6 { 40 }
     end
   end
 end

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

@@ -0,0 +1,39 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::Person2Age, 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) }
+
+  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[age4_known age4])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq("person_2_age")
+  end
+
+  it "has the correct header" do
+    expect(page.header).to eq("")
+  end
+
+  it "has the correct description" do
+    expect(page.description).to eq("")
+  end
+
+  it "has correct depends_on" do
+    expect(page.depends_on).to eq(
+      [
+        { "hholdcount" => 2 },
+        { "hholdcount" => 3 },
+        { "hholdcount" => 4 },
+      ],
+    )
+  end
+end

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

@@ -0,0 +1,38 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::Person3Age, 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) }
+
+  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[age5_known age5])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq("person_3_age")
+  end
+
+  it "has the correct header" do
+    expect(page.header).to eq("")
+  end
+
+  it "has the correct description" do
+    expect(page.description).to eq("")
+  end
+
+  it "has correct depends_on" do
+    expect(page.depends_on).to eq(
+      [
+        { "hholdcount" => 3 },
+        { "hholdcount" => 4 },
+      ],
+    )
+  end
+end

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

@@ -0,0 +1,37 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::Person4Age, 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) }
+
+  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[age6_known age6])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq("person_4_age")
+  end
+
+  it "has the correct header" do
+    expect(page.header).to eq("")
+  end
+
+  it "has the correct description" do
+    expect(page.description).to eq("")
+  end
+
+  it "has correct depends_on" do
+    expect(page.depends_on).to eq(
+      [
+        { "hholdcount" => 4 },
+      ],
+    )
+  end
+end

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

@@ -0,0 +1,62 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::Person2AgeKnown, 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) }
+
+  it "has correct page" do
+    expect(question.page).to eq(page)
+  end
+
+  it "has the correct id" do
+    expect(question.id).to eq("age4_known")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("Do you know person 2’s age?")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("Person 2’s age known?")
+  end
+
+  it "has the correct type" do
+    expect(question.type).to eq("radio")
+  end
+
+  it "is not marked as derived" do
+    expect(question.derived?).to be false
+  end
+
+  it "has the correct answer_options" do
+    expect(question.answer_options).to eq({
+      "0" => { "value" => "Yes" },
+      "1" => { "value" => "No" },
+    })
+  end
+
+  it "has correct conditional for" do
+    expect(question.conditional_for).to eq({
+      "age4" => [0],
+    })
+  end
+
+  it "has the correct hint" do
+    expect(question.hint_text).to eq("")
+  end
+
+  it "has the correct hidden_in_check_answers" do
+    expect(question.hidden_in_check_answers).to eq(
+      {
+        "depends_on" => [
+          {
+            "age4_known" => 0,
+          },
+        ],
+      },
+    )
+  end
+end

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

@@ -0,0 +1,41 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::Person2Age, 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) }
+
+  it "has correct page" do
+    expect(question.page).to eq(page)
+  end
+
+  it "has the correct id" do
+    expect(question.id).to eq("age4")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("Age")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("Person 2’s age")
+  end
+
+  it "has the correct type" do
+    expect(question.type).to eq("numeric")
+  end
+
+  it "is not marked as derived" do
+    expect(question.derived?).to be false
+  end
+
+  it "has the correct hint" do
+    expect(question.hint_text).to be_nil
+  end
+
+  it "has the correct width" do
+    expect(question.width).to eq(3)
+  end
+end

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

@@ -0,0 +1,62 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::Person3AgeKnown, 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) }
+
+  it "has correct page" do
+    expect(question.page).to eq(page)
+  end
+
+  it "has the correct id" do
+    expect(question.id).to eq("age5_known")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("Do you know person 3’s age?")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("Person 3’s age known?")
+  end
+
+  it "has the correct type" do
+    expect(question.type).to eq("radio")
+  end
+
+  it "is not marked as derived" do
+    expect(question.derived?).to be false
+  end
+
+  it "has the correct answer_options" do
+    expect(question.answer_options).to eq({
+      "0" => { "value" => "Yes" },
+      "1" => { "value" => "No" },
+    })
+  end
+
+  it "has correct conditional for" do
+    expect(question.conditional_for).to eq({
+      "age5" => [0],
+    })
+  end
+
+  it "has the correct hint" do
+    expect(question.hint_text).to eq("")
+  end
+
+  it "has the correct hidden_in_check_answers" do
+    expect(question.hidden_in_check_answers).to eq(
+      {
+        "depends_on" => [
+          {
+            "age5_known" => 0,
+          },
+        ],
+      },
+    )
+  end
+end

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

@@ -0,0 +1,41 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::Person3Age, 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) }
+
+  it "has correct page" do
+    expect(question.page).to eq(page)
+  end
+
+  it "has the correct id" do
+    expect(question.id).to eq("age5")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("Age")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("Person 3’s age")
+  end
+
+  it "has the correct type" do
+    expect(question.type).to eq("numeric")
+  end
+
+  it "is not marked as derived" do
+    expect(question.derived?).to be false
+  end
+
+  it "has the correct hint" do
+    expect(question.hint_text).to be_nil
+  end
+
+  it "has the correct width" do
+    expect(question.width).to eq(3)
+  end
+end

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

@@ -0,0 +1,62 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::Person4AgeKnown, 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) }
+
+  it "has correct page" do
+    expect(question.page).to eq(page)
+  end
+
+  it "has the correct id" do
+    expect(question.id).to eq("age6_known")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("Do you know person 4’s age?")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("Person 4’s age known?")
+  end
+
+  it "has the correct type" do
+    expect(question.type).to eq("radio")
+  end
+
+  it "is not marked as derived" do
+    expect(question.derived?).to be false
+  end
+
+  it "has the correct answer_options" do
+    expect(question.answer_options).to eq({
+      "0" => { "value" => "Yes" },
+      "1" => { "value" => "No" },
+    })
+  end
+
+  it "has correct conditional for" do
+    expect(question.conditional_for).to eq({
+      "age6" => [0],
+    })
+  end
+
+  it "has the correct hint" do
+    expect(question.hint_text).to eq("")
+  end
+
+  it "has the correct hidden_in_check_answers" do
+    expect(question.hidden_in_check_answers).to eq(
+      {
+        "depends_on" => [
+          {
+            "age6_known" => 0,
+          },
+        ],
+      },
+    )
+  end
+end

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

@@ -0,0 +1,41 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::Person4Age, 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) }
+
+  it "has correct page" do
+    expect(question.page).to eq(page)
+  end
+
+  it "has the correct id" do
+    expect(question.id).to eq("age6")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("Age")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("Person 4’s age")
+  end
+
+  it "has the correct type" do
+    expect(question.type).to eq("numeric")
+  end
+
+  it "is not marked as derived" do
+    expect(question.derived?).to be false
+  end
+
+  it "has the correct hint" do
+    expect(question.hint_text).to be_nil
+  end
+
+  it "has the correct width" do
+    expect(question.width).to eq(3)
+  end
+end

spec/models/form/sales/subsections/household_characteristics_spec.rb

@@ -34,6 +34,9 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
         buyer_2_live_in_property
         number_of_others_in_property
         person_1_age
+        person_2_age
+        person_3_age
+        person_4_age
       ],
     )
   end

spec/models/form_handler_spec.rb

@@ -61,14 +61,14 @@ RSpec.describe FormHandler do
     it "is able to load a current sales form" do
       form = form_handler.get_form("current_sales")
       expect(form).to be_a(Form)
-      expect(form.pages.count).to eq(36)
+      expect(form.pages.count).to eq(39)
       expect(form.name).to eq("2022_2023_sales")
     end
 
     it "is able to load a previous sales form" do
       form = form_handler.get_form("previous_sales")
       expect(form).to be_a(Form)
-      expect(form.pages.count).to eq(36)
+      expect(form.pages.count).to eq(39)
       expect(form.name).to eq("2021_2022_sales")
     end
   end

spec/models/validations/date_validations_spec.rb

@@ -41,6 +41,22 @@ RSpec.describe Validations::DateValidations do
         .to include(match I18n.t("validations.setup.startdate.before_scheme_end_date"))
     end
 
+    it "validates that the tenancy start date is after the void date if it has a void date" do
+      record.startdate = Time.zone.local(2022, 1, 1)
+      record.voiddate = Time.zone.local(2022, 2, 1)
+      date_validator.validate_startdate(record)
+      expect(record.errors["startdate"])
+        .to include(match I18n.t("validations.setup.startdate.after_void_date"))
+    end
+
+    it "validates that the tenancy start date is after the major repair date if it has a major repair date" do
+      record.startdate = Time.zone.local(2022, 1, 1)
+      record.mrcdate = Time.zone.local(2022, 2, 1)
+      date_validator.validate_startdate(record)
+      expect(record.errors["startdate"])
+        .to include(match I18n.t("validations.setup.startdate.after_major_repair_date"))
+    end
+
     it "produces no error when the tenancy start date is before the end date of the chosen scheme if it has an end date" do
       record.startdate = Time.zone.today - 30.days
       record.scheme = scheme