From 1020b53937237b80f2d5da4b31cb795c97a39e10 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire <94526761+natdeanlewissoftwire@users.noreply.github.com> Date: Tue, 3 Jan 2023 11:47:01 +0000 Subject: [PATCH] Cldc 1521 living before purchase (#1129) * feat: add new page and question and update db * test: add and update tests * feat: reset db --- .../sales/pages/living_before_purchase.rb | 14 +++++ .../sales/questions/living_before_purchase.rb | 16 ++++++ .../discounted_ownership_scheme.rb | 1 + .../subsections/shared_ownership_scheme.rb | 1 + .../20230103094948_add_proplen_to_sales.rb | 7 +++ db/schema.rb | 3 +- spec/factories/sales_log.rb | 1 + .../pages/living_before_purchase_spec.rb | 33 +++++++++++ .../questions/living_before_purchase_spec.rb | 57 +++++++++++++++++++ .../discounted_ownership_scheme_spec.rb | 3 +- .../shared_ownership_scheme_spec.rb | 1 + spec/models/form_handler_spec.rb | 4 +- 12 files changed, 137 insertions(+), 4 deletions(-) create mode 100644 app/models/form/sales/pages/living_before_purchase.rb create mode 100644 app/models/form/sales/questions/living_before_purchase.rb create mode 100644 db/migrate/20230103094948_add_proplen_to_sales.rb create mode 100644 spec/models/form/sales/pages/living_before_purchase_spec.rb create mode 100644 spec/models/form/sales/questions/living_before_purchase_spec.rb diff --git a/app/models/form/sales/pages/living_before_purchase.rb b/app/models/form/sales/pages/living_before_purchase.rb new file mode 100644 index 000000000..e76b8fd63 --- /dev/null +++ b/app/models/form/sales/pages/living_before_purchase.rb @@ -0,0 +1,14 @@ +class Form::Sales::Pages::LivingBeforePurchase < ::Form::Page + def initialize(id, hsh, subsection) + super + @header = "" + @description = "" + @subsection = subsection + end + + def questions + @questions ||= [ + Form::Sales::Questions::LivingBeforePurchase.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/living_before_purchase.rb b/app/models/form/sales/questions/living_before_purchase.rb new file mode 100644 index 000000000..fbcc9a92e --- /dev/null +++ b/app/models/form/sales/questions/living_before_purchase.rb @@ -0,0 +1,16 @@ +class Form::Sales::Questions::LivingBeforePurchase < ::Form::Question + def initialize(id, hsh, page) + super + @id = "proplen" + @check_answer_label = "Number of years buyers living in the property before purchase" + @header = "How long did the buyer(s) live in the property before purchase?" + @hint_text = "You should round this up to the nearest year. If the buyers haven't been living in the property, enter '0'" + @type = "numeric" + @page = page + @min = 0 + @max = 80 + @step = 1 + @width = 5 + @suffix = " years" + 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 6a9b2777f..b1a485382 100644 --- a/app/models/form/sales/subsections/discounted_ownership_scheme.rb +++ b/app/models/form/sales/subsections/discounted_ownership_scheme.rb @@ -9,6 +9,7 @@ class Form::Sales::Subsections::DiscountedOwnershipScheme < ::Form::Subsection def pages @pages ||= [ + Form::Sales::Pages::LivingBeforePurchase.new("living_before_purchase_discounted_ownership", nil, self), Form::Sales::Pages::AboutPriceRtb.new(nil, nil, self), Form::Sales::Pages::AboutPriceNotRtb.new(nil, nil, self), Form::Sales::Pages::AboutDeposit.new("about_deposit_discounted_ownership", 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 b22adc11e..74dba4351 100644 --- a/app/models/form/sales/subsections/shared_ownership_scheme.rb +++ b/app/models/form/sales/subsections/shared_ownership_scheme.rb @@ -9,6 +9,7 @@ class Form::Sales::Subsections::SharedOwnershipScheme < ::Form::Subsection def pages @pages ||= [ + Form::Sales::Pages::LivingBeforePurchase.new("living_before_purchase_shared_ownership", nil, self), Form::Sales::Pages::Staircase.new(nil, nil, self), Form::Sales::Pages::AboutStaircase.new(nil, nil, self), Form::Sales::Pages::Resale.new(nil, nil, self), diff --git a/db/migrate/20230103094948_add_proplen_to_sales.rb b/db/migrate/20230103094948_add_proplen_to_sales.rb new file mode 100644 index 000000000..f373d22a8 --- /dev/null +++ b/db/migrate/20230103094948_add_proplen_to_sales.rb @@ -0,0 +1,7 @@ +class AddProplenToSales < ActiveRecord::Migration[7.0] + def change + change_table :sales_logs, bulk: true do |t| + t.column :proplen, :integer + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 0b85e7f1d..6a3ddbcdf 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_12_22_133600) do +ActiveRecord::Schema[7.0].define(version: 2023_01_03_094948) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -434,6 +434,7 @@ ActiveRecord::Schema[7.0].define(version: 2022_12_22_133600) do t.decimal "equity", precision: 10, scale: 2 t.decimal "discount", precision: 10, scale: 2 t.decimal "grant", precision: 10, scale: 2 + t.integer "proplen" 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 922e265e4..ffe3c852a 100644 --- a/spec/factories/sales_log.rb +++ b/spec/factories/sales_log.rb @@ -72,6 +72,7 @@ FactoryBot.define do cashdis { 1_000 } value { 110_000 } grant { 1_000 } + proplen { 10 } end end end diff --git a/spec/models/form/sales/pages/living_before_purchase_spec.rb b/spec/models/form/sales/pages/living_before_purchase_spec.rb new file mode 100644 index 000000000..b01e381e8 --- /dev/null +++ b/spec/models/form/sales/pages/living_before_purchase_spec.rb @@ -0,0 +1,33 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::LivingBeforePurchase, 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[proplen]) + 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/living_before_purchase_spec.rb b/spec/models/form/sales/questions/living_before_purchase_spec.rb new file mode 100644 index 000000000..2acbe832e --- /dev/null +++ b/spec/models/form/sales/questions/living_before_purchase_spec.rb @@ -0,0 +1,57 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::LivingBeforePurchase, 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("proplen") + end + + it "has the correct header" do + expect(question.header).to eq("How long did the buyer(s) live in the property before purchase?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Number of years buyers living in the property before purchase") + 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("You should round this up to the nearest year. If the buyers haven't been living in the property, enter '0'") + end + + it "has 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 suffix" do + expect(question.suffix).to eq(" years") + end + + it "has correct min" do + expect(question.min).to eq(0) + end + + it "has correct max" do + expect(question.max).to eq(80) + 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 9d716b9ef..3da535e54 100644 --- a/spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb +++ b/spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb @@ -13,7 +13,8 @@ RSpec.describe Form::Sales::Subsections::DiscountedOwnershipScheme, type: :model it "has correct pages" do expect(discounted_ownership_scheme.pages.map(&:id)).to eq( - %w[about_price_rtb + %w[living_before_purchase_discounted_ownership + about_price_rtb about_price_not_rtb about_deposit_discounted_ownership], ) 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 ecabae734..aabf19c13 100644 --- a/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb +++ b/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb @@ -14,6 +14,7 @@ RSpec.describe Form::Sales::Subsections::SharedOwnershipScheme, type: :model do it "has correct pages" do expect(shared_ownership_scheme.pages.map(&:id)).to eq( %w[ + living_before_purchase_shared_ownership staircasing about_staircasing resale diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index eac4f5825..e25eeb375 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(84) + expect(form.pages.count).to eq(86) 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(84) + expect(form.pages.count).to eq(86) expect(form.name).to eq("2021_2022_sales") end end