Cldc 1479 joint buyers (#885)

* Add number joint buyers page and question

* Add jointmore column

* fix form tests

* Add in progress trait and status test for sales log

* Fix test

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

@@ -0,0 +1,18 @@
+class Form::Sales::Pages::NumberJointBuyers < ::Form::Page
+  def initialize(id, hsh, subsection)
+    super
+    @id = "number_joint_buyers"
+    @header = ""
+    @description = ""
+    @subsection = subsection
+    @depends_on = [{
+      "jointpur" => 1,
+    }]
+  end
+
+  def questions
+    @questions ||= [
+      Form::Sales::Questions::NumberJointBuyers.new(nil, nil, self),
+    ]
+  end
+end

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

@@ -0,0 +1,18 @@
+class Form::Sales::Questions::NumberJointBuyers < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "jointmore"
+    @check_answer_label = "More than 2 joint buyers"
+    @header = "Are there more than 2 joint buyers of this property?"
+    @hint_text = "You should still try to answer all questions even if the buyer wasn't interviewed in person"
+    @type = "radio"
+    @answer_options = ANSWER_OPTIONS
+    @page = page
+  end
+
+  ANSWER_OPTIONS = {
+    "1" => { "value" => "Yes" },
+    "2" => { "value" => "No" },
+    "3" => { "value" => "Don’t know" },
+  }.freeze
+end

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

@@ -17,6 +17,7 @@ class Form::Sales::Subsections::Setup < ::Form::Subsection
       Form::Sales::Pages::DiscountedOwnershipType.new(nil, nil, self),
       Form::Sales::Pages::OutrightOwnershipType.new(nil, nil, self),
       Form::Sales::Pages::JointPurchase.new(nil, nil, self),
+      Form::Sales::Pages::NumberJointBuyers.new(nil, nil, self),
     ]
   end
 end

db/migrate/20220920130518_add_joint_buyer_number_column.rb

@@ -0,0 +1,5 @@
+class AddJointBuyerNumberColumn < ActiveRecord::Migration[7.0]
+  def change
+    add_column :sales_logs, :jointmore, :integer
+  end
+end

db/schema.rb

@@ -332,9 +332,10 @@ ActiveRecord::Schema[7.0].define(version: 2022_09_23_093628) do
     t.string "purchid"
     t.integer "type"
     t.integer "ownershipsch"
-    t.integer "jointpur"
     t.string "othtype"
     t.integer "beds"
+    t.integer "jointmore"
+    t.integer "jointpur"
     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

@@ -5,6 +5,12 @@ FactoryBot.define do
     managing_organisation { created_by.organisation }
     created_at { Time.utc(2022, 2, 8, 16, 52, 15) }
     updated_at { Time.utc(2022, 2, 8, 16, 52, 15) }
+    trait :in_progress do
+      purchid { "PC123" }
+      ownershipsch { 2 }
+      type { 8 }
+      saledate { Time.utc(2022, 2, 2, 10, 36, 49) }
+    end
     trait :completed do
       purchid { "PC123" }
       ownershipsch { 2 }
@@ -12,6 +18,7 @@ FactoryBot.define do
       saledate { Time.utc(2022, 2, 2, 10, 36, 49) }
       jointpur { 1 }
       beds { 2 }
+      jointmore { 1 }
     end
   end
 end

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

@@ -0,0 +1,33 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::NumberJointBuyers, 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[jointmore])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq("number_joint_buyers")
+  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([{ "jointpur" => 1 }])
+  end
+end

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

@@ -0,0 +1,45 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::NumberJointBuyers, 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("jointmore")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("Are there more than 2 joint buyers of this property?")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("More than 2 joint buyers")
+  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_text" do
+    expect(question.hint_text).to eq("You should still try to answer all questions even if the buyer wasn't interviewed in person")
+  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
+end

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

@@ -13,7 +13,7 @@ RSpec.describe Form::Sales::Subsections::Setup, type: :model do
 
   it "has correct pages" do
     expect(setup.pages.map(&:id)).to eq(
-      %w[organisation created_by completion_date purchaser_code ownership_scheme shared_ownership_type discounted_ownership_type outright_ownership_type joint_purchase],
+      %w[organisation created_by completion_date purchaser_code ownership_scheme shared_ownership_type discounted_ownership_type outright_ownership_type joint_purchase number_joint_buyers],
     )
   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(10)
+      expect(form.pages.count).to eq(11)
       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(10)
+      expect(form.pages.count).to eq(11)
       expect(form.name).to eq("2021_2022_sales")
     end
   end

spec/models/form_spec.rb

@@ -218,9 +218,9 @@ RSpec.describe Form, type: :model do
       expect(form.sections[0].class).to eq(Form::Sales::Sections::Setup)
       expect(form.subsections.count).to eq(1)
       expect(form.subsections.first.id).to eq("setup")
-      expect(form.pages.count).to eq(9)
+      expect(form.pages.count).to eq(10)
       expect(form.pages.first.id).to eq("organisation")
-      expect(form.questions.count).to eq(10)
+      expect(form.questions.count).to eq(11)
       expect(form.questions.first.id).to eq("owning_organisation_id")
       expect(form.start_date).to eq(Time.zone.parse("2022-04-01"))
       expect(form.end_date).to eq(Time.zone.parse("2023-07-01"))

spec/models/sales_log_spec.rb

@@ -41,23 +41,23 @@ RSpec.describe SalesLog, type: :model do
 
   describe "status" do
     let!(:empty_sales_log) { FactoryBot.create(:sales_log) }
-    # let!(:in_progress_sales_log) { FactoryBot.create(:sales_log, :in_progress) }
+    let!(:in_progress_sales_log) { FactoryBot.create(:sales_log, :in_progress) }
     let!(:completed_sales_log) { FactoryBot.create(:sales_log, :completed) }
 
     it "is set to not started for an empty sales log" do
       expect(empty_sales_log.not_started?).to be(true)
-      # expect(empty_sales_log.in_progress?).to be(false)
+      expect(empty_sales_log.in_progress?).to be(false)
       expect(empty_sales_log.completed?).to be(false)
     end
 
-    # it "is set to in progress for a started sales log" do
-    #   expect(in_progress_sales_log.in_progress?).to be(true)
-    #   expect(in_progress_sales_log.not_started?).to be(false)
-    #   expect(in_progress_sales_log.completed?).to be(false)
-    # end
+    it "is set to in progress for a started sales log" do
+      expect(in_progress_sales_log.in_progress?).to be(true)
+      expect(in_progress_sales_log.not_started?).to be(false)
+      expect(in_progress_sales_log.completed?).to be(false)
+    end
 
     it "is set to completed for a completed sales log" do
-      # expect(completed_sales_log.in_progress?).to be(false)
+      expect(completed_sales_log.in_progress?).to be(false)
       expect(completed_sales_log.not_started?).to be(false)
       expect(completed_sales_log.completed?).to be(true)
     end