From 8f716f85f04f24572c7ebb49fc9c25bee8500d10 Mon Sep 17 00:00:00 2001 From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com> Date: Wed, 21 Dec 2022 10:06:16 +0000 Subject: [PATCH] Cldc 1539 previous bedrooms (#1108) * add frombeds field * Add previous_bedrooms page and question * add Previous Bedrooms page to the shared ownership subsection --- .../form/sales/pages/previous_bedrooms.rb | 15 +++++++ .../form/sales/questions/previous_bedrooms.rb | 13 ++++++ .../subsections/shared_ownership_scheme.rb | 1 + .../20221220155625_add_from_beds_to_sales.rb | 7 +++ db/schema.rb | 1 + .../sales/pages/previous_bedrooms_spec.rb | 33 ++++++++++++++ .../sales/questions/previous_bedrooms_spec.rb | 45 +++++++++++++++++++ .../shared_ownership_scheme_spec.rb | 1 + spec/models/form_handler_spec.rb | 4 +- 9 files changed, 118 insertions(+), 2 deletions(-) create mode 100644 app/models/form/sales/pages/previous_bedrooms.rb create mode 100644 app/models/form/sales/questions/previous_bedrooms.rb create mode 100644 db/migrate/20221220155625_add_from_beds_to_sales.rb create mode 100644 spec/models/form/sales/pages/previous_bedrooms_spec.rb create mode 100644 spec/models/form/sales/questions/previous_bedrooms_spec.rb diff --git a/app/models/form/sales/pages/previous_bedrooms.rb b/app/models/form/sales/pages/previous_bedrooms.rb new file mode 100644 index 000000000..6cc7d186b --- /dev/null +++ b/app/models/form/sales/pages/previous_bedrooms.rb @@ -0,0 +1,15 @@ +class Form::Sales::Pages::PreviousBedrooms < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "previous_bedrooms" + @header = "About the buyers’ previous property" + @description = "" + @subsection = subsection + end + + def questions + @questions ||= [ + Form::Sales::Questions::PreviousBedrooms.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/previous_bedrooms.rb b/app/models/form/sales/questions/previous_bedrooms.rb new file mode 100644 index 000000000..60f361499 --- /dev/null +++ b/app/models/form/sales/questions/previous_bedrooms.rb @@ -0,0 +1,13 @@ +class Form::Sales::Questions::PreviousBedrooms < ::Form::Question + def initialize(id, hsh, page) + super + @id = "frombeds" + @check_answer_label = "Number of bedrooms in previous property" + @header = "How many bedrooms did the property have?" + @type = "numeric" + @page = page + @width = 5 + @min = 0 + @hint_text = "For bedsits enter 1" + end +end diff --git a/app/models/form/sales/subsections/shared_ownership_scheme.rb b/app/models/form/sales/subsections/shared_ownership_scheme.rb index bc6cd237b..0856b3717 100644 --- a/app/models/form/sales/subsections/shared_ownership_scheme.rb +++ b/app/models/form/sales/subsections/shared_ownership_scheme.rb @@ -10,6 +10,7 @@ class Form::Sales::Subsections::SharedOwnershipScheme < ::Form::Subsection def pages @pages ||= [ Form::Sales::Pages::Staircase.new(nil, nil, self), + Form::Sales::Pages::PreviousBedrooms.new(nil, nil, self), ] end diff --git a/db/migrate/20221220155625_add_from_beds_to_sales.rb b/db/migrate/20221220155625_add_from_beds_to_sales.rb new file mode 100644 index 000000000..462d7ba7d --- /dev/null +++ b/db/migrate/20221220155625_add_from_beds_to_sales.rb @@ -0,0 +1,7 @@ +class AddFromBedsToSales < ActiveRecord::Migration[7.0] + def change + change_table :sales_logs, bulk: true do |t| + t.column :frombeds, :integer + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 2246c8690..774735d7a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -415,6 +415,7 @@ ActiveRecord::Schema[7.0].define(version: 2022_12_20_174515) do t.integer "ecstat4" t.integer "ecstat5" t.integer "ecstat6" + t.integer "frombeds" t.integer "staircase" 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" diff --git a/spec/models/form/sales/pages/previous_bedrooms_spec.rb b/spec/models/form/sales/pages/previous_bedrooms_spec.rb new file mode 100644 index 000000000..aeb5d7f96 --- /dev/null +++ b/spec/models/form/sales/pages/previous_bedrooms_spec.rb @@ -0,0 +1,33 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::PreviousBedrooms, 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[frombeds]) + end + + it "has the correct id" do + expect(page.id).to eq("previous_bedrooms") + end + + it "has the correct header" do + expect(page.header).to eq("About the buyers’ previous property") + 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/previous_bedrooms_spec.rb b/spec/models/form/sales/questions/previous_bedrooms_spec.rb new file mode 100644 index 000000000..bbfef7fab --- /dev/null +++ b/spec/models/form/sales/questions/previous_bedrooms_spec.rb @@ -0,0 +1,45 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::PreviousBedrooms, 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("frombeds") + end + + it "has the correct header" do + expect(question.header).to eq("How many bedrooms did the property have?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Number of bedrooms in previous property") + 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("For bedsits enter 1") + end + + it "has correct width" do + expect(question.width).to eq(5) + end + + it "has correct min" do + expect(question.min).to eq(0) + end +end 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 e1118c0d9..c05c73dee 100644 --- a/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb +++ b/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb @@ -15,6 +15,7 @@ RSpec.describe Form::Sales::Subsections::SharedOwnershipScheme, type: :model do expect(shared_ownership_scheme.pages.map(&:id)).to eq( %w[ staircasing + previous_bedrooms ], ) end diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index e1878f2c1..6c5f51a8e 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(69) + expect(form.pages.count).to eq(70) 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(69) + expect(form.pages.count).to eq(70) expect(form.name).to eq("2021_2022_sales") end end