fix: semplify the solution

Signed-off-by: Umberto Sgueglia <usgueglia@contractor.linuxfoundation.org>

Author: ulemons

backend/src/database/repositories/organizationRepository.ts

@@ -1296,25 +1296,6 @@ class OrganizationRepository {
     return { lfxMembershipFilter, updatedfilter }
   }
 
-  private static handleSearchFilter(filter: any): {
-    searchTerm: string | null
-    updatedFilter: any
-  } {
-    if (!filter || typeof filter !== 'object') {
-      return { searchTerm: null, updatedFilter: filter }
-    }
-
-    const updatedFilter = { ...filter }
-    let searchTerm: string | null = null
-
-    if (typeof updatedFilter.search === 'string' && updatedFilter.search.trim()) {
-      searchTerm = updatedFilter.search.trim()
-    }
-    delete updatedFilter.search
-
-    return { searchTerm, updatedFilter }
-  }
-
   static async findAndCountAll(
     {
       countOnly = false,
@@ -1335,6 +1316,7 @@ class OrganizationRepository {
       limit = 20,
       offset = 0,
       orderBy = undefined,
+      search = undefined as string | undefined,
       segmentId = undefined,
     },
     options: IRepositoryOptions,
@@ -1351,6 +1333,7 @@ class OrganizationRepository {
       limit,
       offset,
       orderBy,
+      search,
       segmentId,
     })
 
@@ -1364,6 +1347,7 @@ class OrganizationRepository {
         cacheKey,
         {
           filter,
+          search,
           limit,
           offset,
           orderBy,
@@ -1385,6 +1369,7 @@ class OrganizationRepository {
         cacheKey,
         {
           filter,
+          search,
           segmentId,
           include,
         },
@@ -1405,6 +1390,7 @@ class OrganizationRepository {
       cacheKey,
       {
         filter,
+        search,
         limit,
         offset,
         orderBy,
@@ -1422,6 +1408,7 @@ class OrganizationRepository {
     cacheKey: string,
     {
       filter = {} as any,
+      search = undefined as string | undefined,
       limit = 20,
       offset = 0,
       orderBy = undefined,
@@ -1447,10 +1434,6 @@ class OrganizationRepository {
 
     const withAggregates = include.aggregates
 
-    const { searchTerm, updatedFilter: filterWithoutSearch } =
-      OrganizationRepository.handleSearchFilter(filter)
-    filter = filterWithoutSearch
-
     const { lfxMembershipFilter, updatedfilter } =
       OrganizationRepository.handleLfxMembershipFilter(filter)
     filter = updatedfilter // updated filter without lfxMembershipFilter
@@ -1489,8 +1472,8 @@ class OrganizationRepository {
     }
 
     let searchWhereClause = ''
-    if (searchTerm) {
-      params.searchTerm = `%${searchTerm}%`
+    if (search) {
+      params.searchTerm = `%${search}%`
       searchWhereClause = `AND o."displayName" ILIKE $(searchTerm)`
     }
 
@@ -1679,6 +1662,7 @@ class OrganizationRepository {
     params: {
       // TODO: REMOVE this any
       filter?: any
+      search?: string
       limit: number
       offset: number
       orderBy?: string
@@ -1701,6 +1685,7 @@ class OrganizationRepository {
     cacheKey: string,
     params: {
       filter?: any
+      search?: string
       segmentId?: string
       include: any
     },

backend/src/database/repositories/organizationsQueryCache.ts

@@ -38,6 +38,7 @@ export class OrganizationQueryCache {
     limit: number
     offset: number
     orderBy?: string
+    search?: string
     segmentId?: string
   }): string {
     const cleanParams = Object.fromEntries(
@@ -49,6 +50,7 @@ export class OrganizationQueryCache {
         limit: params.limit,
         offset: params.offset,
         orderBy: params.orderBy,
+        search: params.search,
         segmentId: params.segmentId,
       }).filter(([, value]) => value !== null && value !== undefined),
     )

backend/src/services/organizationService.ts

@@ -1163,10 +1163,13 @@ export default class OrganizationService extends LoggerBase {
   }
 
   async query(data) {
-    const { filter, orderBy, limit, offset, segments } = data
+    const { filter: rawFilter, orderBy, limit, offset, segments } = data
+    const { search, ...filter } = rawFilter ?? {}
+    const searchTerm = typeof search === 'string' && search.trim() ? search.trim() : undefined
     return OrganizationRepository.findAndCountAll(
       {
         filter,
+        search: searchTerm,
         orderBy,
         limit,
         offset,