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.

Handle approve/reject of group applications for already-approved partners

Kiran K5b8bee833132
diff --git a/apps/web/lib/program-applications/approve-program-application.ts b/apps/web/lib/program-applications/approve-program-application.ts
index d93689e9b4..9ed431984c 100644
--- a/apps/web/lib/program-applications/approve-program-application.ts
+++ b/apps/web/lib/program-applications/approve-program-application.ts
@@ -2,6 +2,7 @@ import { trackActivityLog } from "@/lib/api/activity-log/track-activity-log";
import { createId } from "@/lib/api/create-id";
import { DubApiError } from "@/lib/api/errors";
import { getGroupOrThrow } from "@/lib/api/groups/get-group-or-throw";
+import { movePartnersToGroup } from "@/lib/api/groups/move-partners-to-group";
import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
import { trackApplicationEvents } from "@/lib/application-events/update-application-event";
import { dispatchWorkflows } from "@/lib/jobs/publish-workflows";
@@ -30,40 +31,54 @@ export async function approveProgramApplication({
groupId,
userId,
}: ApproveProgramApplicationInput) {
- const programApplication = await prisma.programApplication.findFirst({
- where: {
- ...(applicationId && { id: applicationId }),
- programId,
- partnerId,
- status: {
- in: [
- ProgramApplicationStatus.pending,
- ProgramApplicationStatus.rejected,
- ],
+ const [programApplication, existingEnrollment] = await Promise.all([
+ prisma.programApplication.findFirst({
+ where: {
+ ...(applicationId && { id: applicationId }),
+ programId,
+ partnerId,
+ status: {
+ in: [
+ ProgramApplicationStatus.pending,
+ ProgramApplicationStatus.rejected,
+ ],
+ },
},
- },
- select: {
- id: true,
- groupId: true,
- status: true,
- program: {
- select: {
- defaultGroupId: true,
- workspace: {
- select: {
- id: true,
- trialEndsAt: true,
- partnersUsage: true,
- partnersLimit: true,
+ select: {
+ id: true,
+ groupId: true,
+ status: true,
+ program: {
+ select: {
+ defaultGroupId: true,
+ workspace: {
+ select: {
+ id: true,
+ trialEndsAt: true,
+ partnersUsage: true,
+ partnersLimit: true,
+ },
},
},
},
},
- },
- orderBy: {
- createdAt: "desc",
- },
- });
+ orderBy: {
+ createdAt: "desc",
+ },
+ }),
+
+ prisma.programEnrollment.findUnique({
+ where: {
+ partnerId_programId: {
+ partnerId,
+ programId,
+ },
+ },
+ select: {
+ status: true,
+ },
+ }),
+ ]);
if (!programApplication) {
throw new DubApiError({
@@ -92,39 +107,44 @@ export async function approveProgramApplication({
const now = new Date();
+ const isNewEnrollment =
+ existingEnrollment?.status !== ProgramEnrollmentStatus.approved;
+
await prisma.$transaction(async (tx) => {
- throwIfPartnersLimitExceeded(program.workspace);
-
- const programEnrollment: Partial<ProgramEnrollment> = {
- status: ProgramEnrollmentStatus.approved,
- createdAt: now,
- ...(programApplication && { applicationId: programApplication.id }),
- groupId: group.id,
- clickRewardId: group.clickRewardId,
- leadRewardId: group.leadRewardId,
- saleRewardId: group.saleRewardId,
- referralRewardId: group.referralRewardId,
- customRewardId: group.customRewardId,
- discountId: group.discountId,
- };
-
- await tx.programEnrollment.upsert({
- where: {
- partnerId_programId: {
+ if (isNewEnrollment) {
+ throwIfPartnersLimitExceeded(program.workspace);
+
+ const programEnrollment: Partial<ProgramEnrollment> = {
+ status: ProgramEnrollmentStatus.approved,
+ createdAt: now,
+ ...(programApplication && { applicationId: programApplication.id }),
+ groupId: group.id,
+ clickRewardId: group.clickRewardId,
+ leadRewardId: group.leadRewardId,
+ saleRewardId: group.saleRewardId,
+ referralRewardId: group.referralRewardId,
+ customRewardId: group.customRewardId,
+ discountId: group.discountId,
+ };
+
+ await tx.programEnrollment.upsert({
+ where: {
+ partnerId_programId: {
+ partnerId,
+ programId,
+ },
+ },
+ create: {
+ id: createId({ prefix: "pge_" }),
partnerId,
programId,
+ ...programEnrollment,
},
- },
- create: {
- id: createId({ prefix: "pge_" }),
- partnerId,
- programId,
- ...programEnrollment,
- },
- update: {
- ...programEnrollment,
- },
- });
+ update: {
+ ...programEnrollment,
+ },
+ });
+ }
if (programApplication) {
await tx.programApplication.update({
@@ -141,18 +161,32 @@ export async function approveProgramApplication({
});
}
- await tx.project.update({
- where: {
- id: program.workspace.id,
- },
- data: {
- partnersUsage: {
- increment: 1,
+ if (isNewEnrollment) {
+ await tx.project.update({
+ where: {
+ id: program.workspace.id,
},
- },
- });
+ data: {
+ partnersUsage: {
+ increment: 1,
+ },
+ },
+ });
+ }
});
+ // Approved partners are applying to join another group, so their enrollment
+ // is moved instead of re-approved
+ if (!isNewEnrollment) {
+ await movePartnersToGroup({
+ workspaceId: program.workspace.id,
+ programId,
+ partnerIds: [partnerId],
+ userId,
+ group,
+ });
+ }
+
waitUntil(
Promise.allSettled([
// Queue an index update because the enrollment status moved to approved.
@@ -179,17 +213,18 @@ export async function approveProgramApplication({
partnerIds: [partnerId],
}),
- dispatchWorkflows({
- name: "partner-approved-workflow",
- payload: {
- programId,
- partnerId,
- userId,
- },
- options: {
- label: partnerId,
- },
- }),
+ isNewEnrollment &&
+ dispatchWorkflows({
+ name: "partner-approved-workflow",
+ payload: {
+ programId,
+ partnerId,
+ userId,
+ },
+ options: {
+ label: partnerId,
+ },
+ }),
]),
);
}
diff --git a/apps/web/lib/program-applications/reject-program-application.ts b/apps/web/lib/program-applications/reject-program-application.ts
index 081d1830aa..139164437d 100644
--- a/apps/web/lib/program-applications/reject-program-application.ts
+++ b/apps/web/lib/program-applications/reject-program-application.ts
@@ -4,8 +4,8 @@ import { resolveFraudGroups } from "@/lib/api/fraud/resolve-fraud-groups";
import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import { trackApplicationEvents } from "@/lib/application-events/update-application-event";
-import { getProgramApplicationRejectionReasonLabel } from "@/lib/program-applications/program-application-rejection";
import { prisma } from "@/lib/prisma";
+import { getProgramApplicationRejectionReasonLabel } from "@/lib/program-applications/program-application-rejection";
import { WorkspaceProps } from "@/lib/types";
import { rejectProgramApplicationSchema } from "@/lib/zod/schemas/program-application";
import { sendEmail } from "@dub/email";
@@ -24,6 +24,11 @@ type RejectProgramApplicationInput = z.infer<
workspace: Pick<WorkspaceProps, "id" | "defaultProgramId">;
};
+const REJECTABLE_ENROLLMENT_STATUSES: ProgramEnrollmentStatus[] = [
+ ProgramEnrollmentStatus.pending,
+ ProgramEnrollmentStatus.rejected,
+];
+
export async function rejectProgramApplication({
workspace,
partnerId,
@@ -51,94 +56,144 @@ export async function rejectProgramApplication({
});
}
- const programEnrollment = await prisma.programEnrollment.findUnique({
- where: {
- partnerId_programId: {
- partnerId,
+ const [programApplication, existingEnrollment] = await Promise.all([
+ prisma.programApplication.findFirst({
+ where: {
programId,
+ partnerId,
+ status: ProgramApplicationStatus.pending,
},
- },
- include: {
- partner: true,
- program: {
- select: {
- name: true,
- slug: true,
- supportEmail: true,
+ select: {
+ id: true,
+ partner: {
+ select: {
+ name: true,
+ email: true,
+ },
+ },
+ program: {
+ select: {
+ name: true,
+ slug: true,
+ supportEmail: true,
+ },
},
},
- },
- });
+ orderBy: {
+ createdAt: "desc",
+ },
+ }),
- if (!programEnrollment) {
+ prisma.programEnrollment.findUnique({
+ where: {
+ partnerId_programId: {
+ partnerId,
+ programId,
+ },
+ },
+ select: {
+ id: true,
+ status: true,
+ },
+ }),
+ ]);
+
+ if (!programApplication) {
throw new DubApiError({
code: "not_found",
- message: "Program enrollment not found.",
+ message: "No pending application found.",
});
}
- if (programEnrollment.status !== "pending") {
+ // Approved partners are applying to join another group, so only the
+ // application is rejected and their enrollment is left untouched
+ const isApplyingToAdditionalGroup =
+ existingEnrollment?.status === ProgramEnrollmentStatus.approved;
+
+ const enrollmentToReject = isApplyingToAdditionalGroup
+ ? null
+ : existingEnrollment;
+
+ if (
+ enrollmentToReject &&
+ !REJECTABLE_ENROLLMENT_STATUSES.includes(enrollmentToReject.status)
+ ) {
+ throw new DubApiError({
+ code: "bad_request",
+ message: `This application cannot be rejected because the partner is ${enrollmentToReject.status}.`,
+ });
+ }
+
+ if (isApplyingToAdditionalGroup && flagForFraud) {
throw new DubApiError({
code: "bad_request",
message:
- "This enrollment cannot be rejected because it is no longer pending.",
+ "Cannot flag for fraud when rejecting an application to join another group.",
});
}
await prisma.$transaction(async (tx) => {
- if (programEnrollment.applicationId) {
- await tx.programApplication.update({
- where: {
- id: programEnrollment.applicationId,
- },
- data: {
- status: ProgramApplicationStatus.rejected,
- reviewedAt: new Date(),
- rejectionReason,
- rejectionNote,
- userId,
- },
- });
- }
+ await tx.programApplication.update({
+ where: {
+ id: programApplication.id,
+ },
+ data: {
+ status: ProgramApplicationStatus.rejected,
+ reviewedAt: new Date(),
+ rejectionReason,
+ rejectionNote,
+ userId,
+ },
+ });
- // If the partner can immediately re-apply, delete the enrollment
- if (reapplicationTimeframe === "instant") {
- const { count } = await tx.programEnrollment.deleteMany({
- where: {
- id: programEnrollment.id,
- status: "pending",
- },
- });
+ if (isApplyingToAdditionalGroup) {
+ return;
+ }
- if (count !== 1) {
- throw new DubApiError({
- code: "bad_request",
- message:
- "This enrollment cannot be deleted because it is no longer pending.",
+ if (enrollmentToReject) {
+ // If the partner can immediately re-apply, delete the enrollment
+ if (reapplicationTimeframe === "instant") {
+ const { count } = await tx.programEnrollment.deleteMany({
+ where: {
+ id: enrollmentToReject.id,
+ status: {
+ in: REJECTABLE_ENROLLMENT_STATUSES,
+ },
+ },
});
+
+ if (count !== 1) {
+ throw new DubApiError({
+ code: "bad_request",
+ message:
+ "This enrollment cannot be deleted because it is no longer pending.",
+ });
+ }
+
+ return;
}
- return;
+ // Reject the enrollment and persist the reapplication timeframe
+ await tx.programEnrollment.update({
+ where: {
+ id: enrollmentToReject.id,
+ status: {
+ in: REJECTABLE_ENROLLMENT_STATUSES,
+ },
+ },
+ data: {
+ status: ProgramEnrollmentStatus.rejected,
+ reapplicationTimeframe,
+ clickRewardId: null,
+ leadRewardId: null,
+ saleRewardId: null,
+ referralRewardId: null,
+ customRewardId: null,
+ discountId: null,
+ },
+ });
}
- // Reject the enrollment and persist the reapplication timeframe
- await tx.programEnrollment.update({
- where: {
- id: programEnrollment.id,
- status: "pending",
- },
- data: {
- status: ProgramEnrollmentStatus.rejected,
- reapplicationTimeframe,
- clickRewardId: null,
- leadRewardId: null,
- saleRewardId: null,
- referralRewardId: null,
- customRewardId: null,
- discountId: null,
- },
- });
-
if (flagForFraud && flagForFraudReason) {
await tx.fraudAlert.create({
data: {
@@ -150,13 +205,14 @@ export async function rejectProgramApplication({
}
});
- const { partner, program } = programEnrollment;
+ const { partner, program } = programApplication;
waitUntil(
Promise.allSettled([
// Queue an index update because the enrollment was either rejected or deleted.
// The job reads the ID back, so this does not need to know which.
- queuePartnerSearchSync({ enrollmentIds: [programEnrollment.id] }),
+ enrollmentToReject &&
+ queuePartnerSearchSync({ enrollmentIds: [enrollmentToReject.id] }),
trackActivityLog({
workspaceId: workspace.id,
@@ -167,32 +223,36 @@ export async function rejectProgramApplication({
action: "partner_application.rejected",
changeSet: {
status: {
- old: ProgramEnrollmentStatus.pending,
- new: ProgramEnrollmentStatus.rejected,
+ old: ProgramApplicationStatus.pending,
+ new: ProgramApplicationStatus.rejected,
},
},
}),
- trackApplicationEvents({
- event: "rejected",
- programId,
- partnerIds: [partnerId],
- }),
-
- resolveFraudGroups({
- where: {
+ !isApplyingToAdditionalGroup &&
+ trackApplicationEvents({
+ event: "rejected",
programId,
- partnerId,
- },
- userId,
- resolutionReason:
- "Resolved automatically because the partner application was rejected.",
- }),
+ partnerIds: [partnerId],
+ }),
+
+ !isApplyingToAdditionalGroup &&
+ resolveFraudGroups({
+ where: {
+ programId,
+ partnerId,
+ },
+ userId,
+ resolutionReason:
+ "Resolved automatically because the partner application was rejected.",
+ }),
- partner.email &&
+ partner?.email &&
sendEmail({
to: partner.email,
- subject: `Your application to ${program.name} was not approved`,
+ subject: isApplyingToAdditionalGroup
+ ? `Your application to join a new group in ${program.name} was not approved`
+ : `Your application to ${program.name} was not approved`,
variant: "notifications",
replyTo: program.supportEmail || "noreply",
react: ProgramApplicationRejected({
@@ -205,6 +265,7 @@ export async function rejectProgramApplication({
slug: program.slug,
supportEmail: program.supportEmail,
},
+ isApplyingToAdditionalGroup,
additionalNotes: rejectionNote,
rejectionReason:
getProgramApplicationRejectionReasonLabel(rejectionReason),
diff --git a/apps/web/lib/zod/schemas/program-application.ts b/apps/web/lib/zod/schemas/program-application.ts
index d16ed73f5b..fa211b72db 100644
--- a/apps/web/lib/zod/schemas/program-application.ts
+++ b/apps/web/lib/zod/schemas/program-application.ts
@@ -111,6 +111,12 @@ export const getProgramApplicationsCountQuerySchema =
export const approveProgramApplicationSchema = z.object({
partnerId: z.string().describe("The ID of the partner to approve."),
+ applicationId: z
+ .string()
+ .optional()
+ .describe(
+ "The ID of the application to approve. If not provided, the partner's most recent pending or rejected application is used.",
+ ),
groupId: z
.string()
.nullish()
diff --git a/packages/email/src/templates/program-application-rejected.tsx b/packages/email/src/templates/program-application-rejected.tsx
index 2d5a4f1dcd..7fad4cee84 100644
--- a/packages/email/src/templates/program-application-rejected.tsx
+++ b/packages/email/src/templates/program-application-rejected.tsx
@@ -26,6 +26,7 @@ export default function ProgramApplicationRejected({
slug: "acme",
supportEmail: "[email protected]",
},
+ isApplyingToAdditionalGroup = false,
rejectionReason,
additionalNotes,
reapplicationTimeframe = "standard",
@@ -39,6 +40,7 @@ export default function ProgramApplicationRejected({
slug: string;
supportEmail?: string | null;
};
+ isApplyingToAdditionalGroup?: boolean;
rejectionReason?: string | null;
additionalNotes?: string | null;
reapplicationTimeframe?: ReapplicationTimeframe;
@@ -50,9 +52,11 @@ export default function ProgramApplicationRejected({
<Html>
<Head />
<Preview>
- {reapplicationTimeframe === "instant"
- ? `Program status update — you can submit a new application to ${program.name}`
- : `Program status update — your application to join ${program.name} was not approved`}
+ {isApplyingToAdditionalGroup
+ ? `Program status update — your application to join a new group in ${program.name} was not approved`
+ : reapplicationTimeframe === "instant"
+ ? `Program status update — you can submit a new application to ${program.name}`
+ : `Program status update — your application to join ${program.name} was not approved`}
</Preview>
<Tailwind>
<Body className="mx-auto my-auto bg-white font-sans">
@@ -65,21 +69,38 @@ export default function ProgramApplicationRejected({
Program status update
</Heading>
- <Text className="mt-6 text-sm leading-6 text-neutral-600">
- Thank you for your interest in joining the{" "}
- <strong>{program.name}</strong> partner program. We appreciate the
- time it took to apply.
- </Text>
+ {isApplyingToAdditionalGroup ? (
+ <>
+ <Text className="mt-6 text-sm leading-6 text-neutral-600">
+ Thank you for your interest in joining a new group in the{" "}
+ <strong>{program.name}</strong> partner program.
+ </Text>
- <Text className="text-sm leading-6 text-neutral-600">
- After reviewing your application, we&apos;ve decided not to
- approve you at this time.
- {reapplicationTimeframe === "instant"
- ? " You can submit a new application whenever you're ready."
- : reapplicationTimeframe === "standard"
- ? " You will be able to re-apply in 30 days."
- : null}
- </Text>
+ <Text className="text-sm leading-6 text-neutral-600">
+ After reviewing your application, we&apos;ve decided not to
+ move you to this group at this time. Your current partnership
+ with <strong>{program.name}</strong> is not affected.
+ </Text>
+ </>
+ ) : (
+ <>
+ <Text className="mt-6 text-sm leading-6 text-neutral-600">
+ Thank you for your interest in joining the{" "}
+ <strong>{program.name}</strong> partner program. We appreciate
+ the time it took to apply.
+ </Text>
+
+ <Text className="text-sm leading-6 text-neutral-600">
+ After reviewing your application, we&apos;ve decided not to
+ approve you at this time.
+ {reapplicationTimeframe === "instant"
+ ? " You can submit a new application whenever you're ready."
+ : reapplicationTimeframe === "standard"
+ ? " You will be able to re-apply in 30 days."
+ : null}
+ </Text>
+ </>
+ )}
{reason ? (
<Text className="text-sm leading-6 text-neutral-600">