From daed7965e210ee1b8eeead777b0b867c02248be0 Mon Sep 17 00:00:00 2001
From: natdeanlewissoftwire
 <94526761+natdeanlewissoftwire@users.noreply.github.com>
Date: Tue, 17 Jan 2023 12:28:27 +0000
Subject: [PATCH] CLDC-1751 add extra borrowing question (#1165)

* feat: add page, tests, and update db

* feat: add depends on behaviour

* refactor: linting

* db: update

* db: update
---
 .../form/sales/pages/extra_borrowing.rb       | 17 +++++++
 .../form/sales/questions/extra_borrowing.rb   | 18 +++++++
 .../discounted_ownership_scheme.rb            |  1 +
 .../form/sales/subsections/outright_sale.rb   |  1 +
 .../subsections/shared_ownership_scheme.rb    |  1 +
 .../20230109170748_add_extrabor_to_sales.rb   |  7 +++
 db/schema.rb                                  |  9 ++--
 spec/factories/sales_log.rb                   |  1 +
 .../form/sales/pages/extra_borrowing_spec.rb  | 35 +++++++++++++
 .../sales/questions/extra_borrowing_spec.rb   | 49 +++++++++++++++++++
 .../discounted_ownership_scheme_spec.rb       |  1 +
 .../sales/subsections/outright_sale_spec.rb   |  1 +
 .../shared_ownership_scheme_spec.rb           |  1 +
 spec/models/form_handler_spec.rb              |  4 +-
 14 files changed, 140 insertions(+), 6 deletions(-)
 create mode 100644 app/models/form/sales/pages/extra_borrowing.rb
 create mode 100644 app/models/form/sales/questions/extra_borrowing.rb
 create mode 100644 db/migrate/20230109170748_add_extrabor_to_sales.rb
 create mode 100644 spec/models/form/sales/pages/extra_borrowing_spec.rb
 create mode 100644 spec/models/form/sales/questions/extra_borrowing_spec.rb

diff --git a/app/models/form/sales/pages/extra_borrowing.rb b/app/models/form/sales/pages/extra_borrowing.rb
new file mode 100644
index 000000000..7fb8b08a4
--- /dev/null
+++ b/app/models/form/sales/pages/extra_borrowing.rb
@@ -0,0 +1,17 @@
+class Form::Sales::Pages::ExtraBorrowing < ::Form::Page
+  def initialize(id, hsh, subsection)
+    super
+    @header = ""
+    @description = ""
+    @subsection = subsection
+    @depends_on = [{
+      "mortgageused" => 1,
+    }]
+  end
+
+  def questions
+    @questions ||= [
+      Form::Sales::Questions::ExtraBorrowing.new(nil, nil, self),
+    ]
+  end
+end
diff --git a/app/models/form/sales/questions/extra_borrowing.rb b/app/models/form/sales/questions/extra_borrowing.rb
new file mode 100644
index 000000000..04f906b22
--- /dev/null
+++ b/app/models/form/sales/questions/extra_borrowing.rb
@@ -0,0 +1,18 @@
+class Form::Sales::Questions::ExtraBorrowing < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "extrabor"
+    @check_answer_label = "Any other borrowing?"
+    @header = "Does this include any extra borrowing?"
+    @type = "radio"
+    @answer_options = ANSWER_OPTIONS
+    @page = page
+    @hint_text = ""
+  end
+
+  ANSWER_OPTIONS = {
+    "1" => { "value" => "Yes" },
+    "2" => { "value" => "No" },
+    "3" => { "value" => "Don't know" },
+  }.freeze
+end
diff --git a/app/models/form/sales/subsections/discounted_ownership_scheme.rb b/app/models/form/sales/subsections/discounted_ownership_scheme.rb
index 88456094f..b527cd7d4 100644
--- a/app/models/form/sales/subsections/discounted_ownership_scheme.rb
+++ b/app/models/form/sales/subsections/discounted_ownership_scheme.rb
@@ -17,6 +17,7 @@ class Form::Sales::Subsections::DiscountedOwnershipScheme < ::Form::Subsection
       Form::Sales::Pages::MortgageLender.new("mortgage_lender_discounted_ownership", nil, self),
       Form::Sales::Pages::MortgageLenderOther.new("mortgage_lender_other_discounted_ownership", nil, self),
       Form::Sales::Pages::MortgageLength.new("mortgage_length_discounted_ownership", nil, self),
+      Form::Sales::Pages::ExtraBorrowing.new("extra_borrowing_discounted_ownership", nil, self),
       Form::Sales::Pages::AboutDepositWithoutDiscount.new("about_deposit_discounted_ownership", nil, self),
       Form::Sales::Pages::DepositValueCheck.new("discounted_ownership_deposit_value_check", nil, self),
       Form::Sales::Pages::LeaseholdCharges.new("leasehold_charges_discounted_ownership", nil, self),
diff --git a/app/models/form/sales/subsections/outright_sale.rb b/app/models/form/sales/subsections/outright_sale.rb
index 4f73e5977..82099dab6 100644
--- a/app/models/form/sales/subsections/outright_sale.rb
+++ b/app/models/form/sales/subsections/outright_sale.rb
@@ -14,6 +14,7 @@ class Form::Sales::Subsections::OutrightSale < ::Form::Subsection
       Form::Sales::Pages::MortgageLender.new("mortgage_lender_outright_sale", nil, self),
       Form::Sales::Pages::MortgageLenderOther.new("mortgage_lender_other_outright_sale", nil, self),
       Form::Sales::Pages::MortgageLength.new("mortgage_length_outright_sale", nil, self),
+      Form::Sales::Pages::ExtraBorrowing.new("extra_borrowing_outright_sale", nil, self),
       Form::Sales::Pages::AboutDepositWithoutDiscount.new("about_deposit_outright_sale", nil, self),
       Form::Sales::Pages::DepositValueCheck.new("outright_sale_deposit_value_check", nil, self),
       Form::Sales::Pages::LeaseholdCharges.new("leasehold_charges_outright_sale", nil, self),
diff --git a/app/models/form/sales/subsections/shared_ownership_scheme.rb b/app/models/form/sales/subsections/shared_ownership_scheme.rb
index 56256823f..8b5ff0902 100644
--- a/app/models/form/sales/subsections/shared_ownership_scheme.rb
+++ b/app/models/form/sales/subsections/shared_ownership_scheme.rb
@@ -25,6 +25,7 @@ class Form::Sales::Subsections::SharedOwnershipScheme < ::Form::Subsection
       Form::Sales::Pages::MortgageLender.new("mortgage_lender_shared_ownership", nil, self),
       Form::Sales::Pages::MortgageLenderOther.new("mortgage_lender_other_shared_ownership", nil, self),
       Form::Sales::Pages::MortgageLength.new("mortgage_length_shared_ownership", nil, self),
+      Form::Sales::Pages::ExtraBorrowing.new("extra_borrowing_shared_ownership", nil, self),
       Form::Sales::Pages::AboutDepositWithDiscount.new(nil, nil, self),
       Form::Sales::Pages::AboutDepositWithoutDiscount.new("about_deposit_shared_ownership", nil, self),
       Form::Sales::Pages::DepositValueCheck.new("shared_ownership_deposit_value_check", nil, self),
diff --git a/db/migrate/20230109170748_add_extrabor_to_sales.rb b/db/migrate/20230109170748_add_extrabor_to_sales.rb
new file mode 100644
index 000000000..592018be4
--- /dev/null
+++ b/db/migrate/20230109170748_add_extrabor_to_sales.rb
@@ -0,0 +1,7 @@
+class AddExtraborToSales < ActiveRecord::Migration[7.0]
+  def change
+    change_table :sales_logs, bulk: true do |t|
+      t.column :extrabor, :integer
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index df7cdb35b..5b8e58122 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -483,10 +483,6 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_13_125117) do
     t.integer "hoday"
     t.integer "homonth"
     t.integer "hoyear"
