From f52a9d25873e4a9d15335fc00282f24578486643 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Wed, 4 Sep 2024 17:15:25 +0100
Subject: [PATCH] Fix incorrect filtering of relationships and count

---
 app/models/merge_request.rb | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 7e06180fd..24fa26bde 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -107,15 +107,10 @@ class MergeRequest < ApplicationRecord
   end
 
   def filter_relationships(absorbing_relationships, merging_relationships, absorbing_organisation, merging_organisations)
-    filtered_absorbing_relationships = absorbing_relationships.reject do |relationship|
-      merging_relationships.include?(relationship) || merging_organisations.include?(relationship)
+    unique_relationships = (absorbing_relationships + merging_relationships).uniq
+    unique_relationships.reject do |relationship|
+      merging_organisations.include?(relationship) || relationship == absorbing_organisation
     end
-
-    filtered_merging_relationships = merging_relationships.reject do |relationship|
-      absorbing_relationships.include?(relationship) || relationship == absorbing_organisation || merging_organisations.include?(relationship)
-    end
-
-    (filtered_absorbing_relationships + filtered_merging_relationships).uniq
   end
 
   def total_stock_owners_after_merge