diff --git a/app/models/form/sales/pages/buyer2_live_in_property.rb b/app/models/form/sales/pages/buyer2_live_in_property.rb new file mode 100644 index 000000000..0d2393503 --- /dev/null +++ b/app/models/form/sales/pages/buyer2_live_in_property.rb @@ -0,0 +1,15 @@ +class Form::Sales::Pages::Buyer2LiveInProperty < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "buyer_2_live_in_property" + @header = "" + @description = "" + @subsection = subsection + end + + def questions + @questions ||= [ + Form::Sales::Questions::Buyer2LiveInProperty.new(nil, nil, self), + ] + end +end 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/pages/buyer_interview.rb b/app/models/form/sales/pages/buyer_interview.rb new file mode 100644 index 000000000..a781d8a07 --- /dev/null +++ b/app/models/form/sales/pages/buyer_interview.rb @@ -0,0 +1,15 @@ +class Form::Sales::Pages::BuyerInterview < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "buyer_interview" + @header = "" + @description = "" + @subsection = subsection + end + + def questions + @questions ||= [ + Form::Sales::Questions::BuyerInterview.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/pages/gender_identity2.rb b/app/models/form/sales/pages/gender_identity2.rb new file mode 100644 index 000000000..f5db5aecb --- /dev/null +++ b/app/models/form/sales/pages/gender_identity2.rb @@ -0,0 +1,18 @@ +class Form::Sales::Pages::GenderIdentity2 < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "buyer_2_gender_identity" + @header = "" + @description = "" + @subsection = subsection + @depends_on = [{ + "jointpur" => 1, + }] + end + + def questions + @questions ||= [ + Form::Sales::Questions::GenderIdentity2.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/buyer2_live_in_property.rb b/app/models/form/sales/questions/buyer2_live_in_property.rb new file mode 100644 index 000000000..060f52afc --- /dev/null +++ b/app/models/form/sales/questions/buyer2_live_in_property.rb @@ -0,0 +1,17 @@ +class Form::Sales::Questions::Buyer2LiveInProperty < ::Form::Question + def initialize(id, hsh, page) + super + @id = "buy2livein" + @check_answer_label = "Will buyer 2 live in the property?" + @header = "Will buyer 2 live in the property?" + @type = "radio" + @hint_text = "" + @answer_options = ANSWER_OPTIONS + @page = page + end + + ANSWER_OPTIONS = { + "1" => { "value" => "Yes" }, + "2" => { "value" => "No" }, + }.freeze +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/questions/buyer_interview.rb b/app/models/form/sales/questions/buyer_interview.rb new file mode 100644 index 000000000..d270d9d33 --- /dev/null +++ b/app/models/form/sales/questions/buyer_interview.rb @@ -0,0 +1,17 @@ +class Form::Sales::Questions::BuyerInterview < ::Form::Question + def initialize(id, hsh, page) + super + @id = "noint" + @check_answer_label = "Buyer interviewed in person?" + @header = "Was the buyer interviewed for any of the answers you will provide on this log?" + @type = "radio" + @hint_text = "You should still try to answer all questions even if the buyer wasn't interviewed in person" + @page = page + @answer_options = ANSWER_OPTIONS + end + + ANSWER_OPTIONS = { + "1" => { "value" => "No" }, + "2" => { "value" => "Yes" }, + }.freeze +end diff --git a/app/models/form/sales/questions/gender_identity2.rb b/app/models/form/sales/questions/gender_identity2.rb new file mode 100644 index 000000000..2c0946edb --- /dev/null +++ b/app/models/form/sales/questions/gender_identity2.rb @@ -0,0 +1,18 @@ +class Form::Sales::Questions::GenderIdentity2 < ::Form::Question + def initialize(id, hsh, page) + super + @id = "sex2" + @check_answer_label = "Buyer 2’s gender identity" + @header = "Which of these best describes buyer 2’s gender identity?" + @type = "radio" + @page = page + @answer_options = ANSWER_OPTIONS + end + + ANSWER_OPTIONS = { + "F" => { "value" => "Female" }, + "M" => { "value" => "Male" }, + "X" => { "value" => "Non-binary" }, + "R" => { "value" => "Buyer prefers not to say" }, + }.freeze +end diff --git a/app/models/form/sales/subsections/household_characteristics.rb b/app/models/form/sales/subsections/household_characteristics.rb index 3bfd4d10e..afd1643c1 100644 --- a/app/models/form/sales/subsections/household_characteristics.rb +++ b/app/models/form/sales/subsections/household_characteristics.rb @@ -9,6 +9,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection def pages @pages ||= [ + Form::Sales::Pages::BuyerInterview.new(nil, nil, self), Form::Sales::Pages::Age1.new(nil, nil, self), Form::Sales::Pages::GenderIdentity1.new(nil, nil, self), Form::Sales::Pages::Nationality1.new(nil, nil, self), @@ -21,6 +22,9 @@ 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::Age2.new(nil, nil, self), + Form::Sales::Pages::GenderIdentity2.new(nil, nil, self), + Form::Sales::Pages::Buyer2WorkingSituation.new(nil, nil, self), + Form::Sales::Pages::Buyer2LiveInProperty.new(nil, nil, self), ] end end diff --git a/db/migrate/20220930134358_add_buyer2_sex_to_sales_log.rb b/db/migrate/20220930134358_add_buyer2_sex_to_sales_log.rb new file mode 100644 index 000000000..5d45f147e --- /dev/null +++ b/db/migrate/20220930134358_add_buyer2_sex_to_sales_log.rb @@ -0,0 +1,5 @@ +class AddBuyer2SexToSalesLog < ActiveRecord::Migration[7.0] + def change + add_column :sales_logs, :sex2, :string + end +end diff --git a/db/migrate/20221003092048_add_noint_to_sales_log.rb b/db/migrate/20221003092048_add_noint_to_sales_log.rb new file mode 100644 index 000000000..ab21aead6 --- /dev/null +++ b/db/migrate/20221003092048_add_noint_to_sales_log.rb @@ -0,0 +1,7 @@ +class AddNointToSalesLog < ActiveRecord::Migration[7.0] + def change + change_table :sales_logs, bulk: true do |t| + t.column :noint, :int + end + end +end diff --git a/db/migrate/20221003134554_add_buy2livein_to_sales_log.rb b/db/migrate/20221003134554_add_buy2livein_to_sales_log.rb new file mode 100644 index 000000000..ac8d4fbd7 --- /dev/null +++ b/db/migrate/20221003134554_add_buy2livein_to_sales_log.rb @@ -0,0 +1,7 @@ +class AddBuy2liveinToSalesLog < ActiveRecord::Migration[7.0] + def change + change_table :sales_logs, bulk: true do |t| + t.column :buy2livein, :int + end + 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 b8e0da05e..8baa195e7 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_09_29_125204) 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" @@ -349,6 +349,10 @@ ActiveRecord::Schema[7.0].define(version: 2022_09_29_125204) do t.string "otherrelat2" t.integer "ethnic" t.integer "ethnic_group" + 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 3b975c055..2936d0d06 100644 --- a/spec/factories/sales_log.rb +++ b/spec/factories/sales_log.rb @@ -20,6 +20,7 @@ FactoryBot.define do jointpur { 1 } beds { 2 } jointmore { 1 } + noint { 2 } age1_known { 0 } age1 { 30 } sex1 { "X" } @@ -32,6 +33,9 @@ FactoryBot.define do builtype { 1 } ethnic { 3 } ethnic_group { 12 } + sex2 { "X" } + buy2livein { "1" } + ecstat2 { "1" } end end end diff --git a/spec/models/form/sales/pages/buyer2_live_in_property_spec.rb b/spec/models/form/sales/pages/buyer2_live_in_property_spec.rb new file mode 100644 index 000000000..cfabcf04c --- /dev/null +++ b/spec/models/form/sales/pages/buyer2_live_in_property_spec.rb @@ -0,0 +1,29 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::Buyer2LiveInProperty, 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[buy2livein]) + end + + it "has the correct id" do + expect(page.id).to eq("buyer_2_live_in_property") + 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/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/pages/buyer_interview_spec.rb b/spec/models/form/sales/pages/buyer_interview_spec.rb new file mode 100644 index 000000000..1347fb782 --- /dev/null +++ b/spec/models/form/sales/pages/buyer_interview_spec.rb @@ -0,0 +1,29 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::BuyerInterview, 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[noint]) + end + + it "has the correct id" do + expect(page.id).to eq("buyer_interview") + 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/pages/gender_identity2_spec.rb b/spec/models/form/sales/pages/gender_identity2_spec.rb new file mode 100644 index 000000000..0fdd96e27 --- /dev/null +++ b/spec/models/form/sales/pages/gender_identity2_spec.rb @@ -0,0 +1,35 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::GenderIdentity2, 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[sex2]) + end + + it "has the correct id" do + expect(page.id).to eq("buyer_2_gender_identity") + 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 eq([{ + "jointpur" => 1, + }]) + end +end diff --git a/spec/models/form/sales/questions/buyer2_live_in_property_spec.rb b/spec/models/form/sales/questions/buyer2_live_in_property_spec.rb new file mode 100644 index 000000000..b0d1af779 --- /dev/null +++ b/spec/models/form/sales/questions/buyer2_live_in_property_spec.rb @@ -0,0 +1,44 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::Buyer2LiveInProperty, 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("buy2livein") + end + + it "has the correct header" do + expect(question.header).to eq("Will buyer 2 live in the property?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Will buyer 2 live in the property?") + 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({ + "1" => { "value" => "Yes" }, + "2" => { "value" => "No" }, + }) + 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/questions/buyer_interview_spec.rb b/spec/models/form/sales/questions/buyer_interview_spec.rb new file mode 100644 index 000000000..69c45ee4e --- /dev/null +++ b/spec/models/form/sales/questions/buyer_interview_spec.rb @@ -0,0 +1,44 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::BuyerInterview, 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("noint") + end + + it "has the correct header" do + expect(question.header).to eq("Was the buyer interviewed for any of the answers you will provide on this log?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Buyer interviewed in person?") + 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("You should still try to answer all questions even if the buyer wasn't interviewed in person") + end + + it "has the correct answer_options" do + expect(question.answer_options).to eq({ + "1" => { "value" => "No" }, + "2" => { "value" => "Yes" }, + }) + end +end diff --git a/spec/models/form/sales/questions/gender_identity2_spec.rb b/spec/models/form/sales/questions/gender_identity2_spec.rb new file mode 100644 index 000000000..e4da94a24 --- /dev/null +++ b/spec/models/form/sales/questions/gender_identity2_spec.rb @@ -0,0 +1,42 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::GenderIdentity2, 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("sex2") + end + + it "has the correct header" do + expect(question.header).to eq("Which of these best describes buyer 2’s gender identity?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Buyer 2’s gender identity") + 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({ + "F" => { "value" => "Female" }, + "M" => { "value" => "Male" }, + "X" => { "value" => "Non-binary" }, + "R" => { "value" => "Buyer prefers not to say" }, + }) + 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 e2e8e0a90..575c3d44f 100644 --- a/spec/models/form/sales/subsections/household_characteristics_spec.rb +++ b/spec/models/form/sales/subsections/household_characteristics_spec.rb @@ -14,6 +14,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model it "has correct pages" do expect(household_characteristics.pages.map(&:id)).to eq( %w[ + buyer_interview buyer_1_age buyer_1_gender_identity buyer_1_nationality @@ -26,6 +27,9 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model buyer_1_ethnic_background_mixed buyer_1_ethnic_background_white buyer_2_age + buyer_2_gender_identity + buyer_2_working_situation + buyer_2_live_in_property ], ) end diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index 12b7c214b..32b6fbc7d 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(27) + expect(form.pages.count).to eq(31) 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(27) + expect(form.pages.count).to eq(31) expect(form.name).to eq("2021_2022_sales") end end