[CLDC-1486] Add ethnic group and background questions (#922)

* Add derived variables to sales log

* Add ethnic background question

* Add inferred question response

* Test inferred check questions of lettings logs

app/models/derived_variables/sales_log_variables.rb

@@ -0,0 +1,5 @@
+module DerivedVariables::SalesLogVariables
+  def set_derived_fields!
+    self.ethnic = 17 if ethnic_refused?
+  end
+end

app/models/form/question.rb

@@ -50,9 +50,11 @@ class Form::Question
 
     answer = label_from_value(log[id]) if log[id].present?
     answer_label = [prefix, format_value(answer), suffix_label(log)].join("") if answer
-    return answer_label if answer_label
 
-    has_inferred_check_answers_value?(log) ? inferred_check_answers_value["value"] : ""
+    inferred = inferred_check_answers_value["value"] if has_inferred_check_answers_value?(log)
+    return inferred if inferred.present?
+
+    answer_label
   end
 
   def get_inferred_answers(log)

app/models/form/sales/pages/buyer1_ethnic_background_arab.rb

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

app/models/form/sales/pages/buyer1_ethnic_background_asian.rb

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

app/models/form/sales/pages/buyer1_ethnic_background_black.rb

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

app/models/form/sales/pages/buyer1_ethnic_background_mixed.rb

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

app/models/form/sales/pages/buyer1_ethnic_background_white.rb

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

app/models/form/sales/pages/buyer1_ethnic_group.rb

@@ -0,0 +1,15 @@
+class Form::Sales::Pages::Buyer1EthnicGroup < ::Form::Page
+  def initialize(id, hsh, subsection)
+    super
+    @id = "buyer_1_ethnic_group"
+    @header = ""
+    @description = ""
+    @subsection = subsection
+  end
+
+  def questions
+    @questions ||= [
+      Form::Sales::Questions::Buyer1EthnicGroup.new(nil, nil, self),
+    ]
+  end
+end

app/models/form/sales/questions/buyer1_ethnic_background_arab.rb

@@ -0,0 +1,17 @@
+class Form::Sales::Questions::Buyer1EthnicBackgroundArab < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "ethnic"
+    @check_answer_label = "Buyer 1’s ethnic background"
+    @header = "Which of the following best describes the buyer 1’s Arab background?"
+    @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."
+  end
+
+  ANSWER_OPTIONS = {
+    "19" => { "value" => "Arab" },
+    "16" => { "value" => "Other ethnic group" },
+  }.freeze
+end

app/models/form/sales/questions/buyer1_ethnic_background_asian.rb

@@ -0,0 +1,20 @@
+class Form::Sales::Questions::Buyer1EthnicBackgroundAsian < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "ethnic"
+    @check_answer_label = "Buyer 1’s ethnic background"
+    @header = "Which of the following best describes the buyer 1’s Asian or Asian British background?"
+    @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."
+  end
+
+  ANSWER_OPTIONS = {
+    "10" => { "value" => "Bangladeshi" },
+    "15" => { "value" => "Chinese" },
+    "8" => { "value" => "Indian" },
+    "9" => { "value" => "Pakistani" },
+    "11" => { "value" => "Any other Asian or Asian British background" },
+  }.freeze
+end

app/models/form/sales/questions/buyer1_ethnic_background_black.rb

@@ -0,0 +1,18 @@
+class Form::Sales::Questions::Buyer1EthnicBackgroundBlack < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "ethnic"
+    @check_answer_label = "Buyer 1’s ethnic background"
+    @header = "Which of the following best describes the buyer 1’s Black, African, Caribbean or Black British background?"
+    @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."
+  end
+
+  ANSWER_OPTIONS = {
+    "13" => { "value" => "African" },
+    "12" => { "value" => "Caribbean" },
+    "14" => { "value" => "Any other Black, African or Caribbean background" },
+  }.freeze
+end

app/models/form/sales/questions/buyer1_ethnic_background_mixed.rb

@@ -0,0 +1,19 @@
+class Form::Sales::Questions::Buyer1EthnicBackgroundMixed < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "ethnic"
+    @check_answer_label = "Buyer 1’s ethnic background"
+    @header = "Which of the following best describes the buyer 1’s Mixed or Multiple ethnic groups background?"
+    @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."
+  end
+
+  ANSWER_OPTIONS = {
+    "4" => { "value" => "White and Black Caribbean" },
+    "5" => { "value" => "White and Black African" },
+    "6" => { "value" => "White and Asian" },
+    "7" => { "value" => "Any other Mixed or Multiple ethnic background" },
+  }.freeze
+end

app/models/form/sales/questions/buyer1_ethnic_background_white.rb

@@ -0,0 +1,19 @@
+class Form::Sales::Questions::Buyer1EthnicBackgroundWhite < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "ethnic"
+    @check_answer_label = "Buyer 1’s ethnic background"
+    @header = "Which of the following best describes the buyer 1’s White background?"
+    @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."
+  end
+
+  ANSWER_OPTIONS = {
+    "1" => { "value" => "English, Welsh, Northern Irish, Scottish or British" },
+    "2" => { "value" => "Irish" },
+    "18" => { "value" => "Gypsy or Irish Traveller" },
+    "3" => { "value" => "Any other White background" },
+  }.freeze
+end

app/models/form/sales/questions/buyer1_ethnic_group.rb

@@ -0,0 +1,28 @@
+class Form::Sales::Questions::Buyer1EthnicGroup < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "ethnic_group"
+    @check_answer_label = "Buyer 1’s ethnic group"
+    @header = "What is buyer 1’s ethnic group?"
+    @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."
+    @inferred_check_answers_value = {
+      "condition" => {
+        "ethnic_group" => 17,
+      },
+      "value" => "Prefers not to say",
+    }
+  end
+
+  ANSWER_OPTIONS = {
+    "0" => { "value" => "White" },
+    "1" => { "value" => "Mixed or Multiple ethnic groups" },
+    "2" => { "value" => "Asian or Asian British" },
+    "3" => { "value" => "Black, African, Caribbean or Black British" },
+    "4" => { "value" => "Arab or other ethnic group" },
+    "divider" => { "value" => true },
+    "17" => { "value" => "Buyer 1 prefers not to say" },
+  }.freeze
+end

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

@@ -13,6 +13,12 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Sales::Pages::GenderIdentity1.new(nil, nil, self),
       Form::Sales::Pages::Buyer1LiveInProperty.new(nil, nil, self),
       Form::Sales::Pages::Buyer2RelationshipToBuyer1.new(nil, nil, self),
+      Form::Sales::Pages::Buyer1EthnicGroup.new(nil, nil, self),
+      Form::Sales::Pages::Buyer1EthnicBackgroundBlack.new(nil, nil, self),
+      Form::Sales::Pages::Buyer1EthnicBackgroundAsian.new(nil, nil, self),
+      Form::Sales::Pages::Buyer1EthnicBackgroundArab.new(nil, nil, self),
+      Form::Sales::Pages::Buyer1EthnicBackgroundMixed.new(nil, nil, self),
+      Form::Sales::Pages::Buyer1EthnicBackgroundWhite.new(nil, nil, self),
       Form::Sales::Pages::Age2.new(nil, nil, self),
     ]
   end

