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.

Send disable/delete discount-code webhooks for all providers and skip custom cleanup.

Kiran Ka5bf954de5f5
diff --git a/apps/web/app/(ee)/api/cron/groups/remap-discount-codes/route.ts b/apps/web/app/(ee)/api/cron/groups/remap-discount-codes/route.ts
index 208b409767..e1028fa51b 100644
--- a/apps/web/app/(ee)/api/cron/groups/remap-discount-codes/route.ts
+++ b/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(
diff --git a/apps/web/app/(ee)/api/cron/partners/ban/route.ts b/apps/web/app/(ee)/api/cron/partners/ban/route.ts
index 89ac41c885..d566eaec7b 100644
--- a/apps/web/app/(ee)/api/cron/partners/ban/route.ts
+++ b/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,
},
},
},
diff --git a/apps/web/app/(ee)/api/cron/partners/deactivate/route.ts b/apps/web/app/(ee)/api/cron/partners/deactivate/route.ts
index 2658f91a60..be34948bac 100644
--- a/apps/web/app/(ee)/api/cron/partners/deactivate/route.ts
+++ b/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,
},
},
},
diff --git a/apps/web/lib/api/links/delete-link.ts b/apps/web/lib/api/links/delete-link.ts
index 7976a0737c..a6509c292e 100644
--- a/apps/web/lib/api/links/delete-link.ts
+++ b/apps/web/lib/api/links/delete-link.ts
@@ -1,4 +1,4 @@
-import { enqueueDeleteDiscountCode } from "@/lib/discounts/delete-discount-code";
+import { deleteDiscountCodes } from "@/lib/discounts/delete-discount-code";
import { prisma } from "@/lib/prisma";
import { storage } from "@/lib/storage";
import { recordLink } from "@/lib/tinybird";
@@ -19,34 +19,21 @@ export async function deleteLink(linkId: string) {
...includeProgramEnrollment,
discountCode: {
include: {
- discount: {
- select: {
- provider: true,
- },
- },
+ discount: true,
},
},
},
});
- // Delete the discount code and link in a transaction
- await prisma.$transaction([
- ...(link.discountCode
- ? [
- prisma.discountCode.delete({
- where: {
- id: link.discountCode.id,
- },
- }),
- ]
- : []),
+ if (link.discountCode) {
+ await deleteDiscountCodes([link.discountCode]);
+ }
- prisma.link.delete({
- where: {
- id: linkId,
- },
- }),
- ]);
+ await prisma.link.delete({
+ where: {
+ id: linkId,
+ },
+ });
waitUntil(
Promise.allSettled([
@@ -72,8 +59,6 @@ export async function deleteLink(linkId: string) {
},
},
}),
-
- link.discountCode && enqueueDeleteDiscountCode([link.discountCode]),
]),
);
diff --git a/apps/web/lib/discounts/delete-discount-code.ts b/apps/web/lib/discounts/delete-discount-code.ts
index a300444c35..e65c80f113 100644
--- a/apps/web/lib/discounts/delete-discount-code.ts
+++ b/apps/web/lib/discounts/delete-discount-code.ts
@@ -1,16 +1,21 @@
import { prisma } from "@/lib/prisma";
import { DiscountCodeWebhookSchema } from "@/lib/zod/schemas/discount";
import { APP_DOMAIN_WITH_NGROK, chunk } from "@dub/utils";
-import { Discount, DiscountCode } from "@prisma/client";
+import { Discount, DiscountCode, DiscountProvider } from "@prisma/client";
import { waitUntil } from "@vercel/functions";
+import * as z from "zod/v4";
import { enqueueBatchJobs } from "../cron/enqueue-batch-jobs";
import { sendDiscountCodeWebhook } from "./discount-code-webhook";
+type DiscountCodeWebhookDiscount = z.infer<
+ typeof DiscountCodeWebhookSchema
+>["discount"];
+
type DeleteDiscountCodesParams = Pick<
DiscountCode,
"id" | "code" | "programId" | "partnerId" | "linkId" | "disabledAt"
> & {
- discount: Pick<Discount, "provider"> | null;
+ discount: DiscountCodeWebhookDiscount;
};
type EnqueueDeleteDiscountCodeParams = Pick<
@@ -41,6 +46,8 @@ export async function deleteDiscountCodes(
}
if (isSoftDelete) {
+ const disabledAt = new Date();
+
// Soft delete the discount codes from the database (mark them as disabled)
const disabledDiscountCodes = await prisma.discountCode.updateMany({
where: {
@@ -49,13 +56,23 @@ export async function deleteDiscountCodes(
},
},
data: {
- disabledAt: new Date(),
+ disabledAt,
},
});
console.log(
`[deleteDiscountCodes] Disabled ${disabledDiscountCodes.count} discount codes.`,
);
+
+ waitUntil(
+ sendDiscountCodeWebhooks({
+ trigger: "discount_code.updated",
+ discountCodes: discountCodes.map((discountCode) => ({
+ ...discountCode,
+ disabledAt,
+ })),
+ }),
+ );
} else {
// Delete the discount codes from the database
const deletedDiscountCodes = await prisma.discountCode.deleteMany({
@@ -69,10 +86,13 @@ export async function deleteDiscountCodes(
console.log(
`[deleteDiscountCodes] Deleted ${deletedDiscountCodes.count} discount codes.`,
);
- }
- if (!isSoftDelete) {
- waitUntil(sendDiscountCodeDeletedWebhooks(discountCodes));
+ waitUntil(
+ sendDiscountCodeWebhooks({
+ trigger: "discount_code.deleted",
+ discountCodes,
+ }),
+ );
}
await enqueueDeleteDiscountCode(discountCodes);
@@ -81,12 +101,13 @@ export async function deleteDiscountCodes(
// Only enqueue external-provider cleanup for codes whose provider is known.
// Orphaned codes (discount relation is null) still get deleted locally above
// but we can't tell which external provider to clean up, so we skip them.
+// Custom providers disable via webhook, so they are not queued.
export async function enqueueDeleteDiscountCode(
discountCodes: EnqueueDeleteDiscountCodeParams[],
) {
const codesWithProvider = discountCodes.filter(
(dc): dc is typeof dc & { discount: Pick<Discount, "provider"> } =>
- dc.discount != null,
+ dc.discount != null && dc.discount.provider !== DiscountProvider.custom,
);
if (codesWithProvider.length === 0) {
@@ -112,9 +133,13 @@ export async function enqueueDeleteDiscountCode(
}
}
-async function sendDiscountCodeDeletedWebhooks(
- discountCodes: DeleteDiscountCodesParams[],
-) {
+async function sendDiscountCodeWebhooks({
+ trigger,
+ discountCodes,
+}: {
+ trigger: "discount_code.updated" | "discount_code.deleted";
+ discountCodes: DeleteDiscountCodesParams[];
+}) {
const programIds = [...new Set(discountCodes.map((dc) => dc.programId))];
const workspaces = await prisma.project.findMany({
@@ -143,7 +168,7 @@ async function sendDiscountCodeDeletedWebhooks(
}
return sendDiscountCodeWebhook({
- trigger: "discount_code.deleted",
+ trigger,
workspace,
data: DiscountCodeWebhookSchema.parse(discountCode),
});
diff --git a/apps/web/lib/discounts/discount-code-webhook.ts b/apps/web/lib/discounts/discount-code-webhook.ts
index 1b34e0291b..6cfa892877 100644
--- a/apps/web/lib/discounts/discount-code-webhook.ts
+++ b/apps/web/lib/discounts/discount-code-webhook.ts
@@ -1,6 +1,6 @@
import { sendWorkspaceWebhook } from "@/lib/webhook/publish";
import { DiscountCodeWebhookSchema } from "@/lib/zod/schemas/discount";
-import { DiscountProvider, Project } from "@prisma/client";
+import { Project } from "@prisma/client";
import * as z from "zod/v4";
export async function sendDiscountCodeWebhook({
@@ -15,11 +15,6 @@ export async function sendDiscountCodeWebhook({
data: z.infer<typeof DiscountCodeWebhookSchema>;
workspace: Pick<Project, "id" | "webhookEnabled">;
}) {
- // Only send webhook for custom discount provider for now
- if (data.discount?.provider !== DiscountProvider.custom) {
- return;
- }
-
await sendWorkspaceWebhook({
trigger,
workspace,
diff --git a/apps/web/lib/openapi/discount-codes/delete-discount-code.ts b/apps/web/lib/openapi/discount-codes/delete-discount-code.ts
index 5262afdee9..1f7edac6e6 100644
--- a/apps/web/lib/openapi/discount-codes/delete-discount-code.ts
+++ b/apps/web/lib/openapi/discount-codes/delete-discount-code.ts
@@ -9,7 +9,7 @@ export const deleteDiscountCode: ZodOpenApiOperationObject = {
"x-speakeasy-max-method-params": 1,
summary: "Delete a discount code",
description:
- "Delete a discount code for a partner. This will also disable the code in your connected Stripe or Shopify account.",
+ "Delete a discount code for a partner. This will also disable the code in your connected discount provider (Stripe, Shopify, or custom via webhook).",
requestParams: {
path: z.object({
id: DiscountCodeSchema.shape.id.describe(
diff --git a/apps/web/lib/openapi/discount-codes/update-discount-code.ts b/apps/web/lib/openapi/discount-codes/update-discount-code.ts
index 35793cf592..2c0cb6fb79 100644
--- a/apps/web/lib/openapi/discount-codes/update-discount-code.ts
+++ b/apps/web/lib/openapi/discount-codes/update-discount-code.ts
@@ -1,7 +1,6 @@
import { openApiErrorResponses } from "@/lib/openapi/responses";
import {
DiscountCodeSchema,
- DiscountCodeWebhookSchema,
updateDiscountCodeSchema,
} from "@/lib/zod/schemas/discount";
import { ZodOpenApiOperationObject } from "zod-openapi";
@@ -33,7 +32,7 @@ export const updateDiscountCode: ZodOpenApiOperationObject = {
description: "The updated discount code.",
content: {
"application/json": {
- schema: DiscountCodeWebhookSchema,
+ schema: DiscountCodeSchema,
},
},
},
diff --git a/apps/web/playwright/api/discount-codes/discount-codes.spec.ts b/apps/web/playwright/api/discount-codes/discount-codes.spec.ts
index 4aa17ec72f..4fcb67b379 100644
--- a/apps/web/playwright/api/discount-codes/discount-codes.spec.ts
+++ b/apps/web/playwright/api/discount-codes/discount-codes.spec.ts
@@ -1,4 +1,5 @@
import { createId } from "@/lib/api/create-id";
+import { constructDiscountCode } from "@/lib/discounts/construct-discount-code";
import { conn } from "@/lib/planetscale";
import { prisma } from "@/lib/prisma";
import type { EnrolledPartnerProps } from "@/lib/types";
@@ -114,7 +115,10 @@ test.afterAll(async () => {
}
});
-async function createPartner(api: ApiClient) {
+async function createPartner(
+ api: ApiClient,
+ overrides: Record<string, unknown> = {},
+) {
if (!partnerGroupId) {
throw new Error("Custom discount group was not seeded.");
}
@@ -123,6 +127,7 @@ async function createPartner(api: ApiClient) {
name: randomName(),
email: randomPartnerEmail(),
groupId: partnerGroupId,
+ ...overrides,
});
}
@@ -221,6 +226,49 @@ test("POST /discount-codes – omits code and auto-generates", async ({
}
});
+test("POST /discount-codes – auto-generated first-name collision retries", async ({
+ api,
+}) => {
+ let partnerIdA: string | undefined;
+ let partnerIdB: string | undefined;
+
+ try {
+ const firstName = `Sarah${nanoid(6)}`;
+ const { data: partnerA } = await createPartner(api, {
+ name: `${firstName} One`,
+ });
+ const { data: partnerB } = await createPartner(api, {
+ name: `${firstName} Two`,
+ });
+ partnerIdA = partnerA.id;
+ partnerIdB = partnerB.id;
+
+ const expectedBase = constructDiscountCode({
+ partner: partnerA,
+ discount: customDiscount,
+ });
+
+ const first = await api.post<DiscountCode>("/api/discount-codes", {
+ partnerId: partnerA.id,
+ linkId: partnerA.links?.[0]?.id,
+ });
+ const second = await api.post<DiscountCode>("/api/discount-codes", {
+ partnerId: partnerB.id,
+ linkId: partnerB.links?.[0]?.id,
+ });
+
+ expect(first.status).toEqual(200);
+ expect(second.status).toEqual(200);
+ expect(first.data.code).toEqual(expectedBase);
+ expect(second.data.code).not.toEqual(first.data.code);
+ expect(second.data.code.startsWith(expectedBase)).toBe(true);
+ expect(second.data.code.length).toEqual(expectedBase.length + 2);
+ } finally {
+ await deletePartner(partnerIdA);
+ await deletePartner(partnerIdB);
+ }
+});
+
test("POST /discount-codes – same link", async ({ api }) => {
let partnerId: string | undefined;