Browse Source

[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
pull/903/head
bibblobcode 2 years ago committed by GitHub
parent
commit
3b2b207c71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .gitignore
  2. 16
      app/models/form/sales/pages/age1.rb
  3. 11
      app/models/form/sales/questions/age1.rb
  4. 20
      app/models/form/sales/questions/buyer1_age_known.rb
  5. 10
      app/models/form/sales/sections/household.rb
  6. 14
      app/models/form/sales/subsections/household_characteristics.rb
  7. 1
      app/models/form/sales/subsections/setup.rb
  8. 5
      app/models/form_handler.rb
  9. 8
      db/migrate/20220922084008_add_age1_to_sales_logs.rb
  10. 6
      db/schema.rb
  11. 2
      spec/factories/sales_log.rb
  12. 33
      spec/models/form/sales/pages/age1_spec.rb
  13. 41
      spec/models/form/sales/questions/age1_spec.rb
  14. 50
      spec/models/form/sales/questions/buyer1_age_known_spec.rb
  15. 2
      spec/models/form/sales/subsections/setup_spec.rb
  16. 4
      spec/models/form_handler_spec.rb
  17. 4
      spec/models/form_spec.rb
  18. 2
      spec/spec_helper.rb

2
.gitignore vendored

@ -55,3 +55,5 @@ yarn-debug.log*
/app/assets/builds/* /app/assets/builds/*
!/app/assets/builds/.keep !/app/assets/builds/.keep
spec/examples.txt

16
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

11
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

20
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

10
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

14
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

1
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::OutrightOwnershipType.new(nil, nil, self),
Form::Sales::Pages::JointPurchase.new(nil, nil, self), Form::Sales::Pages::JointPurchase.new(nil, nil, self),
Form::Sales::Pages::NumberJointBuyers.new(nil, nil, self), Form::Sales::Pages::NumberJointBuyers.new(nil, nil, self),
Form::Sales::Pages::Age1.new(nil, nil, self),
] ]
end end
end end

5
app/models/form_handler.rb

@ -19,7 +19,10 @@ class FormHandler
end end
def sales_forms 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") 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") previous_form = Form.new(nil, current_collection_start_year - 1, sales_sections, "sales")
{ "current_sales" => current_form, { "current_sales" => current_form,

8
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

6
db/schema.rb

@ -333,9 +333,11 @@ ActiveRecord::Schema[7.0].define(version: 2022_09_23_093628) do
t.integer "type" t.integer "type"
t.integer "ownershipsch" t.integer "ownershipsch"
t.string "othtype" t.string "othtype"
t.integer "beds"
t.integer "jointmore"
t.integer "jointpur" 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 ["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 ["managing_organisation_id"], name: "index_sales_logs_on_managing_organisation_id"
t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id" t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id"

2
spec/factories/sales_log.rb

@ -19,6 +19,8 @@ FactoryBot.define do
jointpur { 1 } jointpur { 1 }
beds { 2 } beds { 2 }
jointmore { 1 } jointmore { 1 }
age1_known { 0 }
age1 { 30 }
end end
end end
end end

33
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

41
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

50
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

2
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 it "has correct pages" do
expect(setup.pages.map(&:id)).to eq( 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 end

4
spec/models/form_handler_spec.rb

@ -61,14 +61,14 @@ RSpec.describe FormHandler do
it "is able to load a current sales form" do it "is able to load a current sales form" do
form = form_handler.get_form("current_sales") form = form_handler.get_form("current_sales")
expect(form).to be_a(Form) 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") expect(form.name).to eq("2022_2023_sales")
end end
it "is able to load a previous sales form" do it "is able to load a previous sales form" do
form = form_handler.get_form("previous_sales") form = form_handler.get_form("previous_sales")
expect(form).to be_a(Form) 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") expect(form.name).to eq("2021_2022_sales")
end end
end end

4
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.sections[0].class).to eq(Form::Sales::Sections::Setup)
expect(form.subsections.count).to eq(1) expect(form.subsections.count).to eq(1)
expect(form.subsections.first.id).to eq("setup") 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.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.questions.first.id).to eq("owning_organisation_id")
expect(form.start_date).to eq(Time.zone.parse("2022-04-01")) expect(form.start_date).to eq(Time.zone.parse("2022-04-01"))
expect(form.end_date).to eq(Time.zone.parse("2023-07-01")) expect(form.end_date).to eq(Time.zone.parse("2023-07-01"))

2
spec/spec_helper.rb

@ -72,7 +72,7 @@ RSpec.configure do |config|
# # Allows RSpec to persist some state between runs in order to support # # Allows RSpec to persist some state between runs in order to support
# # the `--only-failures` and `--next-failure` CLI options. We recommend # # the `--only-failures` and `--next-failure` CLI options. We recommend
# # you configure your source control system to ignore this file. # # 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 # # Limits the available syntax to the non-monkey patched syntax that is
# # recommended. For more details, see: # # recommended. For more details, see:

Loading…
Cancel
Save