feat(advanced-filters): support for partnerId, groupId, and tenantId

Author: pepeladeira

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,
   };

apps/web/lib/analytics/get-analytics.ts

@@ -14,6 +14,7 @@ import {
 } from "./constants";
 import {
   buildAdvancedFilters,
+  ensureParsedFilter,
   extractWorkspaceLinkFilters,
   prepareFiltersForPipe,
 } from "./filter-helpers";
@@ -130,16 +131,28 @@ 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,
     tagIds: tagIdsParam,
     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,

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,16 +107,27 @@ export const getEvents = async (params: EventsFilters) => {
 
   const allFilters = [...metadataFilters, ...advancedFilters];
 
+  const partnerIdFilter = ensureParsedFilter(params.partnerId);
+
   const {
     domain: domainParam,
     domainOperator,
     tagIds: tagIdsParam,
     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 } : {}),

apps/web/lib/analytics/types.ts

@@ -1,3 +1,4 @@
+import { ParsedFilter } from "@dub/utils";
 import * as z from "zod/v4";
 import {
   analyticsQuerySchema,
@@ -45,13 +46,15 @@ export type AnalyticsFilters = Partial<Omit<z.infer<typeof analyticsQuerySchema>
   folderIds?: string[]; // TODO: remove this once it's been added to the public API
   start?: Date | null;
   end?: Date | null;
+  partnerId?: string | ParsedFilter;
 };
 
 export type EventsFilters = z.infer<typeof eventsQuerySchema> & {
   workspaceId?: string;
   dataAvailableFrom?: Date;
   customerId?: string;
   folderIds?: string[];
+  partnerId?: string | ParsedFilter;
 };
 
 const partnerAnalyticsSchema = analyticsQuerySchema

apps/web/lib/zod/schemas/analytics.ts

@@ -96,17 +96,27 @@ 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()
       .describe("The ID of the program to retrieve analytics for."),
     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 code
   region: z.string().optional(),
   // All dimensional filters now go through the JSON filters parameter