From b5e049df716c3e17620c16e3a31e1f27af25af11 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Mon, 11 Nov 2024 12:41:35 +0000
Subject: [PATCH] Update validate scheme method

---
 app/models/validations/setup_validations.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/validations/setup_validations.rb b/app/models/validations/setup_validations.rb
index 4afdd3ae2..a4c0878d0 100644
--- a/app/models/validations/setup_validations.rb
+++ b/app/models/validations/setup_validations.rb
@@ -73,11 +73,11 @@ module Validations::SetupValidations
   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
+    return unless record.scheme
 
-    if record.scheme&.locations.nil? || (record.scheme&.locations.present? && record.scheme.locations.confirmed.none?)
+    if record.scheme.status == :incomplete
+      record.errors.add :scheme_id, :incomplete, message: I18n.t("validations.lettings.setup.scheme.incomplete")
+    elsif record.scheme.locations.nil? || (record.scheme.locations.present? && record.scheme.locations.confirmed.none?)
       record.errors.add :scheme_id, :no_completed_locations, message: I18n.t("validations.lettings.setup.scheme.no_completed_locations")
     end