feat: add page, tests, and update db

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

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

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

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

@@ -15,6 +15,7 @@ class Form::Sales::Subsections::DiscountedOwnershipScheme < ::Form::Subsection
       Form::Sales::Pages::Mortgageused.new("mortgage_used_discounted_ownership", nil, self),
       Form::Sales::Pages::MortgageAmount.new("mortgage_amount_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),

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

@@ -13,6 +13,7 @@ class Form::Sales::Subsections::OutrightSale < ::Form::Subsection
       Form::Sales::Pages::Mortgageused.new("mortgage_used_outright_sale", nil, self),
       Form::Sales::Pages::MortgageAmount.new("mortgage_amount_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),

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

@@ -22,6 +22,7 @@ class Form::Sales::Subsections::SharedOwnershipScheme < ::Form::Subsection
       Form::Sales::Pages::Mortgageused.new("mortgage_used_shared_ownership", nil, self),
       Form::Sales::Pages::MortgageAmount.new("mortgage_amount_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),

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

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: 2023_01_09_160738) do
+ActiveRecord::Schema[7.0].define(version: 2023_01_09_170748) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -471,6 +471,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_09_160738) do
     t.integer "hoday"
     t.integer "homonth"
     t.integer "hoyear"
+    t.integer "extrabor"
     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

@@ -96,6 +96,7 @@ FactoryBot.define do
       mscharge_known { 1 }
       mscharge { 100 }
       mortlen { 10 }
+      extrabor { 1 }
     end
   end
 end

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

@@ -0,0 +1,33 @@
+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 be_nil
+  end
+end

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

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

@@ -20,6 +20,7 @@ RSpec.describe Form::Sales::Subsections::DiscountedOwnershipScheme, type: :model
         mortgage_used_discounted_ownership
         mortgage_amount_discounted_ownership
         mortgage_length_discounted_ownership
+        extra_borrowing_discounted_ownership
         about_deposit_discounted_ownership
         discounted_ownership_deposit_value_check
         leasehold_charges_discounted_ownership

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

@@ -18,6 +18,7 @@ RSpec.describe Form::Sales::Subsections::OutrightSale, type: :model do
         mortgage_used_outright_sale
         mortgage_amount_outright_sale
         mortgage_length_outright_sale
+        extra_borrowing_outright_sale
         about_deposit_outright_sale
         outright_sale_deposit_value_check
         leasehold_charges_outright_sale

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

@@ -27,6 +27,7 @@ RSpec.describe Form::Sales::Subsections::SharedOwnershipScheme, type: :model do
         mortgage_used_shared_ownership
         mortgage_amount_shared_ownership
         mortgage_length_shared_ownership
+        extra_borrowing_shared_ownership
         about_deposit_with_discount
         about_deposit_shared_ownership
         shared_ownership_deposit_value_check

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(135)
+      expect(form.pages.count).to eq(138)
       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(135)
+      expect(form.pages.count).to eq(138)
       expect(form.name).to eq("2021_2022_sales")
     end
   end