The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Implement pagination and count for fraud events; refactor related hooks and components
Kiran K278c4908e87b
diff --git a/apps/web/app/(ee)/api/fraud/events/count/route.ts b/apps/web/app/(ee)/api/fraud/events/count/route.tsnew file mode 100644index 0000000000..5175b8dec9--- /dev/null+++ b/apps/web/app/(ee)/api/fraud/events/count/route.ts@@ -0,0 +1,50 @@+import { DubApiError } from "@/lib/api/errors";+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";+import { withWorkspace } from "@/lib/auth";+import { fraudEventCountQuerySchema } from "@/lib/zod/schemas/fraud";+import { prisma } from "@dub/prisma";+import { NextResponse } from "next/server";++// GET /api/fraud/events/count - Get the count of fraud events+export const GET = withWorkspace(+ async ({ workspace, searchParams }) => {+ const programId = getDefaultProgramIdOrThrow(workspace);+ const { groupId } = fraudEventCountQuerySchema.parse(searchParams);++ const fraudGroup = await prisma.fraudEventGroup.findUnique({+ where: {+ id: groupId,+ },+ select: {+ programId: true,+ partnerId: true,+ type: true,+ },+ });++ if (!fraudGroup) {+ throw new DubApiError({+ code: "not_found",+ message: "Fraud event group not found.",+ });+ }++ if (fraudGroup.programId !== programId) {+ throw new DubApiError({+ code: "not_found",+ message: "Fraud event group not found in this program.",+ });+ }++ const count = await prisma.fraudEvent.count({+ where: {+ fraudEventGroupId: groupId,+ },+ });++ return NextResponse.json(count);+ },+ {+ requiredPlan: ["advanced", "enterprise"],+ },+);diff --git a/apps/web/app/(ee)/api/fraud/events/route.ts b/apps/web/app/(ee)/api/fraud/events/route.tsindex 8540d779dc..8d785ec4fe 100644--- a/apps/web/app/(ee)/api/fraud/events/route.ts+++ b/apps/web/app/(ee)/api/fraud/events/route.ts@@ -14,14 +14,15 @@ import { z } from "zod";export const GET = withWorkspace(async ({ workspace, searchParams }) => {const programId = getDefaultProgramIdOrThrow(workspace);- const parsedQueryParams = fraudEventQuerySchema.parse(searchParams);+ const { page, pageSize, ...queryParams } =+ fraudEventQuerySchema.parse(searchParams);let where: Prisma.FraudEventWhereInput = {};let eventGroupType: FraudRuleType | undefined;// Filter by group ID- if ("groupId" in parsedQueryParams) {- const { groupId } = parsedQueryParams;+ if ("groupId" in queryParams) {+ const { groupId } = queryParams;const fraudGroup = await prisma.fraudEventGroup.findUnique({where: {@@ -80,8 +81,9 @@ export const GET = withWorkspace(}// Filter by customer ID and type- if ("customerId" in parsedQueryParams && "type" in parsedQueryParams) {- const { customerId, type } = parsedQueryParams;+ // Currently this is only used in E2E tests to fetch raw fraud events for a given customer + type+ if ("customerId" in queryParams && "type" in queryParams) {+ const { customerId, type } = queryParams;where = {customerId,@@ -112,6 +114,8 @@ export const GET = withWorkspace(orderBy: {id: "desc",},+ skip: (page - 1) * pageSize,+ take: pageSize,});return NextResponse.json(z.array(zodSchema).parse(fraudEvents));diff --git a/apps/web/lib/api/fraud/resolve-fraud-groups.ts b/apps/web/lib/api/fraud/resolve-fraud-groups.tsindex 2acb1c3f73..da23c3368d 100644--- a/apps/web/lib/api/fraud/resolve-fraud-groups.ts+++ b/apps/web/lib/api/fraud/resolve-fraud-groups.ts@@ -1,4 +1,5 @@import { prisma } from "@dub/prisma";+import { prettyPrint } from "@dub/utils";import { Prisma } from "@prisma/client";export async function resolveFraudGroups({@@ -23,5 +24,7 @@ export async function resolveFraudGroups({},});+ console.info(`Resolved ${count} fraud event groups ${prettyPrint(where)}`);+return count;}diff --git a/apps/web/lib/swr/use-fraud-events-count.ts b/apps/web/lib/swr/use-fraud-events-count.tsnew file mode 100644index 0000000000..1d7e2b4b82--- /dev/null+++ b/apps/web/lib/swr/use-fraud-events-count.ts@@ -0,0 +1,33 @@+import useWorkspace from "@/lib/swr/use-workspace";+import { useRouterStuff } from "@dub/ui";+import { fetcher } from "@dub/utils";+import useSWR from "swr";++export function useFraudEventsCount({+ enabled = true,+}: { enabled?: boolean } = {}) {+ const { id: workspaceId } = useWorkspace();+ const { getQueryString, searchParams } = useRouterStuff();++ const groupId = searchParams.get("groupId");++ const queryString = getQueryString({+ workspaceId,+ });++ const { data, error } = useSWR<number>(+ workspaceId && groupId && enabled+ ? `/api/fraud/events/count${queryString}`+ : null,+ fetcher,+ {+ keepPreviousData: true,+ },+ );++ return {+ fraudEventsCount: data,+ loading: !error && data === undefined,+ error,+ };+}diff --git a/apps/web/lib/swr/use-fraud-events-paginated.ts b/apps/web/lib/swr/use-fraud-events-paginated.tsnew file mode 100644index 0000000000..a78c730155--- /dev/null+++ b/apps/web/lib/swr/use-fraud-events-paginated.ts@@ -0,0 +1,30 @@+import { useState } from "react";+import { useFraudEvents } from "./use-fraud-events";+import { useFraudEventsCount } from "./use-fraud-events-count";++export function useFraudEventsPaginated<T = unknown>({+ pageSize = 25,+}: {+ pageSize?: number;+} = {}) {+ const [pagination, setPagination] = useState({+ pageIndex: 1,+ pageSize,+ });++ const { fraudEvents, loading, error, isValidating } = useFraudEvents<T>({+ page: pagination.pageIndex,+ pageSize: pagination.pageSize,+ });++ const { fraudEventsCount } = useFraudEventsCount();++ return {+ fraudEvents,+ loading: loading || isValidating,+ error,+ pagination,+ setPagination,+ fraudEventsCount,+ };+}diff --git a/apps/web/lib/swr/use-fraud-events.ts b/apps/web/lib/swr/use-fraud-events.tsindex b44d15edf6..c5ef570932 100644--- a/apps/web/lib/swr/use-fraud-events.ts+++ b/apps/web/lib/swr/use-fraud-events.ts@@ -3,7 +3,13 @@ import { fetcher } from "@dub/utils";import useSWR from "swr";import useWorkspace from "./use-workspace";-export function useFraudEvents<T = unknown>() {+export function useFraudEvents<T = unknown>({+ page,+ pageSize,+}: {+ page?: number;+ pageSize?: number;+} = {}) {const { id: workspaceId } = useWorkspace();const { getQueryString, searchParams } = useRouterStuff();@@ -11,9 +17,11 @@ export function useFraudEvents<T = unknown>() {const queryString = getQueryString({workspaceId,+ ...(page && { page }),+ ...(pageSize && { pageSize }),});- const { data, error } = useSWR<T[]>(+ const { data, error, isValidating } = useSWR<T[]>(workspaceId && groupId ? `/api/fraud/events${queryString}` : undefined,fetcher,{@@ -24,6 +32,7 @@ export function useFraudEvents<T = unknown>() {return {fraudEvents: data,loading: !data && !error,+ isValidating,error,};}diff --git a/apps/web/lib/zod/schemas/fraud.ts b/apps/web/lib/zod/schemas/fraud.tsindex b243f234ca..6a747362c3 100644--- a/apps/web/lib/zod/schemas/fraud.ts+++ b/apps/web/lib/zod/schemas/fraud.ts@@ -64,15 +64,24 @@ export const fraudGroupCountSchema = z.union([]);export const fraudEventQuerySchema = z.union([- z.object({- groupId: z.string(),- }),- z.object({- customerId: z.string(),- type: z.nativeEnum(FraudRuleType),- }),+ z+ .object({+ groupId: z.string(),+ })+ .merge(getPaginationQuerySchema({ pageSize: 25 })),++ z+ .object({+ customerId: z.string(),+ type: z.nativeEnum(FraudRuleType),+ })+ .merge(getPaginationQuerySchema({ pageSize: 25 })),]);+export const fraudEventCountQuerySchema = z.object({+ groupId: z.string(),+});+export const resolveFraudGroupSchema = z.object({workspaceId: z.string(),groupId: z.string(),diff --git a/apps/web/ui/partners/fraud-risks/fraud-events-tables/fraud-paid-traffic-detected-table.tsx b/apps/web/ui/partners/fraud-risks/fraud-events-tables/fraud-paid-traffic-detected-table.tsxindex 16d13b61d7..b18ddaf0c1 100644--- a/apps/web/ui/partners/fraud-risks/fraud-events-tables/fraud-paid-traffic-detected-table.tsx+++ b/apps/web/ui/partners/fraud-risks/fraud-events-tables/fraud-paid-traffic-detected-table.tsx@@ -1,7 +1,7 @@"use client";import { PAID_TRAFFIC_PLATFORMS_CONFIG } from "@/lib/api/fraud/constants";-import { useFraudEvents } from "@/lib/swr/use-fraud-events";+import { useFraudEventsPaginated } from "@/lib/swr/use-fraud-events-paginated";import useWorkspace from "@/lib/swr/use-workspace";import { PaidTrafficPlatform } from "@/lib/types";import { fraudEventSchemas } from "@/lib/zod/schemas/fraud";@@ -44,10 +44,20 @@ const PAID_TRAFFIC_PLATFORM_ICONS: Record<export function FraudPaidTrafficDetectedTable() {const { slug: workspaceSlug } = useWorkspace();- const { fraudEvents, loading, error } = useFraudEvents<EventDataProps>();+ const {+ fraudEvents,+ loading,+ error,+ pagination,+ setPagination,+ fraudEventsCount,+ } = useFraudEventsPaginated<EventDataProps>();const table = useTable({data: fraudEvents || [],+ pagination,+ onPaginationChange: setPagination,+ rowCount: fraudEventsCount ?? 0,columns: [{id: "date",diff --git a/apps/web/ui/partners/fraud-risks/fraud-events-tables/fraud-referral-source-banned-table.tsx b/apps/web/ui/partners/fraud-risks/fraud-events-tables/fraud-referral-source-banned-table.tsxindex 3927b72710..23a7d0e032 100644--- a/apps/web/ui/partners/fraud-risks/fraud-events-tables/fraud-referral-source-banned-table.tsx+++ b/apps/web/ui/partners/fraud-risks/fraud-events-tables/fraud-referral-source-banned-table.tsx@@ -1,6 +1,6 @@"use client";-import { useFraudEvents } from "@/lib/swr/use-fraud-events";+import { useFraudEventsPaginated } from "@/lib/swr/use-fraud-events-paginated";import useWorkspace from "@/lib/swr/use-workspace";import { fraudEventSchemas } from "@/lib/zod/schemas/fraud";import { CustomerRowItem } from "@/ui/customers/customer-row-item";@@ -16,10 +16,20 @@ type EventDataProps = z.infer<export function FraudReferralSourceBannedTable() {const { slug: workspaceSlug } = useWorkspace();- const { fraudEvents, loading, error } = useFraudEvents<EventDataProps>();+ const {+ fraudEvents,+ loading,+ error,+ pagination,+ setPagination,+ fraudEventsCount,+ } = useFraudEventsPaginated<EventDataProps>();const table = useTable({data: fraudEvents || [],+ pagination,+ onPaginationChange: setPagination,+ rowCount: fraudEventsCount ?? 0,columns: [{id: "date",