From c888972e0fadb0963d95f4f2918929574917395a Mon Sep 17 00:00:00 2001 From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com> Date: Wed, 17 Jul 2024 11:57:13 +0100 Subject: [PATCH] Change order, validate scheme before location --- app/models/validations/setup_validations.rb | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/app/models/validations/setup_validations.rb b/app/models/validations/setup_validations.rb index 04b4af76e..69b04fce4 100644 --- a/app/models/validations/setup_validations.rb +++ b/app/models/validations/setup_validations.rb @@ -72,15 +72,6 @@ module Validations::SetupValidations end end - def validate_location(record) - location_during_startdate_validation(record) - - if record.location&.status == :incomplete - record.errors.add :location_id, :incomplete, message: I18n.t("validations.setup.location.incomplete") - record.errors.add :scheme_id, :incomplete, message: I18n.t("validations.setup.location.incomplete") - end - end - def validate_scheme_has_confirmed_locations_validation(record) return unless record.scheme @@ -93,8 +84,13 @@ module Validations::SetupValidations scheme_during_startdate_validation(record) end - def validate_tenancy(record) - tenancy_during_startdate_validation(record) + def validate_location(record) + location_during_startdate_validation(record) + + if record.location&.status == :incomplete + record.errors.add :location_id, :incomplete, message: I18n.t("validations.setup.location.incomplete") + record.errors.add :scheme_id, :incomplete, message: I18n.t("validations.setup.location.incomplete") + end end def validate_managing_organisation_data_sharing_agremeent_signed(record)