From 3b2b207c7143669755478639c91452939645efad Mon Sep 17 00:00:00 2001 From: bibblobcode <113976590+bibblobcode@users.noreply.github.com> Date: Mon, 26 Sep 2022 13:31:29 +0100 Subject: [PATCH] [CLDC-1484] Add Buyer 1 age question (#898) * [CLDC-1484] Add buyer 1 questions to Sales form * [CLDC-1484] Add Age1 page and sections * [CLDC-1484] Enable rspec --only-failures * Rubocop lint --- .gitignore | 2 + app/models/form/sales/pages/age1.rb | 16 ++++++ app/models/form/sales/questions/age1.rb | 11 ++++ .../form/sales/questions/buyer1_age_known.rb | 20 ++++++++ app/models/form/sales/sections/household.rb | 10 ++++ .../subsections/household_characteristics.rb | 14 ++++++ app/models/form/sales/subsections/setup.rb | 1 + app/models/form_handler.rb | 5 +- .../20220922084008_add_age1_to_sales_logs.rb | 8 +++ db/schema.rb | 6 ++- spec/factories/sales_log.rb | 2 + spec/models/form/sales/pages/age1_spec.rb | 33 ++++++++++++ spec/models/form/sales/questions/age1_spec.rb | 41 +++++++++++++++ .../sales/questions/buyer1_age_known_spec.rb | 50 +++++++++++++++++++ .../form/sales/subsections/setup_spec.rb | 2 +- spec/models/form_handler_spec.rb | 4 +- spec/models/form_spec.rb | 4 +- spec/spec_helper.rb | 2 +- 18 files changed, 222 insertions(+), 9 deletions(-) create mode 100644 app/models/form/sales/pages/age1.rb create mode 100644 app/models/form/sales/questions/age1.rb create mode 100644 app/models/form/sales/questions/buyer1_age_known.rb create mode 100644 app/models/form/sales/sections/household.rb create mode 100644 app/models/form/sales/subsections/household_characteristics.rb create mode 100644 db/migrate/20220922084008_add_age1_to_sales_logs.rb create mode 100644 spec/models/form/sales/pages/age1_spec.rb create mode 100644 spec/models/form/sales/questions/age1_spec.rb create mode 100644 spec/models/form/sales/questions/buyer1_age_known_spec.rb diff --git a/.gitignore b/.gitignore index 65bf729e6..93a5a3a05 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,5 @@ yarn-debug.log* /app/assets/builds/* !/app/assets/builds/.keep + +spec/examples.txt diff --git a/app/models/form/sales/pages/age1.rb b/app/models/form/sales/pages/age1.rb new file mode 100644 index 000000000..833758056 --- /dev/null +++ b/app/models/form/sales/pages/age1.rb @@ -0,0 +1,16 @@ +class Form::Sales::Pages::Age1 < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "buyer_1_age" + @header = "" + @description = "" + @subsection = subsection + end + + def questions + @questions ||= [ + Form::Sales::Questions::Buyer1AgeKnown.new(nil, nil, self), + Form::Sales::Questions::Age1.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/age1.rb b/app/models/form/sales/questions/age1.rb new file mode 100644 index 000000000..390fba3a6 --- /dev/null +++ b/app/models/form/sales/questions/age1.rb @@ -0,0 +1,11 @@ +class Form::Sales::Questions::Age1 < ::Form::Question + def initialize(id, hsh, page) + super + @id = "age1" + @check_answer_label = "Lead buyer’s age" + @header = "Age" + @type = "numeric" + @page = page + @width = 2 + end +end diff --git a/app/models/form/sales/questions/buyer1_age_known.rb b/app/models/form/sales/questions/buyer1_age_known.rb new file mode 100644 index 000000000..234cb6be8 --- /dev/null +++ b/app/models/form/sales/questions/buyer1_age_known.rb @@ -0,0 +1,20 @@ +class Form::Sales::Questions::Buyer1AgeKnown < ::Form::Question + def initialize(id, hsh, page) + super + @id = "age1_known" + @check_answer_label = "Buyer 1's age" + @header = "Do you know buyer 1's age?" + @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." + @conditional_for = { + "age1" => [0], + } + end + + ANSWER_OPTIONS = { + "0" => { "value" => "Yes" }, + "1" => { "value" => "No" }, + }.freeze +end diff --git a/app/models/form/sales/sections/household.rb b/app/models/form/sales/sections/household.rb new file mode 100644 index 000000000..b3432522e --- /dev/null +++ b/app/models/form/sales/sections/household.rb @@ -0,0 +1,10 @@ +class Form::Sales::Sections::Household < ::Form::Section + def initialize(id, hsh, form) + super + @id = "household" + @label = "About the household" + @description = "" + @form = form + @subsections = [Form::Sales::Subsections::HouseholdCharacteristics.new(nil, nil, self)] || [] + end +end diff --git a/app/models/form/sales/subsections/household_characteristics.rb b/app/models/form/sales/subsections/household_characteristics.rb new file mode 100644 index 000000000..b03de9ef5 --- /dev/null +++ b/app/models/form/sales/subsections/household_characteristics.rb @@ -0,0 +1,14 @@ +class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection + def initialize(id, hsh, section) + super + @id = "household_characteristics" + @label = "Household characteristics" + @section = section + end + + def pages + @pages ||= [ + Form::Sales::Pages::Age1.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/subsections/setup.rb b/app/models/form/sales/subsections/setup.rb index 0eba081e2..2d415b3c7 100644 --- a/app/models/form/sales/subsections/setup.rb +++ b/app/models/form/sales/subsections/setup.rb @@ -18,6 +18,7 @@ class Form::Sales::Subsections::Setup < ::Form::Subsection Form::Sales::Pages::OutrightOwnershipType.new(nil, nil, self), Form::Sales::Pages::JointPurchase.new(nil, nil, self), Form::Sales::Pages::NumberJointBuyers.new(nil, nil, self), + Form::Sales::Pages::Age1.new(nil, nil, self), ] end end diff --git a/app/models/form_handler.rb b/app/models/form_handler.rb index a4deaf25c..8cbcba5cf 100644 --- a/app/models/form_handler.rb +++ b/app/models/form_handler.rb @@ -19,7 +19,10 @@ class FormHandler end def sales_forms - sales_sections = [Form::Sales::Property::Sections::PropertyInformation] # Add section classes here e.g. Form::Sales::Property::Sections::PropertyInformation + sales_sections = [ + Form::Sales::Property::Sections::PropertyInformation, + Form::Sales::Sections::Household, + ] current_form = Form.new(nil, current_collection_start_year, sales_sections, "sales") previous_form = Form.new(nil, current_collection_start_year - 1, sales_sections, "sales") { "current_sales" => current_form, diff --git a/db/migrate/20220922084008_add_age1_to_sales_logs.rb b/db/migrate/20220922084008_add_age1_to_sales_logs.rb new file mode 100644 index 000000000..4ee837dd9 --- /dev/null +++ b/db/migrate/20220922084008_add_age1_to_sales_logs.rb @@ -0,0 +1,8 @@ +class AddAge1ToSalesLogs < ActiveRecord::Migration[7.0] + def change + change_table :sales_logs, bulk: true do |t| + t.column :age1, :integer + t.column :age1_known, :integer + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 27b896016..ad1371b85 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -333,9 +333,11 @@ ActiveRecord::Schema[7.0].define(version: 2022_09_23_093628) do t.integer "type" t.integer "ownershipsch" t.string "othtype" - t.integer "beds" - t.integer "jointmore" t.integer "jointpur" + t.integer "jointmore" + t.integer "beds" + t.integer "age1" + t.integer "age1_known" 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 1ce44f3aa..5e430a6aa 100644 --- a/spec/factories/sales_log.rb +++ b/spec/factories/sales_log.rb @@ -19,6 +19,8 @@ FactoryBot.define do jointpur { 1 } beds { 2 } jointmore { 1 } + age1_known { 0 } + age1 { 30 } end end end diff --git a/spec/models/form/sales/pages/age1_spec.rb b/spec/models/form/sales/pages/age1_spec.rb new file mode 100644 index 000000000..c70143a68 --- /dev/null +++ b/spec/models/form/sales/pages/age1_spec.rb @@ -0,0 +1,33 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::Age1, 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[age1_known age1]) + end + + it "has the correct id" do + expect(page.id).to eq("buyer_1_age") + 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/age1_spec.rb b/spec/models/form/sales/questions/age1_spec.rb new file mode 100644 index 000000000..7739a123f --- /dev/null +++ b/spec/models/form/sales/questions/age1_spec.rb @@ -0,0 +1,41 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::Age1, 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("age1") + end + + it "has the correct header" do + expect(question.header).to eq("Age") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Lead buyer’s age") + end + + it "has the correct type" do + expect(question.type).to eq("numeric") + 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 be_nil + end + + it "has the correct width" do + expect(question.width).to eq(2) + end +end diff --git a/spec/models/form/sales/questions/buyer1_age_known_spec.rb b/spec/models/form/sales/questions/buyer1_age_known_spec.rb new file mode 100644 index 000000000..9a585cdb0 --- /dev/null +++ b/spec/models/form/sales/questions/buyer1_age_known_spec.rb @@ -0,0 +1,50 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::Buyer1AgeKnown, 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("age1_known") + end + + it "has the correct header" do + expect(question.header).to eq("Do you know buyer 1's age?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Buyer 1's age") + 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({ + "0" => { "value" => "Yes" }, + "1" => { "value" => "No" }, + }) + end + + it "has correct conditional for" do + expect(question.conditional_for).to eq({ + "age1" => [0], + }) + 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/setup_spec.rb b/spec/models/form/sales/subsections/setup_spec.rb index 1aab686ac..0fd5ffb0a 100644 --- a/spec/models/form/sales/subsections/setup_spec.rb +++ b/spec/models/form/sales/subsections/setup_spec.rb @@ -13,7 +13,7 @@ RSpec.describe Form::Sales::Subsections::Setup, type: :model do it "has correct pages" do expect(setup.pages.map(&:id)).to eq( - %w[organisation created_by completion_date purchaser_code ownership_scheme shared_ownership_type discounted_ownership_type outright_ownership_type joint_purchase number_joint_buyers], + %w[organisation created_by completion_date purchaser_code ownership_scheme shared_ownership_type discounted_ownership_type outright_ownership_type joint_purchase number_joint_buyers buyer_1_age], ) end diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index 289899a1e..3a0e12788 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(11) + expect(form.pages.count).to eq(13) 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(11) + expect(form.pages.count).to eq(13) expect(form.name).to eq("2021_2022_sales") end end diff --git a/spec/models/form_spec.rb b/spec/models/form_spec.rb index d92df3467..82d83de49 100644 --- a/spec/models/form_spec.rb +++ b/spec/models/form_spec.rb @@ -218,9 +218,9 @@ RSpec.describe Form, type: :model do expect(form.sections[0].class).to eq(Form::Sales::Sections::Setup) expect(form.subsections.count).to eq(1) expect(form.subsections.first.id).to eq("setup") - expect(form.pages.count).to eq(10) + expect(form.pages.count).to eq(11) expect(form.pages.first.id).to eq("organisation") - expect(form.questions.count).to eq(11) + expect(form.questions.count).to eq(13) expect(form.questions.first.id).to eq("owning_organisation_id") expect(form.start_date).to eq(Time.zone.parse("2022-04-01")) expect(form.end_date).to eq(Time.zone.parse("2023-07-01")) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index c50bec62f..462471744 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -72,7 +72,7 @@ RSpec.configure do |config| # # Allows RSpec to persist some state between runs in order to support # # the `--only-failures` and `--next-failure` CLI options. We recommend # # you configure your source control system to ignore this file. - # config.example_status_persistence_file_path = "spec/examples.txt" + config.example_status_persistence_file_path = "spec/examples.txt" # # # Limits the available syntax to the non-monkey patched syntax that is # # recommended. For more details, see: