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 permanent partner deletion to background cron job.

Kiran Kdaa4e31a35f2
diff --git a/apps/web/app/(ee)/api/cron/partners/delete/route.ts b/apps/web/app/(ee)/api/cron/partners/delete/route.ts
new file mode 100644
index 0000000000..89cace2970
--- /dev/null
+++ b/apps/web/app/(ee)/api/cron/partners/delete/route.ts
@@ -0,0 +1,183 @@
+import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
+import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
+import { includeTags } from "@/lib/api/links/include-tags";
+import { withCron } from "@/lib/cron/with-cron";
+import { deleteDiscountCodes } from "@/lib/discounts/delete-discount-code";
+import { aggregatePartnerLinksStats } from "@/lib/partners/aggregate-partner-links-stats";
+import { canDeletePartner } from "@/lib/partners/utils";
+import { prisma } from "@/lib/prisma";
+import * as z from "zod/v4";
+import { logAndRespond } from "../../utils";
+
+const inputSchema = z.object({
+ workspaceId: z.string(),
+ programId: z.string(),
+ partnerId: z.string(),
+ userId: z.string(),
+});
+
+// POST /api/cron/partners/delete - handle all side effects of permanently deleting a partner
+export const POST = withCron(async ({ rawBody }) => {
+ const { programId, partnerId, workspaceId, userId } = inputSchema.parse(
+ JSON.parse(rawBody),
+ );
+
+ console.info(
+ `Permanently deleting partner ${partnerId} from program ${programId}...`,
+ );
+
+ const programEnrollmentWhere = {
+ programId,
+ partnerId,
+ };
+
+ const programEnrollment = await prisma.programEnrollment.findUnique({
+ where: {
+ partnerId_programId: programEnrollmentWhere,
+ },
+ include: {
+ partner: true,
+ links: {
+ include: includeTags,
+ },
+ programPartnerTags: {
+ include: {
+ partnerTag: true,
+ },
+ },
+ discountCodes: {
+ include: {
+ discount: {
+ select: {
+ provider: true,
+ },
+ },
+ },
+ },
+ },
+ });
+
+ if (!programEnrollment) {
+ return logAndRespond(
+ `Partner ${partnerId} is not enrolled in program ${programId}. Skipping delete.`,
+ );
+ }
+
+ const linkStats = aggregatePartnerLinksStats(programEnrollment.links);
+
+ const canDelete = canDeletePartner({
+ ...programEnrollment,
+ ...linkStats,
+ });
+
+ if (!canDelete) {
+ return logAndRespond(
+ `Partner ${partnerId} can no longer be permanently deleted.`,
+ );
+ }
+
+ // Additional check
+ const [commissionCount, payoutCount] = await Promise.all([
+ prisma.commission.count({
+ where: programEnrollmentWhere,
+ }),
+
+ prisma.payout.count({
+ where: programEnrollmentWhere,
+ }),
+ ]);
+
+ if (commissionCount > 0 || payoutCount > 0) {
+ return logAndRespond(
+ `Partner ${partnerId} cannot be permanently deleted because it has associated commissions or payouts.`,
+ );
+ }
+
+ const { partner, links, programPartnerTags, discountCodes, ...enrollment } =
+ programEnrollment;
+
+ // Clear rows that FK to Customer before detaching customers
+ await Promise.all([
+ prisma.submittedLead.deleteMany({
+ where: programEnrollmentWhere,
+ }),
+
+ prisma.fraudEvent.deleteMany({
+ where: programEnrollmentWhere,
+ }),
+
+ prisma.fraudEventGroup.deleteMany({
+ where: programEnrollmentWhere,
+ }),
+
+ prisma.message.deleteMany({
+ where: programEnrollmentWhere,
+ }),
+
+ prisma.discoveredPartner.deleteMany({
+ where: programEnrollmentWhere,
+ }),
+
+ deleteDiscountCodes(discountCodes),
+ ]);
+
+ if (links.length > 0) {
+ await bulkDeleteLinks(
+ links.map((link) => ({
+ ...link,
+ programEnrollment: {
+ groupId: enrollment.groupId,
+ programPartnerTags,
+ },
+ })),
+ );
+
+ await prisma.link.deleteMany({
+ where: {
+ id: {
+ in: links.map((link) => link.id),
+ },
+ },
+ });
+ }
+
+ await prisma.$transaction([
+ prisma.programEnrollment.delete({
+ where: {
+ id: enrollment.id,
+ },
+ }),
+
+ prisma.project.update({
+ where: {
+ id: workspaceId,
+ },
+ data: {
+ partnersUsage: {
+ decrement: 1,
+ },
+ },
+ }),
+ ]);
+
+ await recordAuditLog({
+ workspaceId,
+ programId,
+ action: "partner.deleted",
+ description: `Partner ${partner.id} permanently deleted`,
+ actor: {
+ id: userId,
+ },
+ targets: [
+ {
+ type: "partner",
+ id: partner.id,
+ metadata: partner,
+ },
+ ],
+ });
+
+ return logAndRespond(
+ `Partner ${partnerId} permanently deleted from program ${programId}.`,
+ );
+});
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/layout.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/layout.tsx
index e5b7bcfc30..1be4b37749 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/layout.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/layout.tsx
@@ -2,6 +2,7 @@
import { deleteProgramInviteAction } from "@/lib/actions/partners/delete-program-invite";
import { resendProgramInviteAction } from "@/lib/actions/partners/resend-program-invite";
+import { canDeletePartner } from "@/lib/partners/utils";
import { mutatePrefix } from "@/lib/swr/mutate";
import usePartner from "@/lib/swr/use-partner";
import useWorkspace from "@/lib/swr/use-workspace";
@@ -248,11 +249,7 @@ function PageControls({ partner }: { partner: EnrolledPartnerProps }) {
partner,
});
- const canPermanentlyDelete =
- ["deactivated", "banned"].includes(partner.status) &&
- partner.totalClicks === 0 &&
- partner.totalLeads === 0 &&
- partner.totalSales === 0;
+ const canDelete = canDeletePartner(partner);
return (
<>
@@ -453,7 +450,8 @@ function PageControls({ partner }: { partner: EnrolledPartnerProps }) {
Ban partner
</MenuItem>
)}
- {canPermanentlyDelete && (
+
+ {canDelete && (
<MenuItem
icon={Trash}
variant="danger"
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx
index 42c0e39e2b..8caf4c125f 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx
@@ -2,6 +2,7 @@
import { deleteProgramInviteAction } from "@/lib/actions/partners/delete-program-invite";
import { resendProgramInviteAction } from "@/lib/actions/partners/resend-program-invite";
+import { canDeletePartner } from "@/lib/partners/utils";
import { mutatePrefix } from "@/lib/swr/mutate";
import useGroups from "@/lib/swr/use-groups";
import usePartnersCount from "@/lib/swr/use-partners-count";
@@ -730,11 +731,7 @@ function RowMenuButton({
partner: row.original,
});
- const canPermanentlyDelete =
- ["deactivated", "banned"].includes(row.original.status) &&
- row.original.totalClicks === 0 &&
- row.original.totalLeads === 0 &&
- row.original.totalSales === 0;
+ const canDelete = canDeletePartner(row.original);
const { executeAsync: resendInvite, isPending: isResendingInvite } =
useAction(resendProgramInviteAction, {
@@ -916,7 +913,7 @@ function RowMenuButton({
/>
)}
- {canPermanentlyDelete && (
+ {canDelete && (
<MenuItem
icon={Trash}
label="Permanently delete"
diff --git a/apps/web/lib/actions/partners/delete-partner.ts b/apps/web/lib/actions/partners/delete-partner.ts
index 32432551d5..a1492a0388 100644
--- a/apps/web/lib/actions/partners/delete-partner.ts
+++ b/apps/web/lib/actions/partners/delete-partner.ts
@@ -1,18 +1,16 @@
"use server";
-import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
-import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
+import { qstash } from "@/lib/cron";
+import { aggregatePartnerLinksStats } from "@/lib/partners/aggregate-partner-links-stats";
+import { canDeletePartner } from "@/lib/partners/utils";
import { prisma } from "@/lib/prisma";
import { deletePartnerSchema } from "@/lib/zod/schemas/partners";
-import { ProgramEnrollmentStatus } from "@prisma/client";
-import { waitUntil } from "@vercel/functions";
+import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
import { authActionClient } from "../safe-action";
import { throwIfNoPermission } from "../throw-if-no-permission";
-const DELETABLE_STATUSES: ProgramEnrollmentStatus[] = ["deactivated", "banned"];
-
// Permanently delete a partner from a program (zero stats only)
export const deletePartnerAction = authActionClient
.inputSchema(deletePartnerSchema)
@@ -27,121 +25,65 @@ export const deletePartnerAction = authActionClient
const programId = getDefaultProgramIdOrThrow(workspace);
- const programEnrollment = await getProgramEnrollmentOrThrow({
- partnerId,
+ const programEnrollmentWhere = {
programId,
+ partnerId,
+ };
+
+ const programEnrollment = await getProgramEnrollmentOrThrow({
+ ...programEnrollmentWhere,
include: {
- partner: true,
- links: true,
- programPartnerTags: {
- include: {
- partnerTag: true,
+ links: {
+ select: {
+ clicks: true,
+ leads: true,
+ sales: true,
+ saleAmount: true,
+ conversions: true,
},
},
},
});
- if (!DELETABLE_STATUSES.includes(programEnrollment.status)) {
- throw new Error(
- "Only deactivated or banned partners can be permanently deleted.",
- );
- }
+ const linkStats = aggregatePartnerLinksStats(programEnrollment.links);
+
+ const canDelete = canDeletePartner({
+ ...programEnrollment,
+ ...linkStats,
+ });
- if (
- programEnrollment.totalClicks > 0 ||
- programEnrollment.totalLeads > 0 ||
- programEnrollment.totalSales > 0
- ) {
+ if (!canDelete) {
throw new Error(
- "Partner has clicks, leads, or sales and cannot be permanently deleted.",
+ "Partner cannot be permanently deleted because it has associated clicks, leads, sales, commissions, or other activity.",
);
}
- const { partner, links, programPartnerTags, ...enrollment } =
- programEnrollment;
-
- await Promise.allSettled([
- bulkDeleteLinks(
- links.map((link) => ({
- ...link,
- programEnrollment: {
- groupId: enrollment.groupId,
- programPartnerTags,
- },
- })),
- ),
-
- prisma.link.deleteMany({
- where: {
- id: {
- in: links.map((link) => link.id),
- },
- },
+ // Additional check
+ const [commissionCount, payoutCount] = await Promise.all([
+ prisma.commission.count({
+ where: programEnrollmentWhere,
}),
- prisma.fraudEvent.deleteMany({
- where: {
- programId,
- partnerId,
- },
- }),
-
- prisma.fraudEventGroup.deleteMany({
- where: {
- programId,
- partnerId,
- },
- }),
-
- prisma.message.deleteMany({
- where: {
- programId,
- partnerId,
- },
- }),
-
- prisma.discoveredPartner.delete({
- where: {
- programId_partnerId: {
- partnerId,
- programId,
- },
- },
+ prisma.payout.count({
+ where: programEnrollmentWhere,
}),
]);
- await prisma.$transaction([
- prisma.programEnrollment.delete({
- where: {
- id: enrollment.id,
- },
- }),
- prisma.project.update({
- where: {
- id: workspace.id,
- },
- data: {
- partnersUsage: {
- decrement: 1,
- },
- },
- }),
- ]);
+ if (commissionCount > 0 || payoutCount > 0) {
+ throw new Error(
+ "Partner cannot be permanently deleted because it has associated commissions or payouts.",
+ );
+ }
- waitUntil(
- recordAuditLog({
+ await qstash.publishJSON({
+ url: `${APP_DOMAIN_WITH_NGROK}/api/cron/partners/delete`,
+ // deduplicationId: `delete-partner-${programId}-${partnerId}`,
+ method: "POST",
+ body: {
workspaceId: workspace.id,
programId,
- action: "partner.deleted",
- description: `Partner ${partner.id} permanently deleted`,
- actor: user,
- targets: [
- {
- type: "partner",
- id: partner.id,
- metadata: partner,
- },
- ],
- }),
- );
+ partnerId,
+ userId: user.id,
+ },
+ });
});
diff --git a/apps/web/lib/partners/utils.ts b/apps/web/lib/partners/utils.ts
new file mode 100644
index 0000000000..4537bd8a19
--- /dev/null
+++ b/apps/web/lib/partners/utils.ts
@@ -0,0 +1,29 @@
+import { DELETABLE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";
+import { EnrolledPartnerExtendedProps } from "../types";
+
+export function canDeletePartner({
+ status,
+ totalClicks,
+ totalLeads,
+ totalSales,
+ totalCommissions,
+}: Pick<
+ EnrolledPartnerExtendedProps,
+ "status" | "totalClicks" | "totalLeads" | "totalSales"
+> & {
+ totalCommissions: number | bigint;
+}): boolean {
+ if (!DELETABLE_ENROLLMENT_STATUSES.includes(status)) {
+ return false;
+ }
+
+ // Deletable partners must have no activity
+ const hasActivity =
+ totalClicks > 0 || totalLeads > 0 || totalSales > 0 || totalCommissions > 0;
+
+ if (hasActivity) {
+ return false;
+ }
+
+ return true;
+}
diff --git a/apps/web/lib/zod/schemas/partners.ts b/apps/web/lib/zod/schemas/partners.ts
index 5f6da8fc71..b7ffc40429 100644
--- a/apps/web/lib/zod/schemas/partners.ts
+++ b/apps/web/lib/zod/schemas/partners.ts
@@ -49,6 +49,11 @@ export const INACTIVE_ENROLLMENT_STATUSES: ProgramEnrollmentStatus[] = [
export const COMMISSION_ELIGIBLE_ENROLLMENT_STATUSES: ProgramEnrollmentStatus[] =
[...ACTIVE_ENROLLMENT_STATUSES, ProgramEnrollmentStatus.invited];
+export const DELETABLE_ENROLLMENT_STATUSES: ProgramEnrollmentStatus[] = [
+ ProgramEnrollmentStatus.deactivated,
+ ProgramEnrollmentStatus.banned,
+];
+
export const exportPartnerColumns = [
{ id: "id", label: "ID", default: true },
{ id: "name", label: "Name", default: true },
diff --git a/apps/web/ui/modals/delete-partner-modal.tsx b/apps/web/ui/modals/delete-partner-modal.tsx
index 8005077ad7..f26fdb6716 100644
--- a/apps/web/ui/modals/delete-partner-modal.tsx
+++ b/apps/web/ui/modals/delete-partner-modal.tsx
@@ -8,7 +8,7 @@ import { PartnerAvatar } from "@/ui/partners/partner-avatar";
import { Button, Modal } from "@dub/ui";
import { cn } from "@dub/utils";
import { useAction } from "next-safe-action/hooks";
-import { useRouter } from "next/navigation";
+import { usePathname, useRouter } from "next/navigation";
import {
Dispatch,
SetStateAction,
@@ -33,6 +33,7 @@ function DeletePartnerModal({
partner: Pick<PartnerProps, "id" | "name" | "email" | "image">;
}) {
const router = useRouter();
+ const pathname = usePathname();
const { id: workspaceId, slug: workspaceSlug } = useWorkspace();
const {
@@ -50,10 +51,16 @@ function DeletePartnerModal({
const { executeAsync, isPending } = useAction(deletePartnerAction, {
onSuccess: async () => {
- toast.success("Partner permanently deleted.");
+ toast.success(
+ "Partner deletion has started and is being processed in the background.",
+ );
setShowDeletePartnerModal(false);
await mutatePrefix("/api/partners");
- router.push(`/${workspaceSlug}/program/partners`);
+
+ // Redirect when deleting from the partner detail page; stay put (keep filters) from the table
+ if (pathname?.includes(`/program/partners/${partner.id}`)) {
+ router.push(`/${workspaceSlug}/program/partners`);
+ }
},
onError({ error }) {
toast.error(error.serverError);
@@ -104,8 +111,8 @@ function DeletePartnerModal({
<p className="text-sm text-neutral-600">
This will permanently remove this partner from your program,
- including their links and messages. This action cannot be undone.
- Only partners with no clicks, leads, or sales can be deleted.
+ including their links and messages. Only partners with no clicks,
+ leads, or sales can be deleted. This action cannot be undone.
</p>
<div>