fix clickhouse filtering on event_name

Co-authored-by: Copilot <copilot@github.com>

src/queries/sql/events/getEventDataArraySeries.ts

@@ -75,7 +75,11 @@ async function clickhouseQuery(
 ): Promise<EventDataSeriesPoint[]> {
   const { timezone = 'UTC', unit = 'day' } = filters;
   const { rawQuery, getDateSQL, parseFilters, getPropertyFilterQuery } = clickhouse;
-  const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });
+  const { filterQuery, cohortQuery, queryParams } = parseFilters({
+    ...filters,
+    websiteId,
+    timezone,
+  });
   const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(eventFilters, 'event', timezone);
 
   return rawQuery(
@@ -98,6 +102,7 @@ async function clickhouseQuery(
     ${cohortQuery}
     where event_data.website_id = {websiteId:UUID}
       and event_data.created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      and event_data.event_name = {eventName:String}
       and event_data.data_key = {propertyName:String}
       and event_data.data_type = ${DATA_TYPE.array}
     ${filterQuery}

src/queries/sql/events/getEventDataDateSeries.ts

@@ -27,7 +27,7 @@ async function relationalQuery(
   propertyName: string,
   filters: QueryFilters,
   eventFilters: EventPropertyFilter[] = [],
-) : Promise<EventDataDateSeriesPoint[]> {
+): Promise<EventDataDateSeriesPoint[]> {
   const { timezone = 'utc' } = filters;
   const { rawQuery, parseFilters, getDateStringSQL, getPropertyFilterQuery } = prisma;
   const { filterQuery, cohortQuery, joinSessionQuery, queryParams } = parseFilters({
@@ -73,7 +73,11 @@ async function clickhouseQuery(
 ): Promise<EventDataDateSeriesPoint[]> {
   const { timezone = 'UTC' } = filters;
   const { rawQuery, parseFilters, getDateStringSQL, getPropertyFilterQuery } = clickhouse;
-  const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });
+  const { filterQuery, cohortQuery, queryParams } = parseFilters({
+    ...filters,
+    websiteId,
+    timezone,
+  });
   const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(eventFilters, 'event', timezone);
 
   return rawQuery(
@@ -95,6 +99,7 @@ async function clickhouseQuery(
     ${cohortQuery}
     where event_data.website_id = {websiteId:UUID}
       and event_data.created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      and event_data.event_name = {eventName:String}
       and event_data.data_key = {propertyName:String}
       and event_data.data_type = ${DATA_TYPE.date}
     ${filterQuery}

src/queries/sql/events/getEventDataNumericSeries.ts

@@ -38,9 +38,11 @@ async function relationalQuery(
   });
   const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(eventFilters, 'event', timezone);
   const aggSql =
-    metric === 'avg' ? 'avg(cast(event_data.number_value as decimal))' :
-    metric === 'count' ? 'count(*)' :
-    'sum(cast(event_data.number_value as decimal))';
+    metric === 'avg'
+      ? 'avg(cast(event_data.number_value as decimal))'
+      : metric === 'count'
+        ? 'count(*)'
+        : 'sum(cast(event_data.number_value as decimal))';
 
   return rawQuery(
     `
@@ -79,12 +81,18 @@ async function clickhouseQuery(
 ): Promise<{ t: string; y: number }[]> {
   const { timezone = 'UTC', unit = 'day' } = filters;
   const { rawQuery, getDateSQL, parseFilters, getPropertyFilterQuery } = clickhouse;
-  const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });
+  const { filterQuery, cohortQuery, queryParams } = parseFilters({
+    ...filters,
+    websiteId,
+    timezone,
+  });
   const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(eventFilters, 'event', timezone);
   const aggSql =
-    metric === 'avg' ? 'avg(event_data.number_value)' :
-    metric === 'count' ? 'count()' :
-    'sum(event_data.number_value)';
+    metric === 'avg'
+      ? 'avg(event_data.number_value)'
+      : metric === 'count'
+        ? 'count()'
+        : 'sum(event_data.number_value)';
 
   return rawQuery(
     `
@@ -105,6 +113,7 @@ async function clickhouseQuery(
     ${cohortQuery}
     where event_data.website_id = {websiteId:UUID}
       and event_data.created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      and event_data.event_name = {eventName:String}
       and event_data.data_key = {propertyName:String}
       and event_data.data_type = 2
     ${filterQuery}

src/queries/sql/events/getEventDataNumericStats.ts

@@ -73,7 +73,11 @@ async function clickhouseQuery(
 ): Promise<EventDataNumericStats[]> {
   const { timezone = 'UTC' } = filters;
   const { rawQuery, parseFilters, getPropertyFilterQuery } = clickhouse;
-  const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });
+  const { filterQuery, cohortQuery, queryParams } = parseFilters({
+    ...filters,
+    websiteId,
+    timezone,
+  });
   const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(eventFilters, 'event', timezone);
 
   return rawQuery(
@@ -98,6 +102,7 @@ async function clickhouseQuery(
     ${cohortQuery}
     where event_data.website_id = {websiteId:UUID}
       and event_data.created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      and event_data.event_name = {eventName:String}
       and event_data.data_key = {propertyName:String}
       and event_data.data_type = 2
     ${filterQuery}

src/queries/sql/events/getEventDataPivot.ts

@@ -20,7 +20,12 @@ export async function getEventDataPivot(
   });
 }
 
-async function relationalQuery(websiteId: string, eventName: string, filters: QueryFilters, eventFilters: EventPropertyFilter[] = []) {
+async function relationalQuery(
+  websiteId: string,
+  eventName: string,
+  filters: QueryFilters,
+  eventFilters: EventPropertyFilter[] = [],
+) {
   const { timezone = 'utc' } = filters;
   const { rawQuery, parseFilters, getPropertyFilterQuery, getDateStringSQL } = prisma;
   const { page = 1, pageSize } = filters;
@@ -104,11 +109,27 @@ async function relationalQuery(websiteId: string, eventName: string, filters: Qu
   // Pivot flat rows into one record per event
   const eventMap = new Map<
     string,
-    { eventId: string; sessionId: string; eventName: string; urlPath: string; createdAt: Date; propertyKeys: string[]; propertyValues: string[] }
+    {
+      eventId: string;
+      sessionId: string;
+      eventName: string;
+      urlPath: string;
+      createdAt: Date;
+      propertyKeys: string[];
+      propertyValues: string[];
+    }
   >();
   for (const { eventId, sessionId, eventName: name, urlPath, createdAt, dataKey, value } of rows) {
     if (!eventMap.has(eventId)) {
-      eventMap.set(eventId, { eventId, sessionId, eventName: name, urlPath, createdAt, propertyKeys: [], propertyValues: [] });
+      eventMap.set(eventId, {
+        eventId,
+        sessionId,
+        eventName: name,
+        urlPath,
+        createdAt,
+        propertyKeys: [],
+        propertyValues: [],
+      });
     }
     const entry = eventMap.get(eventId);
     entry.propertyKeys.push(dataKey);
@@ -118,14 +139,23 @@ async function relationalQuery(websiteId: string, eventName: string, filters: Qu
   return { data: [...eventMap.values()], count, page: +page, pageSize: size };
 }
 
-async function clickhouseQuery(websiteId: string, eventName: string, filters: QueryFilters, eventFilters: EventPropertyFilter[] = []) {
+async function clickhouseQuery(
+  websiteId: string,
+  eventName: string,
+  filters: QueryFilters,
+  eventFilters: EventPropertyFilter[] = [],
+) {
   const { timezone = 'UTC' } = filters;
   const { rawQuery, parseFilters, getPropertyFilterQuery, getDateStringSQL } = clickhouse;
   const { page = 1, pageSize } = filters;
   const size = +pageSize || DEFAULT_PAGE_SIZE;
   const offset = +size * (+page - 1);
 
-  const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });
+  const { filterQuery, cohortQuery, queryParams } = parseFilters({
+    ...filters,
+    websiteId,
+    timezone,
+  });
   const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(eventFilters, 'event', timezone);
 
   const count = await rawQuery(
@@ -145,6 +175,7 @@ async function clickhouseQuery(websiteId: string, eventName: string, filters: Qu
     ${cohortQuery}
     where event_data_pivot.website_id = {websiteId:UUID}
       and event_data_pivot.created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      and event_data_pivot.event_name = {eventName:String}
     ${filterQuery}
     ${pfSQL}
     `,
@@ -183,6 +214,7 @@ async function clickhouseQuery(websiteId: string, eventName: string, filters: Qu
     ${cohortQuery}
     where event_data_pivot.website_id = {websiteId:UUID}
       and event_data_pivot.created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      and event_data_pivot.event_name = {eventName:String}
     ${filterQuery}
     ${pfSQL}
     group by

src/queries/sql/events/getEventDataPropertySeries.ts

@@ -74,7 +74,11 @@ async function clickhouseQuery(
 ): Promise<EventDataSeriesPoint[]> {
   const { timezone = 'UTC', unit = 'day' } = filters;
   const { rawQuery, getDateSQL, parseFilters, getPropertyFilterQuery } = clickhouse;
-  const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });
+  const { filterQuery, cohortQuery, queryParams } = parseFilters({
+    ...filters,
+    websiteId,
+    timezone,
+  });
   const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(eventFilters, 'event', timezone);
 
   return rawQuery(
@@ -97,6 +101,7 @@ async function clickhouseQuery(
     ${cohortQuery}
     where event_data.website_id = {websiteId:UUID}
       and event_data.created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      and event_data.event_name = {eventName:String}
       and event_data.data_key = {propertyName:String}
       and event_data.data_type in (${DATA_TYPE.string}, ${DATA_TYPE.boolean})
     ${filterQuery}

src/queries/sql/events/getEventDataValues.ts

@@ -12,7 +12,11 @@ interface WebsiteEventData {
 }
 
 export async function getEventDataValues(
-  ...args: [websiteId: string, filters: QueryFilters & { propertyName?: string; dataType?: number }]
+  ...args: [
+    websiteId: string,
+    eventName: string,
+    filters: QueryFilters & { propertyName?: string; dataType?: number },
+  ]
 ): Promise<WebsiteEventData[]> {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
@@ -22,6 +26,7 @@ export async function getEventDataValues(
 
 async function relationalQuery(
   websiteId: string,
+  eventName: string,
   filters: QueryFilters & { propertyName?: string; dataType?: number },
 ) {
   const { rawQuery, parseFilters, getDateSQL } = prisma;
@@ -41,6 +46,8 @@ async function relationalQuery(
       join website_event on website_event.event_id = event_data.website_event_id
         and website_event.website_id = {{websiteId::uuid}}
         and website_event.created_at between {{startDate}} and {{endDate}}
+        and website_event.event_type = 2
+        and website_event.event_name = {{eventName}}
       cross join lateral jsonb_array_elements_text(coalesce(event_data.string_value, '[]')::jsonb) as array_item(value)
       ${cohortQuery}
       ${joinSessionQuery}
@@ -53,7 +60,7 @@ async function relationalQuery(
       order by 2 desc
       limit 100
       `,
-      queryParams,
+      { ...queryParams, eventName },
       FUNCTION_NAME,
     );
   }
@@ -61,9 +68,9 @@ async function relationalQuery(
   return rawQuery(
     `
     select
-      case 
-        when data_type = 2 then replace(string_value, '.0000', '') 
-        when data_type = 4 then ${getDateSQL('date_value', 'hour')} 
+      case
+        when data_type = 2 then replace(string_value, '.0000', '')
+        when data_type = 4 then ${getDateSQL('date_value', 'hour')}
         else string_value
       end as "value",
       count(*) as "total"
@@ -71,6 +78,8 @@ async function relationalQuery(
     join website_event on website_event.event_id = event_data.website_event_id
       and website_event.website_id = {{websiteId::uuid}}
       and website_event.created_at between {{startDate}} and {{endDate}}
+      and website_event.event_type = 2
+      and website_event.event_name = {eventName:String}
     ${cohortQuery}
     ${joinSessionQuery}
     where event_data.website_id = {{websiteId::uuid}}
@@ -82,13 +91,14 @@ async function relationalQuery(
     order by 2 desc
     limit 100
     `,
-    queryParams,
+    { ...queryParams, eventName },
     FUNCTION_NAME,
   );
 }
 
 async function clickhouseQuery(
   websiteId: string,
+  eventName: string,
   filters: QueryFilters & { propertyName?: string; dataType?: number },
 ): Promise<{ value: string; total: number }[]> {
   const { rawQuery, parseFilters } = clickhouse;
@@ -101,19 +111,21 @@ async function clickhouseQuery(
       select
         arrayJoin(JSONExtract(ifNull(event_data.string_value, '[]'), 'Array(String)')) as "value",
         count(*) as "total"
-      from event_data 
+      from event_data
       any left join (
-            select * 
+            select *
             from website_event
             where website_id = {websiteId:UUID}
               and created_at between {startDate:DateTime64} and {endDate:DateTime64}
-              and event_type = 2) website_event
+              and event_type = 2
+              and event_name = {eventName:String}) website_event
       on website_event.event_id = event_data.event_id
         and website_event.session_id = event_data.session_id
         and website_event.website_id = event_data.website_id
       ${cohortQuery}
       where event_data.website_id = {websiteId:UUID}
         and event_data.created_at between {startDate:DateTime64} and {endDate:DateTime64}
+        and event_data.event_name = {eventName:String}
         and event_data.data_key = {propertyName:String}
         and event_data.data_type = ${DATA_TYPE.array}
       ${filterQuery}
@@ -121,7 +133,7 @@ async function clickhouseQuery(
       order by 2 desc
       limit 100
       `,
-      queryParams,
+      { ...queryParams, eventName },
       FUNCTION_NAME,
     );
   }
@@ -133,19 +145,21 @@ async function clickhouseQuery(
               data_type = 4, toString(date_trunc('hour', date_value)),
               string_value) as "value",
       count(*) as "total"
-    from event_data 
+    from event_data
     any left join (
-          select * 
+          select *
           from website_event
           where website_id = {websiteId:UUID}
             and created_at between {startDate:DateTime64} and {endDate:DateTime64}
-            and event_type = 2) website_event
+            and event_type = 2
+            and event_name = {eventName:String}) website_event
     on website_event.event_id = event_data.event_id
       and website_event.session_id = event_data.session_id
       and website_event.website_id = event_data.website_id
     ${cohortQuery}
     where event_data.website_id = {websiteId:UUID}
       and event_data.created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      and event_data.event_name = {eventName:String}
       and event_data.data_key = {propertyName:String}
       ${dataType ? `and event_data.data_type = ${dataType}` : ''}
     ${filterQuery}
@@ -153,7 +167,7 @@ async function clickhouseQuery(
     order by 2 desc
     limit 100
     `,
-    queryParams,
+    { ...queryParams, eventName },
     FUNCTION_NAME,
   );
 }