-    t.integer "hhmemb"
-    t.integer "totadult"
-    t.integer "totchild"
-    t.integer "hhtype"
     t.integer "fromprop"
     t.integer "socprevten"
     t.integer "mortgagelender"
@@ -497,6 +493,11 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_13_125117) do
     t.integer "pcodenk"
     t.string "postcode_full"
     t.boolean "is_la_inferred"
+    t.integer "extrabor"
+    t.integer "hhmemb"
+    t.integer "totadult"
+    t.integer "totchild"
+    t.integer "hhtype"
     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"
diff --git a/spec/factories/sales_log.rb b/spec/factories/sales_log.rb
index bdb71ac1c..cac259bc3 100644
--- a/spec/factories/sales_log.rb
+++ b/spec/factories/sales_log.rb
@@ -99,6 +99,7 @@ FactoryBot.define do
       pcodenk { 1 }
       is_la_inferred { false }
       mortgagelender { 5 }
+      extrabor { 1 }
     end
   end
 end
diff --git a/spec/models/form/sales/pages/extra_borrowing_spec.rb b/spec/models/form/sales/pages/extra_borrowing_spec.rb
new file mode 100644
index 000000000..5540f89cf
--- /dev/null
+++ b/spec/models/form/sales/pages/extra_borrowing_spec.rb
@@ -0,0 +1,35 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::ExtraBorrowing, 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[extrabor])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq(nil)
+  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([{
+      "mortgageused" => 1,
+    }])
+  end
+end
diff --git a/spec/models/form/sales/questions/extra_borrowing_spec.rb b/spec/models/form/sales/questions/extra_borrowing_spec.rb
new file mode 100644
index 000000000..b9149c27d
--- /dev/null
+++ b/spec/models/form/sales/questions/extra_borrowing_spec.rb
@@ -0,0 +1,49 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::ExtraBorrowing, 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("extrabor")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("Does this include any extra borrowing?")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("Any other borrowing?")
+  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 eq(nil)
+  end
+
+  it "has the correct hint" do
+    expect(question.hint_text).to eq("")
+  end
+end
diff --git a/spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb b/spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb
index 1ecc1f9cf..632ba85bc 100644
--- a/spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb
+++ b/spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb
@@ -23,6 +23,7 @@ RSpec.describe Form::Sales::Subsections::DiscountedOwnershipScheme, type: :model
         mortgage_lender_discounted_ownership
         mortgage_lender_other_discounted_ownership
         mortgage_length_discounted_ownership
