The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
feat(advanced-filters): support for partnerId, groupId, and tenantId
Pedro Ladeira4d68c7858bbf
diff --git a/apps/web/lib/analytics/filter-helpers.ts b/apps/web/lib/analytics/filter-helpers.tsindex 245de60dfb..ea98bd9e4f 100644--- a/apps/web/lib/analytics/filter-helpers.ts+++ b/apps/web/lib/analytics/filter-helpers.ts@@ -60,7 +60,28 @@ export function prepareFiltersForPipe(params: {}/**- * Extract workspace link filters (domain, tagIds, folderId, root) into+ * Normalize a filter value that may be a plain string (e.g. from partner-profile+ * routes) or an already-parsed ParsedFilter into a consistent ParsedFilter.+ *+ * Useful when callers pass a raw ID string but extractWorkspaceLinkFilters+ * expects a ParsedFilter with sqlOperator.+ */+export function ensureParsedFilter(+ value: string | ParsedFilter | undefined,+): ParsedFilter | undefined {+ if (!value) return undefined;+ if (typeof value === "string") {+ return {+ operator: "IS" as const,+ sqlOperator: "IN" as const,+ values: [value],+ };+ }+ return value;+}++/**+ * Extract workspace link filters (domain, tagIds, folderId, partnerId, root) into* separate values and operators for Tinybird.** These filters are applied on the workspace_links node in Tinybird,@@ -70,6 +91,9 @@ export function extractWorkspaceLinkFilters(params: {domain?: ParsedFilter;tagIds?: ParsedFilter;folderId?: ParsedFilter;+ partnerId?: ParsedFilter;+ groupId?: ParsedFilter;+ tenantId?: ParsedFilter;root?: ParsedFilter;}) {const extractFilter = (filter?: ParsedFilter) => ({@@ -82,6 +106,9 @@ export function extractWorkspaceLinkFilters(params: {const domain = extractFilter(params.domain);const tagIds = extractFilter(params.tagIds);const folderId = extractFilter(params.folderId);+ const partnerId = extractFilter(params.partnerId);+ const groupId = extractFilter(params.groupId);+ const tenantId = extractFilter(params.tenantId);const root = extractFilter(params.root);return {@@ -91,6 +118,12 @@ export function extractWorkspaceLinkFilters(params: {tagIdsOperator: tagIds.operator,folderId: folderId.values,folderIdOperator: folderId.operator,+ partnerId: partnerId.values,+ partnerIdOperator: partnerId.operator,+ groupId: groupId.values,+ groupIdOperator: groupId.operator,+ tenantId: tenantId.values,+ tenantIdOperator: tenantId.operator,root: root.values,rootOperator: root.operator,};diff --git a/apps/web/lib/analytics/get-analytics.ts b/apps/web/lib/analytics/get-analytics.tsindex 15083bad1b..ca1758a3c2 100644--- a/apps/web/lib/analytics/get-analytics.ts+++ b/apps/web/lib/analytics/get-analytics.ts@@ -14,6 +14,7 @@ import {} from "./constants";import {buildAdvancedFilters,+ ensureParsedFilter,extractWorkspaceLinkFilters,prepareFiltersForPipe,} from "./filter-helpers";@@ -130,6 +131,9 @@ export const getAnalytics = async (params: AnalyticsFilters) => {const allFilters = [...metadataFilters, ...advancedFilters];+ // Normalize partnerId (may be a plain string from partner-profile routes)+ const partnerIdFilter = ensureParsedFilter(params.partnerId);+const {domain: domainParam,domainOperator,@@ -137,9 +141,18 @@ export const getAnalytics = async (params: AnalyticsFilters) => {tagIdsOperator,folderId: folderIdParam,folderIdOperator,+ partnerId: partnerIdParam,+ partnerIdOperator,+ groupId: groupIdParam,+ groupIdOperator,+ tenantId: tenantIdParam,+ tenantIdOperator,root: rootParam,rootOperator,- } = extractWorkspaceLinkFilters(params);+ } = extractWorkspaceLinkFilters({+ ...params,+ partnerId: partnerIdFilter,+ });const tinybirdParams: any = {workspaceId,@@ -148,9 +161,12 @@ export const getAnalytics = async (params: AnalyticsFilters) => {folderIds: params.folderIds,customerId: params.customerId,programId: params.programId,- partnerId: params.partnerId,- tenantId: params.tenantId,- groupId: params.groupId,+ partnerId: partnerIdParam,+ partnerIdOperator,+ tenantId: tenantIdParam,+ tenantIdOperator,+ groupId: groupIdParam,+ groupIdOperator,domain: domainParam,domainOperator,tagIds: tagIdsParam,diff --git a/apps/web/lib/analytics/get-events.ts b/apps/web/lib/analytics/get-events.tsindex 0a611612ab..859299d426 100644--- a/apps/web/lib/analytics/get-events.ts+++ b/apps/web/lib/analytics/get-events.ts@@ -23,6 +23,7 @@ import {} from "../zod/schemas/sales";import {buildAdvancedFilters,+ ensureParsedFilter,extractWorkspaceLinkFilters,prepareFiltersForPipe,} from "./filter-helpers";@@ -106,6 +107,8 @@ export const getEvents = async (params: EventsFilters) => {const allFilters = [...metadataFilters, ...advancedFilters];+ const partnerIdFilter = ensureParsedFilter(params.partnerId);+const {domain: domainParam,domainOperator,@@ -113,9 +116,18 @@ export const getEvents = async (params: EventsFilters) => {tagIdsOperator,folderId: folderIdParam,folderIdOperator,+ partnerId: partnerIdParam,+ partnerIdOperator,+ groupId: groupIdParam,+ groupIdOperator,+ tenantId: tenantIdParam,+ tenantIdOperator,root: rootParam,rootOperator,- } = extractWorkspaceLinkFilters(params);+ } = extractWorkspaceLinkFilters({+ ...params,+ partnerId: partnerIdFilter,+ });const tinybirdParams: any = {eventType,@@ -125,9 +137,12 @@ export const getEvents = async (params: EventsFilters) => {folderIds: params.folderIds,customerId: params.customerId,programId: params.programId,- partnerId: params.partnerId,- tenantId: params.tenantId,- groupId: params.groupId,+ partnerId: partnerIdParam,+ partnerIdOperator,+ tenantId: tenantIdParam,+ tenantIdOperator,+ groupId: groupIdParam,+ groupIdOperator,...(typeof triggerForPipe !== 'object' && triggerForPipe ? { trigger: triggerForPipe } : {}),...(typeof countryForPipe !== 'object' && countryForPipe ? { country: countryForPipe } : {}),...(typeof regionForPipe === 'string' ? { region: regionForPipe } : {}),diff --git a/apps/web/lib/analytics/types.ts b/apps/web/lib/analytics/types.tsindex 813b20f97b..6dc8ace45d 100644--- a/apps/web/lib/analytics/types.ts+++ b/apps/web/lib/analytics/types.ts@@ -1,3 +1,4 @@+import { ParsedFilter } from "@dub/utils";import * as z from "zod/v4";import {analyticsQuerySchema,@@ -45,6 +46,7 @@ export type AnalyticsFilters = Partial<Omit<z.infer<typeof analyticsQuerySchema>folderIds?: string[]; // TODO: remove this once it's been added to the public APIstart?: Date | null;end?: Date | null;+ partnerId?: string | ParsedFilter;};export type EventsFilters = z.infer<typeof eventsQuerySchema> & {@@ -52,6 +54,7 @@ export type EventsFilters = z.infer<typeof eventsQuerySchema> & {dataAvailableFrom?: Date;customerId?: string;folderIds?: string[];+ partnerId?: string | ParsedFilter;};const partnerAnalyticsSchema = analyticsQuerySchemadiff --git a/apps/web/lib/zod/schemas/analytics.ts b/apps/web/lib/zod/schemas/analytics.tsindex 6c236db754..b190a0296f 100644--- a/apps/web/lib/zod/schemas/analytics.ts+++ b/apps/web/lib/zod/schemas/analytics.ts@@ -96,9 +96,13 @@ export const analyticsQuerySchema = z.object({tenantId: z.string().optional()+ .transform(parseFilterValue).describe(- "The ID of the tenant that created the link inside your system.",- ),+ "The ID of the tenant that created the link inside your system. " ++ "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`). " ++ "Examples: `tenant_123`, `tenant_123,tenant_456`, `-tenant_789`."+ )+ .meta({ example: "tenant_123" }),programId: z.string().optional()@@ -106,7 +110,13 @@ export const analyticsQuerySchema = z.object({partnerId: z.string().optional()- .describe("The ID of the partner to retrieve analytics for."),+ .transform(parseFilterValue)+ .describe(+ "The ID of the partner to retrieve analytics for. " ++ "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`). " ++ "Examples: `pn_123`, `pn_123,pn_456`, `-pn_789`."+ )+ .meta({ example: "pn_123" }),customerId: z.string().optional()@@ -298,7 +308,13 @@ export const analyticsQuerySchema = z.object({groupId: z.string().optional()- .describe("The group ID to retrieve analytics for."),+ .transform(parseFilterValue)+ .describe(+ "The group ID to retrieve analytics for. " ++ "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`). " ++ "Examples: `grp_123`, `grp_123,grp_456`, `-grp_789`."+ )+ .meta({ example: "grp_123" }),root: z.string().optional()@@ -480,11 +496,26 @@ export const analyticsFilterTB = z.object({.optional().describe("Filter for root domain links."),rootOperator: z.enum(["IN", "NOT IN"]).optional(),- // Program/Partner/Group filters (not using advanced filtering)+ // Program/Partner/Group filters (not using advanced filtering for programId/tenantId/groupId)programId: z.string().optional(),- partnerId: z.string().optional(),- tenantId: z.string().optional(),- groupId: z.string().optional(),+ partnerId: z+ .union([z.string(), z.array(z.string())])+ .transform((v) => (Array.isArray(v) ? v : v.split(",")))+ .optional()+ .describe("The partner ID(s) to retrieve analytics for (with operator support)."),+ partnerIdOperator: z.enum(["IN", "NOT IN"]).optional(),+ tenantId: z+ .union([z.string(), z.array(z.string())])+ .transform((v) => (Array.isArray(v) ? v : v.split(",")))+ .optional()+ .describe("The tenant ID(s) to retrieve analytics for (with operator support)."),+ tenantIdOperator: z.enum(["IN", "NOT IN"]).optional(),+ groupId: z+ .union([z.string(), z.array(z.string())])+ .transform((v) => (Array.isArray(v) ? v : v.split(",")))+ .optional()+ .describe("The group ID(s) to retrieve analytics for (with operator support)."),+ groupIdOperator: z.enum(["IN", "NOT IN"]).optional(),// Region is a special case - it's the subdivision part of a region coderegion: z.string().optional(),// All dimensional filters now go through the JSON filters parameterdiff --git a/apps/web/tests/analytics/advanced-filters.test.ts b/apps/web/tests/analytics/advanced-filters.test.tsindex a6d28a1edc..42c71bcd18 100644--- a/apps/web/tests/analytics/advanced-filters.test.ts+++ b/apps/web/tests/analytics/advanced-filters.test.ts@@ -1,5 +1,9 @@import { parseFilterValue, buildFilterValue } from "@dub/utils";-import { buildAdvancedFilters } from "@/lib/analytics/filter-helpers";+import {+ buildAdvancedFilters,+ ensureParsedFilter,+ extractWorkspaceLinkFilters,+} from "@/lib/analytics/filter-helpers";import { describe, expect, test } from "vitest";describe("Advanced Filters - Unit Tests", () => {@@ -301,4 +305,284 @@ describe("Advanced Filters - Unit Tests", () => {expect(result[2].field).toBe("browser");});});++ describe("ensureParsedFilter", () => {+ test("returns undefined for undefined input", () => {+ expect(ensureParsedFilter(undefined)).toBeUndefined();+ });++ test("returns undefined for empty string", () => {+ expect(ensureParsedFilter("")).toBeUndefined();+ });++ test("converts plain string to IS ParsedFilter", () => {+ const result = ensureParsedFilter("pn_abc123");+ expect(result).toEqual({+ operator: "IS",+ sqlOperator: "IN",+ values: ["pn_abc123"],+ });+ });++ test("passes through ParsedFilter unchanged (IS)", () => {+ const input = {+ operator: "IS" as const,+ sqlOperator: "IN" as const,+ values: ["pn_abc123"],+ };+ expect(ensureParsedFilter(input)).toEqual(input);+ });++ test("passes through ParsedFilter unchanged (IS_NOT)", () => {+ const input = {+ operator: "IS_NOT" as const,+ sqlOperator: "NOT IN" as const,+ values: ["pn_abc123"],+ };+ expect(ensureParsedFilter(input)).toEqual(input);+ });++ test("passes through ParsedFilter with multiple values", () => {+ const input = {+ operator: "IS_ONE_OF" as const,+ sqlOperator: "IN" as const,+ values: ["pn_abc123", "pn_def456"],+ };+ expect(ensureParsedFilter(input)).toEqual(input);+ });++ test("passes through negated ParsedFilter with multiple values", () => {+ const input = {+ operator: "IS_NOT_ONE_OF" as const,+ sqlOperator: "NOT IN" as const,+ values: ["pn_abc123", "pn_def456"],+ };+ expect(ensureParsedFilter(input)).toEqual(input);+ });+ });++ describe("extractWorkspaceLinkFilters - partnerId", () => {+ test("extracts single partnerId with IN operator", () => {+ const result = extractWorkspaceLinkFilters({+ partnerId: {+ operator: "IS",+ sqlOperator: "IN",+ values: ["pn_abc123"],+ },+ });+ expect(result.partnerId).toEqual(["pn_abc123"]);+ expect(result.partnerIdOperator).toBe("IN");+ });++ test("extracts multiple partnerIds with IN operator", () => {+ const result = extractWorkspaceLinkFilters({+ partnerId: {+ operator: "IS_ONE_OF",+ sqlOperator: "IN",+ values: ["pn_abc123", "pn_def456", "pn_ghi789"],+ },+ });+ expect(result.partnerId).toEqual(["pn_abc123", "pn_def456", "pn_ghi789"]);+ expect(result.partnerIdOperator).toBe("IN");+ });++ test("extracts single partnerId with NOT IN operator", () => {+ const result = extractWorkspaceLinkFilters({+ partnerId: {+ operator: "IS_NOT",+ sqlOperator: "NOT IN",+ values: ["pn_abc123"],+ },+ });+ expect(result.partnerId).toEqual(["pn_abc123"]);+ expect(result.partnerIdOperator).toBe("NOT IN");+ });++ test("extracts multiple partnerIds with NOT IN operator", () => {+ const result = extractWorkspaceLinkFilters({+ partnerId: {+ operator: "IS_NOT_ONE_OF",+ sqlOperator: "NOT IN",+ values: ["pn_abc123", "pn_def456"],+ },+ });+ expect(result.partnerId).toEqual(["pn_abc123", "pn_def456"]);+ expect(result.partnerIdOperator).toBe("NOT IN");+ });++ test("returns undefined partnerId when not provided", () => {+ const result = extractWorkspaceLinkFilters({});+ expect(result.partnerId).toBeUndefined();+ expect(result.partnerIdOperator).toBe("IN"); // default+ });++ test("works alongside other workspace link filters", () => {+ const result = extractWorkspaceLinkFilters({+ domain: {+ operator: "IS",+ sqlOperator: "IN",+ values: ["dub.sh"],+ },+ partnerId: {+ operator: "IS_ONE_OF",+ sqlOperator: "IN",+ values: ["pn_abc123", "pn_def456"],+ },+ folderId: {+ operator: "IS_NOT",+ sqlOperator: "NOT IN",+ values: ["fold_xyz"],+ },+ });+ expect(result.domain).toEqual(["dub.sh"]);+ expect(result.domainOperator).toBe("IN");+ expect(result.partnerId).toEqual(["pn_abc123", "pn_def456"]);+ expect(result.partnerIdOperator).toBe("IN");+ expect(result.folderId).toEqual(["fold_xyz"]);+ expect(result.folderIdOperator).toBe("NOT IN");+ });+ });++ describe("extractWorkspaceLinkFilters - groupId", () => {+ test("extracts single groupId with IN operator", () => {+ const result = extractWorkspaceLinkFilters({+ groupId: {+ operator: "IS",+ sqlOperator: "IN",+ values: ["grp_abc123"],+ },+ });+ expect(result.groupId).toEqual(["grp_abc123"]);+ expect(result.groupIdOperator).toBe("IN");+ });++ test("extracts multiple groupIds with IN operator", () => {+ const result = extractWorkspaceLinkFilters({+ groupId: {+ operator: "IS_ONE_OF",+ sqlOperator: "IN",+ values: ["grp_abc123", "grp_def456", "grp_ghi789"],+ },+ });+ expect(result.groupId).toEqual(["grp_abc123", "grp_def456", "grp_ghi789"]);+ expect(result.groupIdOperator).toBe("IN");+ });++ test("extracts single groupId with NOT IN operator", () => {+ const result = extractWorkspaceLinkFilters({+ groupId: {+ operator: "IS_NOT",+ sqlOperator: "NOT IN",+ values: ["grp_abc123"],+ },+ });+ expect(result.groupId).toEqual(["grp_abc123"]);+ expect(result.groupIdOperator).toBe("NOT IN");+ });++ test("extracts multiple groupIds with NOT IN operator", () => {+ const result = extractWorkspaceLinkFilters({+ groupId: {+ operator: "IS_NOT_ONE_OF",+ sqlOperator: "NOT IN",+ values: ["grp_abc123", "grp_def456"],+ },+ });+ expect(result.groupId).toEqual(["grp_abc123", "grp_def456"]);+ expect(result.groupIdOperator).toBe("NOT IN");+ });++ test("returns undefined groupId when not provided", () => {+ const result = extractWorkspaceLinkFilters({});+ expect(result.groupId).toBeUndefined();+ expect(result.groupIdOperator).toBe("IN"); // default+ });++ test("works alongside partnerId and other filters", () => {+ const result = extractWorkspaceLinkFilters({+ partnerId: {+ operator: "IS",+ sqlOperator: "IN",+ values: ["pn_abc123"],+ },+ groupId: {+ operator: "IS_ONE_OF",+ sqlOperator: "IN",+ values: ["grp_abc123", "grp_def456"],+ },+ domain: {+ operator: "IS_NOT",+ sqlOperator: "NOT IN",+ values: ["spam.com"],+ },+ });+ expect(result.partnerId).toEqual(["pn_abc123"]);+ expect(result.partnerIdOperator).toBe("IN");+ expect(result.groupId).toEqual(["grp_abc123", "grp_def456"]);+ expect(result.groupIdOperator).toBe("IN");+ expect(result.domain).toEqual(["spam.com"]);+ expect(result.domainOperator).toBe("NOT IN");+ });+ });++ describe("extractWorkspaceLinkFilters - tenantId", () => {+ test("extracts single tenantId with IN operator", () => {+ const result = extractWorkspaceLinkFilters({+ tenantId: {+ operator: "IS",+ sqlOperator: "IN",+ values: ["tenant_abc123"],+ },+ });+ expect(result.tenantId).toEqual(["tenant_abc123"]);+ expect(result.tenantIdOperator).toBe("IN");+ });++ test("extracts multiple tenantIds with IN operator", () => {+ const result = extractWorkspaceLinkFilters({+ tenantId: {+ operator: "IS_ONE_OF",+ sqlOperator: "IN",+ values: ["tenant_abc", "tenant_def", "tenant_ghi"],+ },+ });+ expect(result.tenantId).toEqual(["tenant_abc", "tenant_def", "tenant_ghi"]);+ expect(result.tenantIdOperator).toBe("IN");+ });++ test("extracts tenantId with NOT IN operator", () => {+ const result = extractWorkspaceLinkFilters({+ tenantId: {+ operator: "IS_NOT_ONE_OF",+ sqlOperator: "NOT IN",+ values: ["tenant_abc", "tenant_def"],+ },+ });+ expect(result.tenantId).toEqual(["tenant_abc", "tenant_def"]);+ expect(result.tenantIdOperator).toBe("NOT IN");+ });++ test("returns undefined tenantId when not provided", () => {+ const result = extractWorkspaceLinkFilters({});+ expect(result.tenantId).toBeUndefined();+ expect(result.tenantIdOperator).toBe("IN");+ });++ test("works alongside all other workspace link filters", () => {+ const result = extractWorkspaceLinkFilters({+ domain: { operator: "IS", sqlOperator: "IN", values: ["dub.sh"] },+ partnerId: { operator: "IS", sqlOperator: "IN", values: ["pn_abc"] },+ groupId: { operator: "IS", sqlOperator: "IN", values: ["grp_abc"] },+ tenantId: { operator: "IS_ONE_OF", sqlOperator: "IN", values: ["t1", "t2"] },+ folderId: { operator: "IS_NOT", sqlOperator: "NOT IN", values: ["fold_x"] },+ });+ expect(result.domain).toEqual(["dub.sh"]);+ expect(result.partnerId).toEqual(["pn_abc"]);+ expect(result.groupId).toEqual(["grp_abc"]);+ expect(result.tenantId).toEqual(["t1", "t2"]);+ expect(result.tenantIdOperator).toBe("IN");+ expect(result.folderId).toEqual(["fold_x"]);+ expect(result.folderIdOperator).toBe("NOT IN");+ });+ });});diff --git a/apps/web/tests/analytics/index.test.ts b/apps/web/tests/analytics/index.test.tsindex a5dede3619..360733200e 100644--- a/apps/web/tests/analytics/index.test.ts+++ b/apps/web/tests/analytics/index.test.ts@@ -4,6 +4,7 @@ import { describe, expect, test } from "vitest";import * as z from "zod/v4";import { env } from "../utils/env";import { IntegrationHarness } from "../utils/integration";+import { E2E_PARTNER, E2E_PARTNERS, E2E_PARTNER_GROUP } from "../utils/resource";describe.runIf(env.CI).sequential("GET /analytics", async () => {const h = new IntegrationHarness();@@ -228,4 +229,303 @@ describe.runIf(env.CI).sequential("GET /analytics", async () => {// Old single-value format should still work});});++ describe("partnerId Filters", () => {+ test("single partnerId filter (count)", async () => {+ const { status, data } = await http.get<any>({+ path: `/analytics`,+ query: {+ event: "composite",+ groupBy: "count",+ workspaceId,+ interval: "all",+ partnerId: E2E_PARTNER.id,+ },+ });++ expect(status).toEqual(200);+ expect(data).toHaveProperty("clicks");+ expect(data).toHaveProperty("leads");+ expect(data).toHaveProperty("sales");+ });++ test("multiple partnerIds filter (IS ONE OF)", async () => {+ const partnerIds = E2E_PARTNERS.map((p) => p.id).join(",");+ const { status, data } = await http.get<any>({+ path: `/analytics`,+ query: {+ event: "composite",+ groupBy: "count",+ workspaceId,+ interval: "all",+ partnerId: partnerIds,+ },+ });++ expect(status).toEqual(200);+ expect(data).toHaveProperty("clicks");+ expect(data).toHaveProperty("leads");+ expect(data).toHaveProperty("sales");+ });++ test("exclude partnerId (IS NOT)", async () => {+ const { status, data } = await http.get<any>({+ path: `/analytics`,+ query: {+ event: "composite",+ groupBy: "count",+ workspaceId,+ interval: "all",+ partnerId: `-${E2E_PARTNER.id}`,+ },+ });++ expect(status).toEqual(200);+ expect(data).toHaveProperty("clicks");+ expect(data).toHaveProperty("leads");+ expect(data).toHaveProperty("sales");+ });++ test("exclude multiple partnerIds (IS NOT ONE OF)", async () => {+ const partnerIds = E2E_PARTNERS.map((p) => p.id).join(",");+ const { status, data } = await http.get<any>({+ path: `/analytics`,+ query: {+ event: "composite",+ groupBy: "count",+ workspaceId,+ interval: "all",+ partnerId: `-${partnerIds}`,+ },+ });++ expect(status).toEqual(200);+ expect(data).toHaveProperty("clicks");+ expect(data).toHaveProperty("leads");+ expect(data).toHaveProperty("sales");+ });++ test("partnerId with timeseries groupBy", async () => {+ const { status, data } = await http.get<any[]>({+ path: `/analytics`,+ query: {+ event: "clicks",+ groupBy: "timeseries",+ workspaceId,+ interval: "30d",+ partnerId: E2E_PARTNER.id,+ },+ });++ expect(status).toEqual(200);+ expect(Array.isArray(data)).toBe(true);+ });++ test("partnerId with top_links groupBy", async () => {+ const { status, data } = await http.get<any[]>({+ path: `/analytics`,+ query: {+ event: "composite",+ groupBy: "top_links",+ workspaceId,+ interval: "all",+ partnerId: E2E_PARTNER.id,+ },+ });++ expect(status).toEqual(200);+ expect(Array.isArray(data)).toBe(true);+ });++ test("partnerId combined with country filter", async () => {+ const { status, data } = await http.get<any>({+ path: `/analytics`,+ query: {+ event: "clicks",+ groupBy: "count",+ workspaceId,+ interval: "all",+ partnerId: E2E_PARTNER.id,+ country: "US",+ },+ });++ expect(status).toEqual(200);+ expect(data).toHaveProperty("clicks");+ });++ test("backward compatibility - single partnerId still works", async () => {+ const { status, data } = await http.get<any>({+ path: `/analytics`,+ query: {+ event: "clicks",+ groupBy: "count",+ workspaceId,+ interval: "all",+ partnerId: E2E_PARTNER.id,+ },+ });++ expect(status).toEqual(200);+ expect(data).toHaveProperty("clicks");+ });+ });++ describe("groupId Filters", () => {+ test("single groupId filter (count)", async () => {+ const { status, data } = await http.get<any>({+ path: `/analytics`,+ query: {+ event: "composite",+ groupBy: "count",+ workspaceId,+ interval: "all",+ groupId: E2E_PARTNER_GROUP.id,+ },+ });++ expect(status).toEqual(200);+ expect(data).toHaveProperty("clicks");+ expect(data).toHaveProperty("leads");+ expect(data).toHaveProperty("sales");+ });++ test("exclude groupId (IS NOT)", async () => {+ const { status, data } = await http.get<any>({+ path: `/analytics`,+ query: {+ event: "composite",+ groupBy: "count",+ workspaceId,+ interval: "all",+ groupId: `-${E2E_PARTNER_GROUP.id}`,+ },+ });++ expect(status).toEqual(200);+ expect(data).toHaveProperty("clicks");+ expect(data).toHaveProperty("leads");+ expect(data).toHaveProperty("sales");+ });++ test("groupId with timeseries groupBy", async () => {+ const { status, data } = await http.get<any[]>({+ path: `/analytics`,+ query: {+ event: "clicks",+ groupBy: "timeseries",+ workspaceId,+ interval: "30d",+ groupId: E2E_PARTNER_GROUP.id,+ },+ });++ expect(status).toEqual(200);+ expect(Array.isArray(data)).toBe(true);+ });++ test("groupId combined with partnerId filter", async () => {+ const { status, data } = await http.get<any>({+ path: `/analytics`,+ query: {+ event: "clicks",+ groupBy: "count",+ workspaceId,+ interval: "all",+ groupId: E2E_PARTNER_GROUP.id,+ partnerId: E2E_PARTNER.id,+ },+ });++ expect(status).toEqual(200);+ expect(data).toHaveProperty("clicks");+ });++ test("backward compatibility - single groupId still works", async () => {+ const { status, data } = await http.get<any>({+ path: `/analytics`,+ query: {+ event: "clicks",+ groupBy: "count",+ workspaceId,+ interval: "all",+ groupId: E2E_PARTNER_GROUP.id,+ },+ });++ expect(status).toEqual(200);+ expect(data).toHaveProperty("clicks");+ });+ });++ describe("tenantId Filters", () => {+ test("single tenantId filter (count)", async () => {+ const { status, data } = await http.get<any>({+ path: `/analytics`,+ query: {+ event: "composite",+ groupBy: "count",+ workspaceId,+ interval: "all",+ tenantId: E2E_PARTNER.tenantId,+ },+ });++ expect(status).toEqual(200);+ expect(data).toHaveProperty("clicks");+ expect(data).toHaveProperty("leads");+ expect(data).toHaveProperty("sales");+ });++ test("exclude tenantId (IS NOT)", async () => {+ const { status, data } = await http.get<any>({+ path: `/analytics`,+ query: {+ event: "composite",+ groupBy: "count",+ workspaceId,+ interval: "all",+ tenantId: `-${E2E_PARTNER.tenantId}`,+ },+ });++ expect(status).toEqual(200);+ expect(data).toHaveProperty("clicks");+ expect(data).toHaveProperty("leads");+ expect(data).toHaveProperty("sales");+ });++ test("tenantId with timeseries groupBy", async () => {+ const { status, data } = await http.get<any[]>({+ path: `/analytics`,+ query: {+ event: "clicks",+ groupBy: "timeseries",+ workspaceId,+ interval: "30d",+ tenantId: E2E_PARTNER.tenantId,+ },+ });++ expect(status).toEqual(200);+ expect(Array.isArray(data)).toBe(true);+ });++ test("tenantId combined with country filter", async () => {+ const { status, data } = await http.get<any>({+ path: `/analytics`,+ query: {+ event: "clicks",+ groupBy: "count",+ workspaceId,+ interval: "all",+ tenantId: E2E_PARTNER.tenantId,+ country: "US",+ },+ });++ expect(status).toEqual(200);+ expect(data).toHaveProperty("clicks");+ });+ });});diff --git a/apps/web/tests/events/index.test.ts b/apps/web/tests/events/index.test.tsindex 3698c1be6a..802da8417c 100644--- a/apps/web/tests/events/index.test.ts+++ b/apps/web/tests/events/index.test.ts@@ -5,6 +5,7 @@ import { describe, expect, test } from "vitest";import * as z from "zod/v4";import { env } from "../utils/env";import { IntegrationHarness } from "../utils/integration";+import { E2E_PARTNER, E2E_PARTNERS, E2E_PARTNER_GROUP } from "../utils/resource";describe.runIf(env.CI).sequential("GET /events", async () => {const h = new IntegrationHarness();@@ -185,6 +186,144 @@ describe.runIf(env.CI).sequential("GET /events", async () => {expect(status).toEqual(200);expect(Array.isArray(data)).toBe(true);});++ test("filter events by single partnerId", async () => {+ const { status, data } = await http.get<any[]>({+ path: `/events`,+ query: {+ event: "clicks",+ workspaceId,+ interval: "all",+ partnerId: E2E_PARTNER.id,+ },+ });++ expect(status).toEqual(200);+ expect(Array.isArray(data)).toBe(true);+ });++ test("filter events by multiple partnerIds (IS ONE OF)", async () => {+ const partnerIds = E2E_PARTNERS.map((p) => p.id).join(",");+ const { status, data } = await http.get<any[]>({+ path: `/events`,+ query: {+ event: "clicks",+ workspaceId,+ interval: "all",+ partnerId: partnerIds,+ },+ });++ expect(status).toEqual(200);+ expect(Array.isArray(data)).toBe(true);+ });++ test("exclude events by partnerId (IS NOT)", async () => {+ const { status, data } = await http.get<any[]>({+ path: `/events`,+ query: {+ event: "clicks",+ workspaceId,+ interval: "all",+ partnerId: `-${E2E_PARTNER.id}`,+ },+ });++ expect(status).toEqual(200);+ expect(Array.isArray(data)).toBe(true);+ });++ test("filter events by partnerId combined with country", async () => {+ const { status, data } = await http.get<any[]>({+ path: `/events`,+ query: {+ event: "clicks",+ workspaceId,+ interval: "all",+ partnerId: E2E_PARTNER.id,+ country: "US",+ },+ });++ expect(status).toEqual(200);+ expect(Array.isArray(data)).toBe(true);+ });++ test("filter events by single groupId", async () => {+ const { status, data } = await http.get<any[]>({+ path: `/events`,+ query: {+ event: "clicks",+ workspaceId,+ interval: "all",+ groupId: E2E_PARTNER_GROUP.id,+ },+ });++ expect(status).toEqual(200);+ expect(Array.isArray(data)).toBe(true);+ });++ test("exclude events by groupId (IS NOT)", async () => {+ const { status, data } = await http.get<any[]>({+ path: `/events`,+ query: {+ event: "clicks",+ workspaceId,+ interval: "all",+ groupId: `-${E2E_PARTNER_GROUP.id}`,+ },+ });++ expect(status).toEqual(200);+ expect(Array.isArray(data)).toBe(true);+ });++ test("filter events by groupId combined with partnerId", async () => {+ const { status, data } = await http.get<any[]>({+ path: `/events`,+ query: {+ event: "clicks",+ workspaceId,+ interval: "all",+ groupId: E2E_PARTNER_GROUP.id,+ partnerId: E2E_PARTNER.id,+ },+ });++ expect(status).toEqual(200);+ expect(Array.isArray(data)).toBe(true);+ });++ test("filter events by single tenantId", async () => {+ const { status, data } = await http.get<any[]>({+ path: `/events`,+ query: {+ event: "clicks",+ workspaceId,+ interval: "all",+ tenantId: E2E_PARTNER.tenantId,+ },+ });++ expect(status).toEqual(200);+ expect(Array.isArray(data)).toBe(true);+ });++ test("exclude events by tenantId (IS NOT)", async () => {+ const { status, data } = await http.get<any[]>({+ path: `/events`,+ query: {+ event: "clicks",+ workspaceId,+ interval: "all",+ tenantId: `-${E2E_PARTNER.tenantId}`,+ },+ });++ expect(status).toEqual(200);+ expect(Array.isArray(data)).toBe(true);+ });});describe("Pagination and Sorting", () => {diff --git a/packages/tinybird/pipes/v3_count.pipe b/packages/tinybird/pipes/v3_count.pipeindex 7b87ce9d3b..999525f04e 100644--- a/packages/tinybird/pipes/v3_count.pipe+++ b/packages/tinybird/pipes/v3_count.pipe@@ -22,9 +22,27 @@ SQL >}}AND deleted == 0{% if defined(programId) %} AND program_id = {{ programId }} {% end %}- {% if defined(partnerId) %} AND partner_id = {{ partnerId }} {% end %}- {% if defined(groupId) %} AND partner_group_id = {{ groupId }} {% end %}- {% if defined(tenantId) %} AND tenant_id = {{ tenantId }} {% end %}+ {% if defined(partnerId) %}+ {% if defined(partnerIdOperator) and String(partnerIdOperator) == 'NOT IN' %}+ AND partner_id NOT IN {{ Array(partnerId, 'String') }}+ {% else %}+ AND partner_id IN {{ Array(partnerId, 'String') }}+ {% end %}+ {% end %}+ {% if defined(groupId) %}+ {% if defined(groupIdOperator) and String(groupIdOperator) == 'NOT IN' %}+ AND partner_group_id NOT IN {{ Array(groupId, 'String') }}+ {% else %}+ AND partner_group_id IN {{ Array(groupId, 'String') }}+ {% end %}+ {% end %}+ {% if defined(tenantId) %}+ {% if defined(tenantIdOperator) and String(tenantIdOperator) == 'NOT IN' %}+ AND tenant_id NOT IN {{ Array(tenantId, 'String') }}+ {% else %}+ AND tenant_id IN {{ Array(tenantId, 'String') }}+ {% end %}+ {% end %}{% if defined(domain) %}{% if defined(domainOperator) and String(domainOperator) == 'NOT IN' %}AND domain NOT IN {{ Array(domain, 'String') }}diff --git a/packages/tinybird/pipes/v3_events.pipe b/packages/tinybird/pipes/v3_events.pipeindex 71888639c1..bb5d4ab246 100644--- a/packages/tinybird/pipes/v3_events.pipe+++ b/packages/tinybird/pipes/v3_events.pipe@@ -22,9 +22,27 @@ SQL >}}AND deleted == 0{% if defined(programId) %} AND program_id = {{ programId }} {% end %}- {% if defined(partnerId) %} AND partner_id = {{ partnerId }} {% end %}- {% if defined(groupId) %} AND partner_group_id = {{ groupId }} {% end %}- {% if defined(tenantId) %} AND tenant_id = {{ tenantId }} {% end %}+ {% if defined(partnerId) %}+ {% if defined(partnerIdOperator) and String(partnerIdOperator) == 'NOT IN' %}+ AND partner_id NOT IN {{ Array(partnerId, 'String') }}+ {% else %}+ AND partner_id IN {{ Array(partnerId, 'String') }}+ {% end %}+ {% end %}+ {% if defined(groupId) %}+ {% if defined(groupIdOperator) and String(groupIdOperator) == 'NOT IN' %}+ AND partner_group_id NOT IN {{ Array(groupId, 'String') }}+ {% else %}+ AND partner_group_id IN {{ Array(groupId, 'String') }}+ {% end %}+ {% end %}+ {% if defined(tenantId) %}+ {% if defined(tenantIdOperator) and String(tenantIdOperator) == 'NOT IN' %}+ AND tenant_id NOT IN {{ Array(tenantId, 'String') }}+ {% else %}+ AND tenant_id IN {{ Array(tenantId, 'String') }}+ {% end %}+ {% end %}{% if defined(domain) %}{% if defined(domainOperator) and String(domainOperator) == 'NOT IN' %}AND domain NOT IN {{ Array(domain, 'String') }}diff --git a/packages/tinybird/pipes/v3_group_by.pipe b/packages/tinybird/pipes/v3_group_by.pipeindex d049c63709..b0f4e5cb4c 100644--- a/packages/tinybird/pipes/v3_group_by.pipe+++ b/packages/tinybird/pipes/v3_group_by.pipe@@ -22,9 +22,27 @@ SQL >}}AND deleted == 0{% if defined(programId) %} AND program_id = {{ programId }} {% end %}- {% if defined(partnerId) %} AND partner_id = {{ partnerId }} {% end %}- {% if defined(groupId) %} AND partner_group_id = {{ groupId }} {% end %}- {% if defined(tenantId) %} AND tenant_id = {{ tenantId }} {% end %}+ {% if defined(partnerId) %}+ {% if defined(partnerIdOperator) and String(partnerIdOperator) == 'NOT IN' %}+ AND partner_id NOT IN {{ Array(partnerId, 'String') }}+ {% else %}+ AND partner_id IN {{ Array(partnerId, 'String') }}+ {% end %}+ {% end %}+ {% if defined(groupId) %}+ {% if defined(groupIdOperator) and String(groupIdOperator) == 'NOT IN' %}+ AND partner_group_id NOT IN {{ Array(groupId, 'String') }}+ {% else %}+ AND partner_group_id IN {{ Array(groupId, 'String') }}+ {% end %}+ {% end %}+ {% if defined(tenantId) %}+ {% if defined(tenantIdOperator) and String(tenantIdOperator) == 'NOT IN' %}+ AND tenant_id NOT IN {{ Array(tenantId, 'String') }}+ {% else %}+ AND tenant_id IN {{ Array(tenantId, 'String') }}+ {% end %}+ {% end %}{% if defined(domain) %}{% if defined(domainOperator) and String(domainOperator) == 'NOT IN' %}AND domain NOT IN {{ Array(domain, 'String') }}diff --git a/packages/tinybird/pipes/v3_group_by_link_metadata.pipe b/packages/tinybird/pipes/v3_group_by_link_metadata.pipeindex 8a6d9e31b8..d916f8be09 100644--- a/packages/tinybird/pipes/v3_group_by_link_metadata.pipe+++ b/packages/tinybird/pipes/v3_group_by_link_metadata.pipe@@ -46,9 +46,27 @@ SQL >partner_id != ''){% if defined(programId) %} AND program_id = {{ programId }} {% end %}- {% if defined(partnerId) %} AND partner_id = {{ partnerId }} {% end %}- {% if defined(groupId) %} AND partner_group_id = {{ groupId }} {% end %}- {% if defined(tenantId) %} AND tenant_id = {{ tenantId }} {% end %}+ {% if defined(partnerId) %}+ {% if defined(partnerIdOperator) and String(partnerIdOperator) == 'NOT IN' %}+ AND partner_id NOT IN {{ Array(partnerId, 'String') }}+ {% else %}+ AND partner_id IN {{ Array(partnerId, 'String') }}+ {% end %}+ {% end %}+ {% if defined(groupId) %}+ {% if defined(groupIdOperator) and String(groupIdOperator) == 'NOT IN' %}+ AND partner_group_id NOT IN {{ Array(groupId, 'String') }}+ {% else %}+ AND partner_group_id IN {{ Array(groupId, 'String') }}+ {% end %}+ {% end %}+ {% if defined(tenantId) %}+ {% if defined(tenantIdOperator) and String(tenantIdOperator) == 'NOT IN' %}+ AND tenant_id NOT IN {{ Array(tenantId, 'String') }}+ {% else %}+ AND tenant_id IN {{ Array(tenantId, 'String') }}+ {% end %}+ {% end %}{% if defined(domain) %}{% if defined(domainOperator) and String(domainOperator) == 'NOT IN' %}AND domain NOT IN {{ Array(domain, 'String') }}diff --git a/packages/tinybird/pipes/v3_timeseries.pipe b/packages/tinybird/pipes/v3_timeseries.pipeindex 69f6e0d127..77980f9557 100644--- a/packages/tinybird/pipes/v3_timeseries.pipe+++ b/packages/tinybird/pipes/v3_timeseries.pipe@@ -95,9 +95,27 @@ SQL >}}AND deleted == 0{% if defined(programId) %} AND program_id = {{ programId }} {% end %}- {% if defined(partnerId) %} AND partner_id = {{ partnerId }} {% end %}- {% if defined(groupId) %} AND partner_group_id = {{ groupId }} {% end %}- {% if defined(tenantId) %} AND tenant_id = {{ tenantId }} {% end %}+ {% if defined(partnerId) %}+ {% if defined(partnerIdOperator) and String(partnerIdOperator) == 'NOT IN' %}+ AND partner_id NOT IN {{ Array(partnerId, 'String') }}+ {% else %}+ AND partner_id IN {{ Array(partnerId, 'String') }}+ {% end %}+ {% end %}+ {% if defined(groupId) %}+ {% if defined(groupIdOperator) and String(groupIdOperator) == 'NOT IN' %}+ AND partner_group_id NOT IN {{ Array(groupId, 'String') }}+ {% else %}+ AND partner_group_id IN {{ Array(groupId, 'String') }}+ {% end %}+ {% end %}+ {% if defined(tenantId) %}+ {% if defined(tenantIdOperator) and String(tenantIdOperator) == 'NOT IN' %}+ AND tenant_id NOT IN {{ Array(tenantId, 'String') }}+ {% else %}+ AND tenant_id IN {{ Array(tenantId, 'String') }}+ {% end %}+ {% end %}{% if defined(domain) %}{% if defined(domainOperator) and String(domainOperator) == 'NOT IN' %}AND domain NOT IN {{ Array(domain, 'String') }}