fix: removed completed surveys from survey list in integrations (#4838)

Co-authored-by: Piyush Gupta <piyushguptaa2z123@gmail.com>

apps/web/app/(app)/environments/[environmentId]/integrations/airtable/page.tsx

@@ -1,4 +1,5 @@
 import { AirtableWrapper } from "@/app/(app)/environments/[environmentId]/integrations/airtable/components/AirtableWrapper";
+import { getSurveys } from "@/app/(app)/environments/[environmentId]/integrations/lib/surveys";
 import { authOptions } from "@/modules/auth/lib/authOptions";
 import { getProjectPermissionByUserId } from "@/modules/ee/teams/lib/roles";
 import { getTeamPermissionFlags } from "@/modules/ee/teams/utils/teams";
@@ -15,7 +16,6 @@ import { getIntegrations } from "@formbricks/lib/integration/service";
 import { getMembershipByUserIdOrganizationId } from "@formbricks/lib/membership/service";
 import { getAccessFlags } from "@formbricks/lib/membership/utils";
 import { getProjectByEnvironmentId } from "@formbricks/lib/project/service";
-import { getSurveys } from "@formbricks/lib/survey/service";
 import { findMatchingLocale } from "@formbricks/lib/utils/locale";
 import { TIntegrationItem } from "@formbricks/types/integration";
 import { TIntegrationAirtable } from "@formbricks/types/integration/airtable";

apps/web/app/(app)/environments/[environmentId]/integrations/google-sheets/page.tsx

@@ -1,4 +1,5 @@
 import { GoogleSheetWrapper } from "@/app/(app)/environments/[environmentId]/integrations/google-sheets/components/GoogleSheetWrapper";
+import { getSurveys } from "@/app/(app)/environments/[environmentId]/integrations/lib/surveys";
 import { authOptions } from "@/modules/auth/lib/authOptions";
 import { getProjectPermissionByUserId } from "@/modules/ee/teams/lib/roles";
 import { getTeamPermissionFlags } from "@/modules/ee/teams/utils/teams";
@@ -19,7 +20,6 @@ import { getIntegrations } from "@formbricks/lib/integration/service";
 import { getMembershipByUserIdOrganizationId } from "@formbricks/lib/membership/service";
 import { getAccessFlags } from "@formbricks/lib/membership/utils";
 import { getProjectByEnvironmentId } from "@formbricks/lib/project/service";
-import { getSurveys } from "@formbricks/lib/survey/service";
 import { findMatchingLocale } from "@formbricks/lib/utils/locale";
 import { TIntegrationGoogleSheets } from "@formbricks/types/integration/google-sheet";
 

apps/web/app/(app)/environments/[environmentId]/integrations/lib/surveys.ts

@@ -0,0 +1,48 @@
+import "server-only";
+import { Prisma } from "@prisma/client";
+import { cache as reactCache } from "react";
+import { prisma } from "@formbricks/database";
+import { cache } from "@formbricks/lib/cache";
+import { surveyCache } from "@formbricks/lib/survey/cache";
+import { selectSurvey } from "@formbricks/lib/survey/service";
+import { transformPrismaSurvey } from "@formbricks/lib/survey/utils";
+import { validateInputs } from "@formbricks/lib/utils/validate";
+import { ZId } from "@formbricks/types/common";
+import { DatabaseError } from "@formbricks/types/errors";
+import { TSurvey } from "@formbricks/types/surveys/types";
+
+export const getSurveys = reactCache(
+  async (environmentId: string): Promise<TSurvey[]> =>
+    cache(
+      async () => {
+        validateInputs([environmentId, ZId]);
+
+        try {
+          const surveysPrisma = await prisma.survey.findMany({
+            where: {
+              environmentId,
+              status: {
+                not: "completed",
+              },
+            },
+            select: selectSurvey,
+            orderBy: {
+              updatedAt: "desc",
+            },
+          });
+
+          return surveysPrisma.map((surveyPrisma) => transformPrismaSurvey<TSurvey>(surveyPrisma));
+        } catch (error) {
+          if (error instanceof Prisma.PrismaClientKnownRequestError) {
+            console.error(error);
+            throw new DatabaseError(error.message);
+          }
+          throw error;
+        }
+      },
+      [`getSurveys-${environmentId}`],
+      {
+        tags: [surveyCache.tag.byEnvironmentId(environmentId)],
+      }
+    )()
+);

apps/web/app/(app)/environments/[environmentId]/integrations/notion/page.tsx

@@ -1,3 +1,4 @@
+import { getSurveys } from "@/app/(app)/environments/[environmentId]/integrations/lib/surveys";
 import { NotionWrapper } from "@/app/(app)/environments/[environmentId]/integrations/notion/components/NotionWrapper";
 import { authOptions } from "@/modules/auth/lib/authOptions";
 import { getProjectPermissionByUserId } from "@/modules/ee/teams/lib/roles";
@@ -21,7 +22,6 @@ import { getMembershipByUserIdOrganizationId } from "@formbricks/lib/membership/
 import { getAccessFlags } from "@formbricks/lib/membership/utils";
 import { getNotionDatabases } from "@formbricks/lib/notion/service";
 import { getProjectByEnvironmentId } from "@formbricks/lib/project/service";
-import { getSurveys } from "@formbricks/lib/survey/service";
 import { findMatchingLocale } from "@formbricks/lib/utils/locale";
 import { TIntegrationNotion, TIntegrationNotionDatabase } from "@formbricks/types/integration/notion";
 

apps/web/app/(app)/environments/[environmentId]/integrations/slack/page.tsx

@@ -1,3 +1,4 @@
+import { getSurveys } from "@/app/(app)/environments/[environmentId]/integrations/lib/surveys";
 import { SlackWrapper } from "@/app/(app)/environments/[environmentId]/integrations/slack/components/SlackWrapper";
 import { authOptions } from "@/modules/auth/lib/authOptions";
 import { getProjectPermissionByUserId } from "@/modules/ee/teams/lib/roles";
@@ -14,7 +15,6 @@ import { getIntegrationByType } from "@formbricks/lib/integration/service";
 import { getMembershipByUserIdOrganizationId } from "@formbricks/lib/membership/service";
 import { getAccessFlags } from "@formbricks/lib/membership/utils";
 import { getProjectByEnvironmentId } from "@formbricks/lib/project/service";
-import { getSurveys } from "@formbricks/lib/survey/service";
 import { findMatchingLocale } from "@formbricks/lib/utils/locale";
 import { TIntegrationSlack } from "@formbricks/types/integration/slack";
 

packages/lib/survey/service.ts

@@ -9,7 +9,6 @@ import { TSegment, ZSegmentFilters } from "@formbricks/types/segment";
 import {
   TSurvey,
   TSurveyCreateInput,
-  TSurveyFilterCriteria,
   TSurveyOpenTextQuestion,
   TSurveyQuestions,
   ZSurvey,
@@ -27,13 +26,7 @@ import { capturePosthogEnvironmentEvent } from "../posthogServer";
 import { getIsAIEnabled } from "../utils/ai";
 import { validateInputs } from "../utils/validate";
 import { surveyCache } from "./cache";
-import {
-  buildOrderByClause,
-  buildWhereClause,
-  doesSurveyHasOpenTextQuestion,
-  getInsightsEnabled,
-  transformPrismaSurvey,
-} from "./utils";
+import { doesSurveyHasOpenTextQuestion, getInsightsEnabled, transformPrismaSurvey } from "./utils";
 
 interface TriggerUpdate {
   create?: Array<{ actionClassId: string }>;
@@ -272,12 +265,7 @@ export const getSurveysByActionClassId = reactCache(
 );
 
 export const getSurveys = reactCache(
-  async (
-    environmentId: string,
-    limit?: number,
-    offset?: number,
-    filterCriteria?: TSurveyFilterCriteria
-  ): Promise<TSurvey[]> =>
+  async (environmentId: string, limit?: number, offset?: number): Promise<TSurvey[]> =>
     cache(
       async () => {
         validateInputs([environmentId, ZId], [limit, ZOptionalNumber], [offset, ZOptionalNumber]);
@@ -286,10 +274,11 @@ export const getSurveys = reactCache(
           const surveysPrisma = await prisma.survey.findMany({
             where: {
               environmentId,
-              ...buildWhereClause(filterCriteria),
             },
             select: selectSurvey,
-            orderBy: buildOrderByClause(filterCriteria?.sortBy),
+            orderBy: {
+              updatedAt: "desc",
+            },
             take: limit,
             skip: offset,
           });
@@ -303,7 +292,7 @@ export const getSurveys = reactCache(
           throw error;
         }
       },
-      [`getSurveys-${environmentId}-${limit}-${offset}-${JSON.stringify(filterCriteria)}`],
+      [`getSurveys-${environmentId}-${limit}-${offset}`],
       {
         tags: [surveyCache.tag.byEnvironmentId(environmentId)],
       }

packages/lib/survey/utils.ts

@@ -1,15 +1,9 @@
 import "server-only";
-import { Prisma } from "@prisma/client";
 import { generateObject } from "ai";
 import { z } from "zod";
 import { TJsEnvironmentStateSurvey } from "@formbricks/types/js";
 import { TSegment } from "@formbricks/types/segment";
-import {
-  TSurvey,
-  TSurveyFilterCriteria,
-  TSurveyQuestion,
-  TSurveyQuestions,
-} from "@formbricks/types/surveys/types";
+import { TSurvey, TSurveyQuestion, TSurveyQuestions } from "@formbricks/types/surveys/types";
 import { llmModel } from "../aiModels";
 
 export const transformPrismaSurvey = <T extends TSurvey | TJsEnvironmentStateSurvey>(
@@ -33,62 +27,6 @@ export const transformPrismaSurvey = <T extends TSurvey | TJsEnvironmentStateSur
   return transformedSurvey;
 };
 
-export const buildWhereClause = (filterCriteria?: TSurveyFilterCriteria) => {
-  const whereClause: Prisma.SurveyWhereInput["AND"] = [];
-
-  // for name
-  if (filterCriteria?.name) {
-    whereClause.push({ name: { contains: filterCriteria.name, mode: "insensitive" } });
-  }
-
-  // for status
-  if (filterCriteria?.status && filterCriteria?.status?.length) {
-    whereClause.push({ status: { in: filterCriteria.status } });
-  }
-
-  // for type
-  if (filterCriteria?.type && filterCriteria?.type?.length) {
-    whereClause.push({ type: { in: filterCriteria.type } });
-  }
-
-  // for createdBy
-  if (filterCriteria?.createdBy?.value && filterCriteria?.createdBy?.value?.length) {
-    if (filterCriteria.createdBy.value.length === 1) {
-      if (filterCriteria.createdBy.value[0] === "you") {
-        whereClause.push({ createdBy: filterCriteria.createdBy.userId });
-      }
-      if (filterCriteria.createdBy.value[0] === "others") {
-        whereClause.push({
-          OR: [
-            {
-              createdBy: {
-                not: filterCriteria.createdBy.userId,
-              },
-            },
-            {
-              createdBy: null,
-            },
-          ],
-        });
-      }
-    }
-  }
-
-  return { AND: whereClause };
-};
-
-export const buildOrderByClause = (
-  sortBy?: TSurveyFilterCriteria["sortBy"]
-): Prisma.SurveyOrderByWithRelationInput[] | undefined => {
-  const orderMapping: { [key: string]: Prisma.SurveyOrderByWithRelationInput } = {
-    name: { name: "asc" },
-    createdAt: { createdAt: "desc" },
-    updatedAt: { updatedAt: "desc" },
-  };
-
-  return sortBy ? [orderMapping[sortBy] || { updatedAt: "desc" }] : undefined;
-};
-
 export const anySurveyHasFilters = (surveys: TSurvey[]): boolean => {
   return surveys.some((survey) => {
     if ("segment" in survey && survey.segment) {