dubinc · steven-tey · Aug 4, 2025 · Jul 16, 2025 · Jul 16, 2025 · Jul 17, 2025
diff --git a/apps/web/app/(ee)/api/customers/[id]/activity/route.ts b/apps/web/app/(ee)/api/customers/[id]/activity/route.ts
@@ -17,7 +17,6 @@ export const GET = withWorkspace(async ({ workspace, params }) => {
 
   const events = await getCustomerEvents({
     customerId: customer.id,
-    includeMetadata: true,
   });
 
   // get the first partner link that this customer interacted with

diff --git a/apps/web/app/(ee)/api/events/route.ts b/apps/web/app/(ee)/api/events/route.ts
@@ -10,6 +10,7 @@ import { eventsQuerySchema } from "@/lib/zod/schemas/analytics";
 import { Folder, Link } from "@dub/prisma/client";
 import { NextResponse } from "next/server";
 
+// GET /api/events
 export const GET = withWorkspace(
   async ({ searchParams, workspace, session }) => {
     throwIfClicksUsageExceeded(workspace);

diff --git a/apps/web/lib/analytics/get-analytics.ts b/apps/web/lib/analytics/get-analytics.ts
@@ -12,6 +12,7 @@ import {
   DIMENSIONAL_ANALYTICS_FILTERS,
   SINGULAR_ANALYTICS_ENDPOINTS,
 } from "./constants";
+import { queryParser } from "./query-parser";
 import { AnalyticsFilters } from "./types";
 import { getStartEndDates } from "./utils/get-start-end-dates";
 
@@ -32,6 +33,7 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
     timezone = "UTC",
     isDeprecatedClicksEndpoint = false,
     dataAvailableFrom,
+    query,
   } = params;
 
   const tagIds = combineTagIds(params);
@@ -100,6 +102,8 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
         : analyticsResponse[groupBy],
   });
 
+  const filters = queryParser(query);
+
   const response = await pipe({
     ...params,
     ...(UTM_TAGS_PLURAL_LIST.includes(groupBy)
@@ -115,6 +119,7 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
     timezone,
     country,
     region,
+    filters: filters ? JSON.stringify(filters) : undefined,
   });
 
   if (groupBy === "count") {
@@ -207,13 +212,16 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
       },
     });
 
-    return topPartnersData.map((item) => {
-      const partner = partners.find((p) => p.id === item.partnerId);
-      return {
-        ...item,
-        partner,
-      };
-    });
+    return topPartnersData
+      .map((item) => {
+        const partner = partners.find((p) => p.id === item.partnerId);
+        if (!partner) return null;
+        return {
+          ...item,
+          partner,
+        };
+      })
+      .filter((d) => d !== null);
   }
 
   // Return array for other endpoints

diff --git a/apps/web/lib/analytics/get-customer-events.ts b/apps/web/lib/analytics/get-customer-events.ts
@@ -8,23 +8,15 @@ import {
   clickEventResponseSchema,
   clickEventSchema,
 } from "../zod/schemas/clicks";
