From e19f1e5b0dd5480d9be74b6be608295ecfbec0a9 Mon Sep 17 00:00:00 2001
From: Rachael Booth <Rachael.Booth@softwire.com>
Date: Wed, 20 Mar 2024 16:27:52 +0000
Subject: [PATCH] CLDC-3234: Prevent errors from nil hhmemb (#2301)

* CLDC-3234: Handle nil hhmemb gracefully in soft validations

* CLDC-3234: Don't blank hhmemb when blanking invalid non setup fields
---
 app/models/log.rb                          |  3 ++-
 app/models/validations/soft_validations.rb | 16 ++++++++++++----
 spec/models/log_spec.rb                    | 11 +++++++++++
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/app/models/log.rb b/app/models/log.rb
index 0d898827a..cc0367daf 100644
--- a/app/models/log.rb
+++ b/app/models/log.rb
@@ -182,12 +182,13 @@ class Log < ApplicationRecord
 
   def blank_invalid_non_setup_fields!
     setup_ids = form.setup_sections.flat_map(&:subsections).flat_map(&:questions).map(&:id)
+    fields_to_keep = setup_ids + %w[hhmemb]
 
     2.times do
       next if valid?
 
       errors.each do |error|
-        next if setup_ids.include?(error.attribute.to_s)
+        next if fields_to_keep.include?(error.attribute.to_s)
 
         question = form.questions.find { |q| q.id == error.attribute.to_s }
         if question&.type == "checkbox"
diff --git a/app/models/validations/soft_validations.rb b/app/models/validations/soft_validations.rb
index 7be2f5090..e5b5f9c88 100644
--- a/app/models/validations/soft_validations.rb
+++ b/app/models/validations/soft_validations.rb
@@ -76,13 +76,17 @@ module Validations::SoftValidations
   end
 
   def all_tenants_age_and_gender_information_completed?
-    (1..hhmemb).all? do |n|
+    person_count = hhmemb || 8
+
+    (1..person_count).all? do |n|
       public_send("sex#{n}").present? && public_send("age#{n}").present? && details_known_or_lead_tenant?(n) && public_send("age#{n}_known").present? && public_send("age#{n}_known").zero?
     end
   end
 
   def all_tenants_gender_information_completed?
-    (1..hhmemb).all? do |n|
+    person_count = hhmemb || 8
+
+    (1..person_count).all? do |n|
       public_send("sex#{n}").present? && details_known_or_lead_tenant?(n)
     end
   end
@@ -207,13 +211,17 @@ private
   end
 
   def females_in_age_range(min, max)
-    (1..hhmemb).any? do |n|
+    person_count = hhmemb || 8
+
+    (1..person_count).any? do |n|
       public_send("sex#{n}") == "F" && public_send("age#{n}").present? && public_send("age#{n}").between?(min, max)
     end
   end
 
   def females_in_the_household?
-    (1..hhmemb).any? do |n|
+    person_count = hhmemb || 8
+
+    (1..person_count).any? do |n|
       public_send("sex#{n}") == "F" || public_send("sex#{n}").nil?
     end
   end
diff --git a/spec/models/log_spec.rb b/spec/models/log_spec.rb
index 3494f152f..b35737c67 100644
--- a/spec/models/log_spec.rb
+++ b/spec/models/log_spec.rb
@@ -76,5 +76,16 @@ RSpec.describe Log, type: :model do
         expect(model.previous_la_known).to be_nil
       end
     end
+
+    context "when hhmemb is invalid for a lettings log" do
+      subject(:model) { build(:lettings_log, :setup_completed, hhmemb: 1, joint: 1) }
+
+      it "does not blank it" do
+        model.valid?
+        model.blank_invalid_non_setup_fields!
+        expect(model.hhmemb).to be(1)
+        expect(model.joint).to be_nil
+      end
+    end
   end
 end