From 78bec4f2acb6e7d1495db7627a75cc4e56e1bda5 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Mon, 4 Nov 2024 15:28:43 +0000
Subject: [PATCH] Move split validate validate owrning org dsa signed into
 lettings and sales methods

---
 app/models/validations/sales/setup_validations.rb |  8 ++++++++
 app/models/validations/setup_validations.rb       |  8 ++++++++
 app/models/validations/shared_validations.rb      | 12 ------------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app/models/validations/sales/setup_validations.rb b/app/models/validations/sales/setup_validations.rb
index 6fdc2f1a3..75e79f15a 100644
--- a/app/models/validations/sales/setup_validations.rb
+++ b/app/models/validations/sales/setup_validations.rb
@@ -58,6 +58,14 @@ module Validations::Sales::SetupValidations
     end
   end
 
+  def validate_owning_organisation_data_sharing_agremeent_signed(record)
+    return if record.skip_dpo_validation
+
+    if record.owning_organisation_id_changed? && record.owning_organisation.present? && !record.owning_organisation.data_protection_confirmed?
+      record.errors.add :owning_organisation_id, I18n.t("validations.sales.setup.owning_organisation.data_sharing_agreement_not_signed")
+    end
+  end
+
 private
 
   def active_collection_start_date
diff --git a/app/models/validations/setup_validations.rb b/app/models/validations/setup_validations.rb
index 017ac226f..ca521803e 100644
--- a/app/models/validations/setup_validations.rb
+++ b/app/models/validations/setup_validations.rb
@@ -135,6 +135,14 @@ module Validations::SetupValidations
     end
   end
 
+  def validate_owning_organisation_data_sharing_agremeent_signed(record)
+    return if record.skip_dpo_validation
+
+    if record.owning_organisation_id_changed? && record.owning_organisation.present? && !record.owning_organisation.data_protection_confirmed?
+      record.errors.add :owning_organisation_id, I18n.t("validations.lettings.setup.owning_organisation.data_sharing_agreement_not_signed")
+    end
+  end
+
 private
 
   def active_collection_start_date
diff --git a/app/models/validations/shared_validations.rb b/app/models/validations/shared_validations.rb
index ec52cfeef..da79599ee 100644
--- a/app/models/validations/shared_validations.rb
+++ b/app/models/validations/shared_validations.rb
@@ -97,18 +97,6 @@ module Validations::SharedValidations
     end
   end
 
-  def validate_owning_organisation_data_sharing_agremeent_signed(record)
-    return if record.skip_dpo_validation
-
-    if record.owning_organisation_id_changed? && record.owning_organisation.present? && !record.owning_organisation.data_protection_confirmed?
-      if record.sales?
-        record.errors.add :owning_organisation_id, I18n.t("validations.sales.setup.owning_organisation.data_sharing_agreement_not_signed")
-      else
-        record.errors.add :owning_organisation_id, I18n.t("validations.lettings.setup.owning_organisation.data_sharing_agreement_not_signed")
-      end
-    end
-  end
-
 private
 
   def person_is_partner?(relationship)