-import {
-  leadEventResponseSchema,
-  leadEventResponseSchemaExtended,
-} from "../zod/schemas/leads";
-import {
-  saleEventResponseSchema,
-  saleEventResponseSchemaExtended,
-} from "../zod/schemas/sales";
+import { leadEventResponseSchema } from "../zod/schemas/leads";
+import { saleEventResponseSchema } from "../zod/schemas/sales";
 
 export const getCustomerEvents = async ({
   customerId,
   linkIds,
-  includeMetadata,
 }: {
   customerId: string;
   linkIds?: string[];
-  includeMetadata?: boolean;
 }) => {
   const pipe = tb.buildPipe({
     pipe: "v2_customer_events",
@@ -68,6 +60,7 @@ export const getCustomerEvents = async ({
           ? {
               eventId: evt.event_id,
               eventName: evt.event_name,
+              metadata: evt.metadata ? JSON.parse(evt.metadata) : undefined,
               ...(evt.event === "sale"
                 ? {
                     sale: {
@@ -83,14 +76,8 @@ export const getCustomerEvents = async ({
 
       return {
         click: clickEventResponseSchema,
-        lead: (includeMetadata
-          ? leadEventResponseSchemaExtended
-          : leadEventResponseSchema
-        ).omit({ customer: true }),
-        sale: (includeMetadata
-          ? saleEventResponseSchemaExtended
-          : saleEventResponseSchema
-        ).omit({ customer: true }),
+        lead: leadEventResponseSchema.omit({ customer: true }),
+        sale: saleEventResponseSchema.omit({ customer: true }),
       }[evt.event].parse(eventData);
     })
     .filter((d) => d !== null);

diff --git a/apps/web/lib/analytics/get-events.ts b/apps/web/lib/analytics/get-events.ts
@@ -21,6 +21,7 @@ import {
   saleEventResponseSchema,
   saleEventSchemaTBEndpoint,
 } from "../zod/schemas/sales";
+import { queryParser } from "./query-parser";
 import { EventsFilters } from "./types";
 import { getStartEndDates } from "./utils/get-start-end-dates";
 
@@ -39,6 +40,7 @@ export const getEvents = async (params: EventsFilters) => {
     order,
     sortOrder,
     dataAvailableFrom,
+    query,
   } = params;
 
   const { startDate, endDate } = getStartEndDates({
@@ -74,6 +76,8 @@ export const getEvents = async (params: EventsFilters) => {
       }[eventType] ?? clickEventSchemaTBEndpoint,
   });
 
+  const filters = queryParser(query);
+
   const response = await pipe({
     ...params,
     eventType,
@@ -85,6 +89,7 @@ export const getEvents = async (params: EventsFilters) => {
     offset: (params.page - 1) * params.limit,
     start: startDate.toISOString().replace("T", " ").replace("Z", ""),
     end: endDate.toISOString().replace("T", " ").replace("Z", ""),
+    filters: filters ? JSON.stringify(filters) : undefined,
   });
 
   const [linksMap, customersMap] = await Promise.all([
@@ -130,6 +135,7 @@ export const getEvents = async (params: EventsFilters) => {
           ? {
               eventId: evt.event_id,
               eventName: evt.event_name,
+              metadata: evt.metadata ? JSON.parse(evt.metadata) : undefined,
               customer: customersMap[evt.customer_id] ?? {
                 id: evt.customer_id,
                 name: "Deleted Customer",

diff --git a/apps/web/lib/analytics/query-parser.ts b/apps/web/lib/analytics/query-parser.ts
@@ -0,0 +1,126 @@
+import { EventsFilters } from "./types";
+
+interface InternalFilter {
+  operand: string;
+  operator:
+    | "equals"
+    | "notEquals"
+    | "greaterThan"
+    | "lessThan"
+    | "greaterThanOrEqual"
+    | "lessThanOrEqual";
+  value: string;
+}
+
+// Query parser that can parse the query string into a list of filters
+export const queryParser = (
+  query: EventsFilters["query"],
+  allowedOperands = ["metadata"],
+) => {
+  if (!query) {
+    return undefined;
+  }
+
+  const filters: InternalFilter[] = [];
+
+  // Split the query by logical operators (AND/OR) to handle multiple conditions
+  // For now, we'll focus on single conditions, but this structure allows for future expansion
+  const conditions = query.split(/\s+(?:AND|and|OR|or)\s+/);
+
+  for (const condition of conditions) {
+    const trimmedCondition = condition.trim();
+
+    if (!trimmedCondition) {
+      continue;
+    }
+
+    const filter = parseCondition(trimmedCondition);
+
+    if (!filter) {
+      continue;
+    }
+
+    const isAllowed = allowedOperands.some((allowed) => {
+      if (filter.operand === allowed) {
+        return true;
+      }
+
+      if (filter.operand.startsWith(`${allowed}.`)) {
+        return true;
+      }
+
+      return false;
+    });
+
+    if (!isAllowed) {
+      continue;
+    }
+
+    filters.push(filter);
+  }
+
+  return filters.length > 0 ? filters : undefined;
+};
+
+// Parses a single condition in the format: field:value, field>value, or metadata['key']:value
+function parseCondition(condition: string): InternalFilter | null {
+  // This regex captures:
+  // 1. field - either a regular field name OR metadata with bracket notation (supports both single and double quotes)
+  // 2. operator - :, >, <, >=, <=, !=
+  // 3. value - the value after the operator (supports quoted and unquoted values)
+  const unifiedPattern =
+    /^([a-zA-Z_][a-zA-Z0-9_]*|metadata\[['"][^'"]*['"]\](?:\[['"][^'"]*['"]\])*)\s*([:><=!]+)\s*(.+)$/;
+
+  const match = condition.match(unifiedPattern);
+
+  if (!match) {
+    return null;
+  }
+
+  // Extract the matched groups
+  const [, fieldOrMetadata, operator, value] = match;
+
+  let operand: string;
+
+  // Determine the operand based on whether it's metadata or a regular field
+  if (fieldOrMetadata.startsWith("metadata")) {
+    const keyPath = fieldOrMetadata.replace(/^metadata/, "");
+
+    const extractedKey = keyPath
+      .replace(/^\[['"]|['"]\]$/g, "") // Remove leading [' or [" and trailing '] or "]
+      .replace(/\[['"]/g, ".") // Replace [' or [" with .
+      .replace(/['"]\]/g, ""); // Remove trailing '] or "]
+
+    operand = `metadata.${extractedKey}`;
+  } else {
+    operand = fieldOrMetadata;
+  }
+
+  return {
+    operand,
+    operator: mapOperator(operator),
+    value: value.trim().replace(/^['"`]|['"`]$/g, ""),
+  };
+}
+
+// Maps operator strings to our internal operator types
+function mapOperator(operator: string): InternalFilter["operator"] {
+  switch (operator) {
+    case ":":
+    case "=":
+      return "equals";
+    case ">":
+      return "greaterThan";
+    case "<":
+      return "lessThan";
+    case ">=":
+      return "greaterThanOrEqual";
+    case "<=":
+      return "lessThanOrEqual";
+    case "!=":
+      return "notEquals";
+    default:
+      // For unsupported operators, default to equals
+      return "equals";
+  }
+}
diff --git a/apps/web/lib/zod/schemas/analytics.ts b/apps/web/lib/zod/schemas/analytics.ts
@@ -232,6 +232,16 @@ export const analyticsQuerySchema = z
       .describe(
         "Filter sales by type: 'new' for first-time purchases, 'recurring' for repeat purchases. If undefined, returns both.",
       ),
+    query: z
+      .string()
+      .max(10000)
+      .optional()
+      .describe(
+        "Search the events by a custom metadata value. Only available for lead and sale events.",
+      )
+      .openapi({
+        example: "metadata['key']:'value'",
+      }),
   })
   .merge(utmTagsSchema);
 
@@ -261,6 +271,10 @@ export const analyticsFilterTB = z
       .optional()
       .describe("The folder IDs to retrieve analytics for."),
     isMegaFolder: z.boolean().optional(),
+    filters: z
+      .string()
+      .optional()
+      .describe("The filters to apply to the analytics."),
   })
   .merge(
     analyticsQuerySchema.pick({

diff --git a/apps/web/lib/zod/schemas/leads.ts b/apps/web/lib/zod/schemas/leads.ts
@@ -119,30 +119,22 @@ export const leadEventSchemaTBEndpoint = z.object({
   referer_url_processed: z.string().nullable(),
   qr: z.number().nullable(),
   ip: z.string().nullable(),
+  metadata: z.string().nullish(),
 });
 
 // response from dub api
 export const leadEventResponseSchema = z
   .object({
     event: z.literal("lead"),
     timestamp: z.coerce.string(),
+    // core event fields
     eventId: z.string(),
     eventName: z.string(),
+    metadata: z.any().nullish(),
     // nested objects
     click: clickEventSchema,
     link: linkEventSchema,
     customer: CustomerSchema,
   })
   .merge(commonDeprecatedEventFields)
   .openapi({ ref: "LeadEvent", title: "LeadEvent" });
-
-export const leadEventResponseSchemaExtended = leadEventResponseSchema.merge(
-  z.object({
-    metadata: z
-      .string()
-      .nullish()
-      .transform((val) => (val === "" ? null : val))
-      .default(null)
-      .openapi({ type: "string" }),
-  }),
-);