From 1b836190c745a57cb151b896577f7a99bf449817 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Thu, 7 Nov 2024 09:42:49 +0000
Subject: [PATCH] Merge validate scheme incomplete and no confirmed locations
 to not interfere

---
 app/models/validations/setup_validations.rb       | 12 ++++--------
 spec/models/validations/setup_validations_spec.rb |  4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/models/validations/setup_validations.rb b/app/models/validations/setup_validations.rb
index ca521803e..1c1dce293 100644
--- a/app/models/validations/setup_validations.rb
+++ b/app/models/validations/setup_validations.rb
@@ -72,19 +72,15 @@ module Validations::SetupValidations
     end
   end
 
-  def validate_scheme_has_confirmed_locations_validation(record)
-    return unless record.scheme
-
-    unless record.scheme.locations.confirmed.any?
-      record.errors.add :scheme_id, :no_completed_locations, message: I18n.t("validations.lettings.setup.scheme.no_completed_locations")
-    end
-  end
-
   def validate_scheme(record)
     if record.scheme&.status == :incomplete
       record.errors.add :scheme_id, :incomplete, message: I18n.t("validations.lettings.setup.scheme.incomplete")
     end
 
+    unless record.scheme&.locations&.confirmed&.any?
+      record.errors.add :scheme_id, :no_completed_locations, message: I18n.t("validations.lettings.setup.scheme.no_completed_locations")
+    end
+
     scheme_during_startdate_validation(record)
     tenancy_startdate_with_scheme_locations(record)
   end
diff --git a/spec/models/validations/setup_validations_spec.rb b/spec/models/validations/setup_validations_spec.rb
index 8103f056d..5b4f03365 100644
--- a/spec/models/validations/setup_validations_spec.rb
+++ b/spec/models/validations/setup_validations_spec.rb
@@ -900,7 +900,7 @@ RSpec.describe Validations::SetupValidations do
 
       it "produces an error" do
         record.scheme = scheme
-        setup_validator.validate_scheme_has_confirmed_locations_validation(record)
+        setup_validator.validate_scheme(record)
         expect(record.errors["scheme_id"])
           .to include(match I18n.t("validations.lettings.setup.scheme.no_completed_locations"))
       end
@@ -914,7 +914,7 @@ RSpec.describe Validations::SetupValidations do
 
       it "does not produce an error" do
         record.scheme = scheme
-        setup_validator.validate_scheme_has_confirmed_locations_validation(record)
+        setup_validator.validate_scheme(record)
         expect(record.errors["scheme_id"])
           .to be_empty
       end