+        extra_borrowing_discounted_ownership
         about_deposit_discounted_ownership
         discounted_ownership_deposit_value_check
         leasehold_charges_discounted_ownership
diff --git a/spec/models/form/sales/subsections/outright_sale_spec.rb b/spec/models/form/sales/subsections/outright_sale_spec.rb
index fa31bc843..45a9f4ca0 100644
--- a/spec/models/form/sales/subsections/outright_sale_spec.rb
+++ b/spec/models/form/sales/subsections/outright_sale_spec.rb
@@ -20,6 +20,7 @@ RSpec.describe Form::Sales::Subsections::OutrightSale, type: :model do
         mortgage_lender_outright_sale
         mortgage_lender_other_outright_sale
         mortgage_length_outright_sale
+        extra_borrowing_outright_sale
         about_deposit_outright_sale
         outright_sale_deposit_value_check
         leasehold_charges_outright_sale
diff --git a/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb b/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb
index 7ee4e4f79..b453ed0d9 100644
--- a/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb
+++ b/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb
@@ -31,6 +31,7 @@ RSpec.describe Form::Sales::Subsections::SharedOwnershipScheme, type: :model do
         mortgage_lender_shared_ownership
         mortgage_lender_other_shared_ownership
         mortgage_length_shared_ownership
+        extra_borrowing_shared_ownership
         about_deposit_with_discount
         about_deposit_shared_ownership
         shared_ownership_deposit_value_check
diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb
index c9b7eeca0..40c23a9e3 100644
--- a/spec/models/form_handler_spec.rb
+++ b/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(145)
+      expect(form.pages.count).to eq(148)
       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(145)
+      expect(form.pages.count).to eq(148)
       expect(form.name).to eq("2021_2022_sales")
     end
   end