From 400d122e52c7136ddc75add13af68aa827fcdcf4 Mon Sep 17 00:00:00 2001 From: Jamie Benstead Date: Fri, 20 Mar 2026 14:13:56 +0000 Subject: [PATCH] Change creator_id to only need to be unique for schools where rejected_at is nil --- app/models/school.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/models/school.rb b/app/models/school.rb index 2f14500b0..cea891f58 100644 --- a/app/models/school.rb +++ b/app/models/school.rb @@ -31,7 +31,11 @@ class School < ApplicationRecord format: { with: /\A[0-9]+[A-Z]+\z/, allow_nil: true, message: I18n.t('validations.school.school_roll_number') }, presence: true, if: :ireland? - validates :creator_id, presence: true, uniqueness: true + validates :creator_id, + presence: true, + uniqueness: { + conditions: -> { where(rejected_at: nil) } + } validates :creator_agree_authority, presence: true, acceptance: true validates :creator_agree_terms_and_conditions, presence: true, acceptance: true validates :creator_agree_responsible_safeguarding, presence: true, acceptance: true