diff --git a/app/models/form/sales/pages/buyer1_live_in_property.rb b/app/models/form/sales/pages/buyer1_live_in_property.rb new file mode 100644 index 000000000..6146f6782 --- /dev/null +++ b/app/models/form/sales/pages/buyer1_live_in_property.rb @@ -0,0 +1,15 @@ +class Form::Sales::Pages::Buyer1LiveInProperty < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "buyer_1_live_in_property" + @header = "" + @description = "" + @subsection = subsection + end + + def questions + @questions ||= [ + Form::Sales::Questions::Buyer1LiveInProperty.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/buyer1_live_in_property.rb b/app/models/form/sales/questions/buyer1_live_in_property.rb new file mode 100644 index 000000000..b80736282 --- /dev/null +++ b/app/models/form/sales/questions/buyer1_live_in_property.rb @@ -0,0 +1,17 @@ +class Form::Sales::Questions::Buyer1LiveInProperty < ::Form::Question + def initialize(id, hsh, page) + super + @id = "buy1livein" + @check_answer_label = "Will buyer 1 live in the property?" + @header = "Will buyer 1 live in the property?" + @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 = { + "1" => { "value" => "Yes" }, + "2" => { "value" => "No" }, + }.freeze +end diff --git a/app/models/form/sales/subsections/household_characteristics.rb b/app/models/form/sales/subsections/household_characteristics.rb index 999c9bbd4..4612a80f2 100644 --- a/app/models/form/sales/subsections/household_characteristics.rb +++ b/app/models/form/sales/subsections/household_characteristics.rb @@ -11,6 +11,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection @pages ||= [ Form::Sales::Pages::Age1.new(nil, nil, self), Form::Sales::Pages::GenderIdentity1.new(nil, nil, self), + Form::Sales::Pages::Buyer1LiveInProperty.new(nil, nil, self), ] end end diff --git a/db/migrate/20220927105552_add_buy1livein.rb b/db/migrate/20220927105552_add_buy1livein.rb new file mode 100644 index 000000000..14b73299e --- /dev/null +++ b/db/migrate/20220927105552_add_buy1livein.rb @@ -0,0 +1,5 @@ +class AddBuy1livein < ActiveRecord::Migration[7.0] + def change + add_column :sales_logs, :buy1livein, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index a0a10507d..91b2935a7 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_26_153206) do +ActiveRecord::Schema[7.0].define(version: 2022_09_27_105552) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -339,6 +339,7 @@ ActiveRecord::Schema[7.0].define(version: 2022_09_26_153206) do t.integer "age1" t.integer "age1_known" t.string "sex1" + t.integer "buy1livein" 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/models/form/sales/pages/buyer1_live_in_property_spec.rb b/spec/models/form/sales/pages/buyer1_live_in_property_spec.rb new file mode 100644 index 000000000..2d3995d6b --- /dev/null +++ b/spec/models/form/sales/pages/buyer1_live_in_property_spec.rb @@ -0,0 +1,33 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::Buyer1LiveInProperty, 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[buy1livein]) + end + + it "has the correct id" do + expect(page.id).to eq("buyer_1_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 + + it "has correct depends_on" do + expect(page.depends_on).to be_nil + end +end diff --git a/spec/models/form/sales/questions/buyer1_live_in_property_spec.rb b/spec/models/form/sales/questions/buyer1_live_in_property_spec.rb new file mode 100644 index 000000000..e241f5151 --- /dev/null +++ b/spec/models/form/sales/questions/buyer1_live_in_property_spec.rb @@ -0,0 +1,48 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::Buyer1LiveInProperty, 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("buy1livein") + end + + it "has the correct header" do + expect(question.header).to eq("Will buyer 1 live in the property?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Will buyer 1 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 answer_options" do + expect(question.answer_options).to eq({ + "1" => { "value" => "Yes" }, + "2" => { "value" => "No" }, + }) + end + + it "has correct conditional for" do + expect(question.conditional_for).to be_nil + end + + it "has the correct hint" do + expect(question.hint_text).to eq("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 +end diff --git a/spec/models/form/sales/subsections/household_characteristics_spec.rb b/spec/models/form/sales/subsections/household_characteristics_spec.rb index e99dddb55..c3d9e2602 100644 --- a/spec/models/form/sales/subsections/household_characteristics_spec.rb +++ b/spec/models/form/sales/subsections/household_characteristics_spec.rb @@ -13,7 +13,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model it "has correct pages" do expect(household_characteristics.pages.map(&:id)).to eq( - %w[buyer_1_age buyer_1_gender_identity], + %w[buyer_1_age buyer_1_gender_identity buyer_1_live_in_property], ) end