diff --git a/app/models/form/sales/pages/mortgage_length.rb b/app/models/form/sales/pages/mortgage_length.rb new file mode 100644 index 000000000..edc005c21 --- /dev/null +++ b/app/models/form/sales/pages/mortgage_length.rb @@ -0,0 +1,14 @@ +class Form::Sales::Pages::MortgageLength < ::Form::Page + def initialize(id, hsh, subsection) + super + @header = "" + @description = "" + @subsection = subsection + end + + def questions + @questions ||= [ + Form::Sales::Questions::MortgageLength.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/mortgage_length.rb b/app/models/form/sales/questions/mortgage_length.rb new file mode 100644 index 000000000..3c06e6e12 --- /dev/null +++ b/app/models/form/sales/questions/mortgage_length.rb @@ -0,0 +1,14 @@ +class Form::Sales::Questions::MortgageLength < ::Form::Question + def initialize(id, hsh, page) + super + @id = "mortlen" + @check_answer_label = "Length of mortgage" + @header = "What is the length of the mortgage?" + @type = "numeric" + @page = page + @min = 0 + @width = 5 + @suffix = " years" + @hint_text = "" + end +end diff --git a/app/models/form/sales/subsections/discounted_ownership_scheme.rb b/app/models/form/sales/subsections/discounted_ownership_scheme.rb index 827ecf1de..773d619df 100644 --- a/app/models/form/sales/subsections/discounted_ownership_scheme.rb +++ b/app/models/form/sales/subsections/discounted_ownership_scheme.rb @@ -14,6 +14,7 @@ class Form::Sales::Subsections::DiscountedOwnershipScheme < ::Form::Subsection Form::Sales::Pages::AboutPriceNotRtb.new(nil, nil, self), 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::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 a751c6734..e3bebb6c8 100644 --- a/app/models/form/sales/subsections/outright_sale.rb +++ b/app/models/form/sales/subsections/outright_sale.rb @@ -12,6 +12,7 @@ class Form::Sales::Subsections::OutrightSale < ::Form::Subsection Form::Sales::Pages::PurchasePrice.new(nil, nil, self), 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::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 25b6c360b..eee58a56e 100644 --- a/app/models/form/sales/subsections/shared_ownership_scheme.rb +++ b/app/models/form/sales/subsections/shared_ownership_scheme.rb @@ -21,6 +21,7 @@ class Form::Sales::Subsections::SharedOwnershipScheme < ::Form::Subsection Form::Sales::Pages::AboutPriceSharedOwnership.new(nil, nil, self), 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::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/20230109160738_add_mortlen_to_sales_logs.rb b/db/migrate/20230109160738_add_mortlen_to_sales_logs.rb new file mode 100644 index 000000000..f4699f096 --- /dev/null +++ b/db/migrate/20230109160738_add_mortlen_to_sales_logs.rb @@ -0,0 +1,7 @@ +class AddMortlenToSalesLogs < ActiveRecord::Migration[7.0] + def change + change_table :sales_logs, bulk: true do |t| + t.column :mortlen, :integer + end + end +end diff --git a/db/schema.rb b/db/schema.rb index a59ce5f0e..31f16f79d 100644 --- a/db/schema.rb +++ b/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_06_145107) do +ActiveRecord::Schema[7.0].define(version: 2023_01_09_160738) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -466,6 +466,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_06_145107) do t.string "sex4" t.string "sex5" t.string "sex6" + t.integer "mortlen" t.datetime "hodate", precision: nil t.integer "hoday" t.integer "homonth" diff --git a/spec/factories/sales_log.rb b/spec/factories/sales_log.rb index 04cf7a94d..7381b31e3 100644 --- a/spec/factories/sales_log.rb +++ b/spec/factories/sales_log.rb @@ -95,6 +95,7 @@ FactoryBot.define do armedforcesspouse { 5 } mscharge_known { 1 } mscharge { 100 } + mortlen { 10 } end end end diff --git a/spec/models/form/sales/pages/mortgage_length_spec.rb b/spec/models/form/sales/pages/mortgage_length_spec.rb new file mode 100644 index 000000000..002fb49cf --- /dev/null +++ b/spec/models/form/sales/pages/mortgage_length_spec.rb @@ -0,0 +1,33 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::MortgageLength, 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[mortlen]) + 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 diff --git a/spec/models/form/sales/questions/mortgage_length_spec.rb b/spec/models/form/sales/questions/mortgage_length_spec.rb new file mode 100644 index 000000000..273c13c7b --- /dev/null +++ b/spec/models/form/sales/questions/mortgage_length_spec.rb @@ -0,0 +1,49 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::MortgageLength, 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("mortlen") + end + + it "has the correct header" do + expect(question.header).to eq("What is the length of the mortgage?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Length of mortgage") + 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("") + end + + it "has correct width" do + expect(question.width).to eq(5) + end + + it "has correct suffix" do + expect(question.suffix).to eq(" years") + end + + it "has correct min" do + expect(question.min).to eq(0) + 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 e30e5bfde..a19617d82 100644 --- a/spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb +++ b/spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb @@ -19,6 +19,7 @@ RSpec.describe Form::Sales::Subsections::DiscountedOwnershipScheme, type: :model about_price_not_rtb mortgage_used_discounted_ownership mortgage_amount_discounted_ownership + mortgage_length_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 06b394f27..8dfc45d7d 100644 --- a/spec/models/form/sales/subsections/outright_sale_spec.rb +++ b/spec/models/form/sales/subsections/outright_sale_spec.rb @@ -17,6 +17,7 @@ RSpec.describe Form::Sales::Subsections::OutrightSale, type: :model do purchase_price mortgage_used_outright_sale mortgage_amount_outright_sale + mortgage_length_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 fb326d359..c2581e635 100644 --- a/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb +++ b/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb @@ -26,6 +26,7 @@ RSpec.describe Form::Sales::Subsections::SharedOwnershipScheme, type: :model do about_price_shared_ownership mortgage_used_shared_ownership mortgage_amount_shared_ownership + mortgage_length_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 3b2b70c33..738e6135f 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(132) + expect(form.pages.count).to eq(135) 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(132) + expect(form.pages.count).to eq(135) expect(form.name).to eq("2021_2022_sales") end end