Merge branch 'CLDC-1440-household-situation-section' into CLDC-1498-still-serving-armed-forces

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

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

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

@@ -0,0 +1,20 @@
+class Form::Sales::Pages::HouseholdWheelchairCheck < ::Form::Page
+  def initialize(id, hsh, subsection)
+    super
+    @header = ""
+    @description = ""
+    @subsection = subsection
+    @depends_on = [
+      {
+        "wheelchair_when_not_disabled?" => true,
+      },
+    ]
+    @informative_text = {}
+  end
+
+  def questions
+    @questions ||= [
+      Form::Sales::Questions::HouseholdWheelchairCheck.new(nil, nil, self),
+    ]
+  end
+end

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

@@ -0,0 +1,19 @@
+class Form::Sales::Questions::ArmedForces < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "hhregres"
+    @check_answer_label = "Have any of the buyers ever served as a regular in the UK armed forces?"
+    @header = "Have any of the buyers ever served as a regular in the UK armed forces?"
+    @type = "radio"
+    @hint_text = "A regular is somebody who has served in the Royal Navy, the Royal Marines, the Royal Airforce or Army full time and does not include reserve forces"
+    @answer_options = ANSWER_OPTIONS
+    @page = page
+  end
+
+  ANSWER_OPTIONS = {
+    "1" => { "value" => "Yes" },
+    "7" => { "value" => "No" },
+    "3" => { "value" => "Buyer prefers not to say" },
+    "8" => { "value" => "Don't know" },
+  }.freeze
+end

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

@@ -0,0 +1,25 @@
+class Form::Sales::Questions::HouseholdWheelchairCheck < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "wheel_value_check"
+    @check_answer_label = "Does anyone in the household use a wheelchair?"
+    @header = "Are you sure? You said previously that somebody in household uses a wheelchair"
+    @type = "interruption_screen"
+    @page = page
+    @answer_options = {
+      "0" => { "value" => "Yes" },
+      "1" => { "value" => "No" },
+    }
+    @hidden_in_check_answers = {
+      "depends_on" => [
+        {
+          "wheel_value_check" => 0,
+        },
+        {
+          "wheel_value_check" => 1,
+        },
+      ],
+    }
+    @page = page
+  end
+end

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

@@ -9,9 +9,11 @@ class Form::Sales::Subsections::HouseholdNeeds < ::Form::Subsection
 
   def pages
     @pages ||= [
+      Form::Sales::Pages::ArmedForces.new(nil, nil, self),
       Form::Sales::Pages::BuyerStillServing.new(nil, nil, self),
       Form::Sales::Pages::HouseholdWheelchair.new(nil, nil, self),
       Form::Sales::Pages::HouseholdDisability.new(nil, nil, self),
+      Form::Sales::Pages::HouseholdWheelchairCheck.new("wheelchair_check", nil, self),
     ]
   end
 end

app/models/validations/sales/soft_validations.rb

@@ -20,4 +20,10 @@ module Validations::Sales::SoftValidations
     income_used_for_mortgage = (income1_used_for_mortgage? ? income1 : 0) + (income2_used_for_mortgage? ? income2 : 0)
     mortgage > income_used_for_mortgage * 5
   end
+
+  def wheelchair_when_not_disabled?
+    return false unless disabled == 2
+
+    wheel == 1
+  end
 end

db/migrate/20221222105044_add_wheel_value_check.rb

@@ -0,0 +1,7 @@
+class AddWheelValueCheck < ActiveRecord::Migration[7.0]
+  def change
+    change_table :sales_logs, bulk: true do |t|
+      t.column :wheel_value_check, :integer
+    end
+  end
+end

db/migrate/20221223134818_add_armed_forces_to_sales_log.rb

@@ -0,0 +1,7 @@
+class AddArmedForcesToSalesLog < ActiveRecord::Migration[7.0]
+  def change
+    change_table :sales_logs, bulk: true do |t|
+      t.column :hhregres, :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_22_153059) do
+ActiveRecord::Schema[7.0].define(version: 2022_12_23_134818) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -415,11 +415,13 @@ ActiveRecord::Schema[7.0].define(version: 2022_12_22_153059) do
     t.integer "ecstat4"
     t.integer "ecstat5"
     t.integer "ecstat6"
+    t.integer "disabled"
+    t.integer "hhregres"
+    t.integer "wheel_value_check"
     t.integer "pregyrha"
     t.integer "pregla"
     t.integer "pregghb"
     t.integer "pregother"
-    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,11 +67,12 @@ FactoryBot.define do
       ecstat4 { 3 }
       ecstat5 { 2 }
       ecstat6 { 1 }
-      disabled { 2 }
       pregyrha { 1 }
       pregla { 1 }
       pregother { 1 }
       pregghb { 1 }
+      disabled { 1 }
+      hhregres { 1 }
     end
   end
 end

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

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

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

@@ -0,0 +1,33 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::HouseholdWheelchairCheck, type: :model do
+  subject(:page) { described_class.new(page_id, page_definition, subsection) }
+
+  let(:page_id) { "buyer_1_income_mortgage_value_check" }
+  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[wheel_value_check])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq("buyer_1_income_mortgage_value_check")
+  end
+
+  it "has the correct header" do
+    expect(page.header).to eq("")
+  end
+
+  it "has correct depends_on" do
+    expect(page.depends_on).to eq([
+      {
+        "wheelchair_when_not_disabled?" => true,
+      },
+    ])
+  end
+end

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

@@ -0,0 +1,46 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::ArmedForces, 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("hhregres")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("Have any of the buyers ever served as a regular in the UK armed forces?")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("Have any of the buyers ever served as a regular in the UK armed forces?")
+  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 hint" do
+    expect(question.hint_text).to eq("A regular is somebody who has served in the Royal Navy, the Royal Marines, the Royal Airforce or Army full time and does not include reserve forces")
+  end
+
+  it "has the correct answer_options" do
+    expect(question.answer_options).to eq({
+      "1" => { "value" => "Yes" },
+      "7" => { "value" => "No" },
+      "3" => { "value" => "Buyer prefers not to say" },
+      "8" => { "value" => "Don't know" },
+    })
+  end
+end

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

@@ -0,0 +1,48 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::HouseholdWheelchairCheck, 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("wheel_value_check")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("Are you sure? You said previously that somebody in household uses a wheelchair")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("Does anyone in the household use a wheelchair?")
+  end
+
+  it "has the correct type" do
+    expect(question.type).to eq("interruption_screen")
+  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 answer_options" do
+    expect(question.answer_options).to eq({
+      "0" => { "value" => "Yes" },
+      "1" => { "value" => "No" },
+    })
+  end
+
+  it "has the correct hidden_in_check_answers" do
+    expect(question.hidden_in_check_answers).to eq({ "depends_on" => [{ "wheel_value_check" => 0 }, { "wheel_value_check" => 1 }] })
+  end
+end

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

@@ -14,9 +14,11 @@ RSpec.describe Form::Sales::Subsections::HouseholdNeeds, type: :model do
   it "has correct pages" do
     expect(household_characteristics.pages.map(&:id)).to eq(
       %w[
+        armed_forces
         buyer_still_serving
         household_wheelchair
         household_disability
+        wheelchair_check
       ],
     )
   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(71)
+      expect(form.pages.count).to eq(73)
       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(71)
+      expect(form.pages.count).to eq(73)
       expect(form.name).to eq("2021_2022_sales")
     end
   end