Browse Source

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

Martin Filser 2 years ago
parent
commit
e5359dc838
5 changed files with 10 additions and 13 deletions
  1. 3 6
      models/cards.js
  2. 1 1
      models/checklists.js
  3. 2 2
      models/exporter.js
  4. 2 2
      models/server/ExporterCardPDF.js
  5. 2 2
      models/server/ExporterExcel.js

+ 3 - 6
models/cards.js

@@ -8,7 +8,6 @@ import {
 } from '../config/const';
 import Attachments, { fileStoreStrategyFactory } from "./attachments";
 import { copyFile } from './lib/fileStoreStrategy.js';
-import { DataCache } from 'meteor-reactive-cache';
 
 Cards = new Mongo.Collection('cards');
 
@@ -595,7 +594,7 @@ Cards.helpers({
       });
 
     // copy checklists
-    Checklists.find({ cardId: oldId }).forEach(ch => {
+    ReactiveCache.getChecklists({ cardId: oldId }).forEach(ch => {
       ch.copy(_id);
     });
 
@@ -811,10 +810,8 @@ Cards.helpers({
   },
 
   checklists() {
-    if (!this._checklists) {
-      this._checklists = new DataCache(() => Checklists.find({ cardId: this.getRealId() }, { sort: { sort: 1 } }).fetch(), 1000);
-    }
-    return this._checklists.get();
+    const ret = ReactiveCache.getChecklists({ cardId: this.getRealId() }, { sort: { sort: 1 } });
+    return ret;
   },
 
   firstChecklist() {

+ 1 - 1
models/checklists.js

@@ -256,7 +256,7 @@ if (Meteor.isServer) {
       const paramBoardId = req.params.boardId;
       const paramCardId = req.params.cardId;
       Authentication.checkBoardAccess(req.userId, paramBoardId);
-      const checklists = Checklists.find({ cardId: paramCardId }).map(function(
+      const checklists = ReactiveCache.getChecklists({ cardId: paramCardId }).map(function(
         doc,
       ) {
         return {

+ 2 - 2
models/exporter.js

@@ -114,9 +114,9 @@ export class Exporter {
     result.actions = [];
     result.cards.forEach((card) => {
       result.checklists.push(
-        ...Checklists.find({
+        ...ReactiveCache.getChecklists({
           cardId: card._id,
-        }).fetch(),
+        }),
       );
       result.checklistItems.push(
         ...ReactiveCache.getChecklistItems({

+ 2 - 2
models/server/ExporterCardPDF.js

@@ -65,9 +65,9 @@ class ExporterCardPDF {
         result.actions = [];
         result.cards.forEach((card) => {
           result.checklists.push(
-            ...Checklists.find({
+            ...ReactiveCache.getChecklists({
               cardId: card._id,
-            }).fetch(),
+            }),
           );
           result.checklistItems.push(
             ...ReactiveCache.getChecklistItems({

+ 2 - 2
models/server/ExporterExcel.js

@@ -67,9 +67,9 @@ class ExporterExcel {
     result.actions = [];
     result.cards.forEach((card) => {
       result.checklists.push(
-        ...Checklists.find({
+        ...ReactiveCache.getChecklists({
           cardId: card._id,
-        }).fetch(),
+        }),
       );
       result.checklistItems.push(
         ...ReactiveCache.getChecklistItems({