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.

Batch discount code sync across partnerIds in one query path.

Kiran K3c29edd2aa1f
diff --git a/apps/web/app/(ee)/api/cron/groups/remap-default-links/route.ts b/apps/web/app/(ee)/api/cron/groups/remap-default-links/route.ts
index 05b0201056..cedcbd6690 100644
--- a/apps/web/app/(ee)/api/cron/groups/remap-default-links/route.ts
+++ b/apps/web/app/(ee)/api/cron/groups/remap-default-links/route.ts
@@ -253,14 +253,10 @@ export async function POST(req: Request) {
partnerIds,
});
- await Promise.all(
- partnerIds.map((partnerId) =>
- syncDiscountCodes({
- programId,
- partnerId,
- }),
- ),
- );
+ await syncDiscountCodes({
+ programId,
+ partnerIds,
+ });
return logAndRespond(`Finished creating default links for the partners.`);
} catch (error) {
diff --git a/apps/web/app/(ee)/api/workflows/detach-discount/route.ts b/apps/web/app/(ee)/api/workflows/detach-discount/route.ts
index 4da2e09c77..bec459d360 100644
--- a/apps/web/app/(ee)/api/workflows/detach-discount/route.ts
+++ b/apps/web/app/(ee)/api/workflows/detach-discount/route.ts
@@ -2,7 +2,7 @@ import { logger } from "@/lib/axiom/server";
import {
detachDiscountFromLinkRewards,
detachDiscountFromProgramEnrollments,
- syncDiscountCodes,
+ dispatchRemapDiscountCodes,
} from "@/lib/discounts/detach-discount";
import { prisma } from "@/lib/prisma";
import { serve } from "@upstash/workflow/nextjs";
@@ -22,9 +22,9 @@ type Input = z.infer<typeof inputSchema>;
* Soft-deleted discounts (programId cleared) are cleaned up as:
*
* 1. detach-discount-from-enrollments + detach-discount-from-link-rewards (parallel)
- * 2. sync-discount-codes
+ * 2. remap-discount-codes
*
- * Hard-delete is deferred to /api/cron/cleanup/orphaned-rewards once syncs
+ * Hard-delete is deferred to /api/cron/cleanup/orphaned-rewards once remaps
* finish and nothing still references the soft-deleted discount.
*/
@@ -95,14 +95,14 @@ export const { POST } = serve<Input>(
]);
// This should run after the enrollments and link rewards are updated
- await context.run("sync-discount-codes", async () => {
- await syncDiscountCodes({
+ await context.run("remap-discount-codes", async () => {
+ await dispatchRemapDiscountCodes({
programId,
discountId,
});
return logAndReturn({
- outputLog: `Synced discount codes for discount ${discountId}`,
+ outputLog: `Dispatched remap jobs for discount codes on ${discountId}`,
});
});
},
diff --git a/apps/web/lib/actions/partners/update-partner-enrollment.ts b/apps/web/lib/actions/partners/update-partner-enrollment.ts
index 8ecccc3f59..e31e7f93ef 100644
--- a/apps/web/lib/actions/partners/update-partner-enrollment.ts
+++ b/apps/web/lib/actions/partners/update-partner-enrollment.ts
@@ -196,7 +196,7 @@ export const updatePartnerEnrollmentAction = authActionClient
if (discountId !== undefined) {
await syncDiscountCodes({
programId,
- partnerId,
+ partnerIds: [partnerId],
});
}
diff --git a/apps/web/lib/api/partners/update-partner-link.ts b/apps/web/lib/api/partners/update-partner-link.ts
index bafb28fe70..1d02c6e77f 100644
--- a/apps/web/lib/api/partners/update-partner-link.ts
+++ b/apps/web/lib/api/partners/update-partner-link.ts
@@ -157,7 +157,7 @@ export async function updatePartnerLink({
if (body.discountId !== undefined) {
await syncDiscountCodes({
programId,
- partnerId: link.partnerId,
+ partnerIds: [link.partnerId],
});
}
diff --git a/apps/web/lib/discounts/detach-discount.ts b/apps/web/lib/discounts/detach-discount.ts
index a2a7c055a8..85c3c61686 100644
--- a/apps/web/lib/discounts/detach-discount.ts
+++ b/apps/web/lib/discounts/detach-discount.ts
@@ -154,7 +154,9 @@ export async function detachDiscountFromLinkRewards({
}
// Dispatch per-code remap jobs for codes still pointing at this discount
-export async function syncDiscountCodes({ discountId }: DetachDiscountParams) {
+export async function dispatchRemapDiscountCodes({
+ discountId,
+}: DetachDiscountParams) {
let startAfterId: string | null = null;
while (true) {
diff --git a/apps/web/lib/discounts/sync-discount-codes.ts b/apps/web/lib/discounts/sync-discount-codes.ts
index b017fc29ec..87be11590e 100644
--- a/apps/web/lib/discounts/sync-discount-codes.ts
+++ b/apps/web/lib/discounts/sync-discount-codes.ts
@@ -1,47 +1,55 @@
import { enqueueBatchJobs } from "@/lib/cron/enqueue-batch-jobs";
import { remapDiscountCodeJob } from "@/lib/jobs/handlers/remap-discount-code-job";
import { prisma } from "@/lib/prisma";
-import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
-import { Discount, ProgramEnrollment } from "@prisma/client";
+import { APP_DOMAIN_WITH_NGROK, pluck } from "@dub/utils";
+import { Discount } from "@prisma/client";
import { ACTIVE_ENROLLMENT_STATUSES } from "../zod/schemas/partners";
-// Read discount codes for a partner in a program and fan out per-code remap jobs
+// Remap existing codes and enqueue missing default-link codes for partners in a program
export async function syncDiscountCodes({
programId,
- partnerId,
-}: Pick<ProgramEnrollment, "programId" | "partnerId">) {
- const programEnrollment = await prisma.programEnrollment.findUnique({
+ partnerIds,
+}: {
+ programId: string;
+ partnerIds: string[];
+}) {
+ partnerIds = [...new Set(partnerIds)];
+
+ if (partnerIds.length === 0) {
+ return;
+ }
+
+ const programEnrollments = await prisma.programEnrollment.findMany({
where: {
- partnerId_programId: {
- partnerId,
- programId,
+ programId,
+ partnerId: {
+ in: partnerIds,
+ },
+ status: {
+ in: ACTIVE_ENROLLMENT_STATUSES,
},
},
select: {
- id: true,
- status: true,
+ partnerId: true,
discount: true,
},
});
- if (!programEnrollment) {
+ if (programEnrollments.length === 0) {
console.info(
- `Program enrollment not found for partner ${partnerId} and program ${programId}. Skipping...`,
+ `No active program enrollments found for program ${programId}. Skipping discount code sync...`,
);
return;
}
- if (!ACTIVE_ENROLLMENT_STATUSES.includes(programEnrollment.status)) {
- console.info(
- `Program enrollment is not active for partner ${partnerId} and program ${programId}. Skipping...`,
- );
- return;
- }
+ const activePartnerIds = pluck(programEnrollments, "partnerId");
const discountCodes = await prisma.discountCode.findMany({
where: {
programId,
- partnerId,
+ partnerId: {
+ in: activePartnerIds,
+ },
disabledAt: null,
},
select: {
@@ -51,38 +59,49 @@ export async function syncDiscountCodes({
if (discountCodes.length === 0) {
console.info(
- `No discount codes found for partner ${partnerId} and program ${programId}. Skipping remap jobs...`,
+ `No discount codes found for ${activePartnerIds.length} partners in program ${programId}. Skipping remap jobs...`,
);
} else {
await remapDiscountCodeJob.dispatchBatch(
discountCodes.map(({ id }) => ({
discountCodeId: id,
})),
- ({ discountCodeId }) => ({
- label: discountCodeId,
- deduplicationId: `remap-discount-code-${discountCodeId}`,
- }),
);
}
await enqueueMissingDiscountCodes({
programId,
- partnerId,
- enrollmentDiscount: programEnrollment.discount,
+ enrollments: programEnrollments,
});
}
// Find default links that do not have a discount code assigned to them and enqueue a job to create one
async function enqueueMissingDiscountCodes({
programId,
- partnerId,
- enrollmentDiscount,
-}: Pick<ProgramEnrollment, "programId" | "partnerId"> & {
- enrollmentDiscount: Pick<Discount, "autoProvisionEnabledAt"> | null;
+ enrollments,
+}: {
+ programId: string;
+ enrollments: {
+ partnerId: string;
+ discount: Pick<Discount, "autoProvisionEnabledAt"> | null;
+ }[];
}) {
+ if (enrollments.length === 0) {
+ return;
+ }
+
+ const enrollmentDiscountByPartnerId = new Map(
+ enrollments.map((enrollment) => [
+ enrollment.partnerId,
+ enrollment.discount,
+ ]),
+ );
+
const links = await prisma.link.findMany({
where: {
- partnerId,
+ partnerId: {
+ in: pluck(enrollments, "partnerId"),
+ },
programId,
partnerGroupDefaultLinkId: {
not: null,
@@ -93,6 +112,7 @@ async function enqueueMissingDiscountCodes({
},
select: {
id: true,
+ partnerId: true,
linkReward: {
select: {
discount: {
@@ -106,7 +126,16 @@ async function enqueueMissingDiscountCodes({
});
const linksToProvision = links.filter((link) => {
- const discount = link.linkReward?.discount ?? enrollmentDiscount;
+ if (!link.partnerId) {
+ return false;
+ }
+
+ const enrollmentDiscount = enrollmentDiscountByPartnerId.get(
+ link.partnerId,
+ );
+
+ const discount = link.linkReward?.discount ?? enrollmentDiscount ?? null;
+
return Boolean(discount?.autoProvisionEnabledAt);
});