Fix incorrect usage of map for categories shortcut

Simplified how category shortcut are map to the id reference
UN-OCHA · Apr 21, 2024 · 405e549 · 405e549
1 parent 6fb94db
commit 405e549
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 60 deletions.
diff --git a/src/domain-services/categories/model.ts b/src/domain-services/categories/model.ts
@@ -31,4 +31,5 @@ export type CategoryGroup =
 export type ShortcutCategoryFilter = {
   category: string;
   operation: typeof Op.IN | typeof Op.NOT_IN;
+  id: number;
 };
diff --git a/src/domain-services/flows/flow-search-service.ts b/src/domain-services/flows/flow-search-service.ts
@@ -319,21 +319,22 @@ export class FlowSearchService {
     isStandardFlows: boolean
   ): ShortcutCategoryFilter[] | null {
     const filters = [
-      { flag: isPendingFlows, category: 'Pending' },
-      { flag: isCommitmentFlows, category: 'Commitment' },
-      { flag: isPaidFlows, category: 'Paid' },
-      { flag: isPledgedFlows, category: 'Pledge' },
-      { flag: isCarryoverFlows, category: 'Carryover' },
-      { flag: isParkedFlows, category: 'Parked' },
-      { flag: isPassThroughFlows, category: 'Pass Through' },
-      { flag: isStandardFlows, category: 'Standard' },
+      { flag: isPendingFlows, category: 'Pending', id: 45 },
+      { flag: isCommitmentFlows, category: 'Commitment', id: 47 },
+      { flag: isPaidFlows, category: 'Paid', id: 48 },
+      { flag: isPledgedFlows, category: 'Pledge', id: 46 },
+      { flag: isCarryoverFlows, category: 'Carryover', id: 137 },
+      { flag: isParkedFlows, category: 'Parked', id: 1252 },
+      { flag: isPassThroughFlows, category: 'Pass Through', id: 136 },
+      { flag: isStandardFlows, category: 'Standard', id: 133 },
     ];
 
     const shortcutFilters: ShortcutCategoryFilter[] = filters
       .filter((filter) => filter.flag !== undefined)
       .map((filter) => ({
         category: filter.category,
         operation: filter.flag ? Op.IN : Op.NOT_IN,
+        id: filter.id,
       }));
 
     return shortcutFilters.length > 0 ? shortcutFilters : null;

diff --git a/src/domain-services/flows/flow-service.ts b/src/domain-services/flows/flow-service.ts
@@ -43,14 +43,7 @@ export class FlowService {
   async getFlowsAsUniqueFlowEntity(
     args: GetFlowsArgs
   ): Promise<UniqueFlowEntity[]> {
-    const {
-      databaseConnection,
-      orderBy,
-      conditions,
-      offset,
-      limit,
-      whereClauses,
-    } = args;
+    const { databaseConnection, orderBy, conditions, whereClauses } = args;
 
     let query = databaseConnection!
       .queryBuilder()
@@ -59,6 +52,8 @@ export class FlowService {
       .whereNull('deletedAt');
     if (orderBy.raw) {
       query = query.orderByRaw(orderBy.raw);
+    } else if (orderBy.entity !== 'flow') {
+      query = query.orderBy('id', orderBy.order);
     } else {
       query = query.orderBy(orderBy.column, orderBy.order);
     }
@@ -70,15 +65,6 @@ export class FlowService {
       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);
-    }
-
     const flows = await query;
 
     const mapFlowsToUniqueFlowEntities = flows.map((flow) => ({
@@ -106,6 +92,8 @@ export class FlowService {
       .whereNull('deletedAt');
     if (orderBy.raw) {
       query = query.orderByRaw(orderBy.raw);
+    } else if (orderBy.entity !== 'flow') {
+      query = query.orderBy('id', orderBy.order);
     } else {
       query = query.orderBy(orderBy.column, orderBy.order);
     }

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
@@ -17,20 +17,6 @@ export class GetFlowIdsFromCategoryConditionsStrategyImpl
 {
   constructor(private readonly categoryService: CategoryService) {}
 
-  private readonly categoryIDsMap: Map<string, number> = new Map<
-    string,
-    number
-  >([
-    ['Pending', 45],
-    ['Pledge', 46],
-    ['Commitment', 47],
-    ['Paid', 48],
-    ['Standard', 133],
-    ['Pass through', 136],
-    ['Carryover', 137],
-    ['Parked', 1252],
-  ]);
-
   async search(
     args: FlowIdSearchStrategyArgs
   ): Promise<FlowIdSearchStrategyResponse> {
@@ -41,19 +27,21 @@ export class GetFlowIdsFromCategoryConditionsStrategyImpl
       databaseConnection,
     } = args;
 
-    const categoriesIds: CategoryId[] = [];
-
-    const whereClause = mapFlowCategoryConditionsToWhereClause(
-      flowCategoryConditions!
-    );
+    let categoriesIds: CategoryId[] = [];
 
+    let whereClause = null;
+    if (flowCategoryConditions) {
+      whereClause = mapFlowCategoryConditionsToWhereClause(
+        flowCategoryConditions
+      );
+    }
     if (whereClause) {
       const categories = await this.categoryService.findCategories(
         models,
         whereClause
       );
 
-      categories.map((category) => category.id);
+      categoriesIds = categories.map((category) => category.id);
     }
 
     // Add category IDs from shortcut filter
@@ -63,17 +51,14 @@ export class GetFlowIdsFromCategoryConditionsStrategyImpl
 
     if (shortcutFilter) {
       for (const shortcut of shortcutFilter) {
-        const shortcutCategoryID = this.categoryIDsMap.get(shortcut.category);
-        if (shortcutCategoryID) {
-          if (shortcut.operation === Op.IN) {
-            categoriesIdsFromShortcutFilterIN.push(
-              createBrandedValue(shortcutCategoryID)
-            );
-          } else {
-            categoriesIdsFromShortcutFilterNOTIN.push(
-              createBrandedValue(shortcutCategoryID)
-            );
-          }
+        if (shortcut.operation === Op.IN) {
+          categoriesIdsFromShortcutFilterIN.push(
+            createBrandedValue(shortcut.id)
+          );
+        } else {
+          categoriesIdsFromShortcutFilterNOTIN.push(
+            createBrandedValue(shortcut.id)
+          );
         }
       }
     }
@@ -91,15 +76,15 @@ export class GetFlowIdsFromCategoryConditionsStrategyImpl
       });
 
     if (categoriesIds.length > 0) {
-      joinQuery = joinQuery.orWhere(function () {
+      joinQuery = joinQuery.andWhere(function () {
         this.where('categoryRef.categoryID', 'IN', categoriesIds)
           .andWhere('categoryRef.objectType', 'flow')
           .andWhere('flow.deletedAt', null);
       });
     }
 
     if (categoriesIdsFromShortcutFilterIN.length > 0) {
-      joinQuery = joinQuery.orWhere(function () {
+      joinQuery = joinQuery.andWhere(function () {
         this.where(
           'categoryRef.categoryID',
           'IN',
@@ -111,7 +96,7 @@ export class GetFlowIdsFromCategoryConditionsStrategyImpl
     }
 
     if (categoriesIdsFromShortcutFilterNOTIN.length > 0) {
-      joinQuery = joinQuery.orWhere(function () {
+      joinQuery = joinQuery.andWhere(function () {
         this.where(
           'categoryRef.categoryID',
           'NOT IN',

diff --git a/src/domain-services/flows/strategy/impl/utils.ts b/src/domain-services/flows/strategy/impl/utils.ts
@@ -62,7 +62,7 @@ export function mapFlowCategoryConditionsToWhereClause(
     return whereClause;
   }
 
-  return {};
+  return null;
 }
 
 export function mergeFlowIDsFromFilteredFlowObjectsAndFlowCategories(