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.

Move partner group change side effects into a background job.

Kiran Kd24a3eaea1bd
diff --git a/apps/web/lib/api/activity-log/track-activity-log.ts b/apps/web/lib/api/activity-log/track-activity-log.ts
index e0e7111079..840aef5bdf 100644
--- a/apps/web/lib/api/activity-log/track-activity-log.ts
+++ b/apps/web/lib/api/activity-log/track-activity-log.ts
@@ -63,3 +63,31 @@ export const trackActivityLog = async (
await logger.flush();
}
};
+
+// Same as trackActivityLog, but writes within the caller's Prisma transaction.
+export const trackActivityLogsTx = async ({
+ tx,
+ logs,
+}: {
+ tx: Prisma.TransactionClient;
+ logs: TrackActivityLogInput | TrackActivityLogInput[];
+}) => {
+ let inputs = Array.isArray(logs) ? logs : [logs];
+
+ inputs = inputs.filter(
+ (i) =>
+ ACTIONS_WITHOUT_CHANGE_SET.includes(i.action) ||
+ (i.changeSet && Object.keys(i.changeSet).length > 0),
+ );
+
+ if (inputs.length === 0) {
+ return;
+ }
+
+ await tx.activityLog.createMany({
+ data: inputs.map((input) => ({
+ ...input,
+ changeSet: input.changeSet as Prisma.InputJsonValue,
+ })),
+ });
+};
diff --git a/apps/web/lib/api/groups/move-partners-to-group.ts b/apps/web/lib/api/groups/move-partners-to-group.ts
index 860058af7f..23f9d925b0 100644
--- a/apps/web/lib/api/groups/move-partners-to-group.ts
+++ b/apps/web/lib/api/groups/move-partners-to-group.ts
@@ -1,21 +1,10 @@
-import { triggerDraftBountySubmissionCreation } from "@/lib/bounty/api/trigger-draft-bounty-submissions";
-import { qstash } from "@/lib/cron";
+import { processPartnerGroupChangeJob } from "@/lib/jobs/handlers/process-partner-group-change-job";
import { prisma } from "@/lib/prisma";
-import { recordLink } from "@/lib/tinybird";
-import { APP_DOMAIN_WITH_NGROK, pluck } from "@dub/utils";
-import { PartnerGroup, WorkspaceRole } from "@prisma/client";
-import { waitUntil } from "@vercel/functions";
+import { pluck } from "@dub/utils";
+import { PartnerGroup, Prisma } from "@prisma/client";
import { buildProgramEnrollmentChangeSet } from "../activity-log/build-program-enrollment-change-set";
-import {
- trackActivityLog,
- TrackActivityLogInput,
-} from "../activity-log/track-activity-log";
+import { trackActivityLogsTx } from "../activity-log/track-activity-log";
import { DubApiError } from "../errors";
-import { getWorkspaceUsers } from "../get-workspace-users";
-import { includeProgramEnrollment } from "../links/include-program-enrollment";
-import { includeTags } from "../links/include-tags";
-import { notifyPartnerGroupChange } from "../partners/notify-partner-group-change";
-import { queuePartnerSearchSync } from "../partners/queue-partner-search-sync";
interface MovePartnersToGroupParams {
workspaceId: string;
@@ -53,34 +42,8 @@ export async function movePartnersToGroup({
});
}
- const programEnrollments = await prisma.programEnrollment.findMany({
- where: {
- partnerId: {
- in: partnerIds,
- },
- programId,
- },
- select: {
- id: true,
- partnerId: true,
- status: true,
- partnerGroup: {
- select: {
- id: true,
- name: true,
- },
- },
- },
- });
-
- if (programEnrollments.length === 0) {
- return 0;
- }
-
- partnerIds = pluck(programEnrollments, "partnerId");
-
- const { count } = await prisma.programEnrollment.updateMany({
- where: {
+ const result = await prisma.$transaction(async (tx) => {
+ const where: Prisma.ProgramEnrollmentWhereInput = {
partnerId: {
in: partnerIds,
},
@@ -88,133 +51,112 @@ export async function movePartnersToGroup({
groupId: {
not: group.id,
},
- },
- data: {
- groupId: group.id,
- clickRewardId: group.clickRewardId,
- leadRewardId: group.leadRewardId,
- saleRewardId: group.saleRewardId,
- referralRewardId: group.referralRewardId,
- customRewardId: group.customRewardId,
- discountId: group.discountId,
- ...(groupMoveDisabledAt !== undefined && { groupMoveDisabledAt }),
- },
- });
+ };
+
+ const programEnrollmentsBefore = await tx.programEnrollment.findMany({
+ where,
+ select: {
+ id: true,
+ partnerId: true,
+ partnerGroup: {
+ select: {
+ id: true,
+ name: true,
+ },
+ },
+ },
+ });
- if (count === 0) {
- return 0;
- }
+ if (programEnrollmentsBefore.length === 0) {
+ return null;
+ }
+
+ const { count } = await tx.programEnrollment.updateMany({
+ where,
+ data: {
+ groupId: group.id,
+ clickRewardId: group.clickRewardId,
+ leadRewardId: group.leadRewardId,
+ saleRewardId: group.saleRewardId,
+ referralRewardId: group.referralRewardId,
+ customRewardId: group.customRewardId,
+ discountId: group.discountId,
+ ...(groupMoveDisabledAt !== undefined && { groupMoveDisabledAt }),
+ },
+ });
- // Queue an index update because the enrollments moved group (filterable field)
- waitUntil(
- queuePartnerSearchSync({
- partnerIds,
- programId,
- }),
- );
+ if (count === 0) {
+ return null;
+ }
- waitUntil(
- (async () => {
- const partnerLinks = await prisma.link.findMany({
- where: {
- programId,
- partnerId: {
- in: partnerIds,
- },
- },
- include: {
- ...includeTags,
- ...includeProgramEnrollment,
+ const programEnrollmentsAfter = await tx.programEnrollment.findMany({
+ where: {
+ id: {
+ in: pluck(programEnrollmentsBefore, "id"),
},
- });
-
- const updatedProgramEnrollments = await prisma.programEnrollment.findMany(
- {
- where: {
- partnerId: {
- in: partnerIds,
- },
- programId,
- },
+ },
+ select: {
+ id: true,
+ partnerId: true,
+ partnerGroup: {
select: {
id: true,
- partnerId: true,
- partnerGroup: {
- select: {
- id: true,
- name: true,
- },
- },
+ name: true,
},
},
- );
-
- // Build activity log inputs
- const activityLogInputs: TrackActivityLogInput[] =
- updatedProgramEnrollments.map((updatedEnrollment) => {
- const oldEnrollment = programEnrollments.find(
- (e) => e.id === updatedEnrollment.id,
- );
-
- return {
- workspaceId,
- programId,
- resourceType: "partner",
- resourceId: updatedEnrollment.partnerId,
- userId,
- action: "partner.groupChanged",
- changeSet: buildProgramEnrollmentChangeSet({
- oldEnrollment,
- newEnrollment: updatedEnrollment,
- }),
- };
- });
-
- // If the userId is not provided, get the workspace user id from the workspace users
- // userId will be null for workflow-initiated actions
- let workspaceUserId = userId;
-
- if (!workspaceUserId) {
- const { users } = await getWorkspaceUsers({
- programId,
- role: WorkspaceRole.owner,
- });
-
- if (users.length > 0) {
- workspaceUserId = users[0].id;
- }
- }
-
- await Promise.allSettled([
- qstash.publishJSON({
- url: `${APP_DOMAIN_WITH_NGROK}/api/cron/groups/remap-default-links`,
- body: {
- programId,
- groupId: group.id,
- // skip remap-default-links / remap-discount-codes for pending applications (no links yet)
- partnerIds: programEnrollments
- .filter(({ status }) => status !== "pending")
- .map(({ partnerId }) => partnerId),
- userId: workspaceUserId,
- },
- }),
+ },
+ });
- triggerDraftBountySubmissionCreation({
- programId,
- partnerIds,
+ // Track the activity logs for the program enrollments that were moved to the group
+ const enrollmentsBeforeById = new Map(
+ programEnrollmentsBefore.map((enrollment) => [enrollment.id, enrollment]),
+ );
+
+ const logs = programEnrollmentsAfter.map((newEnrollment) => {
+ const oldEnrollment = enrollmentsBeforeById.get(newEnrollment.id);
+
+ return {
+ workspaceId,
+ programId,
+ resourceType: "partner" as const,
+ resourceId: newEnrollment.partnerId,
+ userId,
+ action: "partner.groupChanged" as const,
+ changeSet: buildProgramEnrollmentChangeSet({
+ oldEnrollment,
+ newEnrollment,
}),
+ };
+ });
- recordLink(partnerLinks),
+ await trackActivityLogsTx({
+ tx,
+ logs,
+ });
- notifyPartnerGroupChange({
- programId,
- groupId: group.id,
- partnerIds,
- }),
+ return {
+ count,
+ programEnrollmentsAfter,
+ };
+ });
+
+ if (!result) {
+ return 0;
+ }
+
+ const { count, programEnrollmentsAfter } = result;
+ const movedPartnerIds = pluck(programEnrollmentsAfter, "partnerId");
- trackActivityLog(activityLogInputs),
- ]);
- })(),
+ await processPartnerGroupChangeJob.dispatch(
+ {
+ programId,
+ groupId: group.id,
+ movedPartnerIds,
+ userId,
+ },
+ {
+ label: group.id,
+ },
);
return count;
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.ts
new file mode 100644
index 0000000000..d9963c2978
--- /dev/null
+++ b/apps/web/lib/jobs/handlers/process-partner-group-change-job.ts
@@ -0,0 +1,106 @@
+import { getWorkspaceUsers } from "@/lib/api/get-workspace-users";
+import { includeProgramEnrollment } from "@/lib/api/links/include-program-enrollment";
+import { includeTags } from "@/lib/api/links/include-tags";
+import { notifyPartnerGroupChange } from "@/lib/api/partners/notify-partner-group-change";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
+import { triggerDraftBountySubmissionCreation } from "@/lib/bounty/api/trigger-draft-bounty-submissions";
+import { qstash } from "@/lib/cron";
+import { prisma } from "@/lib/prisma";
+import { recordLink } from "@/lib/tinybird";
+import { APP_DOMAIN_WITH_NGROK, pluck } from "@dub/utils";
+import { ProgramEnrollmentStatus, WorkspaceRole } from "@prisma/client";
+import * as z from "zod/v4";
+import { defineJob } from "../index";
+
+const inputSchema = z.object({
+ programId: z.string(),
+ groupId: z.string(),
+ movedPartnerIds: z.array(z.string()).min(1),
+ userId: z.string().nullable(),
+});
+
+// Side effects after partners are moved to a group: search sync, remap default
+// links / discount codes, Tinybird link records, draft bounties, and notify.
+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: {
+ programId,
+ partnerId: {
+ in: movedPartnerIds,
+ },
+ },
+ include: {
+ ...includeTags,
+ ...includeProgramEnrollment,
+ },
+ }),
+
+ prisma.programEnrollment.findMany({
+ where: {
+ programId,
+ partnerId: {
+ in: movedPartnerIds,
+ },
+ },
+ select: {
+ partnerId: true,
+ status: true,
+ },
+ }),
+ ]);
+
+ // If the userId is not provided, get the workspace user id from the workspace users
+ // userId will be null for workflow-initiated actions
+ let workspaceUserId = userId;
+
+ if (!workspaceUserId) {
+ const { users } = await getWorkspaceUsers({
+ programId,
+ role: WorkspaceRole.owner,
+ });
+
+ if (users.length > 0) {
+ workspaceUserId = users[0].id;
+ }
+ }
+
+ const activeProgramEnrollments = programEnrollments.filter(
+ ({ status }) => status !== ProgramEnrollmentStatus.pending,
+ );
+
+ await Promise.all([
+ qstash.publishJSON({
+ url: `${APP_DOMAIN_WITH_NGROK}/api/cron/groups/remap-default-links`,
+ body: {
+ programId,
+ groupId,
+ partnerIds: pluck(activeProgramEnrollments, "partnerId"),
+ userId: workspaceUserId,
+ },
+ }),
+
+ triggerDraftBountySubmissionCreation({
+ programId,
+ partnerIds: movedPartnerIds,
+ }),
+
+ recordLink(partnerLinks),
+
+ notifyPartnerGroupChange({
+ programId,
+ groupId,
+ partnerIds: movedPartnerIds,
+ }),
+ ]);
+ },
+});
diff --git a/apps/web/lib/jobs/registry.ts b/apps/web/lib/jobs/registry.ts
index f5c7f6ef90..b98d940bee 100644
--- a/apps/web/lib/jobs/registry.ts
+++ b/apps/web/lib/jobs/registry.ts
@@ -86,6 +86,11 @@ const jobLoaders = {
"aggregate-clicks-job": () =>
import("./handlers/aggregate-clicks-job").then((m) => m.aggregateClicksJob),
+
+ "process-partner-group-change-job": () =>
+ import("./handlers/process-partner-group-change-job").then(
+ (m) => m.processPartnerGroupChangeJob,
+ ),
} as const satisfies Record<string, () => Promise<JobDefinition>>;
const jobCache = new Map<string, JobDefinition>();