Browse Source

Cldc 1529 person 1 age (#939)

* feat: add person 1 age question

* feat: add new tests and fix old tests

* feat: linting
pull/938/head^2
natdeanlewissoftwire 2 years ago committed by GitHub
parent
commit
72dfcbf8db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 22
      app/models/form/sales/pages/person1_age.rb
  2. 11
      app/models/form/sales/questions/person1_age.rb
  3. 27
      app/models/form/sales/questions/person1_age_known.rb
  4. 1
      app/models/form/sales/subsections/household_characteristics.rb
  5. 8
      db/migrate/20221007093606_add_person1_age_to_sales_log.rb
  6. 7
      db/schema.rb
  7. 2
      spec/factories/sales_log.rb
  8. 40
      spec/models/form/sales/pages/person1_age_spec.rb
  9. 62
      spec/models/form/sales/questions/person1_age_known_spec.rb
  10. 41
      spec/models/form/sales/questions/person1_age_spec.rb
  11. 1
      spec/models/form/sales/subsections/household_characteristics_spec.rb
  12. 4
      spec/models/form_handler_spec.rb

22
app/models/form/sales/pages/person1_age.rb

@ -0,0 +1,22 @@
class Form::Sales::Pages::Person1Age < ::Form::Page
def initialize(id, hsh, subsection)
super
@id = "person_1_age"
@header = ""
@description = ""
@subsection = subsection
@depends_on = [
{ "hholdcount" => 1 },
{ "hholdcount" => 2 },
{ "hholdcount" => 3 },
{ "hholdcount" => 4 },
]
end
def questions
@questions ||= [
Form::Sales::Questions::Person1AgeKnown.new(nil, nil, self),
Form::Sales::Questions::Person1Age.new(nil, nil, self),
]
end
end

11
app/models/form/sales/questions/person1_age.rb

@ -0,0 +1,11 @@
class Form::Sales::Questions::Person1Age < ::Form::Question
def initialize(id, hsh, page)
super
@id = "age3"
@check_answer_label = "Person 1’s age"
@header = "Age"
@type = "numeric"
@page = page
@width = 3
end
end

27
app/models/form/sales/questions/person1_age_known.rb

@ -0,0 +1,27 @@
class Form::Sales::Questions::Person1AgeKnown < ::Form::Question
def initialize(id, hsh, page)
super
@id = "age3_known"
@check_answer_label = "Person 1’s age known?"
@header = "Do you know person 1’s age?"
@type = "radio"
@answer_options = ANSWER_OPTIONS
@page = page
@hint_text = ""
@conditional_for = {
"age3" => [0],
}
@hidden_in_check_answers = {
"depends_on" => [
{
"age3_known" => 0,
},
],
}
end
ANSWER_OPTIONS = {
"0" => { "value" => "Yes" },
"1" => { "value" => "No" },
}.freeze
end

1
app/models/form/sales/subsections/household_characteristics.rb

@ -28,6 +28,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
Form::Sales::Pages::Buyer2WorkingSituation.new(nil, nil, self),
Form::Sales::Pages::Buyer2LiveInProperty.new(nil, nil, self),
Form::Sales::Pages::NumberOfOthersInProperty.new(nil, nil, self),
Form::Sales::Pages::Person1Age.new(nil, nil, self),
]
end
end

8
db/migrate/20221007093606_add_person1_age_to_sales_log.rb

@ -0,0 +1,8 @@
class AddPerson1AgeToSalesLog < ActiveRecord::Migration[7.0]
def change
change_table :sales_logs, bulk: true do |t|
t.column :age3, :integer
t.column :age3_known, :integer
end
end
end

7
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_10_05_150022) do
ActiveRecord::Schema[7.0].define(version: 2022_10_07_093606) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@ -348,15 +348,16 @@ ActiveRecord::Schema[7.0].define(version: 2022_10_05_150022) do
t.integer "age2"
t.integer "age2_known"
t.string "relat2"
t.string "otherrelat2"
t.string "sex2"
t.integer "noint"
t.integer "buy2livein"
t.integer "ecstat2"
t.integer "privacynotice"
t.integer "ecstat1"
t.integer "hholdcount"
t.integer "wheel"
t.integer "hholdcount"
t.integer "age3"
t.integer "age3_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"

2
spec/factories/sales_log.rb

@ -39,6 +39,8 @@ FactoryBot.define do
ecstat2 { "1" }
hholdcount { "1" }
wheel { 1 }
age3_known { 0 }
age3 { 40 }
end
end
end

40
spec/models/form/sales/pages/person1_age_spec.rb

@ -0,0 +1,40 @@
require "rails_helper"
RSpec.describe Form::Sales::Pages::Person1Age, 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[age3_known age3])
end
it "has the correct id" do
expect(page.id).to eq("person_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 eq(
[
{ "hholdcount" => 1 },
{ "hholdcount" => 2 },
{ "hholdcount" => 3 },
{ "hholdcount" => 4 },
],
)
end
end

62
spec/models/form/sales/questions/person1_age_known_spec.rb

@ -0,0 +1,62 @@
require "rails_helper"
RSpec.describe Form::Sales::Questions::Person1AgeKnown, 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("age3_known")
end
it "has the correct header" do
expect(question.header).to eq("Do you know person 1’s age?")
end
it "has the correct check_answer_label" do
expect(question.check_answer_label).to eq("Person 1’s age known?")
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({
"age3" => [0],
})
end
it "has the correct hint" do
expect(question.hint_text).to eq("")
end
it "has the correct hidden_in_check_answers" do
expect(question.hidden_in_check_answers).to eq(
{
"depends_on" => [
{
"age3_known" => 0,
},
],
},
)
end
end

41
spec/models/form/sales/questions/person1_age_spec.rb

@ -0,0 +1,41 @@
require "rails_helper"
RSpec.describe Form::Sales::Questions::Person1Age, 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("age3")
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("Person 1’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(3)
end
end

1
spec/models/form/sales/subsections/household_characteristics_spec.rb

@ -33,6 +33,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
buyer_2_working_situation
buyer_2_live_in_property
number_of_others_in_property
person_1_age
],
)
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
form = form_handler.get_form("current_sales")
expect(form).to be_a(Form)
expect(form.pages.count).to eq(35)
expect(form.pages.count).to eq(36)
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(35)
expect(form.pages.count).to eq(36)
expect(form.name).to eq("2021_2022_sales")
end
end

Loading…
Cancel
Save