[pull] main from dubinc:main

apps/web/app/(ee)/api/cron/discount-codes/create/route.ts

@@ -1,3 +1,4 @@
+import { DubApiError } from "@/lib/api/errors";
 import { withCron } from "@/lib/cron/with-cron";
 import { createDiscountCode } from "@/lib/discounts/create-discount-code";
 import { isNonRecoverableDiscountError } from "@/lib/discounts/discount-error";
@@ -44,6 +45,7 @@ export const POST = withCron(async ({ rawBody }) => {
       project: {
         select: {
           id: true,
+          webhookEnabled: true,
           stripeConnectId: true,
           shopifyStoreId: true,
         },
@@ -94,6 +96,13 @@ export const POST = withCron(async ({ rawBody }) => {
       return logAndRespond(error.message, { logLevel: "warn" });
     }
 
+    if (
+      error instanceof DubApiError &&
+      (error.code === "conflict" || error.code === "bad_request")
+    ) {
+      return logAndRespond(error.message, { logLevel: "warn" });
+    }
+
     throw error;
   }
 

apps/web/app/(ee)/api/cron/groups/remap-discount-codes/route.ts

@@ -4,7 +4,7 @@ import { deleteDiscountCodes } from "@/lib/discounts/delete-discount-code";
 import { isDiscountProviderError } from "@/lib/discounts/discount-error";
 import { isDiscountEquivalent } from "@/lib/discounts/is-discount-equivalent";
 import { prisma } from "@/lib/prisma";
-import { Discount, DiscountCode } from "@prisma/client";
+import { DiscountCode } from "@prisma/client";
 import * as z from "zod/v4";
 import { logAndRespond } from "../../utils";
 
@@ -68,9 +68,7 @@ export const POST = withCron(async ({ rawBody }) => {
 
   // Find the discount codes to update and remove
   const discountCodesToUpdate: DiscountCode[] = [];
-  const discountCodesToRemove: (DiscountCode & {
-    discount: Pick<Discount, "provider"> | null;
-  })[] = [];
+  const discountCodesToRemove: typeof discountCodes = [];
 
   for (const discountCode of discountCodes) {
     const keepDiscountCode = isDiscountEquivalent(
@@ -149,6 +147,7 @@ export const POST = withCron(async ({ rawBody }) => {
         },
         select: {
           id: true,
+          webhookEnabled: true,
           stripeConnectId: true,
           shopifyStoreId: true,
         },

apps/web/app/(ee)/api/cron/partners/ban/route.ts

@@ -40,11 +40,7 @@ export const POST = withCron(async ({ rawBody }) => {
         },
         discountCodes: {
           include: {
-            discount: {
-              select: {
-                provider: true,
-              },
-            },
+            discount: true,
           },
         },
       },

apps/web/app/(ee)/api/cron/partners/deactivate/route.ts

@@ -39,11 +39,7 @@ export const POST = withCron(async ({ rawBody }) => {
       links: true,
       discountCodes: {
         include: {
-          discount: {
-            select: {
-              provider: true,
-            },
-          },
+          discount: true,
         },
       },
     },

apps/web/app/(ee)/api/discount-codes/[discountCodeId]/route.ts → apps/web/app/(ee)/api/discount-codes/[idOrCode]/route.ts

@@ -7,42 +7,38 @@ import { prisma } from "@/lib/prisma";
 import { waitUntil } from "@vercel/functions";
 import { NextResponse } from "next/server";
 
-// DELETE /api/discount-codes/[discountCodeId] - soft delete a discount code
+// DELETE /api/discount-codes/[idOrCode] - delete a discount code
 export const DELETE = withWorkspace(
   async ({ workspace, params, session }) => {
-    const { discountCodeId } = params;
+    const { idOrCode } = params;
     const programId = getDefaultProgramIdOrThrow(workspace);
 
     const discountCode = await prisma.discountCode.findUnique({
-      where: {
-        id: discountCodeId,
-      },
+      where: idOrCode.startsWith("dcode_")
+        ? { id: idOrCode }
+        : { programId_code: { programId, code: idOrCode } },
       include: {
-        discount: {
-          select: {
-            provider: true,
-          },
-        },
+        discount: true,
       },
     });
 
     if (!discountCode || !discountCode.discount) {
       throw new DubApiError({
-        message: `Discount code (${discountCodeId}) not found.`,
-        code: "bad_request",
+        code: "not_found",
+        message: `Discount code (${idOrCode}) not found.`,
       });
     }
 
     if (discountCode.programId !== programId) {
       throw new DubApiError({
-        message: `Discount code (${discountCodeId}) is not associated with the program.`,
-        code: "bad_request",
+        code: "not_found",
+        message: `Discount code (${idOrCode}) not found.`,
       });
     }
 
     await prisma.discountCode.update({
       where: {
-        id: discountCodeId,
+        id: discountCode.id,
       },
       data: {
         discountId: null,

apps/web/app/(ee)/api/discount-codes/route.ts

@@ -1,5 +1,6 @@
 import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
 import { DubApiError } from "@/lib/api/errors";
+import { getDiscountOrThrow } from "@/lib/api/partners/get-discount-or-throw";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
 import { parseRequestBody } from "@/lib/api/utils";
@@ -15,26 +16,47 @@ import { APP_DOMAIN } from "@dub/utils";
 import { waitUntil } from "@vercel/functions";
 import { NextResponse } from "next/server";
 
-// GET /api/discount-codes - get all discount codes for a partner
+// GET /api/discount-codes - list discount codes
 export const GET = withWorkspace(
   async ({ workspace, searchParams }) => {
     const programId = getDefaultProgramIdOrThrow(workspace);
 
-    const { partnerId } = getDiscountCodesQuerySchema.parse(searchParams);
-
-    const programEnrollment = await getProgramEnrollmentOrThrow({
+    const {
       partnerId,
-      programId,
-      include: {
-        discountCodes: true,
+      discountId,
+      page = 1,
+      pageSize,
+    } = getDiscountCodesQuerySchema.parse(searchParams);
+
+    if (discountId) {
+      await getDiscountOrThrow({
+        discountId,
+        programId,
+      });
+    }
+
+    if (partnerId) {
+      await getProgramEnrollmentOrThrow({
+        partnerId,
+        programId,
+        include: {},
+      });
+    }
+
+    const discountCodes = await prisma.discountCode.findMany({
+      where: {
+        programId,
+        ...(partnerId && { partnerId }),
+        ...(discountId && { discountId }),
       },
+      orderBy: {
+        createdAt: "desc",
+      },
+      take: pageSize,
+      skip: (page - 1) * pageSize,
     });
 
-    const response = DiscountCodeSchema.array().parse(
-      programEnrollment.discountCodes,
-    );
-
-    return NextResponse.json(response);
+    return NextResponse.json(DiscountCodeSchema.array().parse(discountCodes));
   },
   {
     requiredPlan: ["business", "advanced", "enterprise"],
@@ -46,17 +68,30 @@ export const POST = withWorkspace(
   async ({ workspace, req, session }) => {
     const programId = getDefaultProgramIdOrThrow(workspace);
 
-    const { partnerId, linkId, code } = createDiscountCodeSchema.parse(
-      await parseRequestBody(req),
-    );
+    const body = await parseRequestBody(req);
+
+    if (typeof body.code === "string" && body.code.trim() === "") {
+      delete body.code;
+    }
+
+    const { partnerId, linkId, code } = createDiscountCodeSchema.parse(body);
 
     const programEnrollment = await getProgramEnrollmentOrThrow({
       partnerId,
       programId,
       include: {
-        links: true,
         discount: true,
-        discountCodes: true,
+        links: {
+          select: {
+            id: true,
+          },
+        },
+        discountCodes: {
+          select: {
+            code: true,
+            linkId: true,
+          },
+        },
         partner: {
           select: {
             id: true,
@@ -85,6 +120,18 @@ export const POST = withWorkspace(
       });
     }
 
+    // A link can have only one discount code
+    const duplicateByLink = programEnrollment.discountCodes.find(
+      (discountCode) => discountCode.linkId === linkId,
+    );
+
+    if (duplicateByLink) {
+      throw new DubApiError({
+        code: "bad_request",
+        message: `This link already has a discount code (${duplicateByLink.code}) assigned.`,
+      });
+    }
+
     // Check for duplicate by code
     if (code) {
       const duplicateByCode = await prisma.discountCode.findUnique({
@@ -107,18 +154,6 @@ export const POST = withWorkspace(
       }
     }
 
-    // A link can have only one discount code
-    const duplicateByLink = programEnrollment.discountCodes.find(
-      (discountCode) => discountCode.linkId === linkId,
-    );
-
-    if (duplicateByLink) {
-      throw new DubApiError({
-        code: "bad_request",
-        message: `This link already has a discount code (${duplicateByLink.code}) assigned.`,
-      });
-    }
-
     const discountCode = await createDiscountCode({
       workspace,
       partner: programEnrollment.partner,

apps/web/app/(ee)/api/workflows/partner-approved/route.ts

@@ -126,6 +126,9 @@ export const { POST } = serve<Input>(
         select: {
           id: true,
           plan: true,
+          webhookEnabled: true,
+          stripeConnectId: true,
+          shopifyStoreId: true,
         },
       });
 
@@ -172,8 +175,21 @@ export const { POST } = serve<Input>(
 
     // Step 2: Auto-provision discount code if enabled
     await context.run("create-discount-codes", async () => {
+      const workspace = await prisma.project.findUniqueOrThrow({
+        where: {
+          id: program.workspaceId,
+        },
+        select: {
+          id: true,
+          plan: true,
+          webhookEnabled: true,
+          stripeConnectId: true,
+          shopifyStoreId: true,
+        },
+      });
+
       await generateDiscountCodeForPartner({
-        workspaceId: program.workspaceId,
+        workspace,
         partner: {
           id: partner.id,
           name: partner.name,

apps/web/app/api/route.ts

@@ -1,8 +1,14 @@
 import { document } from "@/lib/openapi";
 import { NextResponse } from "next/server";
 
-export const runtime = "edge";
+export const dynamic = "force-static";
 
 export function GET() {
-  return NextResponse.json(document);
+  return NextResponse.json(document, {
+    headers: {
+      // cache indefinitely till next deployment
+      "Vercel-CDN-Cache-Control": "s-maxage=31536000",
+      "Cache-Control": "public, max-age=31536000",
+    },
+  });
 }

apps/web/lib/actions/partners/accept-program-invite.ts

@@ -54,6 +54,8 @@ export const acceptProgramInviteAction = authPartnerActionClient
           select: {
             id: true,
             webhookEnabled: true,
+            stripeConnectId: true,
+            shopifyStoreId: true,
           },
         });
 
@@ -72,7 +74,7 @@ export const acceptProgramInviteAction = authPartnerActionClient
         await Promise.allSettled([
           // 1. Generate discount code for partner (if enabled)
           generateDiscountCodeForPartner({
-            workspaceId: workspace.id,
+            workspace,
             partner: enrolledPartner,
           }),
           // 2. Send "partner.enrolled" webhook to workspace

apps/web/lib/actions/partners/create-discount.ts

@@ -82,8 +82,12 @@ export const createDiscountAction = authActionClient
           type,
           maxDuration,
           provider,
-          couponId: coupon?.id || couponId || null,
-          ...(couponTestId && { couponTestId }),
+          couponId:
+            provider === DiscountProvider.stripe
+              ? coupon?.id || couponId || null
+              : null,
+          ...(provider === DiscountProvider.stripe &&
+            couponTestId && { couponTestId }),
           ...(autoProvision && { autoProvisionEnabledAt: new Date() }),
         },
       });

apps/web/lib/actions/partners/delete-discount.ts

@@ -40,15 +40,8 @@ export const deleteDiscountAction = authActionClient
       where: {
         discountId: discount.id,
       },
-      select: {
-        id: true,
-        code: true,
-        programId: true,
-        discount: {
-          select: {
-            provider: true,
-          },
-        },
+      include: {
+        discount: true,
       },
     });
 

apps/web/lib/api/links/bulk-delete-links.ts

@@ -79,11 +79,7 @@ async function deleteLinksBatch(links: ExpandedLink[]): Promise<number> {
       },
     },
     include: {
-      discount: {
-        select: {
-          provider: true,
-        },
-      },
+      discount: true,
     },
   });