From 23c086d5daf1e317e40b7cf578550f6c9d73fa91 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire <94526761+natdeanlewissoftwire@users.noreply.github.com> Date: Tue, 4 Oct 2022 10:01:33 +0100 Subject: [PATCH] Cldc 1525 buyer2 working situation (#929) * feat: add functionality * tests: make tests pass * tests: add new tests * feat: update schema * tests: update tests --- .../sales/pages/buyer2_working_situation.rb | 15 ++++++ .../questions/buyer2_working_situation.rb | 26 +++++++++ .../subsections/household_characteristics.rb | 1 + ...20221003150610_add_ecstat2_to_sales_log.rb | 7 +++ db/schema.rb | 3 +- spec/factories/sales_log.rb | 1 + .../pages/buyer2_working_situation_spec.rb | 29 ++++++++++ .../buyer2_working_situation_spec.rb | 53 +++++++++++++++++++ .../household_characteristics_spec.rb | 1 + spec/models/form_handler_spec.rb | 4 +- 10 files changed, 137 insertions(+), 3 deletions(-) create mode 100644 app/models/form/sales/pages/buyer2_working_situation.rb create mode 100644 app/models/form/sales/questions/buyer2_working_situation.rb create mode 100644 db/migrate/20221003150610_add_ecstat2_to_sales_log.rb create mode 100644 spec/models/form/sales/pages/buyer2_working_situation_spec.rb create mode 100644 spec/models/form/sales/questions/buyer2_working_situation_spec.rb diff --git a/app/models/form/sales/pages/buyer2_working_situation.rb b/app/models/form/sales/pages/buyer2_working_situation.rb new file mode 100644 index 000000000..e445a56c1 --- /dev/null +++ b/app/models/form/sales/pages/buyer2_working_situation.rb @@ -0,0 +1,15 @@ +class Form::Sales::Pages::Buyer2WorkingSituation < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "buyer_2_working_situation" + @header = "" + @description = "" + @subsection = subsection + end + + def questions + @questions ||= [ + Form::Sales::Questions::Buyer2WorkingSituation.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/buyer2_working_situation.rb b/app/models/form/sales/questions/buyer2_working_situation.rb new file mode 100644 index 000000000..11b587f92 --- /dev/null +++ b/app/models/form/sales/questions/buyer2_working_situation.rb @@ -0,0 +1,26 @@ +class Form::Sales::Questions::Buyer2WorkingSituation < ::Form::Question + def initialize(id, hsh, page) + super + @id = "ecstat2" + @check_answer_label = "Buyer 2's working situation" + @header = "Which of these best describes buyer 2's working situation?" + @type = "radio" + @hint_text = "" + @page = page + @answer_options = ANSWER_OPTIONS + end + + ANSWER_OPTIONS = { + "2" => { "value" => "Part-time - Less than 30 hours" }, + "1" => { "value" => "Full-time - 30 hours or more" }, + "3" => { "value" => "In government training into work, such as New Deal" }, + "4" => { "value" => "Jobseeker" }, + "6" => { "value" => "Not seeking work" }, + "8" => { "value" => "Unable to work due to long term sick or disability" }, + "5" => { "value" => "Retired" }, + "0" => { "value" => "Other" }, + "10" => { "value" => "Buyer prefers not to say" }, + "7" => { "value" => "Full-time student" }, + "9" => { "value" => "Child under 16" }, + }.freeze +end diff --git a/app/models/form/sales/subsections/household_characteristics.rb b/app/models/form/sales/subsections/household_characteristics.rb index e8bdba81f..1e28e4653 100644 --- a/app/models/form/sales/subsections/household_characteristics.rb +++ b/app/models/form/sales/subsections/household_characteristics.rb @@ -23,6 +23,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection Form::Sales::Pages::Age2.new(nil, nil, self), Form::Sales::Pages::GenderIdentity2.new(nil, nil, self), Form::Sales::Pages::Buyer2LiveInProperty.new(nil, nil, self), + Form::Sales::Pages::Buyer2WorkingSituation.new(nil, nil, self), ] end end diff --git a/db/migrate/20221003150610_add_ecstat2_to_sales_log.rb b/db/migrate/20221003150610_add_ecstat2_to_sales_log.rb new file mode 100644 index 000000000..e6efb825b --- /dev/null +++ b/db/migrate/20221003150610_add_ecstat2_to_sales_log.rb @@ -0,0 +1,7 @@ +class AddEcstat2ToSalesLog < ActiveRecord::Migration[7.0] + def change + change_table :sales_logs, bulk: true do |t| + t.column :ecstat2, :int + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 86653c655..b30200da0 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_03_134554) do +ActiveRecord::Schema[7.0].define(version: 2022_10_03_150610) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -350,6 +350,7 @@ ActiveRecord::Schema[7.0].define(version: 2022_10_03_134554) do t.string "sex2" t.integer "noint" t.integer "buy2livein" + t.integer "ecstat2" 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 2f3273a81..4f9aa07ed 100644 --- a/spec/factories/sales_log.rb +++ b/spec/factories/sales_log.rb @@ -34,6 +34,7 @@ FactoryBot.define do ethnic_group { 12 } sex2 { "X" } buy2livein { "1" } + ecstat2 { "1" } end end end diff --git a/spec/models/form/sales/pages/buyer2_working_situation_spec.rb b/spec/models/form/sales/pages/buyer2_working_situation_spec.rb new file mode 100644 index 000000000..5077ab6f4 --- /dev/null +++ b/spec/models/form/sales/pages/buyer2_working_situation_spec.rb @@ -0,0 +1,29 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::Buyer2WorkingSituation, 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[ecstat2]) + end + + it "has the correct id" do + expect(page.id).to eq("buyer_2_working_situation") + 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 +end diff --git a/spec/models/form/sales/questions/buyer2_working_situation_spec.rb b/spec/models/form/sales/questions/buyer2_working_situation_spec.rb new file mode 100644 index 000000000..0573f02ed --- /dev/null +++ b/spec/models/form/sales/questions/buyer2_working_situation_spec.rb @@ -0,0 +1,53 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::Buyer2WorkingSituation, 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("ecstat2") + end + + it "has the correct header" do + expect(question.header).to eq("Which of these best describes buyer 2's working situation?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Buyer 2's working situation") + 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 hint" do + expect(question.hint_text).to eq("") + end + + it "has the correct answer_options" do + expect(question.answer_options).to eq({ + "2" => { "value" => "Part-time - Less than 30 hours" }, + "1" => { "value" => "Full-time - 30 hours or more" }, + "3" => { "value" => "In government training into work, such as New Deal" }, + "4" => { "value" => "Jobseeker" }, + "6" => { "value" => "Not seeking work" }, + "8" => { "value" => "Unable to work due to long term sick or disability" }, + "5" => { "value" => "Retired" }, + "0" => { "value" => "Other" }, + "10" => { "value" => "Buyer prefers not to say" }, + "7" => { "value" => "Full-time student" }, + "9" => { "value" => "Child under 16" }, + }) + 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 23e12ea45..e8a5bb0db 100644 --- a/spec/models/form/sales/subsections/household_characteristics_spec.rb +++ b/spec/models/form/sales/subsections/household_characteristics_spec.rb @@ -28,6 +28,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model buyer_2_age buyer_2_gender_identity buyer_2_live_in_property + buyer_2_working_situation ], ) end diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index 527e5edfe..831502602 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(29) + expect(form.pages.count).to eq(30) 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(29) + expect(form.pages.count).to eq(30) expect(form.name).to eq("2021_2022_sales") end end