diff --git a/app/models/form/sales/pages/buyer_still_serving.rb b/app/models/form/sales/pages/buyer_still_serving.rb new file mode 100644 index 000000000..08d2d951b --- /dev/null +++ b/app/models/form/sales/pages/buyer_still_serving.rb @@ -0,0 +1,18 @@ +class Form::Sales::Pages::BuyerStillServing < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "buyer_still_serving" + @header = "" + @description = "" + @subsection = subsection + @depends_on = [{ + "hhregres" => 1, + }] + end + + def questions + @questions ||= [ + Form::Sales::Questions::BuyerStillServing.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/buyer_still_serving.rb b/app/models/form/sales/questions/buyer_still_serving.rb new file mode 100644 index 000000000..07ecd4a16 --- /dev/null +++ b/app/models/form/sales/questions/buyer_still_serving.rb @@ -0,0 +1,19 @@ +class Form::Sales::Questions::BuyerStillServing < ::Form::Question + def initialize(id, hsh, page) + super + @id = "hhregres" + @check_answer_label = "Are they still serving in the UK armed forces?" + @header = "Is the buyer still serving in the UK armed forces?" + @type = "radio" + @hint_text = "" + @answer_options = ANSWER_OPTIONS + @page = page + end + + ANSWER_OPTIONS = { + "4" => { "value" => "Yes" }, + "5" => { "value" => "No" }, + "6" => { "value" => "Buyer prefers not to say" }, + "7" => { "value" => "Don't know" }, + }.freeze +end diff --git a/app/models/form/sales/subsections/household_needs.rb b/app/models/form/sales/subsections/household_needs.rb index ac60d1713..3ff2f4c3a 100644 --- a/app/models/form/sales/subsections/household_needs.rb +++ b/app/models/form/sales/subsections/household_needs.rb @@ -9,6 +9,7 @@ class Form::Sales::Subsections::HouseholdNeeds < ::Form::Subsection def pages @pages ||= [ + Form::Sales::Pages::BuyerStillServing.new(nil, nil, self), Form::Sales::Pages::HouseholdWheelchair.new(nil, nil, self), Form::Sales::Pages::HouseholdDisability.new(nil, nil, self), ] diff --git a/db/migrate/20221223115948_add_buyer_serving_to_sales.rb b/db/migrate/20221223115948_add_buyer_serving_to_sales.rb new file mode 100644 index 000000000..d62c5e1de --- /dev/null +++ b/db/migrate/20221223115948_add_buyer_serving_to_sales.rb @@ -0,0 +1,7 @@ +class AddBuyerServingToSales < ActiveRecord::Migration[7.0] + def change + change_table :sales_logs, bulk: true do |t| + t.column :hhregres, :integer + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 2d53aab20..4c0f0bc06 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_12_21_172821) do +ActiveRecord::Schema[7.0].define(version: 2022_12_23_115948) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -415,7 +415,12 @@ ActiveRecord::Schema[7.0].define(version: 2022_12_21_172821) do t.integer "ecstat4" t.integer "ecstat5" t.integer "ecstat6" + t.integer "pregyrha" + t.integer "pregla" + t.integer "pregghb" + t.integer "pregother" t.integer "disabled" + t.integer "hhregres" 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/buyer_still_serving_spec.rb b/spec/models/form/sales/pages/buyer_still_serving_spec.rb new file mode 100644 index 000000000..562e2d75c --- /dev/null +++ b/spec/models/form/sales/pages/buyer_still_serving_spec.rb @@ -0,0 +1,33 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::BuyerStillServing, 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[hhregres]) + end + + it "has the correct id" do + expect(page.id).to eq("buyer_still_serving") + 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([{ "hhregres" => 1 }]) + end +end diff --git a/spec/models/form/sales/questions/buyer_still_serving_spec.rb b/spec/models/form/sales/questions/buyer_still_serving_spec.rb new file mode 100644 index 000000000..e3282ed61 --- /dev/null +++ b/spec/models/form/sales/questions/buyer_still_serving_spec.rb @@ -0,0 +1,46 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::BuyerStillServing, 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("hhregres") + end + + it "has the correct header" do + expect(question.header).to eq("Is the buyer still serving in the UK armed forces?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Are they still serving in the UK armed forces?") + 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({ + "4" => { "value" => "Yes" }, + "5" => { "value" => "No" }, + "6" => { "value" => "Buyer prefers not to say" }, + "7" => { "value" => "Don't know" }, + }) + end +end diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index e1878f2c1..6c5f51a8e 100644 --- a/spec/models/form_handler_spec.rb +++ b/spec/models/form_handler_spec.rb @@ -52,14 +52,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(69) + expect(form.pages.count).to eq(70) 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(69) + expect(form.pages.count).to eq(70) expect(form.name).to eq("2021_2022_sales") end end