Merge branch 'main' into CLDC-1525-buyer2-working-situation

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

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

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

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

@@ -0,0 +1,17 @@
+class Form::Sales::Questions::Buyer2LiveInProperty < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "buy2livein"
+    @check_answer_label = "Will buyer 2 live in the property?"
+    @header = "Will buyer 2 live in the property?"
+    @type = "radio"
+    @hint_text = ""
+    @answer_options = ANSWER_OPTIONS
+    @page = page
+  end
+
+  ANSWER_OPTIONS = {
+    "1" => { "value" => "Yes" },
+    "2" => { "value" => "No" },
+  }.freeze
+end

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

@@ -22,6 +22,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Sales::Pages::Buyer1EthnicBackgroundWhite.new(nil, nil, self),
       Form::Sales::Pages::Age2.new(nil, nil, self),
       Form::Sales::Pages::GenderIdentity2.new(nil, nil, self),
+      Form::Sales::Pages::Buyer2LiveInProperty.new(nil, nil, self),
       Form::Sales::Pages::Buyer2WorkingSituation.new(nil, nil, self),
     ]
   end

db/migrate/20221003134554_add_buy2livein_to_sales_log.rb

@@ -0,0 +1,7 @@
+class AddBuy2liveinToSalesLog < ActiveRecord::Migration[7.0]
+  def change
+    change_table :sales_logs, bulk: true do |t|
+      t.column :buy2livein, :int
+    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_03_150610) do
+ActiveRecord::Schema[7.0].define(version: 2022_10_03_134554) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -350,7 +350,6 @@ ActiveRecord::Schema[7.0].define(version: 2022_10_03_150610) do
     t.string "sex2"
     t.integer "noint"
     t.integer "buy2livein"
-    t.integer "ecstat2"
     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

@@ -33,6 +33,7 @@ FactoryBot.define do
       ethnic { 3 }
       ethnic_group { 12 }
       sex2 { "X" }
+      buy2livein { "1" }
       ecstat2 { "1" }
     end
   end

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

@@ -0,0 +1,29 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::Buyer2LiveInProperty, 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[buy2livein])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq("buyer_2_live_in_property")
+  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/questions/buyer2_live_in_property_spec.rb

@@ -0,0 +1,44 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::Buyer2LiveInProperty, 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("buy2livein")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("Will buyer 2 live in the property?")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("Will buyer 2 live in the property?")
+  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("")
+  end
+
+  it "has the correct answer_options" do
+    expect(question.answer_options).to eq({
+      "1" => { "value" => "Yes" },
+      "2" => { "value" => "No" },
+    })
+  end
+end

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

@@ -27,6 +27,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
         buyer_1_ethnic_background_white
         buyer_2_age
         buyer_2_gender_identity
+        buyer_2_live_in_property
         buyer_2_working_situation
       ],
     )