Made filters work for all reports.

src/queries/sql/events/getEventDataEvents.ts

@@ -23,7 +23,7 @@ export async function getEventDataEvents(
 async function relationalQuery(websiteId: string, filters: QueryFilters) {
   const { rawQuery, parseFilters } = prisma;
   const { event } = filters;
-  const { params } = await parseFilters(websiteId, filters);
+  const { filterParams } = await parseFilters(websiteId, filters);
 
   if (event) {
     return rawQuery(
@@ -43,7 +43,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
       group by website_event.event_name, event_data.data_key, event_data.data_type, event_data.string_value
       order by 1 asc, 2 asc, 3 asc, 5 desc
       `,
-      params,
+      filterParams,
     );
   }
 
@@ -63,7 +63,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
     order by 1 asc, 2 asc
     limit 500
     `,
-    params,
+    filterParams,
   );
 }
 
@@ -73,7 +73,7 @@ async function clickhouseQuery(
 ): Promise<{ eventName: string; propertyName: string; dataType: number; total: number }[]> {
   const { rawQuery, parseFilters } = clickhouse;
   const { event } = filters;
-  const { params } = await parseFilters(websiteId, filters);
+  const { filterParams } = await parseFilters(websiteId, filters);
 
   if (event) {
     return rawQuery(
@@ -92,7 +92,7 @@ async function clickhouseQuery(
       order by 1 asc, 2 asc, 3 asc, 5 desc
       limit 500
       `,
-      params,
+      filterParams,
     );
   }
 
@@ -110,6 +110,6 @@ async function clickhouseQuery(
     order by 1 asc, 2 asc
     limit 500
     `,
-    params,
+    filterParams,
   );
 }

src/queries/sql/events/getEventDataFields.ts

@@ -1,11 +1,9 @@
 import prisma from '@/lib/prisma';
 import clickhouse from '@/lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
-import { QueryFilters, WebsiteEventData } from '@/lib/types';
+import { QueryFilters } from '@/lib/types';
 
-export async function getEventDataFields(
-  ...args: [websiteId: string, filters: QueryFilters]
-): Promise<WebsiteEventData[]> {
+export async function getEventDataFields(...args: [websiteId: string, filters: QueryFilters]) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
@@ -14,7 +12,7 @@ export async function getEventDataFields(
 
 async function relationalQuery(websiteId: string, filters: QueryFilters) {
   const { rawQuery, parseFilters, getDateSQL } = prisma;
-  const { filterQuery, params } = await parseFilters(websiteId, filters);
+  const { filterQuery, filterParams } = await parseFilters(websiteId, filters);
 
   return rawQuery(
     `
@@ -36,7 +34,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
     order by 2 desc
     limit 100
     `,
-    params,
+    filterParams,
   );
 }
 
@@ -45,7 +43,7 @@ async function clickhouseQuery(
   filters: QueryFilters,
 ): Promise<{ propertyName: string; dataType: number; propertyValue: string; total: number }[]> {
   const { rawQuery, parseFilters } = clickhouse;
-  const { filterQuery, params } = await parseFilters(websiteId, filters);
+  const { filterQuery, filterParams } = await parseFilters(websiteId, filters);
 
   return rawQuery(
     `
@@ -64,6 +62,6 @@ async function clickhouseQuery(
     order by 2 desc
     limit 100
     `,
-    params,
+    filterParams,
   );
 }

src/queries/sql/events/getEventDataProperties.ts

@@ -17,7 +17,7 @@ async function relationalQuery(
   filters: QueryFilters & { propertyName?: string },
 ) {
   const { rawQuery, parseFilters } = prisma;
-  const { filterQuery, params } = await parseFilters(websiteId, filters, {
+  const { filterQuery, filterParams } = await parseFilters(websiteId, filters, {
     columns: { propertyName: 'data_key' },
   });
 
@@ -36,7 +36,7 @@ async function relationalQuery(
     order by 3 desc
     limit 500
     `,
-    params,
+    filterParams,
   );
 }
 
@@ -45,7 +45,7 @@ async function clickhouseQuery(
   filters: QueryFilters & { propertyName?: string },
 ): Promise<{ eventName: string; propertyName: string; total: number }[]> {
   const { rawQuery, parseFilters } = clickhouse;
-  const { filterQuery, params } = await parseFilters(websiteId, filters, {
+  const { filterQuery, filterParams } = await parseFilters(websiteId, filters, {
     columns: { propertyName: 'data_key' },
   });
 
@@ -63,6 +63,6 @@ async function clickhouseQuery(
     order by 1, 3 desc
     limit 500
     `,
-    params,
+    filterParams,
   );
 }

src/queries/sql/events/getEventDataStats.ts

@@ -18,7 +18,7 @@ export async function getEventDataStats(
 
 async function relationalQuery(websiteId: string, filters: QueryFilters) {
   const { rawQuery, parseFilters } = prisma;
-  const { filterQuery, params } = await parseFilters(websiteId, filters);
+  const { filterQuery, filterParams } = await parseFilters(websiteId, filters);
 
   return rawQuery(
     `
@@ -38,7 +38,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
       group by website_event_id, data_key
       ) as t
     `,
-    params,
+    filterParams,
   );
 }
 
@@ -47,7 +47,7 @@ async function clickhouseQuery(
   filters: QueryFilters,
 ): Promise<{ events: number; properties: number; records: number }[]> {
   const { rawQuery, parseFilters } = clickhouse;
-  const { filterQuery, params } = await parseFilters(websiteId, filters);
+  const { filterQuery, filterParams } = await parseFilters(websiteId, filters);
 
   return rawQuery(
     `
@@ -67,6 +67,6 @@ async function clickhouseQuery(
       group by event_id, data_key
       ) as t
     `,
-    params,
+    filterParams,
   );
 }

src/queries/sql/events/getEventDataValues.ts

@@ -1,7 +1,12 @@
 import prisma from '@/lib/prisma';
 import clickhouse from '@/lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
-import { QueryFilters, WebsiteEventData } from '@/lib/types';
+import { QueryFilters } from '@/lib/types';
+
+export interface WebsiteEventData {
+  value: string;
+  total: number;
+}
 
 export async function getEventDataValues(
   ...args: [
@@ -20,7 +25,7 @@ async function relationalQuery(
   filters: QueryFilters & { eventName?: string; propertyName?: string },
 ) {
   const { rawQuery, parseFilters, getDateSQL } = prisma;
-  const { filterQuery, params } = await parseFilters(websiteId, filters);
+  const { filterQuery, filterParams } = await parseFilters(websiteId, filters);
 
   return rawQuery(
     `
@@ -42,7 +47,7 @@ async function relationalQuery(
     order by 2 desc
     limit 100
     `,
-    params,
+    filterParams,
   );
 }
 
@@ -51,7 +56,7 @@ async function clickhouseQuery(
   filters: QueryFilters & { eventName?: string; propertyName?: string },
 ): Promise<{ value: string; total: number }[]> {
   const { rawQuery, parseFilters } = clickhouse;
-  const { filterQuery, params } = await parseFilters(websiteId, filters);
+  const { filterQuery, filterParams } = await parseFilters(websiteId, filters);
 
   return rawQuery(
     `
@@ -70,6 +75,6 @@ async function clickhouseQuery(
     order by 2 desc
     limit 100
     `,
-    params,
+    filterParams,
   );
 }

src/queries/sql/events/getEventMetrics.ts

@@ -22,7 +22,7 @@ export async function getEventMetrics(
 async function relationalQuery(websiteId: string, filters: QueryFilters) {
   const { timezone = 'utc', unit = 'day' } = filters;
   const { rawQuery, getDateSQL, parseFilters } = prisma;
-  const { filterQuery, joinSession, params } = await parseFilters(websiteId, {
+  const { filterQuery, joinSession, filterParams } = await parseFilters(websiteId, {
     ...filters,
     eventType: EVENT_TYPE.customEvent,
   });
@@ -42,7 +42,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
     group by 1, 2
     order by 2
     `,
-    params,
+    filterParams,
   );
 }
 
@@ -52,7 +52,7 @@ async function clickhouseQuery(
 ): Promise<{ x: string; t: string; y: number }[]> {
   const { timezone = 'UTC', unit = 'day' } = filters;
   const { rawQuery, getDateSQL, parseFilters } = clickhouse;
-  const { filterQuery, params } = await parseFilters(websiteId, {
+  const { filterQuery, filterParams } = await parseFilters(websiteId, {
     ...filters,
     eventType: EVENT_TYPE.customEvent,
   });
@@ -92,5 +92,5 @@ async function clickhouseQuery(
     `;
   }
 
-  return rawQuery(sql, params);
+  return rawQuery(sql, filterParams);
 }

src/queries/sql/events/getWebsiteEvents.ts

@@ -15,7 +15,7 @@ export function getWebsiteEvents(
 async function relationalQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
   const { pagedRawQuery, parseFilters } = prisma;
   const { search } = pageParams;
-  const { filterQuery, params } = await parseFilters(websiteId, {
+  const { filterQuery, filterParams } = await parseFilters(websiteId, {
     ...filters,
   });
 
@@ -49,14 +49,14 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, pagePar
     }
     order by created_at desc
     `,
-    { ...params, search: `%${search}%` },
+    { ...filterParams, search: `%${search}%` },
     pageParams,
   );
 }
 
 async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
   const { pagedQuery, parseFilters } = clickhouse;
-  const { params, dateQuery, filterQuery } = await parseFilters(websiteId, filters);
+  const { filterParams, dateQuery, filterQuery } = await parseFilters(websiteId, filters);
   const { search } = pageParams;
 
   return pagedQuery(
@@ -86,7 +86,7 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
     }
     order by created_at desc
     `,
-    { ...params, search },
+    { ...filterParams, search },
     pageParams,
   );
 }