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.

Don't filter out fraud-ineligible payouts on Business plans (#3293)

Steven Tey1473f835ee3a
diff --git a/apps/web/app/(ee)/api/cron/payouts/process/process-payouts.ts b/apps/web/app/(ee)/api/cron/payouts/process/process-payouts.ts
index 2925fb720c..0cf2802787 100644
--- a/apps/web/app/(ee)/api/cron/payouts/process/process-payouts.ts
+++ b/apps/web/app/(ee)/api/cron/payouts/process/process-payouts.ts
@@ -78,7 +78,7 @@ export async function processPayouts({
: excludedPayoutIds && excludedPayoutIds.length > 0
? { id: { notIn: excludedPayoutIds } }
: {}),
- ...getPayoutEligibilityFilter(program),
+ ...getPayoutEligibilityFilter({ program, workspace }),
...(cutoffPeriodValue && {
periodEnd: {
lte: cutoffPeriodValue,
diff --git a/apps/web/app/(ee)/api/cron/payouts/process/route.ts b/apps/web/app/(ee)/api/cron/payouts/process/route.ts
index 7df8a5b05e..246453f518 100644
--- a/apps/web/app/(ee)/api/cron/payouts/process/route.ts
+++ b/apps/web/app/(ee)/api/cron/payouts/process/route.ts
@@ -82,6 +82,7 @@ export async function POST(req: Request) {
if (cutoffPeriod) {
await splitPayouts({
program,
+ workspace,
cutoffPeriod,
selectedPayoutId,
excludedPayoutIds,
@@ -89,8 +90,8 @@ export async function POST(req: Request) {
}
await processPayouts({
- workspace,
program,
+ workspace,
invoice,
userId,
paymentMethodId,
diff --git a/apps/web/app/(ee)/api/cron/payouts/process/split-payouts.ts b/apps/web/app/(ee)/api/cron/payouts/process/split-payouts.ts
index 054e06bc8c..b967c59ed4 100644
--- a/apps/web/app/(ee)/api/cron/payouts/process/split-payouts.ts
+++ b/apps/web/app/(ee)/api/cron/payouts/process/split-payouts.ts
@@ -5,16 +5,18 @@ import {
CUTOFF_PERIOD_TYPES,
} from "@/lib/partners/cutoff-period";
import { prisma } from "@dub/prisma";
-import { Program } from "@dub/prisma/client";
+import { Program, Project } from "@dub/prisma/client";
import { endOfMonth } from "date-fns";
export async function splitPayouts({
program,
+ workspace,
cutoffPeriod,
selectedPayoutId,
excludedPayoutIds,
}: {
program: Pick<Program, "id" | "name" | "minPayoutAmount" | "payoutMode">;
+ workspace: Pick<Project, "plan">;
cutoffPeriod: CUTOFF_PERIOD_TYPES;
selectedPayoutId?: string;
excludedPayoutIds?: string[];
@@ -26,7 +28,7 @@ export async function splitPayouts({
: excludedPayoutIds && excludedPayoutIds.length > 0
? { id: { notIn: excludedPayoutIds } }
: {}),
- ...getPayoutEligibilityFilter(program),
+ ...getPayoutEligibilityFilter({ program, workspace }),
},
include: {
commissions: true,
diff --git a/apps/web/app/(ee)/api/fraud/groups/count/route.ts b/apps/web/app/(ee)/api/fraud/groups/count/route.ts
index 2f3ea4deb6..8475287ac4 100644
--- a/apps/web/app/(ee)/api/fraud/groups/count/route.ts
+++ b/apps/web/app/(ee)/api/fraud/groups/count/route.ts
@@ -82,6 +82,13 @@ export const GET = withWorkspace(
return NextResponse.json(fraudGroupCountSchema.parse(count));
},
{
- requiredPlan: ["advanced", "enterprise"],
+ requiredPlan: [
+ "business",
+ "business plus",
+ "business extra",
+ "business max",
+ "advanced",
+ "enterprise",
+ ],
},
);
diff --git a/apps/web/app/(ee)/api/programs/[programId]/payouts/count/route.ts b/apps/web/app/(ee)/api/programs/[programId]/payouts/count/route.ts
index 6a4113758c..4f7356f326 100644
--- a/apps/web/app/(ee)/api/programs/[programId]/payouts/count/route.ts
+++ b/apps/web/app/(ee)/api/programs/[programId]/payouts/count/route.ts
@@ -23,7 +23,7 @@ export const GET = withWorkspace(async ({ workspace, searchParams }) => {
programId,
...(partnerId && { partnerId }),
...(eligibility === "eligible" && {
- ...getPayoutEligibilityFilter(program),
+ ...getPayoutEligibilityFilter({ program, workspace }),
}),
...(invoiceId && { invoiceId }),
};
diff --git a/apps/web/app/(ee)/api/programs/[programId]/payouts/eligible/count/route.ts b/apps/web/app/(ee)/api/programs/[programId]/payouts/eligible/count/route.ts
index 1cf5ac254b..0d2bf2d07c 100644
--- a/apps/web/app/(ee)/api/programs/[programId]/payouts/eligible/count/route.ts
+++ b/apps/web/app/(ee)/api/programs/[programId]/payouts/eligible/count/route.ts
@@ -30,6 +30,7 @@ export const GET = withWorkspace(async ({ workspace, searchParams }) => {
if (cutoffPeriodValue) {
const eligiblePayouts = await getEligiblePayouts({
program,
+ workspace,
cutoffPeriod,
selectedPayoutId,
excludedPayoutIds,
@@ -50,7 +51,7 @@ export const GET = withWorkspace(async ({ workspace, searchParams }) => {
: excludedPayoutIds && excludedPayoutIds.length > 0
? { id: { notIn: excludedPayoutIds } }
: {}),
- ...getPayoutEligibilityFilter(program),
+ ...getPayoutEligibilityFilter({ program, workspace }),
},
_count: true,
_sum: {
diff --git a/apps/web/app/(ee)/api/programs/[programId]/payouts/eligible/route.ts b/apps/web/app/(ee)/api/programs/[programId]/payouts/eligible/route.ts
index 96b473455a..11bda33f1c 100644
--- a/apps/web/app/(ee)/api/programs/[programId]/payouts/eligible/route.ts
+++ b/apps/web/app/(ee)/api/programs/[programId]/payouts/eligible/route.ts
@@ -28,6 +28,7 @@ export const GET = withWorkspace(async ({ workspace, searchParams }) => {
const eligiblePayouts = await getEligiblePayouts({
program,
+ workspace,
...query,
});
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-table.tsx
index 0e29c09d87..ee8613ae0d 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-table.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-table.tsx
@@ -1,5 +1,6 @@
"use client";
+import { getPlanCapabilities } from "@/lib/plan-capabilities";
import { useFraudGroupCount } from "@/lib/swr/use-fraud-groups-count";
import usePayoutsCount from "@/lib/swr/use-payouts-count";
import useProgram from "@/lib/swr/use-program";
@@ -49,7 +50,7 @@ const PayoutTableInner = memo(
setSearch,
setSelectedFilter,
}: ReturnType<typeof usePayoutFilters>) => {
- const { id: workspaceId, defaultProgramId } = useWorkspace();
+ const { id: workspaceId, plan, defaultProgramId } = useWorkspace();
const { queryParams, searchParams, getQueryString } = useRouterStuff();
const sortBy = searchParams.get("sortBy") || "amount";
@@ -130,9 +131,9 @@ const PayoutTableInner = memo(
{
header: "Status",
cell: ({ row }) => {
- const hasFraudPending = fraudGroupCountMap.has(
- row.original.partner.id,
- );
+ const hasFraudPending =
+ fraudGroupCountMap.has(row.original.partner.id) &&
+ getPlanCapabilities(plan).canManageFraudEvents;
const status =
hasFraudPending && row.original.status === "pending"
@@ -178,7 +179,10 @@ const PayoutTableInner = memo(
cell: ({ row }) => (
<AmountRowItem
payout={row.original}
- hasFraudPending={fraudGroupCountMap.has(row.original.partner.id)}
+ hasFraudPending={
+ fraudGroupCountMap.has(row.original.partner.id) &&
+ getPlanCapabilities(plan).canManageFraudEvents
+ }
/>
),
},
diff --git a/apps/web/lib/actions/partners/confirm-payouts.ts b/apps/web/lib/actions/partners/confirm-payouts.ts
index db386c8795..5d38418686 100644
--- a/apps/web/lib/actions/partners/confirm-payouts.ts
+++ b/apps/web/lib/actions/partners/confirm-payouts.ts
@@ -97,7 +97,7 @@ export const confirmPayoutsAction = authActionClient
: excludedPayoutIds && excludedPayoutIds.length > 0
? { id: { notIn: excludedPayoutIds } }
: {}),
- ...getPayoutEligibilityFilter(program),
+ ...getPayoutEligibilityFilter({ program, workspace }),
},
_count: true,
});
@@ -113,6 +113,7 @@ export const confirmPayoutsAction = authActionClient
const [eligiblePayouts, payoutWebhooks] = await Promise.all([
getEligiblePayouts({
program,
+ workspace,
cutoffPeriod,
selectedPayoutId,
excludedPayoutIds,
diff --git a/apps/web/lib/api/payouts/get-eligible-payouts.ts b/apps/web/lib/api/payouts/get-eligible-payouts.ts
index 885c6b648a..7648788a5d 100644
--- a/apps/web/lib/api/payouts/get-eligible-payouts.ts
+++ b/apps/web/lib/api/payouts/get-eligible-payouts.ts
@@ -4,7 +4,7 @@ import {
PayoutResponseSchema,
} from "@/lib/zod/schemas/payouts";
import { prisma } from "@dub/prisma";
-import { Program } from "@dub/prisma/client";
+import { Program, Project } from "@dub/prisma/client";
import { z } from "zod";
import { getEffectivePayoutMode } from "./get-effective-payout-mode";
import { getPayoutEligibilityFilter } from "./payout-eligibility-filter";
@@ -16,10 +16,12 @@ interface GetEligiblePayoutsProps
> {
excludedPayoutIds?: string[];
program: Pick<Program, "id" | "name" | "minPayoutAmount" | "payoutMode">;
+ workspace: Pick<Project, "plan">;
}
export async function getEligiblePayouts({
program,
+ workspace,
cutoffPeriod,
selectedPayoutId,
excludedPayoutIds,
@@ -37,7 +39,7 @@ export async function getEligiblePayouts({
: excludedPayoutIds && excludedPayoutIds.length > 0
? { id: { notIn: excludedPayoutIds } }
: {}),
- ...getPayoutEligibilityFilter(program),
+ ...getPayoutEligibilityFilter({ program, workspace }),
},
include: {
partner: {
diff --git a/apps/web/lib/api/payouts/payout-eligibility-filter.ts b/apps/web/lib/api/payouts/payout-eligibility-filter.ts
index 1a97f146ea..66f881028f 100644
--- a/apps/web/lib/api/payouts/payout-eligibility-filter.ts
+++ b/apps/web/lib/api/payouts/payout-eligibility-filter.ts
@@ -1,8 +1,13 @@
-import { Prisma, Program } from "@dub/prisma/client";
+import { getPlanCapabilities } from "@/lib/plan-capabilities";
+import { Prisma, Program, Project } from "@dub/prisma/client";
-export function getPayoutEligibilityFilter(
- program: Pick<Program, "id" | "minPayoutAmount" | "payoutMode">,
-): Prisma.PayoutWhereInput {
+export function getPayoutEligibilityFilter({
+ program,
+ workspace,
+}: {
+ program: Pick<Program, "id" | "minPayoutAmount" | "payoutMode">;
+ workspace: Pick<Project, "plan">;
+}): Prisma.PayoutWhereInput {
const commonWhere: Prisma.PayoutWhereInput = {
programId: program.id,
status: "pending",
@@ -10,14 +15,16 @@ export function getPayoutEligibilityFilter(
amount: {
gte: program.minPayoutAmount,
},
- // Filter out payouts from partners with pending fraud events
- programEnrollment: {
- fraudEventGroups: {
- every: {
- status: "resolved",
+ // Filter out payouts from partners with pending fraud events (for eligible workspaces)
+ ...(getPlanCapabilities(workspace.plan).canManageFraudEvents && {
+ programEnrollment: {
+ fraudEventGroups: {
+ every: {
+ status: "resolved",
+ },
},
},
- },
+ }),
};
switch (program.payoutMode) {