Temp: fix MaxStackSize when filtering categoryFlows

UN-OCHA · Apr 16, 2024 · f5bea6c · f5bea6c
1 parent 95d03f1
commit f5bea6c
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 32 deletions.
diff --git a/src/domain-services/flows/flow-service.ts b/src/domain-services/flows/flow-service.ts
@@ -48,37 +48,40 @@ export class FlowService {
       whereClauses,
     } = args;
 
-    let query = databaseConnection!
-      .queryBuilder()
-      .distinct('id', 'versionID', orderBy.column) // Include orderBy.column in the distinct selection
-      .from('flow')
-      .whereNull('deletedAt')
-      .orderBy(orderBy.column, orderBy.order);
+    if (databaseConnection) {
+      let query = databaseConnection
+        .queryBuilder()
+        .distinct('id', 'versionID', orderBy.column) // Include orderBy.column in the distinct selection
+        .from('flow')
+        .whereNull('deletedAt')
+        .orderBy(orderBy.column, orderBy.order);
 
-    if (conditions) {
-      query = applySearchFilters(query, conditions);
-    }
-    if (whereClauses) {
-      query = query.andWhere(prepareCondition(whereClauses));
-    }
+      if (conditions) {
+        query = applySearchFilters(query, conditions);
+      }
+      if (whereClauses) {
+        query = query.andWhere(prepareCondition(whereClauses));
+      }
 
-    // Because this list can be really large (+330K entries), we need to split it in chunks
-    // Using limit and offset as cursors
-    const databaseParsingLimit = 10_000;
-    if (limit && offset) {
-      query = query.limit(databaseParsingLimit + offset).offset(offset);
-    } else if (limit) {
-      query = query.limit(limit + databaseParsingLimit);
-    }
+      // Because this list can be really large (+330K entries), we need to split it in chunks
+      // Using limit and offset as cursors
+      const databaseParsingLimit = 10_000;
+      if (limit && offset) {
+        query = query.limit(databaseParsingLimit + offset).offset(offset);
+      } else if (limit) {
+        query = query.limit(limit + databaseParsingLimit);
+      }
 
-    const flows = await query;
+      const flows = await query;
 
-    const mapFlowsToUniqueFlowEntities = flows.map((flow) => ({
-      id: flow.id,
-      versionID: flow.versionID,
-    }));
+      const mapFlowsToUniqueFlowEntities = flows.map((flow) => ({
+        id: flow.id,
+        versionID: flow.versionID,
+      }));
 
-    return mapFlowsToUniqueFlowEntities;
+      return mapFlowsToUniqueFlowEntities;
+    }
+    return [];
   }
 
   async getFlowsCount(databaseConnection: Knex, conditions: any) {

diff --git a/src/domain-services/flows/strategy/flowID-search-strategy.ts b/src/domain-services/flows/strategy/flowID-search-strategy.ts
@@ -6,6 +6,7 @@ import { type UniqueFlowEntity } from '../model';
 
 export interface FlowIdSearchStrategyResponse {
   flows: UniqueFlowEntity[];
+  count?: number | null;
 }
 
 export interface FlowIdSearchStrategyArgs {

diff --git a/...domain-services/flows/strategy/impl/get-flowIds-flow-category-conditions-strategy-impl.ts b/...domain-services/flows/strategy/impl/get-flowIds-flow-category-conditions-strategy-impl.ts
@@ -122,14 +122,19 @@ export class GetFlowIdsFromCategoryConditionsStrategyImpl
     // Once we have the flowIDs from the category conditions
     // Look after this uniqueFlows in the flow table
     // to check if they are not 'deleted' (by the key: 'deletedAt')
+
+    // TEMPORARY FIX
+    const reducedFlows = mapFlows.slice(0, 1000);
     const searchFlowArgs = {
       databaseConnection,
       orderBy: defaultFlowOrderBy(),
-      whereClauses: buildSearchFlowsConditions(mapFlows),
+      whereClauses: buildSearchFlowsConditions(reducedFlows),
     };
     const uniqueEntitiesFlow =
       await this.flowService.getFlowsAsUniqueFlowEntity(searchFlowArgs);
 
-    return { flows: uniqueEntitiesFlow };
+    const count =
+      reducedFlows.length < mapFlows.length ? mapFlows.length : null;
+    return { flows: uniqueEntitiesFlow, count };
   }
 }
diff --git a/src/domain-services/flows/strategy/impl/get-flowIds-flow-object-conditions-strategy-impl.ts b/src/domain-services/flows/strategy/impl/get-flowIds-flow-object-conditions-strategy-impl.ts
@@ -53,6 +53,7 @@ export class GetFlowIdsFromObjectConditionsStrategyImpl
       orderBy: defaultFlowOrderBy(),
       whereClauses: buildSearchFlowsConditions(flowsFromFilteredFlowObjects),
     };
+
     const uniqueFlowsNotDeleted =
       await this.flowService.getFlowsAsUniqueFlowEntity(searchFlowArgs);
     return { flows: uniqueFlowsNotDeleted };

diff --git a/src/domain-services/flows/strategy/impl/search-flow-by-filters-strategy-impl.ts b/src/domain-services/flows/strategy/impl/search-flow-by-filters-strategy-impl.ts
@@ -127,9 +127,10 @@ export class SearchFlowByFiltersStrategy implements FlowSearchStrategy {
       isSearchByCategoryShotcut || flowCategoryFilters?.length > 0;
 
     const flowsFromCategoryFilters: UniqueFlowEntity[] = [];
-
+    // TEMPORARY FIX
+    let categoryFlowsCount: number | null = null;
     if (isFilterByCategory) {
-      const { flows }: FlowIdSearchStrategyResponse =
+      const { flows, count }: FlowIdSearchStrategyResponse =
         await this.getFlowIdsFromCategoryConditions.search({
           databaseConnection,
           models,
@@ -149,8 +150,8 @@ export class SearchFlowByFiltersStrategy implements FlowSearchStrategy {
       for (const flow of flows) {
         flowsFromCategoryFilters.push(flow);
       }
+      categoryFlowsCount = count ?? null;
     }
-
     // After that, if we need to filter by flowObjects
     // Obtain the flowIDs from the flowObjects
     const isFilterByFlowObjects = flowObjectFilters?.length > 0;
@@ -234,7 +235,8 @@ export class SearchFlowByFiltersStrategy implements FlowSearchStrategy {
       sortedFlows = deduplicatedFlows;
     }
 
-    const count = sortedFlows.length;
+    // TEMPORARY FIX
+    const count = categoryFlowsCount ?? sortedFlows.length;
 
     const flowEntityOrderBy = defaultFlowOrderBy();
     // Store the flows promise