The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Move discount-code queue-batches into publish-discount-codes-creation-job.
Kiran Kcce280bd3d46
diff --git a/apps/web/app/(ee)/api/cron/discount-codes/create/queue-batches/route.ts b/apps/web/app/(ee)/api/cron/discount-codes/create/queue-batches/route.tsindex 7bebc2c207..8bcac00734 100644--- a/apps/web/app/(ee)/api/cron/discount-codes/create/queue-batches/route.ts+++ b/apps/web/app/(ee)/api/cron/discount-codes/create/queue-batches/route.ts@@ -1,11 +1,5 @@-import { CRON_BATCH_SIZE, qstash } from "@/lib/cron";-import { enqueueBatchJobs } from "@/lib/cron/enqueue-batch-jobs";import { withCron } from "@/lib/cron/with-cron";-import { isNonRecoverableDiscountError } from "@/lib/discounts/discount-error";-import { getDiscountProvider } from "@/lib/discounts/discount-provider";-import { prisma } from "@/lib/prisma";-import { ACTIVE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";-import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";+import { publishDiscountCodesCreationJob } from "@/lib/jobs/handlers/publish-discount-codes-creation-job";import * as z from "zod/v4";import { logAndRespond } from "../../../utils";@@ -17,136 +11,11 @@ const inputSchema = z.object({});// POST /api/cron/discount-codes/create/queue-batches+// Drain shim for in-flight QStash messages; new work uses publish-discount-codes-creation-jobexport const POST = withCron(async ({ rawBody }) => {- const { discountId, startingAfter } = inputSchema.parse(JSON.parse(rawBody));-- const discount = await prisma.discount.findUnique({- where: {- id: discountId,- },- include: {- program: {- select: {- id: true,- workspace: {- select: {- id: true,- stripeConnectId: true,- shopifyStoreId: true,- },- },- },- },- },- });-- if (!discount) {- return logAndRespond(`Discount ${discountId} not found. Skipping...`);- }-- if (!discount.programId) {- return logAndRespond(`Discount ${discountId} is soft-deleted. Skipping...`);- }-- if (!discount.autoProvisionEnabledAt) {- return logAndRespond(- `Discount ${discountId} does not have auto-provision enabled. Skipping...`,- );- }-- const { program } = discount;-- if (!program) {- return logAndRespond(`Discount ${discountId} has no program. Skipping...`);- }-- const discountProvider = getDiscountProvider(discount.provider);-- try {- await discountProvider.assertDiscountIntegration({- workspace: program.workspace,- });- } catch (error) {- if (isNonRecoverableDiscountError(error)) {- return logAndRespond(error.message, { logLevel: "warn" });- }-- throw error;- }-- const programEnrollments = await prisma.programEnrollment.findMany({- where: {- programId: program.id,- discountId: discount.id,- status: {- in: ACTIVE_ENROLLMENT_STATUSES,- },- },- select: {- id: true,- partnerId: true,- discountId: true,- links: {- select: {- id: true,- },- where: {- discountCode: null,- partnerGroupDefaultLinkId: {- not: null,- },- },- },- },- ...(startingAfter && {- skip: 1,- cursor: {- id: startingAfter,- },- }),- orderBy: {- id: "asc",- },- take: CRON_BATCH_SIZE,- });-- if (programEnrollments.length === 0) {- return logAndRespond(- `No more program enrollments found for discount ${discountId}.`,- );- }-- const links = programEnrollments.flatMap(({ links }) => links);-- if (links.length > 0) {- await enqueueBatchJobs(- links.map((link) => ({- queueName: "create-discount-code",- url: `${APP_DOMAIN_WITH_NGROK}/api/cron/discount-codes/create`,- deduplicationId: `${discountId}-${link.id}`,- body: {- linkId: link.id,- },- })),- );- }-- if (programEnrollments.length === CRON_BATCH_SIZE) {- const startingAfter = programEnrollments[programEnrollments.length - 1].id;-- await qstash.publishJSON({- url: `${APP_DOMAIN_WITH_NGROK}/api/cron/discount-codes/create/queue-batches`,- method: "POST",- body: {- discountId,- startingAfter,- },- });-- return logAndRespond(- `Queued next batch for discount ${discountId} (startingAfter: ${startingAfter}).`,- );- }-- return logAndRespond(`Finished queuing jobs for discount ${discountId}.`);+ const payload = inputSchema.parse(JSON.parse(rawBody));+ await publishDiscountCodesCreationJob.execute(payload);+ return logAndRespond(+ `Executed publish-discount-codes-creation-job for ${payload.discountId}.`,+ );});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.tsindex d04ac31f14..4968e9bc5e 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@@ -27,7 +27,6 @@ const schema = z.object({groupId: z.string(),partnerIds: z.array(z.string()),userId: z.string().nullish(),- isGroupDeleted: z.boolean().optional(),});/**@@ -50,8 +49,9 @@ export async function POST(req: Request) {const rawBody = await req.text();await verifyQstashSignature({ req, rawBody });- const { programId, groupId, partnerIds, userId, isGroupDeleted } =- schema.parse(JSON.parse(rawBody));+ const { programId, groupId, partnerIds, userId } = schema.parse(+ JSON.parse(rawBody),+ );if (partnerIds.length === 0) {return logAndRespond(@@ -90,17 +90,11 @@ export async function POST(req: Request) {partner: true,partnerGroup: true,links: {- // if this was invoked from the DELETE /groups/[groupId] route, the partnerGroupDefaultLinkId will be null- // due to Prisma cascade SetNull on delete – therefore we should take all links and remap them instead.- ...(isGroupDeleted- ? {}- : {- where: {- partnerGroupDefaultLinkId: {- not: null,- },- },- }),+ where: {+ partnerGroupDefaultLinkId: {+ not: null,+ },+ },orderBy: {createdAt: "asc",},@@ -270,7 +264,6 @@ export async function POST(req: Request) {programId,partnerIds,groupId,- isGroupDeleted,},});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.tsindex 5d98ee0e1f..92d88a138c 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@@ -10,12 +10,11 @@ const inputSchema = z.object({programId: z.string(),groupId: z.string(),partnerIds: z.array(z.string()),- isGroupDeleted: z.boolean().optional(),});// POST /api/cron/groups/remap-discount-codesexport const POST = withCron(async ({ rawBody }) => {- const { programId, partnerIds, groupId, isGroupDeleted } = inputSchema.parse(+ const { programId, partnerIds, groupId } = inputSchema.parse(JSON.parse(rawBody),);@@ -70,7 +69,7 @@ export const POST = withCron(async ({ rawBody }) => {);// if the group is deleted, need to check if there are any remaining discount codes, if not, delete the discount- if (isGroupDeleted && oldDiscount) {+ if (oldDiscount) {const remainingDiscountCodes = await prisma.discountCode.count({where: {discountId: oldDiscount.id,diff --git a/apps/web/app/(ee)/api/cron/programs/reactivate/route.ts b/apps/web/app/(ee)/api/cron/programs/reactivate/route.tsindex 4d3ec48888..4af1a1fbeb 100644--- a/apps/web/app/(ee)/api/cron/programs/reactivate/route.ts+++ b/apps/web/app/(ee)/api/cron/programs/reactivate/route.ts@@ -1,7 +1,7 @@import { bulkReactivatePartners } from "@/lib/api/partners/bulk-reactivate-partners";import { CRON_BATCH_SIZE, qstash } from "@/lib/cron";-import { enqueueBatchJobs } from "@/lib/cron/enqueue-batch-jobs";import { withCron } from "@/lib/cron/with-cron";+import { publishDiscountCodesCreationJob } from "@/lib/jobs/handlers/publish-discount-codes-creation-job";import { prisma } from "@/lib/prisma";import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";import * as z from "zod/v4";@@ -95,15 +95,14 @@ export const POST = withCron(async ({ rawBody }) => {});if (discounts.length > 0) {- await enqueueBatchJobs(+ await publishDiscountCodesCreationJob.dispatchBatch(discounts.map((discount) => ({- queueName: "create-discount-code",- url: `${APP_DOMAIN_WITH_NGROK}/api/cron/discount-codes/create/queue-batches`,- deduplicationId: `reactivate-discount-${discount.id}`,- body: {- discountId: discount.id,- },+ discountId: discount.id,})),+ ({ discountId }) => ({+ label: discountId,+ deduplicationId: `reactivate-discount-${discountId}`,+ }),);console.log(diff --git a/apps/web/lib/actions/partners/update-discount.ts b/apps/web/lib/actions/partners/update-discount.tsindex 7a190c2dbd..6b39bc04f2 100644--- a/apps/web/lib/actions/partners/update-discount.ts+++ b/apps/web/lib/actions/partners/update-discount.ts@@ -4,11 +4,10 @@ import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";import { getDiscountOrThrow } from "@/lib/api/partners/get-discount-or-throw";import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";import { revalidateProgramPublicPages } from "@/lib/api/programs/revalidate-program-public-pages";-import { qstash } from "@/lib/cron";import { invalidateLinksForDiscountsJob } from "@/lib/jobs/handlers/invalidate-links-for-discounts-job";+import { publishDiscountCodesCreationJob } from "@/lib/jobs/handlers/publish-discount-codes-creation-job";import { prisma } from "@/lib/prisma";import { updateDiscountSchema } from "@/lib/zod/schemas/discount";-import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";import { waitUntil } from "@vercel/functions";import { authActionClient } from "../safe-action";import { throwIfNoPermission } from "../throw-if-no-permission";@@ -70,12 +69,10 @@ export const updateDiscountAction = authActionClient...(updatedDiscount.autoProvisionEnabledAt? [- qstash.publishJSON({- url: `${APP_DOMAIN_WITH_NGROK}/api/cron/discount-codes/create/queue-batches`,- body: {- discountId: discount.id,- },- }),+ publishDiscountCodesCreationJob.dispatch(+ { discountId: discount.id },+ { label: discount.id },+ ),]: []),diff --git a/apps/web/lib/discounts/attach-discount.ts b/apps/web/lib/discounts/attach-discount.tsindex 9ead4a2a6b..f6cded74b7 100644--- a/apps/web/lib/discounts/attach-discount.ts+++ b/apps/web/lib/discounts/attach-discount.ts@@ -1,7 +1,8 @@-import { PRISMA_UPDATEMANY_LIMIT, qstash } from "@/lib/cron";+import { PRISMA_UPDATEMANY_LIMIT } from "@/lib/cron";import { prisma } from "@/lib/prisma";-import { APP_DOMAIN_WITH_NGROK, pluck } from "@dub/utils";+import { pluck } from "@dub/utils";import { invalidateLinksForDiscountsJob } from "../jobs/handlers/invalidate-links-for-discounts-job";+import { publishDiscountCodesCreationJob } from "../jobs/handlers/publish-discount-codes-creation-job";// Attach a group-level discount to one batch of enrollments in the group.// Returns whether more enrollments remain to attach.@@ -87,12 +88,10 @@ export async function attachDiscount({...(discount.autoProvisionEnabledAt? [- qstash.publishJSON({- url: `${APP_DOMAIN_WITH_NGROK}/api/cron/discount-codes/create/queue-batches`,- body: {- discountId: discount.id,- },- }),+ publishDiscountCodesCreationJob.dispatch(+ { discountId: discount.id },+ { label: discount.id },+ ),]: []),]);diff --git a/apps/web/lib/jobs/handlers/process-partner-group-change-job.ts b/apps/web/lib/jobs/handlers/process-partner-group-change-job.tsindex d9963c2978..9af8e1c0c6 100644--- a/apps/web/lib/jobs/handlers/process-partner-group-change-job.ts+++ b/apps/web/lib/jobs/handlers/process-partner-group-change-job.ts@@ -25,12 +25,6 @@ export const processPartnerGroupChangeJob = defineJob({name: "process-partner-group-change-job",schema: inputSchema,async handle({ programId, groupId, movedPartnerIds, userId }) {- // Queue an index update because the enrollments moved group (filterable field)- await queuePartnerSearchSync({- partnerIds: movedPartnerIds,- programId,- });-const [partnerLinks, programEnrollments] = await Promise.all([prisma.link.findMany({where: {@@ -79,6 +73,12 @@ export const processPartnerGroupChangeJob = defineJob({);await Promise.all([+ // Queue an index update because the enrollments moved group (filterable field)+ queuePartnerSearchSync({+ partnerIds: movedPartnerIds,+ programId,+ }),+qstash.publishJSON({url: `${APP_DOMAIN_WITH_NGROK}/api/cron/groups/remap-default-links`,body: {diff --git a/apps/web/lib/jobs/handlers/publish-discount-codes-creation-job.ts b/apps/web/lib/jobs/handlers/publish-discount-codes-creation-job.tsnew file mode 100644index 0000000000..a1ffe50a66--- /dev/null+++ b/apps/web/lib/jobs/handlers/publish-discount-codes-creation-job.ts@@ -0,0 +1,155 @@+import { CRON_BATCH_SIZE } from "@/lib/cron";+import { enqueueBatchJobs } from "@/lib/cron/enqueue-batch-jobs";+import { isNonRecoverableDiscountError } from "@/lib/discounts/discount-error";+import { getDiscountProvider } from "@/lib/discounts/discount-provider";+import { prisma } from "@/lib/prisma";+import { ACTIVE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";+import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";+import * as z from "zod/v4";+import { defineJob } from "../index";++const inputSchema = z.object({+ discountId: z.string(),+ startingAfter: z.string().optional(),+});++// Page enrollments for a discount and enqueue per-link create-discount-code jobs+export const publishDiscountCodesCreationJob = defineJob({+ name: "publish-discount-codes-creation-job",+ schema: inputSchema,+ async handle({ discountId, startingAfter }) {+ const discount = await prisma.discount.findUnique({+ where: {+ id: discountId,+ },+ include: {+ program: {+ select: {+ id: true,+ workspace: {+ select: {+ id: true,+ stripeConnectId: true,+ shopifyStoreId: true,+ },+ },+ },+ },+ },+ });++ if (!discount) {+ console.info(`Discount ${discountId} not found. Skipping...`);+ return;+ }++ if (!discount.programId || !discount.groupId) {+ console.info(`Discount ${discountId} is soft-deleted. Skipping...`);+ return;+ }++ if (!discount.autoProvisionEnabledAt) {+ console.info(+ `Discount ${discountId} does not have auto-provision enabled. Skipping...`,+ );+ return;+ }++ const { program } = discount;++ if (!program) {+ console.info(`Discount ${discountId} has no program. Skipping...`);+ return;+ }++ const discountProvider = getDiscountProvider(discount.provider);++ try {+ await discountProvider.assertDiscountIntegration({+ workspace: program.workspace,+ });+ } catch (error) {+ if (isNonRecoverableDiscountError(error)) {+ console.warn(error.message);+ return;+ }++ throw error;+ }++ const programEnrollments = await prisma.programEnrollment.findMany({+ where: {+ programId: program.id,+ discountId: discount.id,+ status: {+ in: ACTIVE_ENROLLMENT_STATUSES,+ },+ },+ select: {+ id: true,+ partnerId: true,+ discountId: true,+ links: {+ select: {+ id: true,+ },+ where: {+ discountCode: null,+ partnerGroupDefaultLinkId: {+ not: null,+ },+ },+ },+ },+ ...(startingAfter && {+ skip: 1,+ cursor: {+ id: startingAfter,+ },+ }),+ orderBy: {+ id: "asc",+ },+ take: CRON_BATCH_SIZE,+ });++ if (programEnrollments.length === 0) {+ console.info(+ `No more program enrollments found for discount ${discountId}.`,+ );+ return;+ }++ const links = programEnrollments.flatMap(({ links }) => links);++ if (links.length > 0) {+ await enqueueBatchJobs(+ links.map((link) => ({+ queueName: "create-discount-code",+ url: `${APP_DOMAIN_WITH_NGROK}/api/cron/discount-codes/create`,+ deduplicationId: `${discountId}-${link.id}`,+ body: {+ linkId: link.id,+ },+ })),+ );+ }++ if (programEnrollments.length === CRON_BATCH_SIZE) {+ const startingAfter =+ programEnrollments[programEnrollments.length - 1].id;++ await publishDiscountCodesCreationJob.dispatch(+ { discountId, startingAfter },+ { label: discountId },+ );++ console.info(+ `Queued next batch for discount ${discountId} (startingAfter: ${startingAfter}).`,+ );+ return;+ }++ console.info(`Finished queuing jobs for discount ${discountId}.`);+ },+});diff --git a/apps/web/lib/jobs/registry.ts b/apps/web/lib/jobs/registry.tsindex b98d940bee..b629b43106 100644--- a/apps/web/lib/jobs/registry.ts+++ b/apps/web/lib/jobs/registry.ts@@ -84,6 +84,11 @@ const jobLoaders = {"attach-discount-job": () =>import("./handlers/attach-discount-job").then((m) => m.attachDiscountJob),+ "publish-discount-codes-creation-job": () =>+ import("./handlers/publish-discount-codes-creation-job").then(+ (m) => m.publishDiscountCodesCreationJob,+ ),+"aggregate-clicks-job": () =>import("./handlers/aggregate-clicks-job").then((m) => m.aggregateClicksJob),