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.

Queue hold commission releases and respect pending fraud group scope

Kiran K3215774c734d
diff --git a/apps/web/app/(ee)/api/cron/cleanup/expired-fraud-groups/route.ts b/apps/web/app/(ee)/api/cron/cleanup/expired-fraud-groups/route.ts
index ee8f215bf6..a9bba148ab 100644
--- a/apps/web/app/(ee)/api/cron/cleanup/expired-fraud-groups/route.ts
+++ b/apps/web/app/(ee)/api/cron/cleanup/expired-fraud-groups/route.ts
@@ -1,5 +1,5 @@
import { FRAUD_GROUP_EXPIRY_DAYS } from "@/lib/api/fraud/constants";
-import { releaseHoldCommissions } from "@/lib/api/fraud/release-hold-commissions";
+import { queueReleaseHoldCommissions } from "@/lib/api/fraud/release-hold-commissions";
import { withCron } from "@/lib/cron/with-cron";
import { prisma } from "@/lib/prisma";
import { subDays } from "date-fns";
@@ -56,7 +56,7 @@ export const POST = withCron(async () => {
console.log(`Expired ${count} fraud groups`);
if (count > 0) {
- await releaseHoldCommissions(groupIds);
+ await queueReleaseHoldCommissions(groupIds);
}
if (groupsToExpire.length < BATCH_SIZE) {
diff --git a/apps/web/app/(ee)/api/cron/fraud/release-hold-commissions/route.ts b/apps/web/app/(ee)/api/cron/fraud/release-hold-commissions/route.ts
new file mode 100644
index 0000000000..6d4b1f4525
--- /dev/null
+++ b/apps/web/app/(ee)/api/cron/fraud/release-hold-commissions/route.ts
@@ -0,0 +1,29 @@
+import { releaseHoldCommissions } from "@/lib/api/fraud/release-hold-commissions";
+import { withCron } from "@/lib/cron/with-cron";
+import * as z from "zod/v4";
+import { logAndRespond } from "../../utils";
+
+export const dynamic = "force-dynamic";
+
+const inputSchema = z.object({
+ programId: z.string(),
+ partnerId: z.string(),
+ resolvedGroupIds: z.array(z.string()),
+});
+
+// POST /api/cron/fraud/release-hold-commissions
+export const POST = withCron(async ({ rawBody }) => {
+ const { programId, partnerId, resolvedGroupIds } = inputSchema.parse(
+ JSON.parse(rawBody),
+ );
+
+ const releasedCount = await releaseHoldCommissions({
+ programId,
+ partnerId,
+ resolvedGroupIds,
+ });
+
+ return logAndRespond(
+ `Released ${releasedCount} hold commissions for partner ${partnerId} in program ${programId}.`,
+ );
+});
diff --git a/apps/web/app/(ee)/api/fraud/rules/route.ts b/apps/web/app/(ee)/api/fraud/rules/route.ts
index 48c24cb9f1..285f6b2ebb 100644
--- a/apps/web/app/(ee)/api/fraud/rules/route.ts
+++ b/apps/web/app/(ee)/api/fraud/rules/route.ts
@@ -134,6 +134,7 @@ export const PATCH = withWorkspace(
userId: session.user.id,
resolutionReason:
"Resolved automatically because the fraud rule was disabled.",
+ releaseHoldCommissions: true,
});
}
})(),
diff --git a/apps/web/lib/actions/fraud/bulk-resolve-fraud-groups.ts b/apps/web/lib/actions/fraud/bulk-resolve-fraud-groups.ts
index ae39b630ab..3892de6618 100644
--- a/apps/web/lib/actions/fraud/bulk-resolve-fraud-groups.ts
+++ b/apps/web/lib/actions/fraud/bulk-resolve-fraud-groups.ts
@@ -64,6 +64,7 @@ export const bulkResolveFraudGroupsAction = authActionClient
},
userId: user.id,
...(resolutionReason && { resolutionReason }),
+ releaseHoldCommissions: true,
});
// Add the resolution reason as a comment to each unique partner
diff --git a/apps/web/lib/actions/fraud/resolve-fraud-group.ts b/apps/web/lib/actions/fraud/resolve-fraud-group.ts
index f888381c22..960974c72d 100644
--- a/apps/web/lib/actions/fraud/resolve-fraud-group.ts
+++ b/apps/web/lib/actions/fraud/resolve-fraud-group.ts
@@ -50,6 +50,7 @@ export const resolveFraudGroupAction = authActionClient
},
userId: user.id,
...(resolutionReason && { resolutionReason }),
+ releaseHoldCommissions: true,
});
// Add the resolution reason as a comment to the partner
diff --git a/apps/web/lib/actions/partners/unban-partner.ts b/apps/web/lib/actions/partners/unban-partner.ts
index 163bffa503..50d15b0c21 100644
--- a/apps/web/lib/actions/partners/unban-partner.ts
+++ b/apps/web/lib/actions/partners/unban-partner.ts
@@ -2,7 +2,6 @@
import { trackActivityLog } from "@/lib/api/activity-log/track-activity-log";
import { trackCommissionStatusUpdate } from "@/lib/api/commissions/track-commission-update-activity-log";
-import { releaseHoldCommissions } from "@/lib/api/fraud/release-hold-commissions";
import { getGroupOrThrow } from "@/lib/api/groups/get-group-or-throw";
import { linkCache } from "@/lib/api/links/cache";
import { includeProgramEnrollment } from "@/lib/api/links/include-program-enrollment";
@@ -188,8 +187,6 @@ export const unbanPartnerAction = authActionClient
},
});
- await releaseHoldCommissions(affectedFraudGroups.map((g) => g.id));
-
await prisma.$transaction([
// Since we're unbanning the partner, we need to
// clean up any pending cross-program ban alerts that originated from this program.
diff --git a/apps/web/lib/api/commissions/get-commissions-count.ts b/apps/web/lib/api/commissions/get-commissions-count.ts
index aae0fcdfee..72f292ea66 100644
--- a/apps/web/lib/api/commissions/get-commissions-count.ts
+++ b/apps/web/lib/api/commissions/get-commissions-count.ts
@@ -109,7 +109,7 @@ export async function getCommissionsCount(filters: CommissionsCountFilters) {
}),
createdAt: {
gte: startDate,
- lt: endDate,
+ lte: endDate,
},
...(Object.keys(programEnrollmentFilter).length > 0 && {
programEnrollment: programEnrollmentFilter,
diff --git a/apps/web/lib/api/fraud/constants.ts b/apps/web/lib/api/fraud/constants.ts
index 5471bdf6e8..340e163c13 100644
--- a/apps/web/lib/api/fraud/constants.ts
+++ b/apps/web/lib/api/fraud/constants.ts
@@ -114,6 +114,13 @@ export const PARTNER_LEVEL_FRAUD_RULES = [
FraudRuleType.partnerDuplicateAccount,
];
+export const CUSTOMER_LEVEL_FRAUD_RULES = [
+ FraudRuleType.customerEmailMatch,
+ FraudRuleType.customerEmailSuspiciousDomain,
+ FraudRuleType.paidTrafficDetected,
+ FraudRuleType.referralSourceBanned,
+];
+
export const FRAUD_SEVERITY_CONFIG: Record<
FraudSeverity,
{
diff --git a/apps/web/lib/api/fraud/release-hold-commissions.ts b/apps/web/lib/api/fraud/release-hold-commissions.ts
index c593b7a3cf..d218f3d9ae 100644
--- a/apps/web/lib/api/fraud/release-hold-commissions.ts
+++ b/apps/web/lib/api/fraud/release-hold-commissions.ts
@@ -1,169 +1,265 @@
import { trackCommissionStatusUpdate } from "@/lib/api/commissions/track-commission-update-activity-log";
import { syncTotalCommissions } from "@/lib/api/partners/sync-total-commissions";
import { executeWorkflows } from "@/lib/api/workflows/execute-workflows";
+import { qstash } from "@/lib/cron";
import { prisma } from "@/lib/prisma";
-import { FraudEventStatus, FraudRuleType, Prisma } from "@prisma/client";
-import { FRAUD_RULES_BY_TYPE, PARTNER_LEVEL_FRAUD_RULES } from "./constants";
+import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
+import {
+ CommissionStatus,
+ FraudEventStatus,
+ FraudRuleType,
+ Prisma,
+} from "@prisma/client";
+import {
+ CUSTOMER_LEVEL_FRAUD_RULES,
+ PARTNER_LEVEL_FRAUD_RULES,
+} from "./constants";
-// When fraud groups are resolved or expired, move eligible hold commissions back to pending
-export async function releaseHoldCommissions(riskGroupIds: string[]) {
- if (riskGroupIds.length === 0) {
+/**
+ * Release hold commissions after fraud groups are resolved or expired.
+ *
+ * Called with the group IDs that were just cleared. Before releasing anything,
+ * we check whether the partner still has other pending fraud groups:
+ *
+ * 1. Partner-level groups (e.g. duplicate account, cross-program ban) — if any
+ * remain pending, all hold commissions stay on hold.
+ * 2. Conversion-event groups (e.g. matching customer email) — commissions tied
+ * to customers in those groups stay on hold; only unrelated commissions are
+ * released.
+ *
+ * Eligible commissions move from `hold` → `pending`, then we log the status
+ * change, sync partner totals, and fire partner-metrics workflows.
+ */
+export async function releaseHoldCommissions({
+ programId,
+ partnerId,
+ resolvedGroupIds,
+}: {
+ programId: string;
+ partnerId: string;
+ // Includes both resolved and expired fraud groups.
+ resolvedGroupIds: string[];
+}) {
+ if (resolvedGroupIds.length === 0) {
return 0;
}
- const riskGroups = await prisma.fraudEventGroup.findMany({
+ const otherPendingGroups = await prisma.fraudEventGroup.findMany({
where: {
+ programId,
+ partnerId,
+ status: FraudEventStatus.pending,
id: {
- in: riskGroupIds,
+ notIn: resolvedGroupIds,
},
},
select: {
- id: true,
- programId: true,
- partnerId: true,
type: true,
- program: {
+ fraudEvents: {
select: {
- workspaceId: true,
+ customerId: true,
},
},
},
});
- if (riskGroups.length === 0) {
+ const hasOtherPendingPartnerLevelGroup = otherPendingGroups.some((g) =>
+ (PARTNER_LEVEL_FRAUD_RULES as readonly FraudRuleType[]).includes(g.type),
+ );
+
+ if (hasOtherPendingPartnerLevelGroup) {
return 0;
}
- let releasedCount = 0;
-
- const partnerProgramKeys = [
- ...new Set(riskGroups.map((g) => `${g.programId}:${g.partnerId}`)),
- ];
+ const blockedCustomerIds = new Set(
+ otherPendingGroups
+ .filter((g) =>
+ CUSTOMER_LEVEL_FRAUD_RULES.includes(
+ g.type as (typeof CUSTOMER_LEVEL_FRAUD_RULES)[number],
+ ),
+ )
+ .flatMap((g) =>
+ g.fraudEvents
+ .map((e) => e.customerId)
+ .filter((id): id is string => id !== null),
+ ),
+ );
- for (const key of partnerProgramKeys) {
- const [programId, partnerId] = key.split(":");
+ const releaseWhere: Prisma.CommissionWhereInput = {
+ programId,
+ partnerId,
+ status: CommissionStatus.hold,
+ };
- const otherPendingGroups = await prisma.fraudEventGroup.findMany({
- where: {
- programId,
- partnerId,
- status: FraudEventStatus.pending,
- id: {
- notIn: riskGroupIds,
- },
+ if (blockedCustomerIds.size > 0) {
+ releaseWhere.OR = [
+ {
+ customerId: null, // custom commissions
},
- select: {
- type: true,
- fraudEvents: {
- select: {
- customerId: true,
- },
+ {
+ customerId: {
+ notIn: [...blockedCustomerIds],
},
},
- });
+ ];
+ }
- const hasOtherPendingPartnerLevelGroup = otherPendingGroups.some((g) =>
- (PARTNER_LEVEL_FRAUD_RULES as readonly FraudRuleType[]).includes(g.type),
- );
+ const commissionsToRelease = await prisma.commission.findMany({
+ where: releaseWhere,
+ select: {
+ id: true,
+ amount: true,
+ earnings: true,
+ status: true,
+ },
+ });
- if (hasOtherPendingPartnerLevelGroup) {
- continue;
- }
+ if (commissionsToRelease.length === 0) {
+ return 0;
+ }
- const blockedCustomerIds = new Set(
- otherPendingGroups
- .filter((g) => FRAUD_RULES_BY_TYPE[g.type]?.scope === "conversionEvent")
- .flatMap((g) =>
- g.fraudEvents
- .map((e) => e.customerId)
- .filter((id): id is string => id !== null),
- ),
- );
+ // Update the commissions to pending
+ const { count: updatedCount } = await prisma.commission.updateMany({
+ where: {
+ id: {
+ in: commissionsToRelease.map((c) => c.id),
+ },
+ status: CommissionStatus.hold,
+ },
+ data: {
+ status: CommissionStatus.pending,
+ },
+ });
- const groupsForPartner = riskGroups.filter(
- (g) => g.programId === programId && g.partnerId === partnerId,
- );
+ if (updatedCount === 0) {
+ return 0;
+ }
- const releaseWhere: Prisma.CommissionWhereInput = {
- programId,
- partnerId,
- status: "hold",
- };
+ const program = await prisma.program.findUniqueOrThrow({
+ where: {
+ id: programId,
+ },
+ select: {
+ workspaceId: true,
+ },
+ });
- if (blockedCustomerIds.size > 0) {
- releaseWhere.OR = [
- {
- customerId: null,
- },
- {
- customerId: {
- notIn: [...blockedCustomerIds],
+ // Get the released commissions
+ const releasedCommissions =
+ updatedCount < commissionsToRelease.length
+ ? await prisma.commission.findMany({
+ where: {
+ id: {
+ in: commissionsToRelease.map((c) => c.id),
+ },
+ status: CommissionStatus.pending,
},
- },
- ];
- }
+ select: {
+ id: true,
+ amount: true,
+ earnings: true,
+ status: true,
+ },
+ })
+ : commissionsToRelease;
- const commissionsToRelease = await prisma.commission.findMany({
- where: releaseWhere,
- select: {
- id: true,
- amount: true,
- earnings: true,
- status: true,
+ await trackCommissionStatusUpdate({
+ workspaceId: program.workspaceId,
+ programId,
+ commissions: releasedCommissions,
+ newStatus: CommissionStatus.pending,
+ });
+
+ await syncTotalCommissions({
+ partnerId,
+ programId,
+ });
+
+ const releasedEarnings = releasedCommissions.reduce(
+ (sum, commission) => sum + commission.earnings,
+ 0,
+ );
+
+ if (releasedEarnings > 0) {
+ await executeWorkflows({
+ trigger: "partnerMetricsUpdated",
+ reason: "commission",
+ identity: {
+ workspaceId: program.workspaceId,
+ programId,
+ partnerId,
+ },
+ metrics: {
+ current: {
+ commissions: releasedEarnings,
+ },
},
});
+ }
- if (commissionsToRelease.length === 0) {
- continue;
- }
+ return releasedCommissions.length;
+}
- await prisma.commission.updateMany({
- where: {
- id: {
- in: commissionsToRelease.map((c) => c.id),
- },
+// Groups resolved/expired fraud groups by program+partner and enqueues a cron
+// job per pair so releaseHoldCommissions runs asynchronously via QStash.
+export async function queueReleaseHoldCommissions(riskGroupIds: string[]) {
+ if (riskGroupIds.length === 0) {
+ return 0;
+ }
+
+ const riskGroups = await prisma.fraudEventGroup.findMany({
+ where: {
+ id: {
+ in: riskGroupIds,
},
- data: {
- status: "pending",
+ status: {
+ in: [FraudEventStatus.resolved, FraudEventStatus.expired],
},
- });
+ },
+ select: {
+ id: true,
+ programId: true,
+ partnerId: true,
+ },
+ });
- await trackCommissionStatusUpdate({
- workspaceId: groupsForPartner[0].program.workspaceId,
- programId,
- commissions: commissionsToRelease,
- newStatus: "pending",
- });
+ if (riskGroups.length === 0) {
+ return 0;
+ }
- await syncTotalCommissions({
- partnerId,
- programId,
- });
+ const pairs = new Map<
+ string,
+ { programId: string; partnerId: string; resolvedGroupIds: string[] }
+ >();
- const releasedEarnings = commissionsToRelease.reduce(
- (sum, commission) => sum + commission.earnings,
- 0,
- );
-
- if (releasedEarnings > 0) {
- await executeWorkflows({
- trigger: "partnerMetricsUpdated",
- reason: "commission",
- identity: {
- workspaceId: groupsForPartner[0].program.workspaceId,
- programId,
- partnerId,
- },
- metrics: {
- current: {
- commissions: releasedEarnings,
- },
- },
+ for (const riskGroup of riskGroups) {
+ const key = `${riskGroup.programId}:${riskGroup.partnerId}`;
+ const existing = pairs.get(key);
+
+ if (existing) {
+ existing.resolvedGroupIds.push(riskGroup.id);
+ } else {
+ pairs.set(key, {
+ programId: riskGroup.programId,
+ partnerId: riskGroup.partnerId,
+ resolvedGroupIds: [riskGroup.id],
});
}
-
- releasedCount += commissionsToRelease.length;
}
- return releasedCount;
+ const jobs = [...pairs.values()].map(
+ ({ programId, partnerId, resolvedGroupIds }) => ({
+ url: `${APP_DOMAIN_WITH_NGROK}/api/cron/fraud/release-hold-commissions`,
+ method: "POST" as const,
+ body: {
+ programId,
+ partnerId,
+ resolvedGroupIds,
+ },
+ }),
+ );
+
+ await qstash.batchJSON(jobs);
+
+ return jobs.length;
}
diff --git a/apps/web/lib/api/fraud/resolve-fraud-groups.ts b/apps/web/lib/api/fraud/resolve-fraud-groups.ts
index df927d0b5d..f3014d4387 100644
--- a/apps/web/lib/api/fraud/resolve-fraud-groups.ts
+++ b/apps/web/lib/api/fraud/resolve-fraud-groups.ts
@@ -1,4 +1,4 @@
-import { releaseHoldCommissions } from "@/lib/api/fraud/release-hold-commissions";
+import { queueReleaseHoldCommissions } from "@/lib/api/fraud/release-hold-commissions";
import { prisma } from "@/lib/prisma";
import { prettyPrint } from "@dub/utils";
import { FraudEventStatus, Prisma } from "@prisma/client";
@@ -7,10 +7,12 @@ export async function resolveFraudGroups({
where,
userId,
resolutionReason,
+ releaseHoldCommissions = false,
}: {
where: Prisma.FraudEventGroupWhereInput;
userId?: string;
resolutionReason?: string;
+ releaseHoldCommissions?: boolean;
}) {
const riskGroups = await prisma.fraudEventGroup.findMany({
where: {
@@ -45,8 +47,8 @@ export async function resolveFraudGroups({
console.info(`Resolved ${count} fraud event groups ${prettyPrint(where)}`);
- if (count > 0) {
- await releaseHoldCommissions(riskGroupIds);
+ if (releaseHoldCommissions && count > 0) {
+ await queueReleaseHoldCommissions(riskGroupIds);
}
return count;
diff --git a/apps/web/scripts/migrations/backfill-fraud-hold-commissions.ts b/apps/web/scripts/migrations/backfill-fraud-hold-commissions.ts
index 2c73ae3192..fad795f213 100644
--- a/apps/web/scripts/migrations/backfill-fraud-hold-commissions.ts
+++ b/apps/web/scripts/migrations/backfill-fraud-hold-commissions.ts
@@ -1,3 +1,4 @@
+import { PARTNER_LEVEL_FRAUD_RULES } from "@/lib/api/fraud/constants";
import { holdPendingCommissions } from "@/lib/api/fraud/hold-pending-commissions";
import { prisma } from "@/lib/prisma";
import "dotenv-flow/config";
@@ -5,7 +6,8 @@ import "dotenv-flow/config";
const BATCH_SIZE = 100;
// One-time backfill: hold pending commissions for partners who already have pending
-// fraud groups but were not covered by the new hold-on-fraud-event logic.
+// partner-level fraud groups but were not covered by the new hold-on-fraud-event logic.
+// Conversion-event fraud holds are applied at commission creation time (customer-scoped).
async function main() {
let startingAfter: string | undefined;
let totalPairs = 0;
@@ -14,6 +16,9 @@ async function main() {
const fraudGroups = await prisma.fraudEventGroup.findMany({
where: {
status: "pending",
+ type: {
+ in: PARTNER_LEVEL_FRAUD_RULES,
+ },
program: {
workspace: {
plan: {
diff --git a/apps/web/ui/partners/fraud-risks/mark-all-as-fraud-modal.tsx b/apps/web/ui/partners/fraud-risks/mark-all-as-fraud-modal.tsx
index a24ee553a9..355e43378a 100644
--- a/apps/web/ui/partners/fraud-risks/mark-all-as-fraud-modal.tsx
+++ b/apps/web/ui/partners/fraud-risks/mark-all-as-fraud-modal.tsx
@@ -60,6 +60,7 @@ function MarkAllAsFraudModal({
workspaceId,
status: "hold",
fraudEventGroupId: fraudGroup.id,
+ partnerId: partner.id,
pageSize: "100",
}).toString()}`
: null,
diff --git a/apps/web/ui/partners/fraud-risks/risk-review-sheet.tsx b/apps/web/ui/partners/fraud-risks/risk-review-sheet.tsx
index c508a8753e..0a615d351a 100644
--- a/apps/web/ui/partners/fraud-risks/risk-review-sheet.tsx
+++ b/apps/web/ui/partners/fraud-risks/risk-review-sheet.tsx
@@ -75,6 +75,7 @@ function RiskReviewSheetContent({
workspaceId,
status: "hold",
fraudEventGroupId: fraudGroup.id,
+ partnerId: partner.id,
}).toString()}`
: null;