Check if the date valid before running location validations

communitiesuk · Feb 4, 2025 · 270999b · 270999b
1 parent dba2998
commit 270999b
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/app/models/validations/setup_validations.rb b/app/models/validations/setup_validations.rb
@@ -97,6 +97,8 @@ def validate_location(record)
   end
 
   def location_during_startdate_validation(record)
+    return unless date_valid?("startdate", record)
+
     location_inactive_status = inactive_status(record.startdate, record.location)
 
     if location_inactive_status.present?
@@ -108,6 +110,8 @@ def location_during_startdate_validation(record)
   end
 
   def scheme_during_startdate_validation(record)
+    return unless date_valid?("startdate", record)
+
     scheme_inactive_status = inactive_status(record.startdate, record.scheme)
 
     if scheme_inactive_status.present?