From 9385c89cca7dbd2df87c235ae6396c3da9308713 Mon Sep 17 00:00:00 2001
From: natdeanlewissoftwire <nat.dean-lewis@softwire.com>
Date: Thu, 20 Jul 2023 18:09:46 +0100
Subject: [PATCH] feat: wip absorbed orgs visibility work

---
 app/helpers/filters_helper.rb | 6 +++---
 app/models/user.rb            | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb
index 80f3199d5..439f0ab7e 100644
--- a/app/helpers/filters_helper.rb
+++ b/app/helpers/filters_helper.rb
@@ -45,12 +45,12 @@ module FiltersHelper
   end
 
   def owning_organisations_filter_options(user)
-    organisation_options = user.support? ? Organisation.all : [user.organisation] + user.organisation.stock_owners
+    organisation_options = user.support? ? Organisation.all : ([user.organisation] + user.organisation.stock_owners + user.organisation.absorbed_organisations.flat_map(&:stock_owners)).uniq
     [OpenStruct.new(id: "", name: "Select an option")] + organisation_options.map { |org| OpenStruct.new(id: org.id, name: org.name) }
   end
 
   def assigned_to_filter_options(user)
-    user_options = user.support? ? User.all : (user.organisation.users + user.organisation.managing_agents.flat_map(&:users) + user.organisation.stock_owners.flat_map(&:users))
+    user_options = user.support? ? User.all : ((user.organisation.users + user.organisation.managing_agents.flat_map(&:users) + user.organisation.stock_owners.flat_map(&:users))).uniq
     [OpenStruct.new(id: "", name: "Select an option")] + user_options.map { |user_option| OpenStruct.new(id: user_option.id, name: user_option.name) }
   end
 
@@ -69,7 +69,7 @@ module FiltersHelper
   end
 
   def managing_organisation_filter_options(user)
-    organisation_options = user.support? ? Organisation.all : [user.organisation] + user.organisation.managing_agents
+    organisation_options = user.support? ? Organisation.all : [user.organisation] + user.organisation.managing_agents + user.organisation.absorbed_organisations.flat_map(&:managing_agents)
     [OpenStruct.new(id: "", name: "Select an option")] + organisation_options.map { |org| OpenStruct.new(id: org.id, name: org.name) }
   end
 
diff --git a/app/models/user.rb b/app/models/user.rb
index f9e34a652..3fe10b604 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -60,7 +60,7 @@ class User < ApplicationRecord
     if support?
       LettingsLog.all
     else
-      LettingsLog.filter_by_organisation(organisation)
+      LettingsLog.filter_by_organisation(organisation.absorbed_organisations << organisation)
     end
   end
 
@@ -68,7 +68,7 @@ class User < ApplicationRecord
     if support?
       SalesLog.all
     else
-      SalesLog.filter_by_organisation(organisation)
+      SalesLog.filter_by_organisation(organisation.absorbed_organisations << organisation)
     end
   end