Move every Activities.find(idOrFirstObjectSelector, options) to the ReactiveCache (directory models/)

models/boards.js

@@ -831,8 +831,8 @@ Boards.helpers({
       ).forEach(card => {
         linkedBoardId.push(card.linkedId);
     });
-    return Activities.find({ boardId: { $in: linkedBoardId } }, { sort: { createdAt: -1 } });
-    //return Activities.find({ boardId: this._id }, { sort: { createdAt: -1 } });
+    const ret = ReactiveCache.getActivities({ boardId: { $in: linkedBoardId } }, { sort: { createdAt: -1 } });
+    return ret;
   },
 
   activeMembers(){

models/cards.js

@@ -767,12 +767,12 @@ Cards.helpers({
   activities() {
     let ret;
     if (this.isLinkedBoard()) {
-      ret = Activities.find(
+      ret = ReactiveCache.getActivities(
         { boardId: this.linkedId },
         { sort: { createdAt: -1 } },
       );
     } else {
-      ret = Activities.find({ cardId: this.getRealId() }, { sort: { createdAt: -1 } });
+      ret = ReactiveCache.getActivities({ cardId: this.getRealId() }, { sort: { createdAt: -1 } });
     }
     return ret;
   },
@@ -2647,7 +2647,7 @@ Cards.mutations({
 
 function updateActivities(doc, fieldNames, modifier) {
   if (_.contains(fieldNames, 'labelIds') && _.contains(fieldNames, 'boardId')) {
-    Activities.find({
+    ReactiveCache.getActivities({
       activityType: 'addedLabel',
       cardId: doc._id,
     }).forEach(a => {

models/checklists.js

@@ -170,7 +170,7 @@ Checklists.mutations({
    */
   move(newCardId) {
     // update every activity
-    Activities.find(
+    ReactiveCache.getActivities(
       {checklistId: this._id}
     ).forEach(activity => {
       Activities.update(activity._id, {
@@ -219,7 +219,7 @@ if (Meteor.isServer) {
   });
 
   Checklists.before.remove((userId, doc) => {
-    const activities = Activities.find({ checklistId: doc._id });
+    const activities = ReactiveCache.getActivities({ checklistId: doc._id });
     const card = ReactiveCache.getCard(doc.cardId);
     if (activities) {
       activities.forEach(activity => {

models/exporter.js

@@ -105,7 +105,7 @@ export class Exporter {
       { fields: { boardIds: 0 } },
     );
     result.comments = CardComments.find(byBoard, noBoardId).fetch();
-    result.activities = Activities.find(byBoard, noBoardId).fetch();
+    result.activities = ReactiveCache.getActivities(byBoard, noBoardId);
     result.rules = ReactiveCache.getRules(byBoard, noBoardId);
     result.checklists = [];
     result.checklistItems = [];

models/server/ExporterCardPDF.js

@@ -56,7 +56,7 @@ class ExporterCardPDF {
           },
         );
         result.comments = CardComments.find(byBoard, noBoardId).fetch();
-        result.activities = Activities.find(byBoard, noBoardId).fetch();
+        result.activities = ReactiveCache.getActivities(byBoard, noBoardId);
         result.rules = ReactiveCache.getRules(byBoard, noBoardId);
         result.checklists = [];
         result.checklistItems = [];

models/server/ExporterExcel.js

@@ -58,7 +58,7 @@ class ExporterExcel {
       },
     );
     result.comments = CardComments.find(byBoard, noBoardId).fetch();
-    result.activities = Activities.find(byBoard, noBoardId).fetch();
+    result.activities = ReactiveCache.getActivities(byBoard, noBoardId);
     result.rules = ReactiveCache.getRules(byBoard, noBoardId);
     result.checklists = [];
     result.checklistItems = [];