Browse Source

[CLDC-1524] Add buyer 2 gender question (#926)

* changes for buyer 2 gender

* Rubocop

Co-authored-by: Jack S <jacopo.scotti@softwire.com>
pull/927/head
Dushan 2 years ago committed by GitHub
parent
commit
04c2e7b638
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 18
      app/models/form/sales/pages/gender_identity2.rb
  2. 18
      app/models/form/sales/questions/gender_identity2.rb
  3. 1
      app/models/form/sales/subsections/household_characteristics.rb
  4. 5
      db/migrate/20220930134358_add_buyer2_sex_to_sales_log.rb
  5. 7
      db/schema.rb
  6. 1
      spec/factories/sales_log.rb
  7. 35
      spec/models/form/sales/pages/gender_identity2_spec.rb
  8. 42
      spec/models/form/sales/questions/gender_identity2_spec.rb
  9. 1
      spec/models/form/sales/subsections/household_characteristics_spec.rb
  10. 4
      spec/models/form_handler_spec.rb

18
app/models/form/sales/pages/gender_identity2.rb

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

18
app/models/form/sales/questions/gender_identity2.rb

@ -0,0 +1,18 @@
class Form::Sales::Questions::GenderIdentity2 < ::Form::Question
def initialize(id, hsh, page)
super
@id = "sex2"
@check_answer_label = "Buyer 2’s gender identity"
@header = "Which of these best describes buyer 2’s gender identity?"
@type = "radio"
@page = page
@answer_options = ANSWER_OPTIONS
end
ANSWER_OPTIONS = {
"F" => { "value" => "Female" },
"M" => { "value" => "Male" },
"X" => { "value" => "Non-binary" },
"R" => { "value" => "Buyer prefers not to say" },
}.freeze
end

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

@ -20,6 +20,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
Form::Sales::Pages::Buyer1EthnicBackgroundMixed.new(nil, nil, self),
Form::Sales::Pages::Buyer1EthnicBackgroundWhite.new(nil, nil, self),
Form::Sales::Pages::Age2.new(nil, nil, self),
Form::Sales::Pages::GenderIdentity2.new(nil, nil, self),
]
end
end

5
db/migrate/20220930134358_add_buyer2_sex_to_sales_log.rb

@ -0,0 +1,5 @@
class AddBuyer2SexToSalesLog < ActiveRecord::Migration[7.0]
def change
add_column :sales_logs, :sex2, :string
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_09_29_125204) do
ActiveRecord::Schema[7.0].define(version: 2022_09_30_134358) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@ -341,12 +341,13 @@ ActiveRecord::Schema[7.0].define(version: 2022_09_29_125204) do
t.integer "buylivein"
t.integer "builtype"
t.integer "proptype"
t.string "relat2"
t.string "otherrelat2"
t.integer "age2"
t.integer "age2_known"
t.integer "ethnic"
t.integer "ethnic_group"
t.string "relat2"
t.string "otherrelat2"
t.string "sex2"
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"

1
spec/factories/sales_log.rb

@ -31,6 +31,7 @@ FactoryBot.define do
builtype { 1 }
ethnic { 3 }
ethnic_group { 12 }
sex2 { "X" }
end
end
end

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

@ -0,0 +1,35 @@
require "rails_helper"
RSpec.describe Form::Sales::Pages::GenderIdentity2, 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[sex2])
end
it "has the correct id" do
expect(page.id).to eq("buyer_2_gender_identity")
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

42
spec/models/form/sales/questions/gender_identity2_spec.rb

@ -0,0 +1,42 @@
require "rails_helper"
RSpec.describe Form::Sales::Questions::GenderIdentity2, 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("sex2")
end
it "has the correct header" do
expect(question.header).to eq("Which of these best describes buyer 2’s gender identity?")
end
it "has the correct check_answer_label" do
expect(question.check_answer_label).to eq("Buyer 2’s gender identity")
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({
"F" => { "value" => "Female" },
"M" => { "value" => "Male" },
"X" => { "value" => "Non-binary" },
"R" => { "value" => "Buyer prefers not to say" },
})
end
end

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

@ -25,6 +25,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
buyer_1_ethnic_background_mixed
buyer_1_ethnic_background_white
buyer_2_age
buyer_2_gender_identity
],
)
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(26)
expect(form.pages.count).to eq(27)
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(26)
expect(form.pages.count).to eq(27)
expect(form.name).to eq("2021_2022_sales")
end
end

Loading…
Cancel
Save