From 2698ea1f4a429c0e3c638803ebde47c51db94a0a Mon Sep 17 00:00:00 2001
From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com>
Date: Mon, 26 Sep 2022 17:40:36 +0100
Subject: [PATCH] Cldc 1485 lead tenant gender (#902)

* Add gender 1 question

* Add gender identity 1 page

* rename files

* Add specs, add page to subsection

* Add sex1 column

* Add answer options to the gender question

* update tests, add depends on for subsection

* remove buyer_1_age from setup

* Change quotes to apostrophes

* Tests
---
 .../form/sales/pages/gender_identity1.rb      | 15 ++++++
 .../form/sales/questions/buyer1_age_known.rb  |  6 +--
 .../form/sales/questions/gender_identity1.rb  | 19 ++++++++
 .../subsections/household_characteristics.rb  |  2 +
 app/models/form/sales/subsections/setup.rb    |  1 -
 db/migrate/20220926153206_add_sex1_column.rb  |  5 ++
 db/schema.rb                                  |  3 +-
 spec/factories/sales_log.rb                   |  1 +
 .../form/sales/pages/gender_identity1_spec.rb | 33 +++++++++++++
 .../sales/questions/buyer1_age_known_spec.rb  |  6 +--
 .../sales/questions/gender_identity1_spec.rb  | 46 +++++++++++++++++++
 .../household_characteristics_spec.rb         |  6 ++-
 .../form/sales/subsections/setup_spec.rb      |  2 +-
 spec/models/form_spec.rb                      |  4 +-
 14 files changed, 137 insertions(+), 12 deletions(-)
 create mode 100644 app/models/form/sales/pages/gender_identity1.rb
 create mode 100644 app/models/form/sales/questions/gender_identity1.rb
 create mode 100644 db/migrate/20220926153206_add_sex1_column.rb
 create mode 100644 spec/models/form/sales/pages/gender_identity1_spec.rb
 create mode 100644 spec/models/form/sales/questions/gender_identity1_spec.rb

diff --git a/app/models/form/sales/pages/gender_identity1.rb b/app/models/form/sales/pages/gender_identity1.rb
new file mode 100644
index 000000000..9a92a16e9
--- /dev/null
+++ b/app/models/form/sales/pages/gender_identity1.rb
@@ -0,0 +1,15 @@
+class Form::Sales::Pages::GenderIdentity1 < ::Form::Page
+  def initialize(id, hsh, subsection)
+    super
+    @id = "buyer_1_gender_identity"
+    @header = ""
+    @description = ""
+    @subsection = subsection
+  end
+
+  def questions
+    @questions ||= [
+      Form::Sales::Questions::GenderIdentity1.new(nil, nil, self),
+    ]
+  end
+end
diff --git a/app/models/form/sales/questions/buyer1_age_known.rb b/app/models/form/sales/questions/buyer1_age_known.rb
index 234cb6be8..6eff9bb1e 100644
--- a/app/models/form/sales/questions/buyer1_age_known.rb
+++ b/app/models/form/sales/questions/buyer1_age_known.rb
@@ -2,12 +2,12 @@ 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?"
+    @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."
+    @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],
     }
diff --git a/app/models/form/sales/questions/gender_identity1.rb b/app/models/form/sales/questions/gender_identity1.rb
new file mode 100644
index 000000000..f5b6edbb6
--- /dev/null
+++ b/app/models/form/sales/questions/gender_identity1.rb
@@ -0,0 +1,19 @@
+class Form::Sales::Questions::GenderIdentity1 < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "sex1"
+    @check_answer_label = "Buyer 1’s gender identity"
+    @header = "Which of these best describes buyer 1’s gender identity?"
+    @type = "radio"
+    @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."
+    @page = page
+    @answer_options = ANSWER_OPTIONS
+  end
+
+  ANSWER_OPTIONS = {
+    "F" => { "value" => "Female" },
+    "M" => { "value" => "Male" },
+    "X" => { "value" => "Non-binary" },
+    "R" => { "value" => "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 b03de9ef5..999c9bbd4 100644
--- a/app/models/form/sales/subsections/household_characteristics.rb
+++ b/app/models/form/sales/subsections/household_characteristics.rb
@@ -4,11 +4,13 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
     @id = "household_characteristics"
     @label = "Household characteristics"
     @section = section
+    @depends_on = [{ "setup" => "completed" }]
   end
 
   def pages
     @pages ||= [
       Form::Sales::Pages::Age1.new(nil, nil, self),
+      Form::Sales::Pages::GenderIdentity1.new(nil, nil, self),
     ]
   end
 end
diff --git a/app/models/form/sales/subsections/setup.rb b/app/models/form/sales/subsections/setup.rb
index 2d415b3c7..0eba081e2 100644
--- a/app/models/form/sales/subsections/setup.rb
+++ b/app/models/form/sales/subsections/setup.rb
@@ -18,7 +18,6 @@ class Form::Sales::Subsections::Setup < ::Form::Subsection
       Form::Sales::Pages::OutrightOwnershipType.new(nil, nil, self),
       Form::Sales::Pages::JointPurchase.new(nil, nil, self),
       Form::Sales::Pages::NumberJointBuyers.new(nil, nil, self),
-      Form::Sales::Pages::Age1.new(nil, nil, self),
     ]
   end
 end
diff --git a/db/migrate/20220926153206_add_sex1_column.rb b/db/migrate/20220926153206_add_sex1_column.rb
new file mode 100644
index 000000000..bef6e7662
--- /dev/null
+++ b/db/migrate/20220926153206_add_sex1_column.rb
@@ -0,0 +1,5 @@
+class AddSex1Column < ActiveRecord::Migration[7.0]
+  def change
+    add_column :sales_logs, :sex1, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index ad1371b85..a0a10507d 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_09_23_093628) do
+ActiveRecord::Schema[7.0].define(version: 2022_09_26_153206) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -338,6 +338,7 @@ ActiveRecord::Schema[7.0].define(version: 2022_09_23_093628) do
     t.integer "beds"
     t.integer "age1"
     t.integer "age1_known"