app/models/lettings_log.rb

@@ -372,10 +372,6 @@ class LettingsLog < Log
     hb == 7
   end
 
-  def ethnic_refused?
-    ethnic_group == 17
-  end
-
   def receives_housing_related_benefits?
     if collection_start_year <= 2021
       receives_housing_benefit_only? || receives_uc_with_housing_element_excl_housing_benefit? ||

app/models/log.rb

@@ -36,6 +36,10 @@ class Log < ApplicationRecord
     false
   end
 
+  def ethnic_refused?
+    ethnic_group == 17
+  end
+
 private
 
   def update_status!

app/models/sales_log.rb

@@ -3,10 +3,15 @@ class SalesLogValidator < ActiveModel::Validator
 end
 
 class SalesLog < Log
+  include DerivedVariables::SalesLogVariables
+
   self.inheritance_column = :_type_disabled
+
   has_paper_trail
 
   validates_with SalesLogValidator
+  before_validation :set_derived_fields!
+  before_validation :reset_invalidated_dependent_fields!
 
   scope :filter_by_year, ->(year) { where(saledate: Time.zone.local(year.to_i, 4, 1)...Time.zone.local(year.to_i + 1, 4, 1)) }
   scope :search_by, ->(param) { filter_by_id(param) }

db/migrate/20220927100350_add_background_to_sales_log.rb

@@ -0,0 +1,6 @@
+class AddBackgroundToSalesLog < ActiveRecord::Migration[7.0]
+  change_table :sales_logs, bulk: true do |t|
+    t.column :ethnic, :integer
+    t.column :ethnic_group, :integer
+  end
+end

db/schema.rb

@@ -345,6 +345,8 @@ ActiveRecord::Schema[7.0].define(version: 2022_09_29_125204) do
     t.string "otherrelat2"
     t.integer "age2"
     t.integer "age2_known"
+    t.integer "ethnic"
+    t.integer "ethnic_group"
     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"

spec/factories/sales_log.rb

