From ec427cc1d531a725ef30a76f0b52c9e4aef1fecb Mon Sep 17 00:00:00 2001 From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com> Date: Mon, 5 Dec 2022 12:18:51 +0000 Subject: [PATCH] Cldc 1518 savings question (#1052) * Add savings columns to the db * Add savings questions * Add savings page and update subsection * update tests --- app/models/form/sales/pages/savings.rb | 16 +++++ app/models/form/sales/questions/savings.rb | 14 +++++ app/models/form/sales/questions/savings_nk.rb | 27 ++++++++ .../income_benefits_and_savings.rb | 1 + .../20221202083418_add_savings_columns.rb | 8 +++ db/schema.rb | 4 +- spec/factories/sales_log.rb | 1 + spec/models/form/sales/pages/savings_spec.rb | 33 ++++++++++ .../form/sales/questions/savings_nk_spec.rb | 62 +++++++++++++++++++ .../form/sales/questions/savings_spec.rb | 53 ++++++++++++++++ .../income_benefits_and_savings_spec.rb | 1 + spec/models/form_handler_spec.rb | 4 +- 12 files changed, 221 insertions(+), 3 deletions(-) create mode 100644 app/models/form/sales/pages/savings.rb create mode 100644 app/models/form/sales/questions/savings.rb create mode 100644 app/models/form/sales/questions/savings_nk.rb create mode 100644 db/migrate/20221202083418_add_savings_columns.rb create mode 100644 spec/models/form/sales/pages/savings_spec.rb create mode 100644 spec/models/form/sales/questions/savings_nk_spec.rb create mode 100644 spec/models/form/sales/questions/savings_spec.rb diff --git a/app/models/form/sales/pages/savings.rb b/app/models/form/sales/pages/savings.rb new file mode 100644 index 000000000..42f2c1bb4 --- /dev/null +++ b/app/models/form/sales/pages/savings.rb @@ -0,0 +1,16 @@ +class Form::Sales::Pages::Savings < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "savings" + @header = "" + @description = "" + @subsection = subsection + end + + def questions + @questions ||= [ + Form::Sales::Questions::SavingsNk.new(nil, nil, self), + Form::Sales::Questions::Savings.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/savings.rb b/app/models/form/sales/questions/savings.rb new file mode 100644 index 000000000..d605b4a47 --- /dev/null +++ b/app/models/form/sales/questions/savings.rb @@ -0,0 +1,14 @@ +class Form::Sales::Questions::Savings < ::Form::Question + def initialize(id, hsh, page) + super + @id = "savings" + @check_answer_label = "Buyer’s total savings (to nearest £10) before any deposit paid" + @header = "Enter their total savings to the nearest £10" + @type = "numeric" + @page = page + @width = 5 + @prefix = "£" + @step = 1 + @min = 0 + end +end diff --git a/app/models/form/sales/questions/savings_nk.rb b/app/models/form/sales/questions/savings_nk.rb new file mode 100644 index 000000000..bce9d849d --- /dev/null +++ b/app/models/form/sales/questions/savings_nk.rb @@ -0,0 +1,27 @@ +class Form::Sales::Questions::SavingsNk < ::Form::Question + def initialize(id, hsh, page) + super + @id = "savingsnk" + @check_answer_label = "Buyer’s total savings known?" + @header = "Do you know how much the buyer had in savings before they paid any deposit for the property?" + @type = "radio" + @answer_options = ANSWER_OPTIONS + @page = page + @hint_text = "" + @conditional_for = { + "savings" => [0], + } + @hidden_in_check_answers = { + "depends_on" => [ + { + "savingsnk" => 0, + }, + ], + } + end + + ANSWER_OPTIONS = { + "0" => { "value" => "Yes" }, + "1" => { "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 26ab3310b..aed3304ba 100644 --- a/app/models/form/sales/subsections/income_benefits_and_savings.rb +++ b/app/models/form/sales/subsections/income_benefits_and_savings.rb @@ -12,6 +12,7 @@ class Form::Sales::Subsections::IncomeBenefitsAndSavings < ::Form::Subsection Form::Sales::Pages::Buyer1Income.new(nil, nil, self), Form::Sales::Pages::Buyer1Mortgage.new(nil, nil, self), Form::Sales::Pages::Buyer2Income.new(nil, nil, self), + Form::Sales::Pages::Savings.new(nil, nil, self), ] end end diff --git a/db/migrate/20221202083418_add_savings_columns.rb b/db/migrate/20221202083418_add_savings_columns.rb new file mode 100644 index 000000000..2ebde632f --- /dev/null +++ b/db/migrate/20221202083418_add_savings_columns.rb @@ -0,0 +1,8 @@ +class AddSavingsColumns < ActiveRecord::Migration[7.0] + def change + change_table :sales_logs, bulk: true do |t| + t.column :savingsnk, :int + t.column :savings, :int + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 4f40c8da5..a49ca6568 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: 2022_11_25_142847) do +ActiveRecord::Schema[7.0].define(version: 2022_12_02_083418) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -387,6 +387,8 @@ ActiveRecord::Schema[7.0].define(version: 2022_11_25_142847) do t.integer "inc1mort" t.integer "income2" t.integer "income2nk" + t.integer "savingsnk" + t.integer "savings" 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 e55287d67..de136bc6a 100644 --- a/spec/factories/sales_log.rb +++ b/spec/factories/sales_log.rb @@ -57,6 +57,7 @@ FactoryBot.define do income2 { 10_000 } la_known { "1" } la { "E09000003" } + savingsnk { 1 } end end end diff --git a/spec/models/form/sales/pages/savings_spec.rb b/spec/models/form/sales/pages/savings_spec.rb new file mode 100644 index 000000000..37093da26 --- /dev/null +++ b/spec/models/form/sales/pages/savings_spec.rb @@ -0,0 +1,33 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::Savings, 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[savingsnk savings]) + end + + it "has the correct id" do + expect(page.id).to eq("savings") + 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/savings_nk_spec.rb b/spec/models/form/sales/questions/savings_nk_spec.rb new file mode 100644 index 000000000..6847c4f5a --- /dev/null +++ b/spec/models/form/sales/questions/savings_nk_spec.rb @@ -0,0 +1,62 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::SavingsNk, 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("savingsnk") + end + + it "has the correct header" do + expect(question.header).to eq("Do you know how much the buyer had in savings before they paid any deposit for the property?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Buyer’s total savings known?") + 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({ + "0" => { "value" => "Yes" }, + "1" => { "value" => "No" }, + }) + end + + it "has correct conditional for" do + expect(question.conditional_for).to eq({ + "savings" => [0], + }) + end + + it "has the correct hint" do + expect(question.hint_text).to eq("") + end + + it "has the correct hidden_in_check_answers" do + expect(question.hidden_in_check_answers).to eq( + { + "depends_on" => [ + { + "savingsnk" => 0, + }, + ], + }, + ) + end +end diff --git a/spec/models/form/sales/questions/savings_spec.rb b/spec/models/form/sales/questions/savings_spec.rb new file mode 100644 index 000000000..3f721d7ef --- /dev/null +++ b/spec/models/form/sales/questions/savings_spec.rb @@ -0,0 +1,53 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::Savings, 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("savings") + end + + it "has the correct header" do + expect(question.header).to eq("Enter their total savings to the nearest £10") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Buyer’s total savings (to nearest £10) before any deposit paid") + 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 be_nil + end + + it "has the correct width" do + expect(question.width).to eq(5) + end + + it "has correct step" do + expect(question.step).to eq(1) + end + + it "has correct prefix" do + expect(question.prefix).to eq("£") + end + + it "has correct min" do + expect(question.min).to eq(0) + 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 bea0fe88d..95735c020 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 @@ -17,6 +17,7 @@ RSpec.describe Form::Sales::Subsections::IncomeBenefitsAndSavings, type: :model buyer_1_income buyer_1_mortgage buyer_2_income + savings ], ) end diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index bf03766e2..5fa29a664 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(46) + expect(form.pages.count).to eq(47) 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(46) + expect(form.pages.count).to eq(47) expect(form.name).to eq("2021_2022_sales") end end