Merge branch 'main' into CLDC-1528-person-relationship-to-buyer-1

# Conflicts:
#	db/schema.rb
#	spec/factories/sales_log.rb
#	spec/models/form_handler_spec.rb

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

@@ -0,0 +1,15 @@
+class Form::Sales::Pages::HouseholdDisability < ::Form::Page
+  def initialize(id, hsh, subsection)
+    super
+    @id = "household_disability"
+    @header = ""
+    @description = ""
+    @subsection = subsection
+  end
+
+  def questions
+    @questions ||= [
+      Form::Sales::Questions::HouseholdDisability.new(nil, nil, self),
+    ]
+  end
+end

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

@@ -0,0 +1,18 @@
+class Form::Sales::Questions::HouseholdDisability < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "disabled"
+    @header = "Does anyone in the household consider themselves to have a disability?"
+    @check_answer_label = "Does anyone in the household have a disability?"
+    @type = "radio"
+    @answer_options = ANSWER_OPTIONS
+    @page = page
+    @hint_text = "This includes any long-term health condition that has an impact on the person's day-to-day life"
+  end
+
+  ANSWER_OPTIONS = {
+    "1" => { "value" => "Yes" },
+    "2" => { "value" => "No" },
+    "3" => { "value" => "Don't know" },
+  }.freeze
+end

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

@@ -10,6 +10,7 @@ class Form::Sales::Subsections::HouseholdNeeds < ::Form::Subsection
   def pages
     @pages ||= [
       Form::Sales::Pages::HouseholdWheelchair.new(nil, nil, self),
+      Form::Sales::Pages::HouseholdDisability.new(nil, nil, self),
     ]
   end
 end

db/migrate/20221221172821_add_disabled_to_sales.rb

@@ -0,0 +1,7 @@
+class AddDisabledToSales < ActiveRecord::Migration[7.0]
+  def change
+    change_table :sales_logs, bulk: true do |t|
+      t.column :disabled, :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_12_15_103247) do
+ActiveRecord::Schema[7.0].define(version: 2022_12_21_172821) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -401,24 +401,21 @@ ActiveRecord::Schema[7.0].define(version: 2022_12_15_103247) do
     t.integer "inc1mort"
     t.integer "income2"
     t.integer "income2nk"
-    t.integer "prevown"
     t.integer "savingsnk"
     t.integer "savings"
+    t.integer "prevown"
     t.string "sex3"
+    t.bigint "updated_by_id"
     t.integer "details_known_1"
-    t.string "relat3"
     t.integer "income1_value_check"
     t.integer "mortgage"
     t.integer "inc2mort"
     t.integer "mortgage_value_check"
-    t.bigint "updated_by_id"
     t.integer "ecstat3"
     t.integer "ecstat4"
     t.integer "ecstat5"
     t.integer "ecstat6"
-    t.string "relat4"
-    t.string "relat5"
-    t.string "relat6"
+    t.integer "disabled"
     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

@@ -67,6 +67,7 @@ FactoryBot.define do
       ecstat4 { 3 }
       ecstat5 { 2 }
       ecstat6 { 1 }
+      disabled { 2 }
       relat3 { "P" }
       relat4 { "P" }
       relat5 { "P" }

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

@@ -0,0 +1,33 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::HouseholdDisability, 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[disabled])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq("household_disability")
+  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 be_nil
+  end
+end

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

@@ -0,0 +1,49 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::HouseholdDisability, 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("disabled")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("Does anyone in the household consider themselves to have a disability?")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("Does anyone in the household have a disability?")
+  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({
+      "1" => { "value" => "Yes" },
+      "2" => { "value" => "No" },
+      "3" => { "value" => "Don't know" },
+    })
+  end
+
+  it "has correct conditional for" do
+    expect(question.conditional_for).to be_nil
+  end
+
+  it "has the correct hint" do
+    expect(question.hint_text).to eq("This includes any long-term health condition that has an impact on the person's day-to-day life")
+  end
+end

spec/models/form_handler_spec.rb

@@ -52,14 +52,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(76)
+      expect(form.pages.count).to eq(77)
       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(76)
+      expect(form.pages.count).to eq(77)
       expect(form.name).to eq("2021_2022_sales")
     end
   end

spec/models/lettings_log_spec.rb

@@ -1888,7 +1888,7 @@ RSpec.describe LettingsLog do
         soft_max: 89.54,
         hard_min: 10.87,
         hard_max: 100.99,
-        start_year: lettings_log.startdate&.year,
+        start_year: lettings_log.collection_start_year,
       )
     end