feat: add segment filter on integratino

Author: ulemons

backend/src/database/repositories/integrationRepository.ts

@@ -319,22 +319,30 @@ class IntegrationRepository {
    * @param {string} [filters.query=''] - The search query to filter integrations.
    * @param {number} [filters.limit=20] - The maximum number of integrations to return.
    * @param {number} [filters.offset=0] - The offset for pagination.
+   * @param {string} [filters.segment=null] - The segment to filter integrations by.
    * @param {IRepositoryOptions} options - The repository options for querying.
    * @returns {Promise<Object>} The result containing the rows of integrations and metadata about the query.
    */
   static async findGlobalIntegrations(
-    { platform = null, status = ['done'], query = '', limit = 20, offset = 0 },
+    { platform = null, status = ['done'], query = '', limit = 20, offset = 0, segment = null },
     options: IRepositoryOptions,
   ) {
     const qx = SequelizeRepository.getQueryExecutor(options)
     if (status.includes('not-connected')) {
-      const rows = await fetchGlobalNotConnectedIntegrations(qx, platform, query, limit, offset)
-      const [result] = await fetchGlobalNotConnectedIntegrationsCount(qx, platform, query)
+      const rows = await fetchGlobalNotConnectedIntegrations(
+        qx,
+        platform,
+        query,
+        limit,
+        offset,
+        segment,
+      )
+      const [result] = await fetchGlobalNotConnectedIntegrationsCount(qx, platform, query, segment)
       return { rows, count: +result.count, limit: +limit, offset: +offset }
     }
 
-    const rows = await fetchGlobalIntegrations(qx, status, platform, query, limit, offset)
-    const [result] = await fetchGlobalIntegrationsCount(qx, status, platform, query)
+    const rows = await fetchGlobalIntegrations(qx, status, platform, query, limit, offset, segment)
+    const [result] = await fetchGlobalIntegrationsCount(qx, status, platform, query, segment)
     return { rows, count: +result.count, limit: +limit, offset: +offset }
   }
 
@@ -344,13 +352,17 @@ class IntegrationRepository {
    *
    * @param {Object} param1 - The optional parameters.
    * @param {string|null} [param1.platform=null] - The platform to filter the integrations. Default is null.
+   * @param {string|null} [param1.segment=null] - The segment to filter the integrations. Default is null.
    * @param {IRepositoryOptions} options - The options for the repository operations.
    * @return {Promise<Array<Object>>} A promise that resolves to an array of objects containing the statuses and their counts.
    */
-  static async findGlobalIntegrationsStatusCount({ platform = null }, options: IRepositoryOptions) {
+  static async findGlobalIntegrationsStatusCount(
+    { platform = null, segment = null },
+    options: IRepositoryOptions,
+  ) {
     const qx = SequelizeRepository.getQueryExecutor(options)
-    const [result] = await fetchGlobalNotConnectedIntegrationsCount(qx, platform, '')
-    const rows = await fetchGlobalIntegrationsStatusCount(qx, platform)
+    const [result] = await fetchGlobalNotConnectedIntegrationsCount(qx, platform, '', segment)
+    const rows = await fetchGlobalIntegrationsStatusCount(qx, platform, segment)
     return [...rows, { status: 'not-connected', count: +result.count }]
   }
 

services/libs/data-access-layer/src/integrations/index.ts

@@ -28,6 +28,7 @@ export async function fetchGlobalIntegrations(
   query: string,
   limit: number,
   offset: number,
+  segmentId?: string | null,
 ): Promise<IIntegration[]> {
   return qx.select(
     `
@@ -46,12 +47,14 @@ export async function fetchGlobalIntegrations(
         WHERE i."status" = ANY ($(status)::text[])
           AND i."deletedAt" IS NULL
           AND ($(platform) IS NULL OR i."platform" = $(platform))
+          AND ($(segmentId) IS NULL OR i."segmentId" = $(segmentId))
           AND s.name ILIKE $(query)
         LIMIT $(limit) OFFSET $(offset)
       `,
     {
       status,
       platform,
+      segmentId,
       query: `%${query}%`,
       limit,
       offset,
@@ -73,6 +76,7 @@ export async function fetchGlobalIntegrationsCount(
   status: string[],
   platform: string | null,
   query: string,
+  segmentId?: string | null,
 ): Promise<{ count: number }[]> {
   return qx.select(
     `
@@ -82,11 +86,13 @@ export async function fetchGlobalIntegrationsCount(
         WHERE i."status" = ANY ($(status)::text[])
           AND i."deletedAt" IS NULL
           AND ($(platform) IS NULL OR i."platform" = $(platform))
+          AND ($(segmentId) IS NULL OR i."segmentId" = $(segmentId))
           AND s.name ILIKE $(query)
       `,
     {
       status,
       platform,
+      segmentId,
       query: `%${query}%`,
     },
   )
@@ -109,6 +115,7 @@ export async function fetchGlobalNotConnectedIntegrations(
   query: string,
   limit: number,
   offset: number,
+  segmentId?: string | null,
 ): Promise<IIntegration[]> {
   return qx.select(
     `
@@ -133,11 +140,13 @@ export async function fetchGlobalNotConnectedIntegrations(
         AND s."parentId" IS NOT NULL
         AND s."grandparentId" IS NOT NULL
         AND ($(platform) IS NULL OR up."platform" = $(platform))
+        AND ($(segmentId) IS NULL OR s.id = $(segmentId))
         AND s.name ILIKE $(query)
       LIMIT $(limit) OFFSET $(offset)
     `,
     {
       platform,
+      segmentId,
       query: `%${query}%`,
       limit,
       offset,
@@ -157,6 +166,7 @@ export async function fetchGlobalNotConnectedIntegrationsCount(
   qx: QueryExecutor,
   platform: string | null,
   query: string,
+  segmentId?: string | null,
 ): Promise<{ count: number }[]> {
   return qx.select(
     `
@@ -175,10 +185,12 @@ export async function fetchGlobalNotConnectedIntegrationsCount(
         AND s."parentId" IS NOT NULL
         AND s."grandparentId" IS NOT NULL
         AND ($(platform) IS NULL OR up."platform" = $(platform))
+        AND ($(segmentId) IS NULL OR s.id = $(segmentId))
         AND s.name ILIKE $(query)
     `,
     {
       platform,
+      segmentId,
       query: `%${query}%`,
     },
   )
@@ -194,6 +206,7 @@ export async function fetchGlobalNotConnectedIntegrationsCount(
 export async function fetchGlobalIntegrationsStatusCount(
   qx: QueryExecutor,
   platform: string | null,
+  segmentId?: string | null,
 ): Promise<{ status: string; count: number }[]> {
   return qx.select(
     `
@@ -202,10 +215,12 @@ export async function fetchGlobalIntegrationsStatusCount(
         FROM "integrations" i
         WHERE i."deletedAt" IS NULL
           AND ($(platform) IS NULL OR i."platform" = $(platform))
+          AND ($(segmentId) IS NULL OR i."segmentId" = $(segmentId))
         GROUP BY i.status
     `,
     {
       platform,
+      segmentId,
     },
   )
 }