Refactor filter handling for queries.

src/queries/prisma/report.ts

@@ -1,6 +1,6 @@
 import { Prisma, Report } from '@/generated/prisma/client';
 import prisma from '@/lib/prisma';
-import { PageResult, PageParams } from '@/lib/types';
+import { PageResult, QueryFilters } from '@/lib/types';
 import ReportFindManyArgs = Prisma.ReportFindManyArgs;
 
 async function findReport(criteria: Prisma.ReportFindUniqueArgs): Promise<Report> {
@@ -17,9 +17,9 @@ export async function getReport(reportId: string): Promise<Report> {
 
 export async function getReports(
   criteria: ReportFindManyArgs,
-  pageParams: PageParams = {},
+  filters: QueryFilters = {},
 ): Promise<PageResult<Report[]>> {
-  const { search } = pageParams;
+  const { search } = filters;
 
   const where: Prisma.ReportWhereInput = {
     ...criteria.where,
@@ -45,12 +45,12 @@ export async function getReports(
     ]),
   };
 
-  return prisma.pagedQuery('report', { ...criteria, where }, pageParams);
+  return prisma.pagedQuery('report', { ...criteria, where }, filters);
 }
 
 export async function getUserReports(
   userId: string,
-  filters?: PageParams,
+  filters?: QueryFilters,
 ): Promise<PageResult<Report[]>> {
   return getReports(
     {
@@ -72,7 +72,7 @@ export async function getUserReports(
 
 export async function getWebsiteReports(
   websiteId: string,
-  filters: PageParams = {},
+  filters: QueryFilters = {},
 ): Promise<PageResult<Report[]>> {
   return getReports(
     {

src/queries/prisma/team.ts

@@ -2,7 +2,7 @@ import { Prisma, Team } from '@/generated/prisma/client';
 import { ROLES } from '@/lib/constants';
 import { uuid } from '@/lib/crypto';
 import prisma from '@/lib/prisma';
-import { PageResult, PageParams } from '@/lib/types';
+import { PageResult, QueryFilters } from '@/lib/types';
 import TeamFindManyArgs = Prisma.TeamFindManyArgs;
 
 export async function findTeam(criteria: Prisma.TeamFindUniqueArgs): Promise<Team> {
@@ -22,7 +22,7 @@ export async function getTeam(teamId: string, options: { includeMembers?: boolea
 
 export async function getTeams(
   criteria: TeamFindManyArgs,
-  filters: PageParams = {},
+  filters: QueryFilters,
 ): Promise<PageResult<Team[]>> {
   const { getSearchParameters } = prisma;
   const { search } = filters;
@@ -42,7 +42,7 @@ export async function getTeams(
   );
 }
 
-export async function getUserTeams(userId: string, filters: PageParams = {}) {
+export async function getUserTeams(userId: string, filters: QueryFilters) {
   return getTeams(
     {
       where: {

src/queries/prisma/teamUser.ts

@@ -1,7 +1,7 @@
 import { Prisma, TeamUser } from '@/generated/prisma/client';
 import { uuid } from '@/lib/crypto';
 import prisma from '@/lib/prisma';
-import { PageResult, PageParams } from '@/lib/types';
+import { PageResult, QueryFilters } from '@/lib/types';
 import TeamUserFindManyArgs = Prisma.TeamUserFindManyArgs;
 
 export async function findTeamUser(criteria: Prisma.TeamUserFindUniqueArgs): Promise<TeamUser> {
@@ -19,7 +19,7 @@ export async function getTeamUser(teamId: string, userId: string): Promise<TeamU
 
 export async function getTeamUsers(
   criteria: TeamUserFindManyArgs,
-  filters?: PageParams,
+  filters?: QueryFilters,
 ): Promise<PageResult<TeamUser[]>> {
   const { search } = filters;
 

src/queries/prisma/user.ts

@@ -1,7 +1,7 @@
 import { Prisma, User } from '@/generated/prisma/client';
 import { ROLES } from '@/lib/constants';
 import prisma from '@/lib/prisma';
-import { PageResult, Role, PageParams } from '@/lib/types';
+import { PageResult, Role, QueryFilters } from '@/lib/types';
 import { getRandomChars } from '@/lib/crypto';
 import UserFindManyArgs = Prisma.UserFindManyArgs;
 
@@ -49,9 +49,9 @@ export async function getUserByUsername(username: string, options: GetUserOption
 
 export async function getUsers(
   criteria: UserFindManyArgs,
-  pageParams?: PageParams,
+  filters: QueryFilters = {},
 ): Promise<PageResult<User[]>> {
-  const { search } = pageParams;
+  const { search } = filters;
 
   const where: Prisma.UserWhereInput = {
     ...criteria.where,
@@ -68,7 +68,7 @@ export async function getUsers(
     {
       orderBy: 'createdAt',
       sortDescending: true,
-      ...pageParams,
+      ...filters,
     },
   );
 }

src/queries/prisma/website.ts

@@ -1,7 +1,7 @@
 import { Prisma, Website } from '@/generated/prisma/client';
 import redis from '@/lib/redis';
 import prisma from '@/lib/prisma';
-import { PageResult, PageParams } from '@/lib/types';
+import { PageResult, QueryFilters } from '@/lib/types';
 import WebsiteFindManyArgs = Prisma.WebsiteFindManyArgs;
 import { ROLES } from '@/lib/constants';
 
@@ -28,9 +28,9 @@ export async function getSharedWebsite(shareId: string) {
 
 export async function getWebsites(
   criteria: WebsiteFindManyArgs,
-  pageParams: PageParams,
+  filters: QueryFilters,
 ): Promise<PageResult<Website[]>> {
-  const { search } = pageParams;
+  const { search } = filters;
 
   const where: Prisma.WebsiteWhereInput = {
     ...criteria.where,
@@ -43,7 +43,7 @@ export async function getWebsites(
     deletedAt: null,
   };
 
-  return prisma.pagedQuery('website', { ...criteria, where }, pageParams);
+  return prisma.pagedQuery('website', { ...criteria, where }, filters);
 }
 
 export async function getAllWebsites(userId: string) {
@@ -90,7 +90,7 @@ export async function getAllUserWebsitesIncludingTeamOwner(userId: string) {
 
 export async function getUserWebsites(
   userId: string,
-  filters?: PageParams,
+  filters?: QueryFilters,
 ): Promise<PageResult<Website[]>> {
   return getWebsites(
     {
@@ -115,7 +115,7 @@ export async function getUserWebsites(
 
 export async function getTeamWebsites(
   teamId: string,
-  filters?: PageParams,
+  filters?: QueryFilters,
 ): Promise<PageResult<Website[]>> {
   return getWebsites(
     {

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 { filterParams } = await parseFilters(websiteId, filters);
+  const { queryParams } = await parseFilters(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
       `,
-      filterParams,
+      queryParams,
     );
   }
 
@@ -63,7 +63,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
     order by 1 asc, 2 asc
     limit 500
     `,
-    filterParams,
+    queryParams,
   );
 }
 
@@ -73,7 +73,7 @@ async function clickhouseQuery(
 ): Promise<{ eventName: string; propertyName: string; dataType: number; total: number }[]> {
   const { rawQuery, parseFilters } = clickhouse;
   const { event } = filters;
-  const { filterParams } = await parseFilters(websiteId, filters);
+  const { queryParams } = await parseFilters(filters);
 
   if (event) {
     return rawQuery(
@@ -92,7 +92,7 @@ async function clickhouseQuery(
       order by 1 asc, 2 asc, 3 asc, 5 desc
       limit 500
       `,
-      filterParams,
+      queryParams,
     );
   }
 
@@ -110,6 +110,6 @@ async function clickhouseQuery(
     order by 1 asc, 2 asc
     limit 500
     `,
-    filterParams,
+    queryParams,
   );
 }

src/queries/sql/events/getEventDataFields.ts

@@ -12,7 +12,7 @@ export async function getEventDataFields(...args: [websiteId: string, filters: Q
 
 async function relationalQuery(websiteId: string, filters: QueryFilters) {
   const { rawQuery, parseFilters, getDateSQL } = prisma;
-  const { filterQuery, filterParams } = await parseFilters(websiteId, filters);
+  const { filterQuery, queryParams } = await parseFilters(filters);
 
   return rawQuery(
     `
@@ -34,7 +34,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
     order by 2 desc
     limit 100
     `,
-    filterParams,
+    queryParams,
   );
 }
 
@@ -43,7 +43,7 @@ async function clickhouseQuery(
   filters: QueryFilters,
 ): Promise<{ propertyName: string; dataType: number; propertyValue: string; total: number }[]> {
   const { rawQuery, parseFilters } = clickhouse;
-  const { filterQuery, filterParams } = await parseFilters(websiteId, filters);
+  const { filterQuery, queryParams } = await parseFilters(filters);
 
   return rawQuery(
     `
@@ -62,6 +62,6 @@ async function clickhouseQuery(
     order by 2 desc
     limit 100
     `,
-    filterParams,
+    queryParams,
   );
 }

src/queries/sql/events/getEventDataProperties.ts

@@ -1,11 +1,11 @@
 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 getEventDataProperties(
   ...args: [websiteId: string, filters: QueryFilters & { propertyName?: string }]
-): Promise<WebsiteEventData[]> {
+) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
@@ -17,7 +17,7 @@ async function relationalQuery(
   filters: QueryFilters & { propertyName?: string },
 ) {
   const { rawQuery, parseFilters } = prisma;
-  const { filterQuery, filterParams } = await parseFilters(websiteId, filters, {
+  const { filterQuery, queryParams } = await parseFilters(filters, {
     columns: { propertyName: 'data_key' },
   });
 
@@ -36,7 +36,7 @@ async function relationalQuery(
     order by 3 desc
     limit 500
     `,
-    filterParams,
+    queryParams,
   );
 }
 
@@ -45,7 +45,7 @@ async function clickhouseQuery(
   filters: QueryFilters & { propertyName?: string },
 ): Promise<{ eventName: string; propertyName: string; total: number }[]> {
   const { rawQuery, parseFilters } = clickhouse;
-  const { filterQuery, filterParams } = await parseFilters(websiteId, filters, {
+  const { filterQuery, queryParams } = await parseFilters(filters, {
     columns: { propertyName: 'data_key' },
   });
 
@@ -63,6 +63,6 @@ async function clickhouseQuery(
     order by 1, 3 desc
     limit 500
     `,
-    filterParams,
+    queryParams,
   );
 }

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

src/queries/sql/events/getEventDataUsage.ts

@@ -1,7 +1,8 @@
 import clickhouse from '@/lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery, notImplemented } from '@/lib/db';
+import { QueryFilters } from '@/lib/types';
 
-export function getEventDataUsage(...args: [websiteIds: string[], startDate: Date, endDate: Date]) {
+export function getEventDataUsage(...args: [websiteIds: string[], filters: QueryFilters]) {
   return runQuery({
     [PRISMA]: notImplemented,
     [CLICKHOUSE]: () => clickhouseQuery(...args),
@@ -10,10 +11,10 @@ export function getEventDataUsage(...args: [websiteIds: string[], startDate: Dat
 
 function clickhouseQuery(
   websiteIds: string[],
-  startDate: Date,
-  endDate: Date,
+  filters: QueryFilters,
 ): Promise<{ websiteId: string; count: number }[]> {
   const { rawQuery } = clickhouse;
+  const { startDate, endDate } = filters;
 
   return rawQuery(
     `

src/queries/sql/events/getEventDataValues.ts

@@ -25,7 +25,7 @@ async function relationalQuery(
   filters: QueryFilters & { eventName?: string; propertyName?: string },
 ) {
   const { rawQuery, parseFilters, getDateSQL } = prisma;
-  const { filterQuery, filterParams } = await parseFilters(websiteId, filters);
+  const { filterQuery, queryParams } = await parseFilters({ ...filters, websiteId });
 
   return rawQuery(
     `
@@ -47,7 +47,7 @@ async function relationalQuery(
     order by 2 desc
     limit 100
     `,
-    filterParams,
+    queryParams,
   );
 }
 
@@ -56,7 +56,7 @@ async function clickhouseQuery(
   filters: QueryFilters & { eventName?: string; propertyName?: string },
 ): Promise<{ value: string; total: number }[]> {
   const { rawQuery, parseFilters } = clickhouse;
-  const { filterQuery, filterParams } = await parseFilters(websiteId, filters);
+  const { filterQuery, queryParams } = await parseFilters({ ...filters, websiteId });
 
   return rawQuery(
     `
@@ -75,6 +75,6 @@ async function clickhouseQuery(
     order by 2 desc
     limit 100
     `,
-    filterParams,
+    queryParams,
   );
 }

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, filterParams } = await parseFilters(websiteId, {
+  const { filterQuery, joinSessionQuery, queryParams } = await parseFilters({
     ...filters,
     eventType: EVENT_TYPE.customEvent,
   });
@@ -34,7 +34,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
       ${getDateSQL('website_event.created_at', unit, timezone)} t,
       count(*) y
     from website_event
-    ${joinSession}
+    ${joinSessionQuery}
     where website_event.website_id = {{websiteId::uuid}}
       and website_event.created_at between {{startDate}} and {{endDate}}
       and event_type = {{eventType}}
@@ -42,7 +42,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
     group by 1, 2
     order by 2
     `,
-    filterParams,
+    queryParams,
   );
 }
 
@@ -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, filterParams } = await parseFilters(websiteId, {
+  const { filterQuery, queryParams } = await parseFilters({
     ...filters,
     eventType: EVENT_TYPE.customEvent,
   });
@@ -92,5 +92,5 @@ async function clickhouseQuery(
     `;
   }
 
-  return rawQuery(sql, filterParams);
+  return rawQuery(sql, queryParams);
 }

src/queries/sql/events/getEventUsage.ts

@@ -1,7 +1,8 @@
 import clickhouse from '@/lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery, notImplemented } from '@/lib/db';
+import { QueryFilters } from '@/lib/types';
 
-export function getEventUsage(...args: [websiteIds: string[], startDate: Date, endDate: Date]) {
+export function getEventUsage(...args: [websiteIds: string[], filters: QueryFilters]) {
   return runQuery({
     [PRISMA]: notImplemented,
     [CLICKHOUSE]: () => clickhouseQuery(...args),
@@ -10,10 +11,10 @@ export function getEventUsage(...args: [websiteIds: string[], startDate: Date, e
 
 function clickhouseQuery(
   websiteIds: string[],
-  startDate: Date,
-  endDate: Date,
+  filters: QueryFilters,
 ): Promise<{ websiteId: string; count: number }[]> {
   const { rawQuery } = clickhouse;
+  const { startDate, endDate } = filters;
 
   return rawQuery(
     `

src/queries/sql/events/getWebsiteEvents.ts

@@ -1,26 +1,27 @@
 import clickhouse from '@/lib/clickhouse';
-import { CLICKHOUSE, getDatabaseType, POSTGRESQL, PRISMA, runQuery } from '@/lib/db';
+import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
 import prisma from '@/lib/prisma';
-import { PageParams, QueryFilters } from '@/lib/types';
+import { QueryFilters } from '@/lib/types';
 
-export function getWebsiteEvents(
-  ...args: [websiteId: string, filters: QueryFilters, pageParams?: PageParams]
-) {
+export function getWebsiteEvents(...args: [websiteId: string, filters: QueryFilters]) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
   });
 }
 
-async function relationalQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
+async function relationalQuery(websiteId: string, filters: QueryFilters) {
   const { pagedRawQuery, parseFilters } = prisma;
-  const { search } = pageParams;
-  const { filterQuery, filterParams } = await parseFilters(websiteId, {
+  const { search } = filters;
+  const { filterQuery, queryParams } = await parseFilters({
     ...filters,
+    websiteId,
   });
 
-  const db = getDatabaseType();
-  const like = db === POSTGRESQL ? 'ilike' : 'like';
+  const searchQuery = filters.search
+    ? `and ((event_name ilike {{search}} and event_type = 2)
+           or (url_path ilike {{search}} and event_type = 1))`
+    : '';
 
   return pagedRawQuery(
     `
@@ -41,25 +42,27 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, pagePar
     where website_id = {{websiteId::uuid}}
         and created_at between {{startDate}} and {{endDate}}
     ${filterQuery}
-    ${
-      search
-        ? `and ((event_name ${like} {{search}} and event_type = 2)
-           or (url_path ${like} {{search}} and event_type = 1))`
-        : ''
-    }
+    ${searchQuery}
     order by created_at desc
     `,
-    { ...filterParams, search: `%${search}%` },
-    pageParams,
+    { ...queryParams, search: `%${search}%` },
+    filters,
   );
 }
 
-async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
-  const { pagedQuery, parseFilters } = clickhouse;
-  const { filterParams, dateQuery, filterQuery } = await parseFilters(websiteId, filters);
-  const { search } = pageParams;
+async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
+  const { pagedRawQuery, parseFilters } = clickhouse;
+  const { queryParams, dateQuery, filterQuery } = await parseFilters({
+    ...filters,
+    websiteId,
+  });
 
-  return pagedQuery(
+  const searchQuery = filters.search
+    ? `and ((positionCaseInsensitive(event_name, {search:String}) > 0 and event_type = 2)
+           or (positionCaseInsensitive(url_path, {search:String}) > 0 and event_type = 1))`
+    : '';
+
+  return pagedRawQuery(
     `
     select
       event_id as id,
@@ -78,15 +81,10 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
     where website_id = {websiteId:UUID}
     ${dateQuery}
     ${filterQuery}
-    ${
-      search
-        ? `and ((positionCaseInsensitive(event_name, {search:String}) > 0 and event_type = 2)
-           or (positionCaseInsensitive(url_path, {search:String}) > 0 and event_type = 1))`
-        : ''
-    }
+    ${searchQuery}
     order by created_at desc
     `,
-    { ...filterParams, search },
-    pageParams,
+    queryParams,
+    filters,
   );
 }

src/queries/sql/getChannelMetrics.ts

@@ -12,7 +12,7 @@ export async function getChannelMetrics(...args: [websiteId: string, filters?: Q
 
 async function relationalQuery(websiteId: string, filters: QueryFilters) {
   const { rawQuery, parseFilters } = prisma;
-  const { filterParams, filterQuery, dateQuery } = await parseFilters(websiteId, filters);
+  const { queryParams, filterQuery, dateQuery } = await parseFilters(filters);
 
   return rawQuery(
     `
@@ -27,7 +27,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
     group by 1, 2
     order by visitors desc
     `,
-    filterParams,
+    queryParams,
   );
 }
 
@@ -36,7 +36,7 @@ async function clickhouseQuery(
   filters: QueryFilters,
 ): Promise<{ x: string; y: number }[]> {
   const { rawQuery, parseFilters } = clickhouse;
-  const { filterParams, filterQuery, dateQuery } = await parseFilters(websiteId, filters);
+  const { queryParams, filterQuery, dateQuery } = await parseFilters(filters);
 
   const sql = `
     select
@@ -51,5 +51,5 @@ async function clickhouseQuery(
     order by visitors desc
   `;
 
-  return rawQuery(sql, filterParams);
+  return rawQuery(sql, queryParams);
 }

src/queries/sql/getRealtimeActivity.ts

@@ -12,7 +12,7 @@ export async function getRealtimeActivity(...args: [websiteId: string, filters:
 
 async function relationalQuery(websiteId: string, filters: QueryFilters) {
   const { rawQuery, parseFilters } = prisma;
-  const { filterParams, filterQuery, dateQuery } = await parseFilters(websiteId, filters);
+  const { queryParams, filterQuery, dateQuery } = await parseFilters(filters);
 
   return rawQuery(
     `
@@ -35,13 +35,13 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
     order by website_event.created_at desc
     limit 100
     `,
-    filterParams,
+    queryParams,
   );
 }
 
 async function clickhouseQuery(websiteId: string, filters: QueryFilters): Promise<{ x: number }> {
   const { rawQuery, parseFilters } = clickhouse;
-  const { filterParams, filterQuery, dateQuery } = await parseFilters(websiteId, filters);
+  const { queryParams, filterQuery, dateQuery } = await parseFilters(filters);
 
   return rawQuery(
     `
@@ -62,6 +62,6 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters): Promis
         order by createdAt desc
         limit 100
     `,
-    { ...filters, ...filterParams },
+    { ...filters, ...queryParams },
   );
 }

src/queries/sql/getRealtimeData.ts

@@ -1,4 +1,5 @@
 import { getPageviewStats, getRealtimeActivity, getSessionStats } from '@/queries';
+import { QueryFilters } from '@/lib/types';
 
 function increment(data: object, key: string) {
   if (key) {
@@ -10,12 +11,7 @@ function increment(data: object, key: string) {
   }
 }
 
-export async function getRealtimeData(
-  websiteId: string,
-  criteria: { startDate: Date; timezone: string },
-) {
-  const { startDate, timezone } = criteria;
-  const filters = { startDate, endDate: new Date(), unit: 'minute', timezone };
+export async function getRealtimeData(websiteId: string, filters: QueryFilters) {
   const [activity, pageviews, sessions] = await Promise.all([
     getRealtimeActivity(websiteId, filters),
     getPageviewStats(websiteId, filters),

src/queries/sql/getValues.ts

@@ -1,9 +1,10 @@
 import prisma from '@/lib/prisma';
 import clickhouse from '@/lib/clickhouse';
 import { runQuery, CLICKHOUSE, PRISMA } from '@/lib/db';
+import { QueryFilters } from '@/lib/types';
 
 export async function getValues(
-  ...args: [websiteId: string, column: string, startDate: Date, endDate: Date, search: string]
+  ...args: [websiteId: string, column: string, filters: QueryFilters]
 ) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
@@ -11,15 +12,11 @@ export async function getValues(
   });
 }
 
-async function relationalQuery(
-  websiteId: string,
-  column: string,
-  startDate: Date,
-  endDate: Date,
-  search: string,
-) {
+async function relationalQuery(websiteId: string, column: string, filters: QueryFilters) {
   const { rawQuery, getSearchSQL } = prisma;
   const params = {};
+  const { startDate, endDate, search } = filters;
+
   let searchQuery = '';
 
   if (search) {
@@ -63,15 +60,11 @@ async function relationalQuery(
   );
 }
 
-async function clickhouseQuery(
-  websiteId: string,
-  column: string,
-  startDate: Date,
-  endDate: Date,
-  search: string,
-) {
+async function clickhouseQuery(websiteId: string, column: string, filters: QueryFilters) {
   const { rawQuery, getSearchSQL } = clickhouse;
   const params = {};
+  const { startDate, endDate, search } = filters;
+
   let searchQuery = '';
 
   if (search) {

src/queries/sql/getWebsiteDateRange.ts

@@ -12,8 +12,9 @@ export async function getWebsiteDateRange(...args: [websiteId: string]) {
 
 async function relationalQuery(websiteId: string) {
   const { rawQuery, parseFilters } = prisma;
-  const { filterParams } = await parseFilters(websiteId, {
+  const { queryParams } = await parseFilters({
     startDate: new Date(DEFAULT_RESET_DATE),
+    websiteId,
   });
 
   const result = await rawQuery(
@@ -25,7 +26,7 @@ async function relationalQuery(websiteId: string) {
     where website_id = {{websiteId::uuid}}
       and created_at >= {{startDate}}
     `,
-    filterParams,
+    queryParams,
   );
 
   return result[0] ?? null;
@@ -33,8 +34,9 @@ async function relationalQuery(websiteId: string) {
 
 async function clickhouseQuery(websiteId: string) {
   const { rawQuery, parseFilters } = clickhouse;
-  const { filterParams } = await parseFilters(websiteId, {
+  const { queryParams } = await parseFilters({
     startDate: new Date(DEFAULT_RESET_DATE),
+    websiteId,
   });
 
   const result = await rawQuery(
@@ -46,7 +48,7 @@ async function clickhouseQuery(websiteId: string) {
     where website_id = {websiteId:UUID}
       and created_at >= {startDate:DateTime64}
     `,
-    filterParams,
+    queryParams,
   );
 
   return result[0] ?? null;

src/queries/sql/getWebsiteStats.ts

@@ -5,11 +5,17 @@ import prisma from '@/lib/prisma';
 import { QueryFilters } from '@/lib/types';
 import { EVENT_COLUMNS } from '@/lib/constants';
 
+export interface WebsiteStatsData {
+  pageviews: number;
+  visitors: number;
+  visits: number;
+  bounces: number;
+  totaltime: number;
+}
+
 export async function getWebsiteStats(
   ...args: [websiteId: string, filters: QueryFilters]
-): Promise<
-  { pageviews: number; visitors: number; visits: number; bounces: number; totaltime: number }[]
-> {
+): Promise<WebsiteStatsData[]> {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
@@ -19,12 +25,11 @@ export async function getWebsiteStats(
 async function relationalQuery(
   websiteId: string,
   filters: QueryFilters,
-): Promise<
-  { pageviews: number; visitors: number; visits: number; bounces: number; totaltime: number }[]
-> {
+): Promise<WebsiteStatsData[]> {
   const { getTimestampDiffSQL, parseFilters, rawQuery } = prisma;
-  const { filterQuery, joinSession, filterParams } = await parseFilters(websiteId, {
+  const { filterQuery, joinSessionQuery, queryParams } = await parseFilters({
     ...filters,
+    websiteId,
     eventType: EVENT_TYPE.pageView,
   });
 
@@ -44,7 +49,7 @@ async function relationalQuery(
         min(website_event.created_at) as "min_time",
         max(website_event.created_at) as "max_time"
       from website_event
-        ${joinSession}
+        ${joinSessionQuery}
       where website_event.website_id = {{websiteId::uuid}}
         and website_event.created_at between {{startDate}} and {{endDate}}
         and event_type = {{eventType}}
@@ -52,19 +57,18 @@ async function relationalQuery(
       group by 1, 2
     ) as t
     `,
-    filterParams,
+    queryParams,
   );
 }
 
 async function clickhouseQuery(
   websiteId: string,
   filters: QueryFilters,
-): Promise<
-  { pageviews: number; visitors: number; visits: number; bounces: number; totaltime: number }[]
-> {
+): Promise<WebsiteStatsData[]> {
   const { rawQuery, parseFilters } = clickhouse;
-  const { filterQuery, filterParams } = await parseFilters(websiteId, {
+  const { filterQuery, queryParams } = await parseFilters({
     ...filters,
+    websiteId,
     eventType: EVENT_TYPE.pageView,
   });
 
@@ -117,5 +121,5 @@ async function clickhouseQuery(
     `;
   }
 
-  return rawQuery(sql, filterParams).then(result => result?.[0]);
+  return rawQuery(sql, queryParams).then(result => result?.[0]);
 }

src/queries/sql/pageviews/getPageviewMetrics.ts

@@ -28,8 +28,7 @@ async function relationalQuery(
 ) {
   const column = FILTER_COLUMNS[type] || type;
   const { rawQuery, parseFilters } = prisma;
-  const { filterQuery, joinSession, filterParams } = await parseFilters(
-    websiteId,
+  const { filterQuery, joinSessionQuery, queryParams } = await parseFilters(
     {
       ...filters,
       eventType: column === 'event_name' ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
@@ -70,7 +69,7 @@ async function relationalQuery(
     select ${column} x,
       ${column === 'referrer_domain' ? 'count(distinct website_event.session_id)' : 'count(*)'} as y
     from website_event
-    ${joinSession}
+    ${joinSessionQuery}
     ${entryExitQuery}
     where website_event.website_id = {{websiteId::uuid}}
       and website_event.created_at between {{startDate}} and {{endDate}}
@@ -82,7 +81,7 @@ async function relationalQuery(
     limit ${limit}
     offset ${offset}
     `,
-    filterParams,
+    queryParams,
   );
 }
 
@@ -95,7 +94,7 @@ async function clickhouseQuery(
 ): Promise<{ x: string; y: number }[]> {
   const column = FILTER_COLUMNS[type] || type;
   const { rawQuery, parseFilters } = clickhouse;
-  const { filterQuery, filterParams } = await parseFilters(websiteId, {
+  const { filterQuery, queryParams } = await parseFilters({
     ...filters,
     eventType: column === 'event_name' ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
   });
@@ -180,5 +179,5 @@ async function clickhouseQuery(
     `;
   }
 
-  return rawQuery(sql, filterParams);
+  return rawQuery(sql, queryParams);
 }

src/queries/sql/pageviews/getPageviewStats.ts

@@ -14,8 +14,9 @@ export async function getPageviewStats(...args: [websiteId: string, filters: Que
 async function relationalQuery(websiteId: string, filters: QueryFilters) {
   const { timezone = 'utc', unit = 'day' } = filters;
   const { getDateSQL, parseFilters, rawQuery } = prisma;
-  const { filterQuery, joinSession, filterParams } = await parseFilters(websiteId, {
+  const { filterQuery, joinSessionQuery, queryParams } = await parseFilters({
     ...filters,
+    websiteId,
     eventType: EVENT_TYPE.pageView,
   });
 
@@ -25,7 +26,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
       ${getDateSQL('website_event.created_at', unit, timezone)} x,
       count(*) y
     from website_event
-      ${joinSession}
+      ${joinSessionQuery}
     where website_event.website_id = {{websiteId::uuid}}
       and website_event.created_at between {{startDate}} and {{endDate}}
       and event_type = {{eventType}}
@@ -33,7 +34,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
     group by 1
     order by 1
     `,
-    filterParams,
+    queryParams,
   );
 }
 
@@ -43,8 +44,9 @@ async function clickhouseQuery(
 ): Promise<{ x: string; y: number }[]> {
   const { timezone = 'utc', unit = 'day' } = filters;
   const { parseFilters, rawQuery, getDateSQL } = clickhouse;
-  const { filterQuery, filterParams } = await parseFilters(websiteId, {
+  const { filterQuery, queryParams } = await parseFilters({
     ...filters,
+    websiteId,
     eventType: EVENT_TYPE.pageView,
   });
 
@@ -88,5 +90,5 @@ async function clickhouseQuery(
     `;
   }
 
-  return rawQuery(sql, filterParams);
+  return rawQuery(sql, queryParams);
 }

src/queries/sql/reports/getAttribution.ts

@@ -244,7 +244,7 @@ async function clickhouseQuery(
   const { rawQuery, parseFilters } = clickhouse;
   const eventType = type === 'page' ? EVENT_TYPE.pageView : EVENT_TYPE.customEvent;
   const column = type === 'page' ? 'url_path' : 'event_name';
-  const { filterQuery, filterParams } = await parseFilters(websiteId, criteria);
+  const { filterQuery, queryParams } = await parseFilters(criteria);
 
   function getUTMQuery(utmColumn: string) {
     return `
@@ -345,7 +345,7 @@ async function clickhouseQuery(
     order by 2 desc
     limit 20
     `,
-    { ...filterParams, websiteId, startDate, endDate, conversionStep: step, eventType, currency },
+    { ...queryParams, websiteId, startDate, endDate, conversionStep: step, eventType, currency },
   );
 
   const paidAdsres = await rawQuery<
@@ -376,7 +376,7 @@ async function clickhouseQuery(
     order by 2 desc
     limit 20
     `,
-    { ...filterParams, websiteId, startDate, endDate, conversionStep: step, eventType, currency },
+    { ...queryParams, websiteId, startDate, endDate, conversionStep: step, eventType, currency },
   );
 
   const sourceRes = await rawQuery<
@@ -390,7 +390,7 @@ async function clickhouseQuery(
     ${getModelQuery(model)}
     ${getUTMQuery('utm_source')}
     `,
-    { ...filterParams, websiteId, startDate, endDate, conversionStep: step, eventType, currency },
+    { ...queryParams, websiteId, startDate, endDate, conversionStep: step, eventType, currency },
   );
 
   const mediumRes = await rawQuery<
@@ -404,7 +404,7 @@ async function clickhouseQuery(
     ${getModelQuery(model)}
     ${getUTMQuery('utm_medium')}
     `,
-    { ...filterParams, websiteId, startDate, endDate, conversionStep: step, eventType, currency },
+    { ...queryParams, websiteId, startDate, endDate, conversionStep: step, eventType, currency },
   );
 
   const campaignRes = await rawQuery<
@@ -418,7 +418,7 @@ async function clickhouseQuery(
     ${getModelQuery(model)}
     ${getUTMQuery('utm_campaign')}
     `,
-    { ...filterParams, websiteId, startDate, endDate, conversionStep: step, eventType, currency },
+    { ...queryParams, websiteId, startDate, endDate, conversionStep: step, eventType, currency },
   );
 
   const contentRes = await rawQuery<
@@ -432,7 +432,7 @@ async function clickhouseQuery(
     ${getModelQuery(model)}
     ${getUTMQuery('utm_content')}
     `,
-    { ...filterParams, websiteId, startDate, endDate, conversionStep: step, eventType, currency },
+    { ...queryParams, websiteId, startDate, endDate, conversionStep: step, eventType, currency },
   );
 
   const termRes = await rawQuery<
@@ -446,7 +446,7 @@ async function clickhouseQuery(
     ${getModelQuery(model)}
     ${getUTMQuery('utm_term')}
     `,
-    { ...filterParams, websiteId, startDate, endDate, conversionStep: step, eventType, currency },
+    { ...queryParams, websiteId, startDate, endDate, conversionStep: step, eventType, currency },
   );
 
   const totalRes = await rawQuery<{ pageviews: number; visitors: number; visits: number }>(
@@ -462,7 +462,7 @@ async function clickhouseQuery(
         and event_type = {eventType:UInt32}
         ${filterQuery}
     `,
-    { ...filterParams, websiteId, startDate, endDate, conversionStep: step, eventType, currency },
+    { ...queryParams, websiteId, startDate, endDate, conversionStep: step, eventType, currency },
   ).then(result => result?.[0]);
 
   return {

src/queries/sql/reports/getBreakdown.ts

@@ -24,8 +24,7 @@ async function relationalQuery(
   }[]
 > {
   const { getTimestampDiffSQL, parseFilters, rawQuery } = prisma;
-  const { filterQuery, joinSession, filterParams } = await parseFilters(
-    websiteId,
+  const { filterQuery, joinSessionQuery, queryParams } = await parseFilters(
     {
       ...filters,
       eventType: EVENT_TYPE.pageView,
@@ -53,7 +52,7 @@ async function relationalQuery(
         min(website_event.created_at) as "min_time",
         max(website_event.created_at) as "max_time"
       from website_event
-        ${joinSession}
+        ${joinSessionQuery}
       where website_event.website_id = {{websiteId::uuid}}
         and website_event.created_at between {{startDate}} and {{endDate}}
         and event_type = {{eventType}}
@@ -65,7 +64,7 @@ async function relationalQuery(
     order by 1 desc, 2 desc
     limit 500
     `,
-    filterParams,
+    queryParams,
   );
 }
 
@@ -80,7 +79,7 @@ async function clickhouseQuery(
   }[]
 > {
   const { parseFilters, rawQuery } = clickhouse;
-  const { filterQuery, filterParams } = await parseFilters(websiteId, {
+  const { filterQuery, queryParams } = await parseFilters({
     ...filters,
     eventType: EVENT_TYPE.pageView,
   });
@@ -114,7 +113,7 @@ async function clickhouseQuery(
     order by 1 desc, 2 desc
     limit 500
     `,
-    filterParams,
+    queryParams,
   );
 }
 

src/queries/sql/reports/getFunnel.ts

@@ -126,7 +126,7 @@ async function clickhouseQuery(
     steps,
     windowMinutes,
   );
-  const { filterQuery, filterParams: filterParams } = await parseFilters(websiteId, criteria);
+  const { filterQuery, queryParams } = await parseFilters(criteria);
 
   function getFunnelQuery(
     steps: { type: string; value: string }[],
@@ -136,7 +136,7 @@ async function clickhouseQuery(
     levelQuery: string;
     sumQuery: string;
     stepFilterQuery: string;
-    params: { [key: string]: string };
+    params: Record<string, string>;
   } {
     return steps.reduce(
       (pv, cv, i) => {
@@ -215,7 +215,7 @@ async function clickhouseQuery(
       startDate,
       endDate,
       ...params,
-      ...filterParams,
+      ...queryParams,
     },
   ).then(formatResults(steps));
 }

src/queries/sql/reports/getGoal.ts

@@ -1,6 +1,7 @@
 import clickhouse from '@/lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
 import prisma from '@/lib/prisma';
+import { QueryFilters } from '@/lib/types';
 
 export interface GoalCriteria {
   startDate: Date;
@@ -9,6 +10,7 @@ export interface GoalCriteria {
   value: string;
   operator?: string;
   property?: string;
+  filters: QueryFilters;
 }
 
 export async function getGoal(...args: [websiteId: string, criteria: GoalCriteria]) {
@@ -19,9 +21,13 @@ export async function getGoal(...args: [websiteId: string, criteria: GoalCriteri
 }
 
 async function relationalQuery(websiteId: string, criteria: GoalCriteria) {
-  const { type, value } = criteria;
+  const { type, value, filters } = criteria;
   const { rawQuery, parseFilters } = prisma;
-  const { filterQuery, dateQuery, filterParams } = await parseFilters(websiteId, criteria);
+  const { filterQuery, dateQuery, queryParams } = await parseFilters({
+    ...filters,
+    websiteId,
+    value,
+  });
   const isPage = type === 'page';
   const column = isPage ? 'url_path' : 'event_name';
   const eventType = isPage ? 1 : 2;
@@ -43,14 +49,18 @@ async function relationalQuery(websiteId: string, criteria: GoalCriteria) {
     ${dateQuery}
     ${filterQuery}
     `,
-    { ...filterParams, value },
+    queryParams,
   );
 }
 
 async function clickhouseQuery(websiteId: string, criteria: GoalCriteria) {
-  const { type, value } = criteria;
+  const { type, value, filters } = criteria;
   const { rawQuery, parseFilters } = clickhouse;
-  const { filterQuery, dateQuery, filterParams } = await parseFilters(websiteId, criteria);
+  const { filterQuery, dateQuery, queryParams } = await parseFilters({
+    ...filters,
+    websiteId,
+    value,
+  });
   const isPage = type === 'page';
   const column = isPage ? 'url_path' : 'event_name';
   const eventType = isPage ? 1 : 2;
@@ -71,6 +81,6 @@ async function clickhouseQuery(websiteId: string, criteria: GoalCriteria) {
     ${dateQuery}
     ${filterQuery}
     `,
-    { ...filterParams, value },
+    queryParams,
   ).then(results => results?.[0]);
 }

src/queries/sql/reports/getJourney.ts

@@ -57,7 +57,7 @@ async function relationalQuery(
     sequenceQuery: string;
     startStepQuery: string;
     endStepQuery: string;
-    params: { [key: string]: string };
+    params: Record<string, string>;
   } {
     const params = {};
     let sequenceQuery = '';
@@ -108,7 +108,7 @@ async function relationalQuery(
       sequenceQuery,
       startStepQuery,
       endStepQuery,
-      filterParams: params,
+      params,
     };
   }
 
@@ -167,7 +167,7 @@ async function clickhouseQuery(
     sequenceQuery: string;
     startStepQuery: string;
     endStepQuery: string;
-    params: { [key: string]: string };
+    params: Record<string, string>;
   } {
     const params = {};
     let sequenceQuery = '';
@@ -218,11 +218,11 @@ async function clickhouseQuery(
       sequenceQuery,
       startStepQuery,
       endStepQuery,
-      filterParams: params,
+      params,
     };
   }
 
-  const { filterQuery, filterParams: filterParams } = await parseFilters(websiteId, filters);
+  const { filterQuery, queryParams } = await parseFilters(filters);
 
   return rawQuery(
     `
@@ -249,7 +249,7 @@ async function clickhouseQuery(
       startDate,
       endDate,
       ...params,
-      ...filterParams,
+      ...queryParams,
     },
   ).then(parseResult);
 }

src/queries/sql/reports/getRetention.ts

@@ -31,7 +31,7 @@ async function relationalQuery(
   const { getDateSQL, getDayDiffQuery, getCastColumnQuery, rawQuery, parseFilters } = prisma;
   const unit = 'day';
 
-  const { filterQuery, filterParams } = await parseFilters(websiteId, criteria);
+  const { filterQuery, queryParams } = await parseFilters(criteria);
 
   return rawQuery(
     `
@@ -85,7 +85,7 @@ async function relationalQuery(
       websiteId,
       startDate,
       endDate,
-      ...filterParams,
+      ...queryParams,
     },
   );
 }
@@ -98,7 +98,7 @@ async function clickhouseQuery(
   const { getDateSQL, rawQuery, parseFilters } = clickhouse;
   const unit = 'day';
 
-  const { filterQuery, filterParams } = await parseFilters(websiteId, criteria);
+  const { filterQuery, queryParams } = await parseFilters(criteria);
 
   return rawQuery(
     `
@@ -154,7 +154,7 @@ async function clickhouseQuery(
       websiteId,
       startDate,
       endDate,
-      ...filterParams,
+      ...queryParams,
     },
   );
 }

src/queries/sql/reports/getUTM.ts

@@ -17,7 +17,7 @@ export async function getUTM(...args: [websiteId: string, criteria: UTMCriteria]
 async function relationalQuery(websiteId: string, criteria: UTMCriteria) {
   const { startDate, endDate } = criteria;
   const { rawQuery, parseFilters } = prisma;
-  const { filterQuery, filterParams } = await parseFilters(websiteId, criteria);
+  const { filterQuery, queryParams } = await parseFilters(criteria);
 
   return rawQuery(
     `
@@ -31,7 +31,7 @@ async function relationalQuery(websiteId: string, criteria: UTMCriteria) {
     group by 1
     `,
     {
-      ...filterParams,
+      ...queryParams,
       websiteId,
       startDate,
       endDate,
@@ -42,7 +42,7 @@ async function relationalQuery(websiteId: string, criteria: UTMCriteria) {
 async function clickhouseQuery(websiteId: string, criteria: UTMCriteria) {
   const { startDate, endDate } = criteria;
   const { rawQuery, parseFilters } = clickhouse;
-  const { filterQuery, filterParams } = await parseFilters(websiteId, criteria);
+  const { filterQuery, queryParams } = await parseFilters(criteria);
 
   return rawQuery(
     `
@@ -56,7 +56,7 @@ async function clickhouseQuery(websiteId: string, criteria: UTMCriteria) {
     group by 1
     `,
     {
-      ...filterParams,
+      ...queryParams,
       websiteId,
       startDate,
       endDate,

src/queries/sql/sessions/getSessionActivity.ts

@@ -1,9 +1,10 @@
 import clickhouse from '@/lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
 import prisma from '@/lib/prisma';
+import { QueryFilters } from '@/lib/types';
 
 export async function getSessionActivity(
-  ...args: [websiteId: string, sessionId: string, startDate: Date, endDate: Date]
+  ...args: [websiteId: string, sessionId: string, filters: QueryFilters]
 ) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
@@ -11,12 +12,9 @@ export async function getSessionActivity(
   });
 }
 
-async function relationalQuery(
-  websiteId: string,
-  sessionId: string,
-  startDate: Date,
-  endDate: Date,
-) {
+async function relationalQuery(websiteId: string, sessionId: string, filters: QueryFilters) {
+  const { startDate, endDate } = filters;
+
   return prisma.client.websiteEvent.findMany({
     where: {
       sessionId,
@@ -28,13 +26,9 @@ async function relationalQuery(
   });
 }
 
-async function clickhouseQuery(
-  websiteId: string,
-  sessionId: string,
-  startDate: Date,
-  endDate: Date,
-) {
+async function clickhouseQuery(websiteId: string, sessionId: string, filters: QueryFilters) {
   const { rawQuery } = clickhouse;
+  const { startDate, endDate } = filters;
 
   return rawQuery(
     `

src/queries/sql/sessions/getSessionDataProperties.ts

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

src/queries/sql/sessions/getSessionDataValues.ts

@@ -1,11 +1,11 @@
 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 getSessionDataValues(
   ...args: [websiteId: string, filters: QueryFilters & { propertyName?: string }]
-): Promise<WebsiteEventData[]> {
+) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
@@ -17,7 +17,7 @@ async function relationalQuery(
   filters: QueryFilters & { propertyName?: string },
 ) {
   const { rawQuery, parseFilters, getDateSQL } = prisma;
-  const { filterQuery, filterParams } = await parseFilters(websiteId, filters);
+  const { filterQuery, queryParams } = await parseFilters(filters);
 
   return rawQuery(
     `
@@ -39,7 +39,7 @@ async function relationalQuery(
     order by 2 desc
     limit 100
     `,
-    filterParams,
+    queryParams,
   );
 }
 
@@ -48,7 +48,7 @@ async function clickhouseQuery(
   filters: QueryFilters & { propertyName?: string },
 ): Promise<{ propertyName: string; dataType: number; propertyValue: string; total: number }[]> {
   const { rawQuery, parseFilters } = clickhouse;
-  const { filterQuery, filterParams } = await parseFilters(websiteId, filters);
+  const { filterQuery, queryParams } = await parseFilters(filters);
 
   return rawQuery(
     `
@@ -68,6 +68,6 @@ async function clickhouseQuery(
     order by 2 desc
     limit 100
     `,
-    filterParams,
+    queryParams,
   );
 }

src/queries/sql/sessions/getSessionMetrics.ts

@@ -28,8 +28,7 @@ async function relationalQuery(
 ) {
   const column = FILTER_COLUMNS[type] || type;
   const { parseFilters, rawQuery } = prisma;
-  const { filterQuery, joinSession, filterParams } = await parseFilters(
-    websiteId,
+  const { filterQuery, joinSessionQuery, queryParams } = await parseFilters(
     {
       ...filters,
       eventType: EVENT_TYPE.pageView,
@@ -47,7 +46,7 @@ async function relationalQuery(
       count(distinct website_event.session_id) y
       ${includeCountry ? ', country' : ''}
     from website_event
-    ${joinSession}
+    ${joinSessionQuery}
     where website_event.website_id = {{websiteId::uuid}}
       and website_event.created_at between {{startDate}} and {{endDate}}
       and website_event.event_type = {{eventType}}
@@ -58,7 +57,7 @@ async function relationalQuery(
     limit ${limit}
     offset ${offset}
     `,
-    filterParams,
+    queryParams,
   );
 }
 
@@ -71,7 +70,7 @@ async function clickhouseQuery(
 ): Promise<{ x: string; y: number }[]> {
   const column = FILTER_COLUMNS[type] || type;
   const { parseFilters, rawQuery } = clickhouse;
-  const { filterQuery, filterParams } = await parseFilters(websiteId, {
+  const { filterQuery, queryParams } = await parseFilters({
     ...filters,
     eventType: EVENT_TYPE.pageView,
   });
@@ -115,5 +114,5 @@ async function clickhouseQuery(
     `;
   }
 
-  return rawQuery(sql, filterParams);
+  return rawQuery(sql, queryParams);
 }

src/queries/sql/sessions/getSessionStats.ts

@@ -14,7 +14,7 @@ export async function getSessionStats(...args: [websiteId: string, filters: Quer
 async function relationalQuery(websiteId: string, filters: QueryFilters) {
   const { timezone = 'utc', unit = 'day' } = filters;
   const { getDateSQL, parseFilters, rawQuery } = prisma;
-  const { filterQuery, joinSession, filterParams } = await parseFilters(websiteId, {
+  const { filterQuery, joinSessionQuery, queryParams } = await parseFilters({
     ...filters,
     eventType: EVENT_TYPE.pageView,
   });
@@ -25,7 +25,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
       ${getDateSQL('website_event.created_at', unit, timezone)} x,
       count(distinct website_event.session_id) y
     from website_event
-      ${joinSession}
+      ${joinSessionQuery}
     where website_event.website_id = {{websiteId::uuid}}
       and website_event.created_at between {{startDate}} and {{endDate}}
       and event_type = {{eventType}}
@@ -33,7 +33,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
     group by 1
     order by 1
     `,
-    filterParams,
+    queryParams,
   );
 }
 
@@ -43,7 +43,7 @@ async function clickhouseQuery(
 ): Promise<{ x: string; y: number }[]> {
   const { timezone = 'utc', unit = 'day' } = filters;
   const { parseFilters, rawQuery, getDateSQL } = clickhouse;
-  const { filterQuery, filterParams } = await parseFilters(websiteId, {
+  const { filterQuery, queryParams } = await parseFilters({
     ...filters,
     eventType: EVENT_TYPE.pageView,
   });
@@ -88,5 +88,5 @@ async function clickhouseQuery(
     `;
   }
 
-  return rawQuery(sql, filterParams);
+  return rawQuery(sql, queryParams);
 }

src/queries/sql/sessions/getWebsiteSessionStats.ts

@@ -3,11 +3,17 @@ import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
 import prisma from '@/lib/prisma';
 import { QueryFilters } from '@/lib/types';
 
+export interface WebsiteSessionStatsData {
+  pageviews: number;
+  visitors: number;
+  visits: number;
+  countries: number;
+  events: number;
+}
+
 export async function getWebsiteSessionStats(
   ...args: [websiteId: string, filters: QueryFilters]
-): Promise<
-  { pageviews: number; visitors: number; visits: number; countries: number; events: number }[]
-> {
+): Promise<WebsiteSessionStatsData[]> {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
@@ -17,13 +23,9 @@ export async function getWebsiteSessionStats(
 async function relationalQuery(
   websiteId: string,
   filters: QueryFilters,
-): Promise<
-  { pageviews: number; visitors: number; visits: number; countries: number; events: number }[]
-> {
+): Promise<WebsiteSessionStatsData[]> {
   const { parseFilters, rawQuery } = prisma;
-  const { filterQuery, filterParams } = await parseFilters(websiteId, {
-    ...filters,
-  });
+  const { filterQuery, queryParams } = await parseFilters(filters);
 
   return rawQuery(
     `
@@ -39,20 +41,16 @@ async function relationalQuery(
       and website_event.created_at between {{startDate}} and {{endDate}}
       ${filterQuery}
     `,
-    filterParams,
+    queryParams,
   );
 }
 
 async function clickhouseQuery(
   websiteId: string,
   filters: QueryFilters,
-): Promise<
-  { pageviews: number; visitors: number; visits: number; countries: number; events: number }[]
-> {
+): Promise<WebsiteSessionStatsData[]> {
   const { rawQuery, parseFilters } = clickhouse;
-  const { filterQuery, filterParams } = await parseFilters(websiteId, {
-    ...filters,
-  });
+  const { filterQuery, queryParams } = await parseFilters(filters);
 
   return rawQuery(
     `
@@ -67,6 +65,6 @@ async function clickhouseQuery(
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}
         ${filterQuery}
     `,
-    filterParams,
+    queryParams,
   );
 }

src/queries/sql/sessions/getWebsiteSessions.ts

@@ -1,26 +1,18 @@
 import clickhouse from '@/lib/clickhouse';
-import { CLICKHOUSE, getDatabaseType, POSTGRESQL, PRISMA, runQuery } from '@/lib/db';
+import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
 import prisma from '@/lib/prisma';
-import { PageParams, QueryFilters } from '@/lib/types';
+import { QueryFilters } from '@/lib/types';
 
-export async function getWebsiteSessions(
-  ...args: [websiteId: string, filters?: QueryFilters, pageParams?: PageParams]
-) {
+export async function getWebsiteSessions(...args: [websiteId: string, filters: QueryFilters]) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
   });
 }
 
-async function relationalQuery(websiteId: string, filters: QueryFilters, pageParams: PageParams) {
+async function relationalQuery(websiteId: string, filters: QueryFilters) {
   const { pagedRawQuery, parseFilters } = prisma;
-  const { search } = pageParams;
-  const { filterQuery, filterParams } = await parseFilters(websiteId, {
-    ...filters,
-  });
-
-  const db = getDatabaseType();
-  const like = db === POSTGRESQL ? 'ilike' : 'like';
+  const { filterQuery, dateQuery, queryParams } = await parseFilters(filters);
 
   return pagedRawQuery(
     `
@@ -44,17 +36,8 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, pagePar
     from website_event 
     join session on session.session_id = website_event.session_id
     where website_event.website_id = {{websiteId::uuid}}
-        and website_event.created_at between {{startDate}} and {{endDate}}
+    ${dateQuery}
     ${filterQuery}
-    ${
-      search
-        ? `and (distinct_id ${like} {{search}}
-           or city ${like} {{search}}
-           or browser ${like} {{search}}
-           or os ${like} {{search}}
-           or device ${like} {{search}})`
-        : ''
-    }
     group by session.session_id, 
       session.website_id, 
       website_event.hostname, 
@@ -68,17 +51,16 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, pagePar
       session.city
     order by max(website_event.created_at) desc
     `,
-    { ...filterParams, search: `%${search}%` },
-    pageParams,
+    queryParams,
+    filters,
   );
 }
 
-async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
-  const { pagedQuery, parseFilters, getDateStringSQL } = clickhouse;
-  const { filterParams, dateQuery, filterQuery } = await parseFilters(websiteId, filters);
-  const { search } = pageParams;
+async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
+  const { pagedRawQuery, parseFilters, getDateStringSQL } = clickhouse;
+  const { filterQuery, dateQuery, queryParams } = await parseFilters(filters);
 
-  return pagedQuery(
+  return pagedRawQuery(
     `
     select
       session_id as id,
@@ -101,19 +83,10 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
     where website_id = {websiteId:UUID}
     ${dateQuery}
     ${filterQuery}
-    ${
-      search
-        ? `and ((positionCaseInsensitive(distinct_id, {search:String}) > 0)
-           or (positionCaseInsensitive(city, {search:String}) > 0)
-           or (positionCaseInsensitive(browser, {search:String}) > 0)
-           or (positionCaseInsensitive(os, {search:String}) > 0)
-           or (positionCaseInsensitive(device, {search:String}) > 0))`
-        : ''
-    }
     group by session_id, website_id, hostname, browser, os, device, screen, language, country, region, city
     order by lastAt desc
     `,
-    { ...filterParams, search },
-    pageParams,
+    queryParams,
+    filters,
   );
 }

src/queries/sql/sessions/getWebsiteSessionsWeekly.ts

@@ -4,7 +4,7 @@ import { runQuery, PRISMA, CLICKHOUSE } from '@/lib/db';
 import { QueryFilters } from '@/lib/types';
 
 export async function getWebsiteSessionsWeekly(
-  ...args: [websiteId: string, filters?: QueryFilters]
+  ...args: [websiteId: string, filters: QueryFilters]
 ) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
@@ -15,7 +15,7 @@ export async function getWebsiteSessionsWeekly(
 async function relationalQuery(websiteId: string, filters: QueryFilters) {
   const { timezone = 'utc' } = filters;
   const { rawQuery, getDateWeeklySQL, parseFilters } = prisma;
-  const { filterParams } = await parseFilters(websiteId, filters);
+  const { queryParams } = await parseFilters(filters);
 
   return rawQuery(
     `
@@ -28,14 +28,14 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
     group by time
     order by 2
     `,
-    filterParams,
+    queryParams,
   ).then(formatResults);
 }
 
 async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
   const { timezone = 'utc' } = filters;
   const { rawQuery, parseFilters } = clickhouse;
-  const { filterParams } = await parseFilters(websiteId, filters);
+  const { queryParams } = await parseFilters(filters);
 
   return rawQuery(
     `
@@ -48,7 +48,7 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
     group by time
     order by time
     `,
-    filterParams,
+    queryParams,
   ).then(formatResults);
 }