perf(stage): count archived cards

close #778
erxes · May 12, 2020 · 3700afa · 3700afa
1 parent 3bb59fa
commit 3700afa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/data/resolvers/queries/boardUtils.ts b/src/data/resolvers/queries/boardUtils.ts
@@ -34,13 +34,18 @@ export const generateCommonFilters = async (currentUserId: string, args: any) =>
     labelIds,
     priority,
     userIds,
+    filterArchive = true,
   } = args;
 
   const isListEmpty = value => {
     return value.length === 1 && value[0].length === 0;
   };
 
-  const filter: any = { status: { $ne: BOARD_STATUSES.ARCHIVED } };
+  const filter: any = {};
+
+  if (filterArchive) {
+    filter.status = { $ne: BOARD_STATUSES.ARCHIVED };
+  }
 
   let filterIds: string[] = [];
 

diff --git a/src/data/resolvers/stages.ts b/src/data/resolvers/stages.ts
@@ -56,7 +56,7 @@ export default {
       case BOARD_TYPES.DEAL: {
         const filter = await generateDealCommonFilters(
           user._id,
-          { ...args, stageId: stage._id, pipelineId: stage.pipelineId },
+          { ...args, stageId: stage._id, pipelineId: stage.pipelineId, filterArchive: false },
           args.extraParams,
         );
 
@@ -65,7 +65,7 @@ export default {
       case BOARD_TYPES.TICKET: {
         const filter = await generateTicketCommonFilters(
           user._id,
-          { ...args, stageId: stage._id, pipelineId: stage.pipelineId },
+          { ...args, stageId: stage._id, pipelineId: stage.pipelineId, filterArchive: false },
           args.extraParams,
         );
 
@@ -76,14 +76,15 @@ export default {
           ...args,
           stageId: stage._id,
           pipelineId: stage.pipelineId,
+          filterArchive: false,
         });
 
         return Tasks.find(filter).countDocuments();
       }
       case BOARD_TYPES.GROWTH_HACK: {
         const filter = await generateGrowthHackCommonFilters(
           user._id,
-          { ...args, stageId: stage._id, pipelineId: stage.pipelineId },
+          { ...args, stageId: stage._id, pipelineId: stage.pipelineId, filterArchive: false },
           args.extraParams,
         );