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.

Only sync commissions actually held when bulk-holding pending commissions

Kiran Ka967ec1b6665
diff --git a/apps/web/app/(ee)/api/commissions/route.ts b/apps/web/app/(ee)/api/commissions/route.ts
index 4214b47542..231290d04b 100644
--- a/apps/web/app/(ee)/api/commissions/route.ts
+++ b/apps/web/app/(ee)/api/commissions/route.ts
@@ -19,16 +19,10 @@ import * as z from "zod/v4";
export const GET = withWorkspace(async ({ workspace, searchParams }) => {
const programId = getDefaultProgramIdOrThrow(workspace);
- let {
- fraudEventGroupId,
- type: rawType,
- partnerId,
- tenantId,
- ...filters
- } = getCommissionsQuerySchema
+ let { partnerId, tenantId, ...filters } = getCommissionsQuerySchema
.extend({
fraudEventGroupId: z.string().optional(),
- type: z.string().optional(),
+ type: z.string().optional(), // May be comma-separated string, for multi-value handling
})
.parse(searchParams);
@@ -57,11 +51,8 @@ export const GET = withWorkspace(async ({ workspace, searchParams }) => {
const commissions = await getCommissions({
...filters,
- // Pass raw type string (may be comma-separated) for multi-value handling
- ...(rawType && { type: rawType }),
partnerId,
programId,
- ...(fraudEventGroupId && { fraudEventGroupId }),
});
return NextResponse.json(
diff --git a/apps/web/app/(ee)/api/cron/export/payouts/route.ts b/apps/web/app/(ee)/api/cron/export/payouts/route.ts
index f1bdc0bf7a..e052fe8f30 100644
--- a/apps/web/app/(ee)/api/cron/export/payouts/route.ts
+++ b/apps/web/app/(ee)/api/cron/export/payouts/route.ts
@@ -25,8 +25,12 @@ export const POST = withCron(async ({ rawBody }) => {
const { workspaceId, programId, userId, columns } =
payoutsExportCronInputSchema.parse(payload);
- const filters = payoutsQuerySchema.parse(payload);
- const { page: _page, pageSize: _pageSize, ...exportFilters } = filters;
+ const filters = payoutsQuerySchema
+ .omit({
+ page: true,
+ pageSize: true,
+ })
+ .parse(payload);
const user = await prisma.user.findUnique({
where: {
@@ -63,7 +67,7 @@ export const POST = withCron(async ({ rawBody }) => {
for await (const { payouts } of fetchPayoutsBatch({
workspaceId,
programId,
- filters: exportFilters,
+ filters,
})) {
const formatted = formatPayoutsForExport(payouts, columns);
const remaining = MAX_PAYOUTS_EXPORT_LIMIT - allRows.length;
diff --git a/apps/web/lib/api/fraud/hold-pending-commissions.ts b/apps/web/lib/api/fraud/hold-pending-commissions.ts
index 409b59957f..12dc01691f 100644
--- a/apps/web/lib/api/fraud/hold-pending-commissions.ts
+++ b/apps/web/lib/api/fraud/hold-pending-commissions.ts
@@ -4,6 +4,9 @@ import { chunk, groupBy } from "@dub/utils";
import { CommissionStatus, ProgramEnrollment } from "@prisma/client";
import { syncTotalCommissions } from "../partners/sync-total-commissions";
+// Bulk-hold pending commissions for partner-program pairs flagged by partner-level fraud
+// (duplicate identity, duplicate payout method, cross-program ban). Conversion-event fraud
+// is handled separately at commission creation time with customer-scoped holds.
export async function holdPendingCommissions(
programEnrollments: Pick<ProgramEnrollment, "programId" | "partnerId">[],
) {
@@ -27,11 +30,11 @@ export async function holdPendingCommissions(
partnerId,
})),
status: CommissionStatus.pending,
+ // Clawbacks (earnings <= 0) are never held — matches create-partner-commission.
earnings: {
gt: 0,
},
- // Only hold commissions for workspaces whose plan can manage fraud events,
- // Other plans have no way to review or resolve fraud groups, so their commissions should never be frozen.
+ // Fraud holds are an advanced/enterprise capability (canManageFraudEvents).
program: {
workspace: {
plan: {
@@ -49,6 +52,7 @@ export async function holdPendingCommissions(
partnerId: true,
program: {
select: {
+ id: true,
workspaceId: true,
},
},
@@ -59,26 +63,56 @@ export async function holdPendingCommissions(
continue;
}
- await prisma.commission.updateMany({
+ // Update the status of the commissions to hold
+ const { count: updatedCount } = await prisma.commission.updateMany({
where: {
id: {
in: pendingCommissions.map((c) => c.id),
},
+ status: CommissionStatus.pending,
},
data: {
status: CommissionStatus.hold,
},
});
- const commissionsByProgram = groupBy(
- pendingCommissions,
- (c) => c.programId,
- );
+ if (updatedCount === 0) {
+ continue;
+ }
+
+ // updateMany re-checks status: pending, so a commission can change between findMany
+ // and updateMany (e.g. payout processing). Only log/sync rows we actually held.
+ let heldCommissions = pendingCommissions;
+
+ if (updatedCount < pendingCommissions.length) {
+ const pendingCommissionIds = pendingCommissions.map((c) => c.id);
+
+ const heldCommissionIds = await prisma.commission.findMany({
+ where: {
+ id: {
+ in: pendingCommissionIds,
+ },
+ status: CommissionStatus.hold,
+ },
+ select: {
+ id: true,
+ },
+ });
+
+ const heldIds = new Set(heldCommissionIds.map(({ id }) => id));
+
+ heldCommissions = pendingCommissions.filter((c) => heldIds.has(c.id));
+ }
+
+ // Activity logs are scoped to a workspace + program, so batch by program.
+ const commissionsByProgram = groupBy(heldCommissions, (c) => c.programId);
for (const commissions of Object.values(commissionsByProgram)) {
+ const { id: programId, workspaceId } = commissions[0].program;
+
await trackCommissionStatusUpdate({
- workspaceId: commissions[0].program.workspaceId,
- programId: commissions[0].programId,
+ workspaceId,
+ programId,
commissions,
newStatus: CommissionStatus.hold,
});
@@ -86,7 +120,7 @@ export async function holdPendingCommissions(
const affectedPairs = [
...new Map(
- pendingCommissions.map((c) => [
+ heldCommissions.map((c) => [
`${c.programId}:${c.partnerId}`,
{ programId: c.programId, partnerId: c.partnerId },
]),
diff --git a/apps/web/lib/api/payouts/get-payouts.ts b/apps/web/lib/api/payouts/get-payouts.ts
index a94d97c3da..050b960c4f 100644
--- a/apps/web/lib/api/payouts/get-payouts.ts
+++ b/apps/web/lib/api/payouts/get-payouts.ts
@@ -27,7 +27,7 @@ export function buildProgramEnrollmentFilter({
};
}
-export function buildPayoutWhere({
+function buildPayoutWhere({
programId,
filters,
}: {