🏃 Increased performance when obtaining 'Parked Parents Flows'

Author: manelcecs

src/domain-services/flow-link/flow-link-service.ts

@@ -1,6 +1,6 @@
 import { type FlowId } from '@unocha/hpc-api-core/src/db/models/flow';
 import { type Database } from '@unocha/hpc-api-core/src/db/type';
-import { Op } from '@unocha/hpc-api-core/src/db/util/conditions';
+import { Cond, Op } from '@unocha/hpc-api-core/src/db/util/conditions';
 import { type InstanceOfModel } from '@unocha/hpc-api-core/src/db/util/types';
 import { getOrCreate } from '@unocha/hpc-api-core/src/util';
 import { Service } from 'typedi';
@@ -14,9 +14,25 @@ export class FlowLinkService {
     // Fetch all flow links in one go
     const flowLinks = await models.flowLink.find({
       where: {
-        parentID: {
-          [Op.IN]: flowIds,
-        },
+        [Cond.AND]: [
+          {
+            [Cond.OR]: [
+              {
+                parentID: {
+                  [Op.IN]: flowIds,
+                },
+              },
+              {
+                childID: {
+                  [Op.IN]: flowIds,
+                },
+              },
+            ],
+          },
+          {
+            depth: { [Op.GTE]: 1 },
+          },
+        ],
       },
     });
 
@@ -28,12 +44,10 @@ export class FlowLinkService {
 
     // Group flow links by parentID in one pass
     for (const link of flowLinks) {
-      const flowLinksForFlow = getOrCreate(
-        flowLinksMap,
-        link.parentID,
-        () => []
-      );
-      flowLinksForFlow.push(link);
+      const childFlowLink = getOrCreate(flowLinksMap, link.childID, () => []);
+      const parentFlowLink = getOrCreate(flowLinksMap, link.parentID, () => []);
+      childFlowLink.push(link);
+      parentFlowLink.push(link);
     }
 
     return flowLinksMap;

src/domain-services/flows/flow-search-service.ts

@@ -223,8 +223,6 @@ export class FlowSearchService {
     ]);
 
     const promises = flows.map(async (flow) => {
-      const flowLink = getOrCreate(flowLinksMap, flow.id, () => []);
-
       // Categories Map follows the structure:
       // flowID: { versionID: [categories]}
       // So we need to get the categories for the flow version
@@ -247,16 +245,6 @@ export class FlowSearchService {
       }
 
       let parkedParentSource: FlowParkedParentSource | null = null;
-      const shouldLookAfterParentSource =
-        flowLink.length > 0 && shouldIncludeChildrenOfParkedFlows;
-
-      if (shouldLookAfterParentSource) {
-        parkedParentSource = await this.flowService.getParketParents(
-          flow,
-          flowLink,
-          models
-        );
-      }
 
       const childIDs: number[] =
         flowLinksMap
@@ -266,14 +254,23 @@ export class FlowSearchService {
           )
           .map((flowLink) => flowLink.childID.valueOf()) ?? [];
 
-      const parentIDs: number[] =
+      const parentLinks =
         flowLinksMap
           .get(flow.id)
           ?.filter(
             (flowLink) => flowLink.childID === flow.id && flowLink.depth > 0
-          )
-          .map((flowLink) => flowLink.parentID.valueOf()) ?? [];
+          ) ?? [];
+      const parentIDs: number[] = parentLinks.map((flowLink) =>
+        flowLink.parentID.valueOf()
+      );
 
+      if (shouldIncludeChildrenOfParkedFlows) {
+        parkedParentSource = await this.flowService.getParketParents(
+          flow,
+          parentLinks,
+          models
+        );
+      }
       const parsedFlow: Flow = this.buildFlowDTO(
         flow,
         categoriesByVersion,

src/domain-services/flows/flow-service.ts

@@ -386,7 +386,6 @@ export class FlowService {
     if (flowLinksParentsIDs.length === 0) {
       return null;
     }
-
     const parkedCategory = await models.category.findOne({
       where: {
         group: 'flowType',