From a279b0b0cd42fe249783967ff2dce7e8309db839 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Wed, 11 Sep 2024 12:42:20 +0100
Subject: [PATCH] Update row parser, after removing organisation association in
 bulk upload

---
 app/services/bulk_upload/lettings/year2024/row_parser.rb | 4 ++--
 app/services/bulk_upload/sales/year2024/row_parser.rb    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/services/bulk_upload/lettings/year2024/row_parser.rb b/app/services/bulk_upload/lettings/year2024/row_parser.rb
index 3254d0d39..7f463d8c4 100644
--- a/app/services/bulk_upload/lettings/year2024/row_parser.rb
+++ b/app/services/bulk_upload/lettings/year2024/row_parser.rb
@@ -899,8 +899,8 @@ private
   def validate_owning_org_permitted
     return unless owning_organisation
 
-    return if (bulk_upload.user.support? && bulk_upload.organisation.affiliated_stock_owners.include?(bulk_upload.organisation)) ||
-      (!bulk_upload.user.support? && bulk_upload.user.organisation.affiliated_stock_owners.include?(owning_organisation))
+    bulk_upload_organisation = bulk_upload.user.support? ? Organisation.find(bulk_upload.organisation_id) : bulk_upload.user.organisation
+    return if bulk_upload_organisation.affiliated_stock_owners.include?(owning_organisation)
 
     block_log_creation!
 
diff --git a/app/services/bulk_upload/sales/year2024/row_parser.rb b/app/services/bulk_upload/sales/year2024/row_parser.rb
index eddc83de3..6b5b6be2d 100644
--- a/app/services/bulk_upload/sales/year2024/row_parser.rb
+++ b/app/services/bulk_upload/sales/year2024/row_parser.rb
@@ -1303,8 +1303,8 @@ private
   def validate_owning_org_permitted
     return unless owning_organisation
 
-    return if (bulk_upload.user.support? && bulk_upload.organisation.affiliated_stock_owners.include?(bulk_upload.organisation)) ||
-      (!bulk_upload.user.support? && bulk_upload.user.organisation.affiliated_stock_owners.include?(owning_organisation))
+    bulk_upload_organisation = bulk_upload.user.support? ? Organisation.find(bulk_upload.organisation_id) : bulk_upload.user.organisation
+    return if bulk_upload_organisation.affiliated_stock_owners.include?(owning_organisation)
 
     block_log_creation!