+    t.string "sex1"
     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/factories/sales_log.rb b/spec/factories/sales_log.rb
index 5e430a6aa..d65f0345d 100644
--- a/spec/factories/sales_log.rb
+++ b/spec/factories/sales_log.rb
@@ -21,6 +21,7 @@ FactoryBot.define do
       jointmore { 1 }
       age1_known { 0 }
       age1 { 30 }
+      sex1 { "X" }
     end
   end
 end
diff --git a/spec/models/form/sales/pages/gender_identity1_spec.rb b/spec/models/form/sales/pages/gender_identity1_spec.rb
new file mode 100644
index 000000000..fe4e4ff87
--- /dev/null
+++ b/spec/models/form/sales/pages/gender_identity1_spec.rb
@@ -0,0 +1,33 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::GenderIdentity1, 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[sex1])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq("buyer_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 be_nil
+  end
+end
diff --git a/spec/models/form/sales/questions/buyer1_age_known_spec.rb b/spec/models/form/sales/questions/buyer1_age_known_spec.rb
index 9a585cdb0..c07fb5864 100644
--- a/spec/models/form/sales/questions/buyer1_age_known_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_age_known_spec.rb
@@ -16,11 +16,11 @@ RSpec.describe Form::Sales::Questions::Buyer1AgeKnown, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Do you know buyer 1's age?")
+    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")
+    expect(question.check_answer_label).to eq("Buyer 1’s age")
   end
 
   it "has the correct type" do
@@ -45,6 +45,6 @@ RSpec.describe Form::Sales::Questions::Buyer1AgeKnown, type: :model do
   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.")
+    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
diff --git a/spec/models/form/sales/questions/gender_identity1_spec.rb b/spec/models/form/sales/questions/gender_identity1_spec.rb
new file mode 100644
index 000000000..a09d0bcf9
--- /dev/null
+++ b/spec/models/form/sales/questions/gender_identity1_spec.rb
@@ -0,0 +1,46 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::GenderIdentity1, 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("sex1")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("Which of these best describes buyer 1’s gender identity?")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("Buyer 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 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
+
+  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" => "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 b8c3d3e71..e99dddb55 100644
--- a/spec/models/form/sales/subsections/household_characteristics_spec.rb
+++ b/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],
+      %w[buyer_1_age buyer_1_gender_identity],
     )
   end
 
@@ -24,4 +24,8 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
   it "has the correct label" do
     expect(household_characteristics.label).to eq("Household characteristics")
   end
+
+  it "has correct depends on" do
+    expect(household_characteristics.depends_on).to eq([{ "setup" => "completed" }])
+  end
 end
diff --git a/spec/models/form/sales/subsections/setup_spec.rb b/spec/models/form/sales/subsections/setup_spec.rb
index 0fd5ffb0a..1aab686ac 100644
--- a/spec/models/form/sales/subsections/setup_spec.rb
+++ b/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
     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 buyer_1_age],
+      %w[organisation created_by completion_date purchaser_code ownership_scheme shared_ownership_type discounted_ownership_type outright_ownership_type joint_purchase number_joint_buyers],
     )
   end
 
diff --git a/spec/models/form_spec.rb b/spec/models/form_spec.rb
index fef3be5d7..7eb2fee3f 100644
--- a/spec/models/form_spec.rb
+++ b/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.subsections.count).to eq(1)
       expect(form.subsections.first.id).to eq("setup")
-      expect(form.pages.count).to eq(11)
+      expect(form.pages.count).to eq(10)
       expect(form.pages.first.id).to eq("organisation")
-      expect(form.questions.count).to eq(13)
+      expect(form.questions.count).to eq(11)
       expect(form.questions.first.id).to eq("owning_organisation_id")
       expect(form.start_date).to eq(Time.zone.parse("2022-04-01"))
       expect(form.end_date).to eq(Time.zone.parse("2023-07-01"))