From 99ab6d13d458c65993b92e15d5c100c699e07f8d Mon Sep 17 00:00:00 2001
From: Martin Filser <github-wekan@linux-email.de>
Date: Sun, 12 Mar 2023 18:16:00 +0100
Subject: [PATCH] Move every Team.find(idOrFirstObjectSelector, options) to the
 ReactiveCache (directory server/)

---
 server/publications/boards.js |  2 +-
 server/publications/team.js   | 27 +++++++++++++++------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/server/publications/boards.js b/server/publications/boards.js
index 12061ef15..20d3023bf 100644
--- a/server/publications/boards.js
+++ b/server/publications/boards.js
@@ -142,7 +142,7 @@ Meteor.publish('boardsReport', function() {
   const ret = [
     boards,
     ReactiveCache.getUsers({ _id: { $in: userIds } }, { fields: Users.safeFields }, true),
-    Team.find({ _id: { $in: teamIds } }),
+    ReactiveCache.getTeams({ _id: { $in: teamIds } }, {}, true),
     ReactiveCache.getOrgs({ _id: { $in: orgIds } }, {}, true),
   ]
   return ret;
diff --git a/server/publications/team.js b/server/publications/team.js
index 7399ccaa3..37a161793 100644
--- a/server/publications/team.js
+++ b/server/publications/team.js
@@ -8,19 +8,22 @@ Meteor.publish('team', function(query, limit) {
 
   let ret = [];
   if (user && user.isAdmin) {
-    ret = Team.find(query, {
-      limit,
-      sort: { createdAt: -1 },
-      fields: {
-        teamDisplayName: 1,
-        teamDesc: 1,
-        teamShortName: 1,
-        teamWebsite: 1,
-        teams: 1,
-        createdAt: 1,
-        teamIsActive: 1,
+    ret = ReactiveCache.getTeams(query,
+      {
+        limit,
+        sort: { createdAt: -1 },
+        fields: {
+          teamDisplayName: 1,
+          teamDesc: 1,
+          teamShortName: 1,
+          teamWebsite: 1,
+          teams: 1,
+          createdAt: 1,
+          teamIsActive: 1,
+        }
       },
-    });
+      true,
+    );
   }
 
   return ret;