Cldc 1527 others in property (#934)

* feat: add functionality and make tests pass

* tests: add new tests

* refactor: appease linting

* feat: update schema

* feat: update test

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

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

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

@@ -0,0 +1,12 @@
+class Form::Sales::Questions::NumberOfOthersInProperty < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "hholdcount"
+    @check_answer_label = "Number of other people living in the property"
+    @header = "Besides the buyers, how many other people live in the property?"
+    @type = "numeric"
+    @hint_text = "You can provide details for a maximum of 4 other people."
+    @page = page
+    @width = 2
+  end
+end

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

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

db/migrate/20221005125543_add_hholdcount_to_sales_log.rb

@@ -0,0 +1,7 @@
+class AddHholdcountToSalesLog < ActiveRecord::Migration[7.0]
+  def change
+    change_table :sales_logs, bulk: true do |t|
+      t.column :hholdcount, :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_04_184301) do
+ActiveRecord::Schema[7.0].define(version: 2022_10_05_125543) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -333,10 +333,12 @@ ActiveRecord::Schema[7.0].define(version: 2022_10_04_184301) do
     t.integer "jointmore"
     t.integer "jointpur"
     t.integer "beds"
+    t.integer "companybuy"
     t.integer "age1"
     t.integer "age1_known"
-    t.integer "companybuy"
     t.string "sex1"
+    t.integer "national"
+    t.string "othernational"
     t.integer "ethnic"
     t.integer "ethnic_group"
     t.integer "buy1livein"
@@ -351,10 +353,9 @@ ActiveRecord::Schema[7.0].define(version: 2022_10_04_184301) do
     t.integer "noint"
     t.integer "buy2livein"
     t.integer "ecstat2"
-    t.integer "ecstat1"
-    t.integer "national"
-    t.string "othernational"
     t.integer "privacynotice"
+    t.integer "hholdcount"
+    t.integer "ecstat1"
     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

@@ -37,6 +37,7 @@ FactoryBot.define do
       buy2livein { "1" }
       ecstat1 { "1" }
       ecstat2 { "1" }
+      hholdcount { "1" }
     end
   end
 end

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

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

@@ -0,0 +1,37 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::NumberOfOthersInProperty, 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("hholdcount")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("Besides the buyers, how many other people live in the property?")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("Number of other people living in the property")
+  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 eq("You can provide details for a maximum of 4 other people.")
+  end
+end

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

@@ -32,6 +32,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
         buyer_2_gender_identity
         buyer_2_working_situation
         buyer_2_live_in_property
+        number_of_others_in_property
       ],
     )
   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(33)
+      expect(form.pages.count).to eq(34)
       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(33)
+      expect(form.pages.count).to eq(34)
       expect(form.name).to eq("2021_2022_sales")
     end
   end