@@ -29,6 +29,8 @@ FactoryBot.define do
       age2_known { 0 }
       age2 { 35 }
       builtype { 1 }
+      ethnic { 3 }
+      ethnic_group { 12 }
     end
   end
 end

spec/fixtures/forms/2021_2022.json

@@ -303,6 +303,12 @@
                     "leftreg": [
                       1
                     ]
+                  },
+                  "inferred_check_answers_value": {
+                    "condition": {
+                      "armedforces": 3
+                    },
+                    "value": "Prefers not to say"
                   }
                 },
                 "leftreg": {

spec/models/form/question_spec.rb

@@ -340,6 +340,29 @@ RSpec.describe Form::Question, type: :model do
         expect(question.answer_label(lettings_log)).to eq("£500.00 every year")
       end
     end
+
+    context "with inferred_check_answers_value" do
+      context "when Lettings form" do
+        let(:section_id) { "household" }
+        let(:subsection_id) { "household_needs" }
+        let(:page_id) { "armed_forces" }
+        let(:question_id) { "armedforces" }
+
+        it "returns the inferred label value" do
+          lettings_log.armedforces = 3
+          expect(question.answer_label(lettings_log)).to eq("Prefers not to say")
+        end
+      end
+
+      context "when Sales form" do
+        let(:sales_log) { FactoryBot.create(:sales_log, :completed, ethnic_group: 17) }
+        let(:question) { sales_log.form.get_question("ethnic_group", sales_log) }
+
+        it "returns the inferred label value" do
+          expect(question.answer_label(sales_log)).to eq("Prefers not to say")
+        end
+      end
+    end
   end
 
   describe ".completed?" do

spec/models/form/sales/pages/buyer1_ethnic_background_arab_spec.rb

@@ -0,0 +1,33 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::Buyer1EthnicBackgroundArab, 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[ethnic])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq("buyer_1_ethnic_background_arab")
+  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([{ "ethnic_group" => 4 }])
+  end
+end

spec/models/form/sales/pages/buyer1_ethnic_background_asian_spec.rb

@@ -0,0 +1,33 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::Buyer1EthnicBackgroundAsian, 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[ethnic])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq("buyer_1_ethnic_background_asian")
+  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([{ "ethnic_group" => 2 }])
+  end
+end

spec/models/form/sales/pages/buyer1_ethnic_background_black_spec.rb

@@ -0,0 +1,33 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::Buyer1EthnicBackgroundBlack, 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[ethnic])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq("buyer_1_ethnic_background_black")
+  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([{ "ethnic_group" => 3 }])
+  end
+end

spec/models/form/sales/pages/buyer1_ethnic_background_mixed_spec.rb

@@ -0,0 +1,33 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::Buyer1EthnicBackgroundMixed, 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[ethnic])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq("buyer_1_ethnic_background_mixed")
+  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([{ "ethnic_group" => 1 }])
+  end
+end

spec/models/form/sales/pages/buyer1_ethnic_background_white_spec.rb

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

spec/models/form/sales/pages/buyer1_ethnic_group_spec.rb

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

spec/models/form/sales/questions/buyer1_ethnic_background_arab_spec.rb

@@ -0,0 +1,44 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::Buyer1EthnicBackgroundArab, 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("ethnic")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("Which of the following best describes the buyer 1’s Arab background?")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("Buyer 1’s ethnic background")
+  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_text" 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({
+      "16" => { "value" => "Other ethnic group" },
+      "19" => { "value" => "Arab" },
+    })
+  end
+end

spec/models/form/sales/questions/buyer1_ethnic_background_asian_spec.rb

@@ -0,0 +1,47 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::Buyer1EthnicBackgroundAsian, 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("ethnic")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("Which of the following best describes the buyer 1’s Asian or Asian British background?")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("Buyer 1’s ethnic background")
+  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_text" 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({
+      "10" => { "value" => "Bangladeshi" },
+      "11" => { "value" => "Any other Asian or Asian British background" },
+      "15" => { "value" => "Chinese" },
+      "8" => { "value" => "Indian" },
+      "9" => { "value" => "Pakistani" },
+    })
+  end
+end

spec/models/form/sales/questions/buyer1_ethnic_background_black_spec.rb

@@ -0,0 +1,45 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::Buyer1EthnicBackgroundBlack, 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("ethnic")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("Which of the following best describes the buyer 1’s Black, African, Caribbean or Black British background?")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("Buyer 1’s ethnic background")
+  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_text" 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({
+      "12" => { "value" => "Caribbean" },
+      "13" => { "value" => "African" },
+      "14" => { "value" => "Any other Black, African or Caribbean background" },
+    })
+  end
+end

