From 6ad5c5f86e9b0aa7d43182974c56337a0bcb1e05 Mon Sep 17 00:00:00 2001 From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com> Date: Thu, 5 Jan 2023 16:53:48 +0000 Subject: [PATCH] Add buyer 2 mortgage question (#1097) --- .../form/sales/pages/buyer2_mortgage.rb | 16 +++++++ .../form/sales/questions/buyer1_mortgage.rb | 2 +- .../form/sales/questions/buyer2_mortgage.rb | 17 +++++++ .../income_benefits_and_savings.rb | 2 + .../form/sales/pages/buyer2_mortgage_spec.rb | 33 ++++++++++++++ .../sales/questions/buyer1_mortgage_spec.rb | 2 +- .../sales/questions/buyer2_mortgage_spec.rb | 44 +++++++++++++++++++ .../income_benefits_and_savings_spec.rb | 2 + spec/models/form_handler_spec.rb | 4 +- 9 files changed, 118 insertions(+), 4 deletions(-) create mode 100644 app/models/form/sales/pages/buyer2_mortgage.rb create mode 100644 app/models/form/sales/questions/buyer2_mortgage.rb create mode 100644 spec/models/form/sales/pages/buyer2_mortgage_spec.rb create mode 100644 spec/models/form/sales/questions/buyer2_mortgage_spec.rb diff --git a/app/models/form/sales/pages/buyer2_mortgage.rb b/app/models/form/sales/pages/buyer2_mortgage.rb new file mode 100644 index 000000000..bcac72218 --- /dev/null +++ b/app/models/form/sales/pages/buyer2_mortgage.rb @@ -0,0 +1,16 @@ +class Form::Sales::Pages::Buyer2Mortgage < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "buyer_2_mortgage" + @header = "" + @description = "" + @subsection = subsection + @depends_on = [{ "jointpur" => 1 }] + end + + def questions + @questions ||= [ + Form::Sales::Questions::Buyer2Mortgage.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/buyer1_mortgage.rb b/app/models/form/sales/questions/buyer1_mortgage.rb index 07499ee32..76f25085c 100644 --- a/app/models/form/sales/questions/buyer1_mortgage.rb +++ b/app/models/form/sales/questions/buyer1_mortgage.rb @@ -3,7 +3,7 @@ class Form::Sales::Questions::Buyer1Mortgage < ::Form::Question super @id = "inc1mort" @check_answer_label = "Buyer 1's income used for mortgage application" - @header = "Was buyer 1's income used for a mortgage application" + @header = "Was buyer 1's income used for a mortgage application?" @type = "radio" @answer_options = ANSWER_OPTIONS @page = page diff --git a/app/models/form/sales/questions/buyer2_mortgage.rb b/app/models/form/sales/questions/buyer2_mortgage.rb new file mode 100644 index 000000000..329567d3c --- /dev/null +++ b/app/models/form/sales/questions/buyer2_mortgage.rb @@ -0,0 +1,17 @@ +class Form::Sales::Questions::Buyer2Mortgage < ::Form::Question + def initialize(id, hsh, page) + super + @id = "inc2mort" + @check_answer_label = "Buyer 2's income used for mortgage application" + @header = "Was buyer 2's income used for a mortgage application?" + @type = "radio" + @answer_options = ANSWER_OPTIONS + @page = page + @check_answers_card_number = 2 + end + + ANSWER_OPTIONS = { + "1" => { "value" => "Yes" }, + "2" => { "value" => "No" }, + }.freeze +end diff --git a/app/models/form/sales/subsections/income_benefits_and_savings.rb b/app/models/form/sales/subsections/income_benefits_and_savings.rb index a9bc1a7c9..9232b9318 100644 --- a/app/models/form/sales/subsections/income_benefits_and_savings.rb +++ b/app/models/form/sales/subsections/income_benefits_and_savings.rb @@ -16,6 +16,8 @@ class Form::Sales::Subsections::IncomeBenefitsAndSavings < ::Form::Subsection Form::Sales::Pages::MortgageValueCheck.new("buyer_1_mortgage_value_check", nil, self), Form::Sales::Pages::Buyer2Income.new(nil, nil, self), Form::Sales::Pages::MortgageValueCheck.new("buyer_2_income_mortgage_value_check", nil, self), + Form::Sales::Pages::Buyer2Mortgage.new(nil, nil, self), + Form::Sales::Pages::MortgageValueCheck.new("buyer_2_mortgage_value_check", nil, self), Form::Sales::Pages::Savings.new(nil, nil, self), Form::Sales::Pages::PreviousOwnership.new(nil, nil, self), ] diff --git a/spec/models/form/sales/pages/buyer2_mortgage_spec.rb b/spec/models/form/sales/pages/buyer2_mortgage_spec.rb new file mode 100644 index 000000000..ed51c0ae1 --- /dev/null +++ b/spec/models/form/sales/pages/buyer2_mortgage_spec.rb @@ -0,0 +1,33 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::Buyer2Mortgage, 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[inc2mort]) + end + + it "has the correct id" do + expect(page.id).to eq("buyer_2_mortgage") + 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 diff --git a/spec/models/form/sales/questions/buyer1_mortgage_spec.rb b/spec/models/form/sales/questions/buyer1_mortgage_spec.rb index 3fc341dfd..59ae45afc 100644 --- a/spec/models/form/sales/questions/buyer1_mortgage_spec.rb +++ b/spec/models/form/sales/questions/buyer1_mortgage_spec.rb @@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer1Mortgage, type: :model do end it "has the correct header" do - expect(question.header).to eq("Was buyer 1's income used for a mortgage application") + expect(question.header).to eq("Was buyer 1's income used for a mortgage application?") end it "has the correct check_answer_label" do diff --git a/spec/models/form/sales/questions/buyer2_mortgage_spec.rb b/spec/models/form/sales/questions/buyer2_mortgage_spec.rb new file mode 100644 index 000000000..bb561af43 --- /dev/null +++ b/spec/models/form/sales/questions/buyer2_mortgage_spec.rb @@ -0,0 +1,44 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::Buyer2Mortgage, 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("inc2mort") + end + + it "has the correct header" do + expect(question.header).to eq("Was buyer 2's income used for a mortgage application?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Buyer 2's income used for mortgage application") + 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" }, + }) + end + + it "has the correct check_answers_card_number" do + expect(question.check_answers_card_number).to eq(2) + end +end diff --git a/spec/models/form/sales/subsections/income_benefits_and_savings_spec.rb b/spec/models/form/sales/subsections/income_benefits_and_savings_spec.rb index c7e2c7606..02d58622a 100644 --- a/spec/models/form/sales/subsections/income_benefits_and_savings_spec.rb +++ b/spec/models/form/sales/subsections/income_benefits_and_savings_spec.rb @@ -21,6 +21,8 @@ RSpec.describe Form::Sales::Subsections::IncomeBenefitsAndSavings, type: :model buyer_1_mortgage_value_check buyer_2_income buyer_2_income_mortgage_value_check + buyer_2_mortgage + buyer_2_mortgage_value_check savings previous_ownership ], diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index 26699ddf6..d9bee9a52 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(105) + expect(form.pages.count).to eq(107) 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(105) + expect(form.pages.count).to eq(107) expect(form.name).to eq("2021_2022_sales") end end