TEMP

UN-OCHA · May 2, 2024 · 60b6bb5 · 60b6bb5
1 parent 504b7c4
commit 60b6bb5
Showing 1 changed file with 7 additions and 9 deletions.
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
@@ -67,6 +67,7 @@ export class GetFlowIdsFromCategoryConditionsStrategyImpl
       .queryBuilder()
       .distinct('flow.id', 'flow.versionID')
       .from('flow')
+      .where('flow.deletedAt', null)
       .join('categoryRef', function () {
         this.on('flow.id', '=', 'categoryRef.objectID').andOn(
           'flow.versionID',
@@ -77,9 +78,10 @@ export class GetFlowIdsFromCategoryConditionsStrategyImpl
 
     if (categoriesIds.length > 0) {
       joinQuery = joinQuery.andWhere(function () {
-        this.where('categoryRef.categoryID', 'IN', categoriesIds)
-          .andWhere('categoryRef.objectType', 'flow')
-          .andWhere('flow.deletedAt', null);
+        this.where('categoryRef.categoryID', 'IN', categoriesIds).andWhere(
+          'categoryRef.objectType',
+          'flow'
+        );
       });
     }
 
@@ -89,9 +91,7 @@ export class GetFlowIdsFromCategoryConditionsStrategyImpl
           'categoryRef.categoryID',
           'IN',
           categoriesIdsFromShortcutFilterIN
-        )
-          .andWhere('categoryRef.objectType', 'flow')
-          .andWhere('flow.deletedAt', null);
+        ).andWhere('categoryRef.objectType', 'flow');
       });
     }
 
@@ -101,9 +101,7 @@ export class GetFlowIdsFromCategoryConditionsStrategyImpl
           'categoryRef.categoryID',
           'NOT IN',
           categoriesIdsFromShortcutFilterNOTIN
-        )
-          .andWhere('categoryRef.objectType', 'flow')
-          .andWhere('flow.deletedAt', null);
+        ).andWhere('categoryRef.objectType', 'flow');
       });
     }