spec/models/form/sales/questions/buyer1_ethnic_background_mixed_spec.rb

@@ -0,0 +1,46 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::Buyer1EthnicBackgroundMixed, 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("ethnic")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("Which of the following best describes the buyer 1’s Mixed or Multiple ethnic groups background?")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("Buyer 1’s ethnic background")
+  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_text" 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({
+      "4" => { "value" => "White and Black Caribbean" },
+      "5" => { "value" => "White and Black African" },
+      "6" => { "value" => "White and Asian" },
+      "7" => { "value" => "Any other Mixed or Multiple ethnic background" },
+    })
+  end
+end

spec/models/form/sales/questions/buyer1_ethnic_background_white_spec.rb

@@ -0,0 +1,46 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::Buyer1EthnicBackgroundWhite, 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("ethnic")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("Which of the following best describes the buyer 1’s White background?")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("Buyer 1’s ethnic background")
+  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_text" 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({
+      "1" => { "value" => "English, Welsh, Northern Irish, Scottish or British" },
+      "18" => { "value" => "Gypsy or Irish Traveller" },
+      "2" => { "value" => "Irish" },
+      "3" => { "value" => "Any other White background" },
+    })
+  end
+end

spec/models/form/sales/questions/buyer1_ethnic_group_spec.rb

@@ -0,0 +1,49 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::Buyer1EthnicGroup, 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("ethnic_group")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("What is buyer 1’s ethnic group?")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("Buyer 1’s ethnic group")
+  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_text" 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({
+      "0" => { "value" => "White" },
+      "1" => { "value" => "Mixed or Multiple ethnic groups" },
+      "17" => { "value" => "Buyer 1 prefers not to say" },
+      "2" => { "value" => "Asian or Asian British" },
+      "3" => { "value" => "Black, African, Caribbean or Black British" },
+      "4" => { "value" => "Arab or other ethnic group" },
+      "divider" => { "value" => true },
+    })
+  end
+end

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

@@ -13,7 +13,19 @@ 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 buyer_2_relationship_to_buyer_1 buyer_2_age],
+      %w[
+        buyer_1_age
+        buyer_1_gender_identity
+        buyer_1_live_in_property
+        buyer_2_relationship_to_buyer_1
+        buyer_1_ethnic_group
+        buyer_1_ethnic_background_black
+        buyer_1_ethnic_background_asian
+        buyer_1_ethnic_background_arab
+        buyer_1_ethnic_background_mixed
+        buyer_1_ethnic_background_white
+        buyer_2_age
+      ],
     )
   end
 

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(20)
+      expect(form.pages.count).to eq(26)
       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(20)
+      expect(form.pages.count).to eq(26)
       expect(form.name).to eq("2021_2022_sales")
     end
   end

spec/models/lettings_log_spec.rb

@@ -1,4 +1,5 @@
 require "rails_helper"
+require "shared/shared_examples_for_derived_fields"
 
 RSpec.describe LettingsLog do
   let(:owning_organisation) { FactoryBot.create(:organisation) }
@@ -10,6 +11,8 @@ RSpec.describe LettingsLog do
     allow(FormHandler.instance).to receive(:current_lettings_form).and_return(fake_2021_2022_form)
   end
 
+  include_examples "shared examples for derived fields", :lettings_log
+
   it "inherits from log" do
     expect(described_class).to be < Log
     expect(described_class).to be < ApplicationRecord

spec/models/sales_log_spec.rb

@@ -1,9 +1,12 @@
 require "rails_helper"
+require "shared/shared_examples_for_derived_fields"
 
 RSpec.describe SalesLog, type: :model do
   let(:owning_organisation) { FactoryBot.create(:organisation) }
   let(:created_by_user) { FactoryBot.create(:user) }
 
+  include_examples "shared examples for derived fields", :sales_log
+
   it "inherits from log" do
     expect(described_class).to be < Log
     expect(described_class).to be < ApplicationRecord

spec/shared/shared_examples_for_derived_fields.rb

@@ -0,0 +1,17 @@
+require "rails_helper"
+
+RSpec.shared_examples "shared examples for derived fields" do |log_type|
+  describe "sets ethnic based on the value of ethnic_refused" do
+    it "is set to 17 when ethnic_group is 17" do
+      log = FactoryBot.build(log_type, ethnic_group: 17, ethnic: nil)
+
+      expect { log.set_derived_fields! }.to change(log, :ethnic).from(nil).to(17)
+    end
+
+    it "is is not modified otherwise" do
+      log = FactoryBot.build(log_type, ethnic_group: nil, ethnic: nil)
+
+      expect { log.set_derived_fields! }.not_to change(log, :ethnic)
+    end
+  end
+end