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.

Deduplicate fraud event IDs and fix payout export/count filters

Kiran Ke77525a247df
diff --git a/apps/web/app/(ee)/api/payouts/export/route.ts b/apps/web/app/(ee)/api/payouts/export/route.ts
index 4f1542a0c2..fe3fdba50e 100644
--- a/apps/web/app/(ee)/api/payouts/export/route.ts
+++ b/apps/web/app/(ee)/api/payouts/export/route.ts
@@ -15,8 +15,8 @@ export const GET = withWorkspace(
async ({ searchParams, workspace, session }) => {
const programId = getDefaultProgramIdOrThrow(workspace);
- const { columns, ...filters } =
- payoutsExportQuerySchema.parse(searchParams);
+ const parsedParams = payoutsExportQuerySchema.parse(searchParams);
+ const { columns, ...filters } = parsedParams;
const count = await getPayoutsCount({
programId,
@@ -27,7 +27,7 @@ export const GET = withWorkspace(
await qstash.publishJSON({
url: `${APP_DOMAIN_WITH_NGROK}/api/cron/export/payouts`,
body: {
- ...searchParams,
+ ...filters,
columns: columns.join(","),
workspaceId: workspace.id,
programId,
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 bc594348f2..331d40a777 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
@@ -101,7 +101,6 @@ export function PayoutTable() {
const {
id: workspaceId,
slug: workspaceSlug,
- plan,
defaultProgramId,
} = useWorkspace();
diff --git a/apps/web/lib/api/commissions/get-commissions-count.ts b/apps/web/lib/api/commissions/get-commissions-count.ts
index c73e337916..aae0fcdfee 100644
--- a/apps/web/lib/api/commissions/get-commissions-count.ts
+++ b/apps/web/lib/api/commissions/get-commissions-count.ts
@@ -4,7 +4,7 @@ import { getCommissionsCountQuerySchema } from "@/lib/zod/schemas/commissions";
import { parseFilterValue } from "@dub/utils";
import { CommissionStatus, CommissionType } from "@prisma/client";
import * as z from "zod/v4";
-import { PARTNER_LEVEL_FRAUD_RULES } from "../fraud/constants";
+import { getFraudEventGroupEventIds } from "../fraud/get-fraud-event-group-event-ids";
type CommissionsCountFilters = z.infer<
typeof getCommissionsCountQuerySchema
@@ -31,38 +31,12 @@ export async function getCommissionsCount(filters: CommissionsCountFilters) {
} = filters;
// Filter the commissions based on the risk event group
- let eventIds: string[] | undefined;
-
- if (fraudEventGroupId) {
- const riskEventGroup = await prisma.fraudEventGroup.findUniqueOrThrow({
- where: {
- id: fraudEventGroupId,
+ const eventIds = fraudEventGroupId
+ ? await getFraudEventGroupEventIds({
+ fraudEventGroupId,
programId,
- },
- select: {
- type: true,
- fraudEvents: {
- select: {
- eventId: true,
- },
- },
- },
- });
-
- if (riskEventGroup.fraudEvents.length > 0) {
- const isPartnerLevelRisk = PARTNER_LEVEL_FRAUD_RULES.includes(
- riskEventGroup.type as (typeof PARTNER_LEVEL_FRAUD_RULES)[number],
- );
-
- // Partner-level: include all commissions for the partner
- // Customer-level: include only commissions for the customers in the risk event group
- if (!isPartnerLevelRisk) {
- eventIds = riskEventGroup.fraudEvents
- .map((e) => e.eventId)
- .filter((e) => e !== null) as string[];
- }
- }
- }
+ })
+ : undefined;
const { startDate, endDate } = getStartEndDates({
interval,
diff --git a/apps/web/lib/api/commissions/get-commissions.ts b/apps/web/lib/api/commissions/get-commissions.ts
index ffb22ee105..f397eef013 100644
--- a/apps/web/lib/api/commissions/get-commissions.ts
+++ b/apps/web/lib/api/commissions/get-commissions.ts
@@ -5,7 +5,7 @@ import { parseFilterValue } from "@dub/utils";
import { CommissionStatus, CommissionType } from "@prisma/client";
import * as z from "zod/v4";
import { DubApiError } from "../errors";
-import { PARTNER_LEVEL_FRAUD_RULES } from "../fraud/constants";
+import { getFraudEventGroupEventIds } from "../fraud/get-fraud-event-group-event-ids";
import { buildPaginationQuery } from "../pagination";
type CommissionsFilters = Omit<
@@ -62,38 +62,12 @@ export async function getCommissions(filters: CommissionsFilters) {
}
// Filter the commissions based on the risk event group
- let eventIds: string[] | undefined;
-
- if (fraudEventGroupId) {
- const riskEventGroup = await prisma.fraudEventGroup.findUniqueOrThrow({
- where: {
- id: fraudEventGroupId,
+ const eventIds = fraudEventGroupId
+ ? await getFraudEventGroupEventIds({
+ fraudEventGroupId,
programId,
- },
- select: {
- type: true,
- fraudEvents: {
- select: {
- eventId: true,
- },
- },
- },
- });
-
- if (riskEventGroup.fraudEvents.length > 0) {
- const isPartnerLevelRisk = PARTNER_LEVEL_FRAUD_RULES.includes(
- riskEventGroup.type as (typeof PARTNER_LEVEL_FRAUD_RULES)[number],
- );
-
- // Partner-level: include all commissions for the partner
- // Customer-level: include only commissions for the customers in the risk event group
- if (!isPartnerLevelRisk) {
- eventIds = riskEventGroup.fraudEvents
- .map((e) => e.eventId)
- .filter((e) => e !== null) as string[];
- }
- }
- }
+ })
+ : undefined;
const { startDate, endDate } = getStartEndDates({
interval,
diff --git a/apps/web/lib/api/fraud/get-fraud-event-group-event-ids.ts b/apps/web/lib/api/fraud/get-fraud-event-group-event-ids.ts
new file mode 100644
index 0000000000..207d68f678
--- /dev/null
+++ b/apps/web/lib/api/fraud/get-fraud-event-group-event-ids.ts
@@ -0,0 +1,54 @@
+import { prisma } from "@/lib/prisma";
+import { PARTNER_LEVEL_FRAUD_RULES } from "./constants";
+
+export async function getFraudEventGroupEventIds({
+ fraudEventGroupId,
+ programId,
+}: {
+ fraudEventGroupId: string;
+ programId: string;
+}) {
+ const riskEventGroup = await prisma.fraudEventGroup.findUniqueOrThrow({
+ where: {
+ id: fraudEventGroupId,
+ programId,
+ },
+ select: {
+ type: true,
+ },
+ });
+
+ const isPartnerLevelRisk = PARTNER_LEVEL_FRAUD_RULES.includes(
+ riskEventGroup.type as (typeof PARTNER_LEVEL_FRAUD_RULES)[number],
+ );
+
+ // Partner-level: include all commissions for the partner
+ // Customer-level: include only commissions for the customers in the risk event group
+ if (isPartnerLevelRisk) {
+ return undefined;
+ }
+
+ const fraudEvents = await prisma.fraudEvent.findMany({
+ where: {
+ fraudEventGroupId,
+ programId,
+ eventId: {
+ not: null,
+ },
+ },
+ distinct: ["eventId"],
+ select: {
+ eventId: true,
+ },
+ });
+
+ const eventIds = [
+ ...new Set(
+ fraudEvents
+ .map((e) => e.eventId)
+ .filter((id): id is string => id !== null),
+ ),
+ ];
+
+ return eventIds.length > 0 ? eventIds : undefined;
+}
diff --git a/apps/web/lib/api/payouts/get-payouts.ts b/apps/web/lib/api/payouts/get-payouts.ts
index 050b960c4f..bd6537426a 100644
--- a/apps/web/lib/api/payouts/get-payouts.ts
+++ b/apps/web/lib/api/payouts/get-payouts.ts
@@ -18,12 +18,10 @@ export function buildProgramEnrollmentFilter({
}
return {
- ...(groupFilter && {
- groupId:
- groupFilter.sqlOperator === "NOT IN"
- ? { notIn: groupFilter.values }
- : { in: groupFilter.values },
- }),
+ groupId:
+ groupFilter.sqlOperator === "NOT IN"
+ ? { notIn: groupFilter.values }
+ : { in: groupFilter.values },
};
}
diff --git a/apps/web/lib/zod/schemas/payouts.ts b/apps/web/lib/zod/schemas/payouts.ts
index 55f66b675b..59c1de0c2a 100644
--- a/apps/web/lib/zod/schemas/payouts.ts
+++ b/apps/web/lib/zod/schemas/payouts.ts
@@ -73,6 +73,7 @@ export const payoutsCountQuerySchema = payoutsQuerySchema
partnerId: true,
invoiceId: true,
groupId: true,
+ tenantId: true,
})
.extend({
programId: z.string().optional(),