The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
fix multi filter status for commission
Pedro Ladeira86538156808e
diff --git a/apps/web/app/(ee)/api/commissions/count/route.ts b/apps/web/app/(ee)/api/commissions/count/route.tsindex c86698e83e..f008e3edf3 100644--- a/apps/web/app/(ee)/api/commissions/count/route.ts+++ b/apps/web/app/(ee)/api/commissions/count/route.ts@@ -10,17 +10,16 @@ export const GET = withWorkspace(async ({ workspace, searchParams }) => {const isHoldStatus = searchParams.status === "hold";const {- status: _status,+ status: rawStatus,fraudEventGroupId,...restSearchParams} = searchParams;- const parsedParams = getCommissionsCountQuerySchema.parse(- isHoldStatus ? restSearchParams : searchParams,- );+ const parsedParams = getCommissionsCountQuerySchema.parse(restSearchParams);const counts = await getCommissionsCount({...parsedParams,+ ...(!isHoldStatus && rawStatus && { status: rawStatus }),programId,isHoldStatus,...(fraudEventGroupId && { fraudEventGroupId }),diff --git a/apps/web/app/(ee)/api/commissions/route.ts b/apps/web/app/(ee)/api/commissions/route.tsindex d999975ce6..07aa8527c7 100644--- a/apps/web/app/(ee)/api/commissions/route.ts+++ b/apps/web/app/(ee)/api/commissions/route.ts@@ -17,17 +17,14 @@ export const GET = withWorkspace(async ({ workspace, searchParams }) => {const isHoldStatus = searchParams.status === "hold";const {- status: _status,+ status: rawStatus,fraudEventGroupId,type: rawType,...restSearchParams} = searchParams;- let { partnerId, tenantId, ...filters } = getCommissionsQuerySchema.parse(- isHoldStatus- ? restSearchParams- : { ...restSearchParams, status: searchParams.status },- );+ let { partnerId, tenantId, ...filters } =+ getCommissionsQuerySchema.parse(restSearchParams);if (tenantId && !partnerId) {const partner = await prisma.programEnrollment.findUnique({@@ -54,8 +51,9 @@ export const GET = withWorkspace(async ({ workspace, searchParams }) => {const commissions = await getCommissions({...filters,- // Pass raw type string (may be comma-separated) for multi-value handling+ // Pass raw type/status strings (may be comma-separated) for multi-value handling...(rawType && { type: rawType }),+ ...(!isHoldStatus && rawStatus && { status: rawStatus }),partnerId,programId,isHoldStatus,diff --git a/apps/web/lib/api/commissions/get-commissions-count.ts b/apps/web/lib/api/commissions/get-commissions-count.tsindex b53ac66d32..635e5fb5c4 100644--- a/apps/web/lib/api/commissions/get-commissions-count.ts+++ b/apps/web/lib/api/commissions/get-commissions-count.ts@@ -9,9 +9,11 @@ import {import { parseFilterValue } from "@dub/utils";import * as z from "zod/v4";-type CommissionsCountFilters = z.infer<- typeof getCommissionsCountQuerySchema+type CommissionsCountFilters = Omit<+ z.infer<typeof getCommissionsCountQuerySchema>,+ "status"> & {+ status?: string;programId: string;isHoldStatus?: boolean;fraudEventGroupId?: string;@@ -61,15 +63,34 @@ export async function getCommissionsCount(filters: CommissionsCountFilters) {timezone,});+ const validCommissionStatuses = new Set(Object.values(CommissionStatus));+ const rawStatusFilter = parseFilterValue(status);+ const statusValueFilter =+ rawStatusFilter &&+ rawStatusFilter.values.some((v) =>+ validCommissionStatuses.has(v as CommissionStatus),+ )+ ? {+ ...rawStatusFilter,+ values: rawStatusFilter.values.filter((v) =>+ validCommissionStatuses.has(v as CommissionStatus),+ ) as CommissionStatus[],+ }+ : null;+const statusFilter = isHoldStatus? { in: [CommissionStatus.pending, CommissionStatus.processed] }- : status ?? {- notIn: [- CommissionStatus.duplicate,- CommissionStatus.fraud,- CommissionStatus.canceled,- ],- };+ : statusValueFilter+ ? statusValueFilter.sqlOperator === "NOT IN"+ ? { notIn: statusValueFilter.values }+ : { in: statusValueFilter.values }+ : {+ notIn: [+ CommissionStatus.duplicate,+ CommissionStatus.fraud,+ CommissionStatus.canceled,+ ],+ };const groupFilter = parseFilterValue(groupId);const partnerTagFilter = parseFilterValue(partnerTagId);diff --git a/apps/web/lib/api/commissions/get-commissions.ts b/apps/web/lib/api/commissions/get-commissions.tsindex 454e56f0c2..afb6a7291e 100644--- a/apps/web/lib/api/commissions/get-commissions.ts+++ b/apps/web/lib/api/commissions/get-commissions.ts@@ -13,9 +13,10 @@ import { buildPaginationQuery } from "../pagination";type CommissionsFilters = Omit<z.infer<typeof getCommissionsQuerySchema>,- "type"+ "type" | "status"> & {type?: string;+ status?: string;programId: string;isHoldStatus?: boolean;fraudEventGroupId?: string;@@ -119,10 +120,35 @@ export async function getCommissions(filters: CommissionsFilters) {}: null;+ const validCommissionStatuses = new Set(Object.values(CommissionStatus));+ const rawStatusFilter = parseFilterValue(status);+ if (+ rawStatusFilter?.sqlOperator === "IN" &&+ !rawStatusFilter.values.some((v) =>+ validCommissionStatuses.has(v as CommissionStatus),+ )+ ) {+ return [];+ }+ const statusValueFilter =+ rawStatusFilter &&+ rawStatusFilter.values.some((v) =>+ validCommissionStatuses.has(v as CommissionStatus),+ )+ ? {+ ...rawStatusFilter,+ values: rawStatusFilter.values.filter((v) =>+ validCommissionStatuses.has(v as CommissionStatus),+ ) as CommissionStatus[],+ }+ : null;+const statusFilter = isHoldStatus? { in: [CommissionStatus.pending, CommissionStatus.processed] }- : status- ? status+ : statusValueFilter+ ? statusValueFilter.sqlOperator === "NOT IN"+ ? { notIn: statusValueFilter.values }+ : { in: statusValueFilter.values }: customerId || partnerFilter || typeFilter? undefined: {