Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

finalize getProgramOrThrow

Steven Tey4626ebe48ec7
diff --git a/apps/web/app/(ee)/api/programs/[programId]/route.ts b/apps/web/app/(ee)/api/programs/[programId]/route.ts
index 21a66e6bc0..834e4a7bf1 100644
--- a/apps/web/app/(ee)/api/programs/[programId]/route.ts
+++ b/apps/web/app/(ee)/api/programs/[programId]/route.ts
@@ -1,5 +1,6 @@
import { getProgramOrThrow } from "@/lib/api/programs/get-program-or-throw";
import { withWorkspace } from "@/lib/auth";
+import { ProgramSchema } from "@/lib/zod/schemas/programs";
import { NextResponse } from "next/server";
// GET /api/programs/[programId] - get a program by id
@@ -12,5 +13,5 @@ export const GET = withWorkspace(async ({ workspace, params }) => {
},
});
- return NextResponse.json(program);
+ return NextResponse.json(ProgramSchema.parse(program));
});
diff --git a/apps/web/lib/api/programs/get-program-or-throw.ts b/apps/web/lib/api/programs/get-program-or-throw.ts
index 6c8d6d0753..874c0f5ef7 100644
--- a/apps/web/lib/api/programs/get-program-or-throw.ts
+++ b/apps/web/lib/api/programs/get-program-or-throw.ts
@@ -1,22 +1,14 @@
-import { programInviteEmailDataSchema } from "@/lib/zod/schemas/program-invite-email";
import { ProgramSchema } from "@/lib/zod/schemas/programs";
import { prisma } from "@dub/prisma";
import { Prisma } from "@dub/prisma/client";
import { z } from "zod";
import { DubApiError } from "../errors";
-// Extended schema with inviteEmailData
-const ProgramWithInviteEmailSchema = ProgramSchema.extend({
- inviteEmailData: programInviteEmailDataSchema,
-});
-
-// Type that combines Zod schema inference with Prisma include payload
type ProgramWithInclude<T extends Prisma.ProgramInclude = {}> = z.infer<
- typeof ProgramWithInviteEmailSchema
+ typeof ProgramSchema
> &
Prisma.ProgramGetPayload<{ include: T }>;
-// Type-safe version that accepts an include object directly
export async function getProgramOrThrow<T extends Prisma.ProgramInclude = {}>({
workspaceId,
programId,
@@ -26,18 +18,11 @@ export async function getProgramOrThrow<T extends Prisma.ProgramInclude = {}>({
programId: string;
include?: T;
}): Promise<ProgramWithInclude<T>> {
- const finalInclude = include
- ? ({
- ...include,
- categories: include.categories ? true : false,
- } as T)
- : undefined;
-
const program = await prisma.program.findUnique({
where: {
id: programId,
},
- ...(finalInclude && { include: finalInclude }),
+ include,
});
if (!program || program.workspaceId !== workspaceId) {
@@ -57,7 +42,5 @@ export async function getProgramOrThrow<T extends Prisma.ProgramInclude = {}>({
}
: program;
- return ProgramWithInviteEmailSchema.parse(
- transformedProgram,
- ) as ProgramWithInclude<T>;
+ return transformedProgram as ProgramWithInclude<T>;
}
diff --git a/apps/web/lib/zod/schemas/programs.ts b/apps/web/lib/zod/schemas/programs.ts
index 5a84551586..87186384bf 100644
--- a/apps/web/lib/zod/schemas/programs.ts
+++ b/apps/web/lib/zod/schemas/programs.ts
@@ -19,6 +19,7 @@ import { DiscountSchema } from "./discount";
import { GroupSchema } from "./groups";
import { LinkSchema } from "./links";
import { programApplicationFormDataWithValuesSchema } from "./program-application-form";
+import { programInviteEmailDataSchema } from "./program-invite-email";
import { RewardSchema } from "./rewards";
import { UserSchema } from "./users";
import { parseDateSchema } from "./utils";
@@ -40,6 +41,7 @@ export const ProgramSchema = z.object({
rewards: z.array(RewardSchema).nullish(),
discounts: z.array(DiscountSchema).nullish(),
categories: z.array(z.nativeEnum(Category)).nullish(),
+ inviteEmailData: programInviteEmailDataSchema, // TODO: move to group-level soon
defaultFolderId: z.string(),
defaultGroupId: z.string(),
supportEmail: z.string().nullish(),