From 316276fe15556167b1137a62962b995475d0208d Mon Sep 17 00:00:00 2001 From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com> Date: Fri, 6 Jan 2023 08:24:20 +0000 Subject: [PATCH] Cldc 1517 housing benefits (#1096) * Add housing benefits column * Add housing benefits questions and pages * Add page to the section * Remove card number and fix tests * rebase tests --- .../form/sales/pages/housing_benefits.rb | 15 ++++++ .../form/sales/questions/housing_benefits.rb | 20 ++++++++ .../income_benefits_and_savings.rb | 1 + ...215161301_add_housing_benefits_to_sales.rb | 7 +++ db/schema.rb | 1 + spec/factories/sales_log.rb | 1 + .../form/sales/pages/housing_benefits_spec.rb | 33 +++++++++++++ .../sales/questions/housing_benefits_spec.rb | 47 +++++++++++++++++++ .../income_benefits_and_savings_spec.rb | 1 + spec/models/form_handler_spec.rb | 4 +- 10 files changed, 128 insertions(+), 2 deletions(-) create mode 100644 app/models/form/sales/pages/housing_benefits.rb create mode 100644 app/models/form/sales/questions/housing_benefits.rb create mode 100644 db/migrate/20221215161301_add_housing_benefits_to_sales.rb create mode 100644 spec/models/form/sales/pages/housing_benefits_spec.rb create mode 100644 spec/models/form/sales/questions/housing_benefits_spec.rb diff --git a/app/models/form/sales/pages/housing_benefits.rb b/app/models/form/sales/pages/housing_benefits.rb new file mode 100644 index 000000000..da67f7bf3 --- /dev/null +++ b/app/models/form/sales/pages/housing_benefits.rb @@ -0,0 +1,15 @@ +class Form::Sales::Pages::HousingBenefits < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "housing_benefits" + @header = "" + @description = "" + @subsection = subsection + end + + def questions + @questions ||= [ + Form::Sales::Questions::HousingBenefits.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/housing_benefits.rb b/app/models/form/sales/questions/housing_benefits.rb new file mode 100644 index 000000000..7b19473ab --- /dev/null +++ b/app/models/form/sales/questions/housing_benefits.rb @@ -0,0 +1,20 @@ +class Form::Sales::Questions::HousingBenefits < ::Form::Question + def initialize(id, hsh, page) + super + @id = "hb" + @check_answer_label = "Housing-related benefits buyer received before buying this property" + @header = "Was the buyer receiving any of these housing-related benefits immediately before buying this property?" + @type = "radio" + @page = page + @hint_text = "" + @answer_options = ANSWER_OPTIONS + end + + ANSWER_OPTIONS = { + "2" => { "value" => "Housing benefit" }, + "3" => { "value" => "Universal Credit housing element" }, + "divider" => { "value" => true }, + "1" => { "value" => "Neither housing benefit or Universal Credit housing element" }, + "4" => { "value" => "Don’t know " }, + }.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 318095373..409d50270 100644 --- a/app/models/form/sales/subsections/income_benefits_and_savings.rb +++ b/app/models/form/sales/subsections/income_benefits_and_savings.rb @@ -18,6 +18,7 @@ class Form::Sales::Subsections::IncomeBenefitsAndSavings < ::Form::Subsection 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::HousingBenefits.new(nil, nil, self), Form::Sales::Pages::Savings.new(nil, nil, self), Form::Sales::Pages::SavingsValueCheck.new("savings_value_check", nil, self), Form::Sales::Pages::DepositValueCheck.new("savings_deposit_value_check", nil, self), diff --git a/db/migrate/20221215161301_add_housing_benefits_to_sales.rb b/db/migrate/20221215161301_add_housing_benefits_to_sales.rb new file mode 100644 index 000000000..e724ac1a9 --- /dev/null +++ b/db/migrate/20221215161301_add_housing_benefits_to_sales.rb @@ -0,0 +1,7 @@ +class AddHousingBenefitsToSales < ActiveRecord::Migration[7.0] + def change + change_table :sales_logs, bulk: true do |t| + t.column :hb, :integer + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 8418104e8..232ff5d4c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -457,6 +457,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_04_164318) do t.integer "prevten" t.integer "savings_value_check" t.integer "deposit_value_check" + t.integer "hb" 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 eba47978d..7770a76d1 100644 --- a/spec/factories/sales_log.rb +++ b/spec/factories/sales_log.rb @@ -86,6 +86,7 @@ FactoryBot.define do relat4 { "P" } relat5 { "P" } relat6 { "P" } + hb { 4 } end end end diff --git a/spec/models/form/sales/pages/housing_benefits_spec.rb b/spec/models/form/sales/pages/housing_benefits_spec.rb new file mode 100644 index 000000000..477490c6e --- /dev/null +++ b/spec/models/form/sales/pages/housing_benefits_spec.rb @@ -0,0 +1,33 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::HousingBenefits, 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[hb]) + end + + it "has the correct id" do + expect(page.id).to eq("housing_benefits") + 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/housing_benefits_spec.rb b/spec/models/form/sales/questions/housing_benefits_spec.rb new file mode 100644 index 000000000..5579f3b48 --- /dev/null +++ b/spec/models/form/sales/questions/housing_benefits_spec.rb @@ -0,0 +1,47 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::HousingBenefits, 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("hb") + end + + it "has the correct header" do + expect(question.header).to eq("Was the buyer receiving any of these housing-related benefits immediately before buying this property?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Housing-related benefits buyer received before buying this property") + 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" do + expect(question.hint_text).to eq("") + end + + it "has the correct answer_options" do + expect(question.answer_options).to eq({ + "2" => { "value" => "Housing benefit" }, + "3" => { "value" => "Universal Credit housing element" }, + "divider" => { "value" => true }, + "1" => { "value" => "Neither housing benefit or Universal Credit housing element" }, + "4" => { "value" => "Don’t know " }, + }) + 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 d568c8f99..edd03eb37 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 @@ -23,6 +23,7 @@ RSpec.describe Form::Sales::Subsections::IncomeBenefitsAndSavings, type: :model buyer_2_income_mortgage_value_check buyer_2_mortgage buyer_2_mortgage_value_check + housing_benefits savings savings_value_check savings_deposit_value_check diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index 1dc26e32b..861e1e5eb 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(112) + expect(form.pages.count).to eq(113) 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(112) + expect(form.pages.count).to eq(113) expect(form.name).to eq("2021_2022_sales") end end