Browse Source

Cldc 1518 savings question (#1052)

* Add savings columns to the db

* Add savings questions

* Add savings page and update subsection

* update tests
pull/1057/head
kosiakkatrina 2 years ago committed by GitHub
parent
commit
ec427cc1d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 16
      app/models/form/sales/pages/savings.rb
  2. 14
      app/models/form/sales/questions/savings.rb
  3. 27
      app/models/form/sales/questions/savings_nk.rb
  4. 1
      app/models/form/sales/subsections/income_benefits_and_savings.rb
  5. 8
      db/migrate/20221202083418_add_savings_columns.rb
  6. 4
      db/schema.rb
  7. 1
      spec/factories/sales_log.rb
  8. 33
      spec/models/form/sales/pages/savings_spec.rb
  9. 62
      spec/models/form/sales/questions/savings_nk_spec.rb
  10. 53
      spec/models/form/sales/questions/savings_spec.rb
  11. 1
      spec/models/form/sales/subsections/income_benefits_and_savings_spec.rb
  12. 4
      spec/models/form_handler_spec.rb

16
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

14
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

27
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

1
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::Buyer1Income.new(nil, nil, self),
Form::Sales::Pages::Buyer1Mortgage.new(nil, nil, self), Form::Sales::Pages::Buyer1Mortgage.new(nil, nil, self),
Form::Sales::Pages::Buyer2Income.new(nil, nil, self), Form::Sales::Pages::Buyer2Income.new(nil, nil, self),
Form::Sales::Pages::Savings.new(nil, nil, self),
] ]
end end
end end

8
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

4
db/schema.rb

@ -10,7 +10,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # 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 # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension "plpgsql"
@ -387,6 +387,8 @@ ActiveRecord::Schema[7.0].define(version: 2022_11_25_142847) do
t.integer "inc1mort" t.integer "inc1mort"
t.integer "income2" t.integer "income2"
t.integer "income2nk" t.integer "income2nk"
t.integer "savingsnk"
t.integer "savings"
t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id" 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 ["managing_organisation_id"], name: "index_sales_logs_on_managing_organisation_id"
t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id" t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id"

1
spec/factories/sales_log.rb

@ -57,6 +57,7 @@ FactoryBot.define do
income2 { 10_000 } income2 { 10_000 }
la_known { "1" } la_known { "1" }
la { "E09000003" } la { "E09000003" }
savingsnk { 1 }
end end
end end
end end

33
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

62
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

53
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

1
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_income
buyer_1_mortgage buyer_1_mortgage
buyer_2_income buyer_2_income
savings
], ],
) )
end end

4
spec/models/form_handler_spec.rb

@ -52,14 +52,14 @@ RSpec.describe FormHandler do
it "is able to load a current sales form" do it "is able to load a current sales form" do
form = form_handler.get_form("current_sales") form = form_handler.get_form("current_sales")
expect(form).to be_a(Form) 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") expect(form.name).to eq("2022_2023_sales")
end end
it "is able to load a previous sales form" do it "is able to load a previous sales form" do
form = form_handler.get_form("previous_sales") form = form_handler.get_form("previous_sales")
expect(form).to be_a(Form) 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") expect(form.name).to eq("2021_2022_sales")
end end
end end

Loading…
Cancel
Save