From c34f922d76f180b55608dc09bac92fe672e36ab1 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 5 Oct 2022 15:36:59 +0100 Subject: [PATCH] CLDC-1505 Buyer 1 working situation (#932) * CLDC-1505 Buyer 1 working situation * Update sales log factory --- .../sales/pages/buyer1_working_situation.rb | 15 ++++++ .../questions/buyer1_working_situation.rb | 26 ++++++++++ .../subsections/household_characteristics.rb | 1 + ...20221004184301_add_ecstat1_to_sales_log.rb | 7 +++ db/schema.rb | 9 ++-- spec/factories/sales_log.rb | 1 + .../pages/buyer1_working_situation_spec.rb | 25 ++++++++++ .../buyer1_working_situation_spec.rb | 49 +++++++++++++++++++ .../household_characteristics_spec.rb | 1 + spec/models/form_handler_spec.rb | 4 +- 10 files changed, 132 insertions(+), 6 deletions(-) create mode 100644 app/models/form/sales/pages/buyer1_working_situation.rb create mode 100644 app/models/form/sales/questions/buyer1_working_situation.rb create mode 100644 db/migrate/20221004184301_add_ecstat1_to_sales_log.rb create mode 100644 spec/models/form/sales/pages/buyer1_working_situation_spec.rb create mode 100644 spec/models/form/sales/questions/buyer1_working_situation_spec.rb diff --git a/app/models/form/sales/pages/buyer1_working_situation.rb b/app/models/form/sales/pages/buyer1_working_situation.rb new file mode 100644 index 000000000..caaa0e60f --- /dev/null +++ b/app/models/form/sales/pages/buyer1_working_situation.rb @@ -0,0 +1,15 @@ +class Form::Sales::Pages::Buyer1WorkingSituation < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "buyer_1_working_situation" + @header = "Which of these best describes buyer 1's working situation?" + @description = "" + @subsection = subsection + end + + def questions + @questions ||= [ + Form::Sales::Questions::Buyer1WorkingSituation.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/buyer1_working_situation.rb b/app/models/form/sales/questions/buyer1_working_situation.rb new file mode 100644 index 000000000..571ab7366 --- /dev/null +++ b/app/models/form/sales/questions/buyer1_working_situation.rb @@ -0,0 +1,26 @@ +class Form::Sales::Questions::Buyer1WorkingSituation < ::Form::Question + def initialize(id, hsh, page) + super + @id = "ecstat1" + @check_answer_label = "Buyer 1's working situation" + @header = "Which of these best describes buyer 1's working situation?" + @type = "radio" + @answer_options = ANSWER_OPTIONS + @page = page + @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it's a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest." + 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 055aca08b..32a8b16b5 100644 --- a/app/models/form/sales/subsections/household_characteristics.rb +++ b/app/models/form/sales/subsections/household_characteristics.rb @@ -20,6 +20,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection Form::Sales::Pages::Buyer1EthnicBackgroundMixed.new(nil, nil, self), Form::Sales::Pages::Buyer1EthnicBackgroundWhite.new(nil, nil, self), Form::Sales::Pages::Nationality1.new(nil, nil, self), + Form::Sales::Pages::Buyer1WorkingSituation.new(nil, nil, self), Form::Sales::Pages::Buyer1LiveInProperty.new(nil, nil, self), Form::Sales::Pages::Buyer2RelationshipToBuyer1.new(nil, nil, self), Form::Sales::Pages::Age2.new(nil, nil, self), diff --git a/db/migrate/20221004184301_add_ecstat1_to_sales_log.rb b/db/migrate/20221004184301_add_ecstat1_to_sales_log.rb new file mode 100644 index 000000000..989a4442a --- /dev/null +++ b/db/migrate/20221004184301_add_ecstat1_to_sales_log.rb @@ -0,0 +1,7 @@ +class AddEcstat1ToSalesLog < ActiveRecord::Migration[7.0] + def change + change_table :sales_logs, bulk: true do |t| + t.column :ecstat1, :int + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 368f1a4e8..9e0ceb71e 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_04_184301) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -333,12 +333,10 @@ ActiveRecord::Schema[7.0].define(version: 2022_10_04_095132) do t.integer "jointmore" t.integer "jointpur" t.integer "beds" - t.integer "companybuy" t.integer "age1" t.integer "age1_known" + t.integer "companybuy" t.string "sex1" - t.integer "national" - t.string "othernational" t.integer "ethnic" t.integer "ethnic_group" t.integer "buy1livein" @@ -353,6 +351,9 @@ ActiveRecord::Schema[7.0].define(version: 2022_10_04_095132) do t.integer "noint" t.integer "buy2livein" t.integer "ecstat2" + t.integer "ecstat1" + t.integer "national" + t.string "othernational" t.integer "privacynotice" 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/factories/sales_log.rb b/spec/factories/sales_log.rb index 2936d0d06..a091030bc 100644 --- a/spec/factories/sales_log.rb +++ b/spec/factories/sales_log.rb @@ -35,6 +35,7 @@ FactoryBot.define do ethnic_group { 12 } sex2 { "X" } buy2livein { "1" } + ecstat1 { "1" } ecstat2 { "1" } end end diff --git a/spec/models/form/sales/pages/buyer1_working_situation_spec.rb b/spec/models/form/sales/pages/buyer1_working_situation_spec.rb new file mode 100644 index 000000000..2a48f0b0f --- /dev/null +++ b/spec/models/form/sales/pages/buyer1_working_situation_spec.rb @@ -0,0 +1,25 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::Buyer1WorkingSituation, 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[ecstat1]) + end + + it "has the correct id" do + expect(page.id).to eq("buyer_1_working_situation") + end + + it "has the correct header" do + expect(page.header).to eq("Which of these best describes buyer 1's working situation?") + end +end diff --git a/spec/models/form/sales/questions/buyer1_working_situation_spec.rb b/spec/models/form/sales/questions/buyer1_working_situation_spec.rb new file mode 100644 index 000000000..832c91538 --- /dev/null +++ b/spec/models/form/sales/questions/buyer1_working_situation_spec.rb @@ -0,0 +1,49 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::Buyer1WorkingSituation, 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("ecstat1") + end + + it "has the correct header" do + expect(question.header).to eq("Which of these best describes buyer 1's working situation?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Buyer 1'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 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 29874c8e6..aa94e05dd 100644 --- a/spec/models/form/sales/subsections/household_characteristics_spec.rb +++ b/spec/models/form/sales/subsections/household_characteristics_spec.rb @@ -25,6 +25,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model buyer_1_ethnic_background_mixed buyer_1_ethnic_background_white buyer_1_nationality + buyer_1_working_situation buyer_1_live_in_property buyer_2_relationship_to_buyer_1 buyer_2_age 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