From dedad2f093eb62adfc09e49624e9f93e747f3c80 Mon Sep 17 00:00:00 2001 From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com> Date: Wed, 7 Dec 2022 16:43:49 +0000 Subject: [PATCH] Cldc 1536 gender identity (#1058) * Add gender identity 3 comumn to the sales table * Add gender identity for person 1 * Add gender identity for person 1 when there is only 1 buyer * Add person 1 gender identity page to subsection * Rename questions and pages * fix tests --- .../sales/pages/person1_gender_identity.rb | 19 ++++++++ .../person1_gender_identity_joint_purchase.rb | 19 ++++++++ .../questions/person1_gender_identity.rb | 19 ++++++++ .../person1_gender_identity_joint_purchase.rb | 19 ++++++++ .../subsections/household_characteristics.rb | 2 + db/migrate/20221206081127_add_sex3_column.rb | 5 ++ db/schema.rb | 5 +- ...on1_gender_identity_joint_purchase_spec.rb | 36 +++++++++++++++ .../pages/person1_gender_identity_spec.rb | 36 +++++++++++++++ ...on1_gender_identity_joint_purchase_spec.rb | 46 +++++++++++++++++++ .../questions/person1_gender_identity_spec.rb | 46 +++++++++++++++++++ .../household_characteristics_spec.rb | 2 + spec/models/form_handler_spec.rb | 4 +- 13 files changed, 254 insertions(+), 4 deletions(-) create mode 100644 app/models/form/sales/pages/person1_gender_identity.rb create mode 100644 app/models/form/sales/pages/person1_gender_identity_joint_purchase.rb create mode 100644 app/models/form/sales/questions/person1_gender_identity.rb create mode 100644 app/models/form/sales/questions/person1_gender_identity_joint_purchase.rb create mode 100644 db/migrate/20221206081127_add_sex3_column.rb create mode 100644 spec/models/form/sales/pages/person1_gender_identity_joint_purchase_spec.rb create mode 100644 spec/models/form/sales/pages/person1_gender_identity_spec.rb create mode 100644 spec/models/form/sales/questions/person1_gender_identity_joint_purchase_spec.rb create mode 100644 spec/models/form/sales/questions/person1_gender_identity_spec.rb diff --git a/app/models/form/sales/pages/person1_gender_identity.rb b/app/models/form/sales/pages/person1_gender_identity.rb new file mode 100644 index 000000000..ec9f8269d --- /dev/null +++ b/app/models/form/sales/pages/person1_gender_identity.rb @@ -0,0 +1,19 @@ +class Form::Sales::Pages::Person1GenderIdentity < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "person_1_gender_identity" + @header = "" + @description = "" + @subsection = subsection + @depends_on = [{ + "jointpur" => 2, + "details_known_2" => 1, + }] + end + + def questions + @questions ||= [ + Form::Sales::Questions::Person1GenderIdentity.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/pages/person1_gender_identity_joint_purchase.rb b/app/models/form/sales/pages/person1_gender_identity_joint_purchase.rb new file mode 100644 index 000000000..24e9f1114 --- /dev/null +++ b/app/models/form/sales/pages/person1_gender_identity_joint_purchase.rb @@ -0,0 +1,19 @@ +class Form::Sales::Pages::Person1GenderIdentityJointPurchase < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "person_1_gender_identity_joint_purchase" + @header = "" + @description = "" + @subsection = subsection + @depends_on = [{ + "jointpur" => 1, + "details_known_3" => 1, + }] + end + + def questions + @questions ||= [ + Form::Sales::Questions::Person1GenderIdentityJointPurchase.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/person1_gender_identity.rb b/app/models/form/sales/questions/person1_gender_identity.rb new file mode 100644 index 000000000..8cf8f29af --- /dev/null +++ b/app/models/form/sales/questions/person1_gender_identity.rb @@ -0,0 +1,19 @@ +class Form::Sales::Questions::Person1GenderIdentity < ::Form::Question + def initialize(id, hsh, page) + super + @id = "sex2" + @check_answer_label = "Person 1’s gender identity" + @header = "Which of these best describes Person 1’s gender identity?" + @type = "radio" + @page = page + @answer_options = ANSWER_OPTIONS + @check_answers_card_number = 2 + end + + ANSWER_OPTIONS = { + "F" => { "value" => "Female" }, + "M" => { "value" => "Male" }, + "X" => { "value" => "Non-binary" }, + "R" => { "value" => "Buyer prefers not to say" }, + }.freeze +end diff --git a/app/models/form/sales/questions/person1_gender_identity_joint_purchase.rb b/app/models/form/sales/questions/person1_gender_identity_joint_purchase.rb new file mode 100644 index 000000000..1127bf313 --- /dev/null +++ b/app/models/form/sales/questions/person1_gender_identity_joint_purchase.rb @@ -0,0 +1,19 @@ +class Form::Sales::Questions::Person1GenderIdentityJointPurchase < ::Form::Question + def initialize(id, hsh, page) + super + @id = "sex3" + @check_answer_label = "Person 1’s gender identity" + @header = "Which of these best describes Person 1’s gender identity?" + @type = "radio" + @page = page + @answer_options = ANSWER_OPTIONS + @check_answers_card_number = 3 + end + + ANSWER_OPTIONS = { + "F" => { "value" => "Female" }, + "M" => { "value" => "Male" }, + "X" => { "value" => "Non-binary" }, + "R" => { "value" => "Buyer prefers not to say" }, + }.freeze +end diff --git a/app/models/form/sales/subsections/household_characteristics.rb b/app/models/form/sales/subsections/household_characteristics.rb index 5a8eeef83..541b7734b 100644 --- a/app/models/form/sales/subsections/household_characteristics.rb +++ b/app/models/form/sales/subsections/household_characteristics.rb @@ -29,6 +29,8 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection Form::Sales::Pages::Buyer2LiveInProperty.new(nil, nil, self), Form::Sales::Pages::NumberOfOthersInProperty.new(nil, nil, self), Form::Sales::Pages::Person1Age.new(nil, nil, self), + Form::Sales::Pages::Person1GenderIdentity.new(nil, nil, self), + Form::Sales::Pages::Person1GenderIdentityJointPurchase.new(nil, nil, self), Form::Sales::Pages::Person2Known.new(nil, nil, self), Form::Sales::Pages::Person2Age.new(nil, nil, self), Form::Sales::Pages::Person3Known.new(nil, nil, self), diff --git a/db/migrate/20221206081127_add_sex3_column.rb b/db/migrate/20221206081127_add_sex3_column.rb new file mode 100644 index 000000000..dc7e26bc3 --- /dev/null +++ b/db/migrate/20221206081127_add_sex3_column.rb @@ -0,0 +1,5 @@ +class AddSex3Column < ActiveRecord::Migration[7.0] + def change + add_column :sales_logs, :sex3, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 912eba818..70daf01b5 100644 --- a/db/schema.rb +++ b/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_12_02_100512) do +ActiveRecord::Schema[7.0].define(version: 2022_12_06_081127) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -387,9 +387,10 @@ ActiveRecord::Schema[7.0].define(version: 2022_12_02_100512) do t.integer "inc1mort" t.integer "income2" t.integer "income2nk" + t.integer "prevown" t.integer "savingsnk" t.integer "savings" - t.integer "prevown" + t.string "sex3" 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/models/form/sales/pages/person1_gender_identity_joint_purchase_spec.rb b/spec/models/form/sales/pages/person1_gender_identity_joint_purchase_spec.rb new file mode 100644 index 000000000..04e7dd91d --- /dev/null +++ b/spec/models/form/sales/pages/person1_gender_identity_joint_purchase_spec.rb @@ -0,0 +1,36 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::Person1GenderIdentityJointPurchase, 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[sex3]) + end + + it "has the correct id" do + expect(page.id).to eq("person_1_gender_identity_joint_purchase") + 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, + "details_known_3" => 1, + }]) + end +end diff --git a/spec/models/form/sales/pages/person1_gender_identity_spec.rb b/spec/models/form/sales/pages/person1_gender_identity_spec.rb new file mode 100644 index 000000000..213f7ed7c --- /dev/null +++ b/spec/models/form/sales/pages/person1_gender_identity_spec.rb @@ -0,0 +1,36 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::Person1GenderIdentity, 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("person_1_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" => 2, + "details_known_2" => 1, + }]) + end +end diff --git a/spec/models/form/sales/questions/person1_gender_identity_joint_purchase_spec.rb b/spec/models/form/sales/questions/person1_gender_identity_joint_purchase_spec.rb new file mode 100644 index 000000000..d1d97ba3d --- /dev/null +++ b/spec/models/form/sales/questions/person1_gender_identity_joint_purchase_spec.rb @@ -0,0 +1,46 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::Person1GenderIdentityJointPurchase, 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("sex3") + end + + it "has the correct header" do + expect(question.header).to eq("Which of these best describes Person 1’s gender identity?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Person 1’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 expected check answers card number" do + expect(question.check_answers_card_number).to eq(3) + 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 diff --git a/spec/models/form/sales/questions/person1_gender_identity_spec.rb b/spec/models/form/sales/questions/person1_gender_identity_spec.rb new file mode 100644 index 000000000..41adde38a --- /dev/null +++ b/spec/models/form/sales/questions/person1_gender_identity_spec.rb @@ -0,0 +1,46 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::Person1GenderIdentity, 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 Person 1’s gender identity?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Person 1’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 expected check answers card number" do + expect(question.check_answers_card_number).to eq(2) + 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 diff --git a/spec/models/form/sales/subsections/household_characteristics_spec.rb b/spec/models/form/sales/subsections/household_characteristics_spec.rb index 7aec7d56a..0146e9aea 100644 --- a/spec/models/form/sales/subsections/household_characteristics_spec.rb +++ b/spec/models/form/sales/subsections/household_characteristics_spec.rb @@ -34,6 +34,8 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model buyer_2_live_in_property number_of_others_in_property person_1_age + person_1_gender_identity + person_1_gender_identity_joint_purchase person_2_known person_2_age person_3_known diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index b6efb7bbd..f9d03aa36 100644 --- a/spec/models/form_handler_spec.rb +++ b/spec/models/form_handler_spec.rb @@ -52,14 +52,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(48) + expect(form.pages.count).to eq(50) 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(48) + expect(form.pages.count).to eq(50) expect(form.name).to eq("2021_2022_sales") end end