From 8360a2786e339f2f20d0cde7a3ec67c65d1d82f9 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Wed, 16 Apr 2025 10:28:38 +0100
Subject: [PATCH] Add validation to ensure start date is before organisation's
 merge date if present

---
 app/models/organisation_name_change.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/models/organisation_name_change.rb b/app/models/organisation_name_change.rb
index 77ec74536..6df115dff 100644
--- a/app/models/organisation_name_change.rb
+++ b/app/models/organisation_name_change.rb
@@ -10,6 +10,7 @@ class OrganisationNameChange < ApplicationRecord
   validate :startdate_must_be_after_last_change
   validate :name_must_be_different_from_current
   validate :startdate_must_be_unique_for_organisation
+  validate :startdate_must_be_before_merge_date
 
   attr_accessor :immediate_change
 
@@ -94,4 +95,13 @@ private
       errors.add(:name, "New name must be different from the current name on the change date.")
     end
   end
+
+  def startdate_must_be_before_merge_date
+    return if startdate.blank? || organisation.merge_date.blank?
+
+    if startdate >= organisation.merge_date
+      errors.add(:startdate, "Start date must be earlier than the organisation's merge date (#{organisation.merge_date.to_formatted_s(:govuk_date)}). You cannot make changes to the name of an organisation after it has merged.") unless immediate_change
+      errors.add(:immediate_change, "Start date must be earlier than the organisation's merge date (#{organisation.merge_date.to_formatted_s(:govuk_date)}). You cannot make changes to the name of an organisation after it has merged.") if immediate_change
+    end
+  end
 end