From 458f30bf66f509452f2c86ff0e56d5c21c4cd979 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Wed, 5 Oct 2022 15:06:54 +0100 Subject: [PATCH] feat: add functionality and make tests pass --- .../sales/pages/number_of_others_in_property.rb | 15 +++++++++++++++ .../questions/number_of_others_in_property.rb | 12 ++++++++++++ .../subsections/household_characteristics.rb | 1 + .../20221005125543_add_hholdcount_to_sales_log.rb | 7 +++++++ db/schema.rb | 3 ++- spec/factories/sales_log.rb | 1 + .../subsections/household_characteristics_spec.rb | 1 + spec/models/form_handler_spec.rb | 4 ++-- 8 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 app/models/form/sales/pages/number_of_others_in_property.rb create mode 100644 app/models/form/sales/questions/number_of_others_in_property.rb create mode 100644 db/migrate/20221005125543_add_hholdcount_to_sales_log.rb diff --git a/app/models/form/sales/pages/number_of_others_in_property.rb b/app/models/form/sales/pages/number_of_others_in_property.rb new file mode 100644 index 000000000..b97c70775 --- /dev/null +++ b/app/models/form/sales/pages/number_of_others_in_property.rb @@ -0,0 +1,15 @@ +class Form::Sales::Pages::NumberOfOthersInProperty < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "number_of_others_in_property" + @header = "" + @description = "" + @subsection = subsection + end + + def questions + @questions ||= [ + Form::Sales::Questions::NumberOfOthersInProperty.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/number_of_others_in_property.rb b/app/models/form/sales/questions/number_of_others_in_property.rb new file mode 100644 index 000000000..46df505f7 --- /dev/null +++ b/app/models/form/sales/questions/number_of_others_in_property.rb @@ -0,0 +1,12 @@ +class Form::Sales::Questions::NumberOfOthersInProperty < ::Form::Question + def initialize(id, hsh, page) + super + @id = "hholdcount" + @check_answer_label = "Number of other people living in the property" + @header = "Besides the buyers, how many other people live in the property?" + @type = "numeric" + @hint_text = "You can provide details for a maximum of 4 other people." + @page = page + @width = 2 + end +end diff --git a/app/models/form/sales/subsections/household_characteristics.rb b/app/models/form/sales/subsections/household_characteristics.rb index 055aca08b..6d0e2f399 100644 --- a/app/models/form/sales/subsections/household_characteristics.rb +++ b/app/models/form/sales/subsections/household_characteristics.rb @@ -26,6 +26,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection Form::Sales::Pages::GenderIdentity2.new(nil, nil, self), Form::Sales::Pages::Buyer2WorkingSituation.new(nil, nil, self), Form::Sales::Pages::Buyer2LiveInProperty.new(nil, nil, self), + Form::Sales::Pages::NumberOfOthersInProperty.new(nil, nil, self), ] end end diff --git a/db/migrate/20221005125543_add_hholdcount_to_sales_log.rb b/db/migrate/20221005125543_add_hholdcount_to_sales_log.rb new file mode 100644 index 000000000..c21b6dd8c --- /dev/null +++ b/db/migrate/20221005125543_add_hholdcount_to_sales_log.rb @@ -0,0 +1,7 @@ +class AddHholdcountToSalesLog < ActiveRecord::Migration[7.0] + def change + change_table :sales_logs, bulk: true do |t| + t.column :hholdcount, :int + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 368f1a4e8..9e6355950 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_10_04_095132) do +ActiveRecord::Schema[7.0].define(version: 2022_10_05_125543) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -354,6 +354,7 @@ ActiveRecord::Schema[7.0].define(version: 2022_10_04_095132) do t.integer "buy2livein" t.integer "ecstat2" t.integer "privacynotice" + t.integer "hholdcount" 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 2936d0d06..1a5296bda 100644 --- a/spec/factories/sales_log.rb +++ b/spec/factories/sales_log.rb @@ -36,6 +36,7 @@ FactoryBot.define do sex2 { "X" } buy2livein { "1" } ecstat2 { "1" } + hholdcount { "1" } end end end diff --git a/spec/models/form/sales/subsections/household_characteristics_spec.rb b/spec/models/form/sales/subsections/household_characteristics_spec.rb index 29874c8e6..1267ecb18 100644 --- a/spec/models/form/sales/subsections/household_characteristics_spec.rb +++ b/spec/models/form/sales/subsections/household_characteristics_spec.rb @@ -31,6 +31,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model buyer_2_gender_identity buyer_2_working_situation buyer_2_live_in_property + number_of_others_in_property ], ) end diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index c42b021cd..e2ee27419 100644 --- a/spec/models/form_handler_spec.rb +++ b/spec/models/form_handler_spec.rb @@ -61,14 +61,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(32) + expect(form.pages.count).to eq(33) 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(32) + expect(form.pages.count).to eq(33) expect(form.name).to eq("2021_2022_sales") end end