Merge branch 'main' into hmaan-displayId

apps/web/app/api/v1/client/[environmentId]/responses/route.ts

@@ -1,6 +1,7 @@
 import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
 import { sendToPipeline } from "@/app/lib/pipelines";
+import { getDisplay } from "@/lib/display/service";
 import { validateFileUploads } from "@/lib/fileValidation";
 import { capturePosthogEnvironmentEvent } from "@/lib/posthogServer";
 import { getSurvey } from "@/lib/survey/service";
@@ -97,6 +98,14 @@ export const POST = async (request: Request, context: Context): Promise<Response
     return responses.badRequestResponse("Invalid file upload response");
   }
 
+  // check display
+  if (responseInputData.displayId) {
+    const display = await getDisplay(responseInputData.displayId);
+    if (!display) {
+      return responses.notFoundResponse("Display", responseInputData.displayId, true);
+    }
+  }
+
   let response: TResponse;
   try {
     const meta: TResponseInput["meta"] = {

apps/web/app/api/v2/client/[environmentId]/responses/route.ts

@@ -2,6 +2,7 @@ import { checkSurveyValidity } from "@/app/api/v2/client/[environmentId]/respons
 import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
 import { sendToPipeline } from "@/app/lib/pipelines";
+import { getDisplay } from "@/lib/display/service";
 import { capturePosthogEnvironmentEvent } from "@/lib/posthogServer";
 import { getSurvey } from "@/lib/survey/service";
 import { validateOtherOptionLengthForMultipleChoice } from "@/modules/api/v2/lib/question";
@@ -104,6 +105,14 @@ export const POST = async (request: Request, context: Context): Promise<Response
     );
   }
 
+  // check display
+  if (responseInputData.displayId) {
+    const display = await getDisplay(responseInputData.displayId);
+    if (!display) {
+      return responses.notFoundResponse("Display", responseInputData.displayId, true);
+    }
+  }
+
   let response: TResponse;
   try {
     const meta: TResponseInputV2["meta"] = {

apps/web/lib/display/service.ts

@@ -62,3 +62,19 @@ export const deleteDisplay = async (displayId: string): Promise<TDisplay> => {
     throw error;
   }
 };
+
+export const getDisplay = reactCache(async (displayId: string): Promise<{ id: string } | null> => {
+  validateInputs([displayId, ZId]);
+  try {
+    const display = await prisma.display.findUnique({
+      where: { id: displayId },
+      select: { id: true },
+    });
+    return display;
+  } catch (error) {
+    if (error instanceof Prisma.PrismaClientKnownRequestError) {
+      throw new DatabaseError(error.message);
+    }
+    throw error;
+  }
+});

packages/types/responses.ts

@@ -297,7 +297,7 @@ export const ZResponseInput = z.object({
   environmentId: z.string().cuid2(),
   surveyId: z.string().cuid2(),
   userId: z.string().nullish(),
-  displayId: z.string().nullish(),
+  displayId: z.string().cuid2().nullish(),
   singleUseId: z.string().nullable().optional(),
   finished: z.boolean(),
   endingId: z.string().nullish(),