CLDC-3148 Update disabled access needs for 24/25 (#2183)

* feat: add 2024 answer option and test

* feat: update validation

* feat: add validation tests

* refactor: lint

* refactor: typo

app/models/form/lettings/questions/housingneeds_other.rb

@@ -7,9 +7,21 @@ class Form::Lettings::Questions::HousingneedsOther < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 0
     @hint_text = ""
-    @answer_options = ANSWER_OPTIONS
     @question_number = 72
   end
 
-  ANSWER_OPTIONS = { "1" => { "value" => "Yes" }, "0" => { "value" => "No" } }.freeze
+  def answer_options
+    if form.start_year_after_2024?
+      {
+        "1" => { "value" => "Yes" },
+        "0" => { "value" => "No" },
+        "2" => { "value" => "Don't know" },
+      }.freeze
+    else
+      {
+        "1" => { "value" => "Yes" },
+        "0" => { "value" => "No" },
+      }.freeze
+    end
+  end
 end

app/models/lettings_log.rb

@@ -669,6 +669,18 @@ class LettingsLog < Log
     renttype == 1 || renttype == 2
   end
 
+  def no_or_unknown_other_housing_needs?
+    housingneeds_other&.zero? || housingneeds_other == 2
+  end
+
+  def has_housingneeds?
+    housingneeds == 1
+  end
+
+  def housingneeds_type_not_listed?
+    housingneeds_type == 3
+  end
+
   def duplicates
     LettingsLog.where.not(duplicate_set_id: nil).where(duplicate_set_id:).where.not(id:)
   end
@@ -823,10 +835,6 @@ private
     housingneeds_other == 1
   end
 
-  def has_housingneeds?
-    housingneeds == 1
-  end
-
   def no_housingneeds?
     housingneeds == 2
   end

app/models/validations/household_validations.rb

@@ -129,7 +129,7 @@ module Validations::HouseholdValidations
   end
 
   def validate_combination_of_housing_needs_responses(record)
-    if record.housingneeds == 1 && record.housingneeds_type == 3 && record.housingneeds_other&.zero?
+    if record.has_housingneeds? && record.housingneeds_type_not_listed? && record.no_or_unknown_other_housing_needs?
       record.errors.add :housingneeds, I18n.t("validations.household.housingneeds.invalid")
       record.errors.add :housingneeds_type, I18n.t("validations.household.housingneeds.invalid")
       record.errors.add :housingneeds_other, I18n.t("validations.household.housingneeds.invalid")

spec/models/form/lettings/questions/housingneeds_other_spec.rb

@@ -0,0 +1,68 @@
+require "rails_helper"
+
+RSpec.describe Form::Lettings::Questions::HousingneedsOther, 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) }
+  let(:subsection) { instance_double(Form::Subsection) }
+  let(:form) { instance_double(Form) }
+
+  before do
+    allow(form).to receive(:start_year_after_2024?).and_return(false)
+    allow(page).to receive(:subsection).and_return(subsection)
+    allow(subsection).to receive(:form).and_return(form)
+  end
+
+  it "has correct page" do
+    expect(question.page).to eq(page)
+  end
+
+  it "has the correct id" do
+    expect(question.id).to eq("housingneeds_other")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("Do they have any other disabled access needs?")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("Other disabled access needs")
+  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
+
+  context "with 2023/24 form" do
+    it "has the correct answer_options" do
+      expect(question.answer_options).to eq({
+        "1" => { "value" => "Yes" },
+        "0" => { "value" => "No" },
+      })
+    end
+  end
+
+  context "with 2024/25 form" do
+    before do
+      allow(form).to receive(:start_year_after_2024?).and_return(true)
+    end
+
+    it "has the correct answer_options" do
+      expect(question.answer_options).to eq({
+        "1" => { "value" => "Yes" },
+        "0" => { "value" => "No" },
+        "2" => { "value" => "Don't know" },
+      })
+    end
+  end
+
+  it "has the correct check_answers_card_number" do
+    expect(question.check_answers_card_number).to eq(0)
+  end
+end

spec/models/validations/household_validations_spec.rb

@@ -674,11 +674,34 @@ RSpec.describe Validations::HouseholdValidations do
   end
 
   describe "housing needs validations" do
-    it "is invalid when a combination of housingneeds == 1 (yes) && housingneeds_type == 3 (none of listed) && housingneeds_other == 0 (no)" do
+    context "with housingneeds == 1 (yes) && housingneeds_type == 3" do
+      before do
         record.housingneeds = 1
         record.housingneeds_type = 3
+      end
+
+      context "with housingneeds_other == 0 (no)" do
+        before do
           record.housingneeds_other = 0
+        end
+
+        it "is invalid" do
+          household_validator.validate_combination_of_housing_needs_responses(record)
+
+          error_message = ["If somebody in the household has disabled access needs, they must have the access needs listed, or other access needs"]
+
+          expect(record.errors["housingneeds"]).to eq(error_message)
+          expect(record.errors["housingneeds_type"]).to eq(error_message)
+          expect(record.errors["housingneeds_other"]).to eq(error_message)
+        end
+      end
 
+      context "with housingneeds_other == 2 (don't know)" do
+        before do
+          record.housingneeds_other = 2
+        end
+
+        it "is invalid" do
           household_validator.validate_combination_of_housing_needs_responses(record)
 
           error_message = ["If somebody in the household has disabled access needs, they must have the access needs listed, or other access needs"]
@@ -689,3 +712,5 @@ RSpec.describe Validations::HouseholdValidations do
         end
       end
     end
+  end
+end