Temp: merge with parkedParentSource commit

UN-OCHA · Dec 26, 2023 · ff8d11f · ff8d11f
1 parent d813008
commit ff8d11f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/src/domain-services/flows/flow-search-service.ts b/src/domain-services/flows/flow-search-service.ts
@@ -366,8 +366,14 @@ export class FlowSearchService {
     databaseConnection: Knex,
     filters: SearchFlowsArgs
   ): Promise<FlowSearchResult> {
-    const { limit, nextPageCursor, prevPageCursor, sortField, sortOrder } =
-      filters;
+    const {
+      limit,
+      nextPageCursor,
+      prevPageCursor,
+      sortField,
+      sortOrder,
+      includeChildrenOfParkedFlows: shouldIncludeChildrenOfParkedFlows,
+    } = filters;
 
     const orderBy: FlowOrderBy = this.buildOrderBy(sortField, sortOrder);
 
@@ -499,7 +505,8 @@ export class FlowSearchService {
 
         let parkedParentSource: FlowParkedParentSource | null = null;
         const shouldLookAfterParentSource =
-          flow.activeStatus && flowLink.length > 0;
+          flowLink.length > 0 && shouldIncludeChildrenOfParkedFlows;
+
         if (shouldLookAfterParentSource) {
           parkedParentSource = await this.getParketParents(
             flow,
@@ -848,6 +855,7 @@ export class FlowSearchService {
     const mappedParkedParentOrganizations: FlowParkedParentSource = {
       organization: [],
       orgName: [],
+      abbreviation: [],
     };
 
     for (const parkedParentOrganization of parkedParentOrganizations) {
@@ -857,6 +865,9 @@ export class FlowSearchService {
       mappedParkedParentOrganizations.orgName.push(
         parkedParentOrganization.name
       );
+      mappedParkedParentOrganizations.abbreviation.push(
+        parkedParentOrganization.abbreviation ?? ''
+      );
     }
 
     return mappedParkedParentOrganizations;

diff --git a/src/domain-services/flows/graphql/types.ts b/src/domain-services/flows/graphql/types.ts
@@ -39,6 +39,9 @@ export class FlowParkedParentSource {
 
   @Field(() => [String], { nullable: false })
   orgName: string[];
+
+  @Field(() => [String], { nullable: false })
+  abbreviation: string[];
 }
 
 @ObjectType()