Browse Source

add changes for buyer 2 age (#916)

pull/920/head
Dushan 2 years ago committed by GitHub
parent
commit
ae349cd68f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 19
      app/models/form/sales/pages/age2.rb
  2. 11
      app/models/form/sales/questions/age2.rb
  3. 19
      app/models/form/sales/questions/buyer2_age_known.rb
  4. 1
      app/models/form/sales/subsections/household_characteristics.rb
  5. 8
      db/migrate/20220929105157_add_buyer2_age_to_sales_log.rb
  6. 4
      db/schema.rb
  7. 2
      spec/factories/sales_log.rb
  8. 35
      spec/models/form/sales/pages/age2_spec.rb
  9. 41
      spec/models/form/sales/questions/age2_spec.rb
  10. 46
      spec/models/form/sales/questions/buyer2_age_known_spec.rb
  11. 2
      spec/models/form/sales/subsections/household_characteristics_spec.rb
  12. 4
      spec/models/form_handler_spec.rb

19
app/models/form/sales/pages/age2.rb

@ -0,0 +1,19 @@
class Form::Sales::Pages::Age2 < ::Form::Page
def initialize(id, hsh, subsection)
super
@id = "buyer_2_age"
@header = ""
@description = ""
@subsection = subsection
@depends_on = [{
"jointpur" => 1,
}]
end
def questions
@questions ||= [
Form::Sales::Questions::Buyer2AgeKnown.new(nil, nil, self),
Form::Sales::Questions::Age2.new(nil, nil, self),
]
end
end

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

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

19
app/models/form/sales/questions/buyer2_age_known.rb

@ -0,0 +1,19 @@
class Form::Sales::Questions::Buyer2AgeKnown < ::Form::Question
def initialize(id, hsh, page)
super
@id = "age2_known"
@check_answer_label = "Buyer 2’s age"
@header = "Do you know buyer 2’s age?"
@type = "radio"
@answer_options = ANSWER_OPTIONS
@page = page
@conditional_for = {
"age2" => [0],
}
end
ANSWER_OPTIONS = {
"0" => { "value" => "Yes" },
"1" => { "value" => "No" },
}.freeze
end

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

@ -12,6 +12,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
Form::Sales::Pages::Age1.new(nil, nil, self),
Form::Sales::Pages::GenderIdentity1.new(nil, nil, self),
Form::Sales::Pages::Buyer1LiveInProperty.new(nil, nil, self),
Form::Sales::Pages::Age2.new(nil, nil, self),
]
end
end

8
db/migrate/20220929105157_add_buyer2_age_to_sales_log.rb

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

4
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_28_132657) do
ActiveRecord::Schema[7.0].define(version: 2022_09_29_105157) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@ -340,6 +340,8 @@ ActiveRecord::Schema[7.0].define(version: 2022_09_28_132657) do
t.integer "buy1livein"
t.integer "buylivein"
t.integer "proptype"
t.integer "age2"
t.integer "age2_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

@ -24,6 +24,8 @@ FactoryBot.define do
sex1 { "X" }
buy1livein { 1 }
proptype { 1 }
age2_known { 0 }
age2 { 35 }
end
end
end

35
spec/models/form/sales/pages/age2_spec.rb

@ -0,0 +1,35 @@
require "rails_helper"
RSpec.describe Form::Sales::Pages::Age2, 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[age2_known age2])
end
it "has the correct id" do
expect(page.id).to eq("buyer_2_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([{
"jointpur" => 1,
}])
end
end

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

@ -0,0 +1,41 @@
require "rails_helper"
RSpec.describe Form::Sales::Questions::Age2, 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("age2")
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("Buyer 2’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

46
spec/models/form/sales/questions/buyer2_age_known_spec.rb

@ -0,0 +1,46 @@
require "rails_helper"
RSpec.describe Form::Sales::Questions::Buyer2AgeKnown, 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("age2_known")
end
it "has the correct header" do
expect(question.header).to eq("Do you know buyer 2’s age?")
end
it "has the correct check_answer_label" do
expect(question.check_answer_label).to eq("Buyer 2’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({
"age2" => [0],
})
end
end

2
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 buyer_1_live_in_property],
%w[buyer_1_age buyer_1_gender_identity buyer_1_live_in_property buyer_2_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(16)
expect(form.pages.count).to eq(17)
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(16)
expect(form.pages.count).to eq(17)
expect(form.name).to eq("2021_2022_sales")
end
end

Loading…
Cancel
Save