src/lib/clickhouse.ts

@@ -181,7 +181,6 @@ async function pagedRawQuery(
   query: string,
   queryParams: Record<string, any>,
   filters: QueryFilters,
-  name?: string,
 ) {
   const { page = 1, pageSize, orderBy, sortDescending = false, search } = filters;
   const size = +pageSize || DEFAULT_PAGE_SIZE;
@@ -199,7 +198,7 @@ async function pagedRawQuery(
     res => res[0].num,
   );
 
-  const data = await rawQuery(`${query}${statements}`, queryParams, name);
+  const data = await rawQuery(`${query}${statements}`, queryParams);
 
   return { data, count, page: +page, pageSize: size, orderBy, search };
 }

src/lib/prisma.ts

@@ -219,7 +219,6 @@ async function pagedRawQuery(
   query: string,
   filters: QueryFilters,
   queryParams: Record<string, any>,
-  name?: string,
 ) {
   const { page = 1, pageSize, orderBy, sortDescending = false } = filters;
   const size = +pageSize || DEFAULT_PAGE_SIZE;
@@ -237,7 +236,7 @@ async function pagedRawQuery(
     res => res[0].num,
   );
 
-  const data = await rawQuery(`${query}${statements}`, queryParams, name);
+  const data = await rawQuery(`${query}${statements}`, queryParams);
 
   return { data, count, page: +page, pageSize: size, orderBy };
 }

src/queries/sql/events/getEventData.ts

@@ -3,8 +3,6 @@ import prisma from '@/lib/prisma';
 import clickhouse from '@/lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
 
-const FUNCTION_NAME = 'getEventData';
-
 export async function getEventData(...args: [eventId: string]): Promise<EventData[]> {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
@@ -32,7 +30,6 @@ async function relationalQuery(eventId: string) {
     where event_id = {{eventId::uuid}}
     `,
     { eventId },
-    FUNCTION_NAME,
   );
 }
 
@@ -56,6 +53,5 @@ async function clickhouseQuery(eventId: string): Promise<EventData[]> {
       where event_id = {eventId:UUID}
     `,
     { eventId },
-    FUNCTION_NAME,
   );
 }

src/queries/sql/events/getEventDataEvents.ts

@@ -3,8 +3,6 @@ import clickhouse from '@/lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
 import { QueryFilters } from '@/lib/types';
 
-const FUNCTION_NAME = 'getEventDataEvents';
-
 export interface WebsiteEventData {
   eventName?: string;
   propertyName: string;
@@ -46,7 +44,6 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
       order by 1 asc, 2 asc, 3 asc, 5 desc
       `,
       queryParams,
-      FUNCTION_NAME,
     );
   }
 
@@ -62,10 +59,11 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
       on website_event.event_id = event_data.website_event_id
     where event_data.website_id = {{websiteId::uuid}}
       and event_data.created_at between {{startDate}} and {{endDate}}
+    group by website_event.event_name, event_data.data_key, event_data.data_type
+    order by 1 asc, 2 asc
     limit 500
     `,
     queryParams,
-    FUNCTION_NAME,
   );
 }
 
@@ -95,7 +93,6 @@ async function clickhouseQuery(
       limit 500
       `,
       queryParams,
-      FUNCTION_NAME,
     );
   }
 
@@ -114,6 +111,5 @@ async function clickhouseQuery(
     limit 500
     `,
     queryParams,
-    FUNCTION_NAME,
   );
 }

src/queries/sql/events/getEventDataFields.ts

@@ -3,8 +3,6 @@ import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
 import prisma from '@/lib/prisma';
 import { QueryFilters } from '@/lib/types';
 
-const FUNCTION_NAME = 'getEventDataFields';
-
 export async function getEventDataFields(...args: [websiteId: string, filters: QueryFilters]) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
@@ -44,7 +42,6 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
     limit 100
     `,
     queryParams,
-    FUNCTION_NAME,
   );
 }
 
@@ -74,6 +71,5 @@ async function clickhouseQuery(
     limit 100
     `,
     queryParams,
-    FUNCTION_NAME,
   );
 }

src/queries/sql/events/getEventDataProperties.ts

@@ -3,8 +3,6 @@ import clickhouse from '@/lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
 import { QueryFilters } from '@/lib/types';
 
-const FUNCTION_NAME = 'getEventDataProperties';
-
 export async function getEventDataProperties(
   ...args: [websiteId: string, filters: QueryFilters & { propertyName?: string }]
 ) {
@@ -46,7 +44,6 @@ async function relationalQuery(
     limit 500
     `,
     queryParams,
-    FUNCTION_NAME,
   );
 }
 
@@ -78,6 +75,5 @@ async function clickhouseQuery(
     limit 500
     `,
     queryParams,
-    FUNCTION_NAME,
   );
 }

src/queries/sql/events/getEventDataStats.ts

@@ -3,8 +3,6 @@ import clickhouse from '@/lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
 import { QueryFilters } from '@/lib/types';
 
-const FUNCTION_NAME = 'getEventDataStats';
-
 export async function getEventDataStats(
   ...args: [websiteId: string, filters: QueryFilters]
 ): Promise<{
@@ -49,7 +47,6 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
       ) as t
     `,
     queryParams,
-    FUNCTION_NAME,
   );
 }
 
@@ -80,6 +77,5 @@ async function clickhouseQuery(
       ) as t
     `,
     queryParams,
-    FUNCTION_NAME,
   );
 }

src/queries/sql/events/getEventDataUsage.ts

@@ -2,8 +2,6 @@ import clickhouse from '@/lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery, notImplemented } from '@/lib/db';
 import { QueryFilters } from '@/lib/types';
 
-const FUNCTION_NAME = 'getEventDataUsage';
-
 export function getEventDataUsage(...args: [websiteIds: string[], filters: QueryFilters]) {
   return runQuery({
     [PRISMA]: notImplemented,
@@ -33,6 +31,5 @@ function clickhouseQuery(
       startDate,
       endDate,
     },
-    FUNCTION_NAME,
   );
 }

src/queries/sql/events/getEventDataValues.ts

@@ -3,8 +3,6 @@ import clickhouse from '@/lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
 import { QueryFilters } from '@/lib/types';
 
-const FUNCTION_NAME = 'getEventDataValues';
-
 interface WebsiteEventData {
   value: string;
   total: number;
@@ -57,7 +55,6 @@ async function relationalQuery(
     limit 100
     `,
     queryParams,
-    FUNCTION_NAME,
   );
 }
 
@@ -87,6 +84,5 @@ async function clickhouseQuery(
     limit 100
     `,
     queryParams,
-    FUNCTION_NAME,
   );
 }

src/queries/sql/events/getEventExpandedMetrics.ts

@@ -4,8 +4,6 @@ import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
 import prisma from '@/lib/prisma';
 import { QueryFilters } from '@/lib/types';
 
-const FUNCTION_NAME = 'getEventExpandedMetrics';
-
 export interface EventExpandedMetricParameters {
   type: string;
   limit?: string;
@@ -63,7 +61,6 @@ async function relationalQuery(
     offset ${offset}
     `,
     queryParams,
-    FUNCTION_NAME,
   );
 }
 
@@ -112,6 +109,5 @@ async function clickhouseQuery(
     offset ${offset}
     `,
     { ...queryParams, ...parameters },
-    FUNCTION_NAME,
   );
 }

src/queries/sql/events/getEventStats.ts

@@ -4,8 +4,6 @@ import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
 import prisma from '@/lib/prisma';
 import { QueryFilters } from '@/lib/types';
 
-const FUNCTION_NAME = 'getEventStats';
-
 interface WebsiteEventMetric {
   x: string;
   t: string;
@@ -46,7 +44,6 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
     order by 2
     `,
     queryParams,
-    FUNCTION_NAME,
   );
 }
 
@@ -97,5 +94,5 @@ async function clickhouseQuery(
     `;
   }
 
-  return rawQuery(sql, queryParams, FUNCTION_NAME);
+  return rawQuery(sql, queryParams);
 }

src/queries/sql/events/getEventUsage.ts

@@ -2,8 +2,6 @@ import clickhouse from '@/lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery, notImplemented } from '@/lib/db';
 import { QueryFilters } from '@/lib/types';
 
-const FUNCTION_NAME = 'getEventUsage';
-
 export function getEventUsage(...args: [websiteIds: string[], filters: QueryFilters]) {
   return runQuery({
     [PRISMA]: notImplemented,
@@ -33,6 +31,5 @@ function clickhouseQuery(
       startDate,
       endDate,
     },
-    FUNCTION_NAME,
   );
 }

src/queries/sql/events/getWebsiteEvents.ts

@@ -3,8 +3,6 @@ import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
 import prisma from '@/lib/prisma';
 import { QueryFilters } from '@/lib/types';
 
-const FUNCTION_NAME = 'getWebsiteEvents';
-
 export function getWebsiteEvents(...args: [websiteId: string, filters: QueryFilters]) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
@@ -58,7 +56,6 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
     `,
     queryParams,
     filters,
-    FUNCTION_NAME,
   );
 }
 
@@ -107,6 +104,5 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
     `,
     queryParams,
     filters,
-    FUNCTION_NAME,
   );
 }

src/queries/sql/getWebsiteStats.ts

@@ -4,8 +4,6 @@ import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
 import prisma from '@/lib/prisma';
 import { QueryFilters } from '@/lib/types';
 
-const FUNCTION_NAME = 'getWebsiteStats';
-
 export interface WebsiteStatsData {
   pageviews: number;
   visitors: number;
@@ -59,7 +57,6 @@ async function relationalQuery(
     ) as t
     `,
     queryParams,
-    FUNCTION_NAME,
   ).then(result => result?.[0]);
 }
 
@@ -124,5 +121,5 @@ async function clickhouseQuery(
     `;
   }
 
-  return rawQuery(sql, queryParams, FUNCTION_NAME).then(result => result?.[0]);
+  return rawQuery(sql, queryParams).then(result => result?.[0]);
 }

src/queries/sql/getWeeklyTraffic.ts

@@ -4,8 +4,6 @@ import { runQuery, PRISMA, CLICKHOUSE } from '@/lib/db';
 import { QueryFilters } from '@/lib/types';
 import { EVENT_COLUMNS } from '@/lib/constants';
 
-const FUNCTION_NAME = 'getWeeklyTraffic';
-
 export async function getWeeklyTraffic(...args: [websiteId: string, filters: QueryFilters]) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
@@ -36,7 +34,6 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
     order by 2
     `,
     queryParams,
-    FUNCTION_NAME,
   ).then(formatResults);
 }
 
@@ -75,7 +72,7 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
     `;
   }
 
-  return rawQuery(sql, queryParams, FUNCTION_NAME).then(formatResults);
+  return rawQuery(sql, queryParams).then(formatResults);
 }
 
 function formatResults(data: any) {

src/queries/sql/pageviews/getPageviewStats.ts

@@ -4,8 +4,6 @@ import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
 import prisma from '@/lib/prisma';
 import { QueryFilters } from '@/lib/types';
 
-const FUNCTION_NAME = 'getPageviewStats';
-
 export async function getPageviewStats(...args: [websiteId: string, filters: QueryFilters]) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
@@ -37,7 +35,6 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
     order by 1
     `,
     queryParams,
-    FUNCTION_NAME,
   );
 }
 
@@ -94,5 +91,5 @@ async function clickhouseQuery(
     `;
   }
 
-  return rawQuery(sql, queryParams, FUNCTION_NAME);
+  return rawQuery(sql, queryParams);
 }

src/queries/sql/sessions/getSessionActivity.ts

@@ -3,8 +3,6 @@ import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
 import prisma from '@/lib/prisma';
 import { QueryFilters } from '@/lib/types';
 
-const FUNCTION_NAME = 'getSessionActivity';
-
 export async function getSessionActivity(
   ...args: [websiteId: string, sessionId: string, filters: QueryFilters]
 ) {
@@ -15,31 +13,17 @@ export async function getSessionActivity(
 }
 
 async function relationalQuery(websiteId: string, sessionId: string, filters: QueryFilters) {
-  const { rawQuery } = prisma;
   const { startDate, endDate } = filters;
 
-  return rawQuery(
+  return prisma.client.websiteEvent.findMany({
-    `
+    where: {
-    select
+      sessionId,
-      created_at as createdAt,
+      websiteId,
-      url_path as urlPath,
+      createdAt: { gte: startDate, lte: endDate },
-      url_query as urlQuery,
+    },
-      referrer_domain as referrerDomain,
+    take: 500,
-      event_id as eventId,
+    orderBy: { createdAt: 'desc' },
-      event_type as eventType,
+  });
-      event_name as eventName,
-      visit_id as visitId,
-      event_id IN (SELECT event_id FROM event_data) AS hasData
-    from website_event e 
-    where e.website_id = {websiteId:UUID}
-      and e.session_id = {sessionId:UUID} 
-      and e.created_at between {startDate:DateTime64} and {endDate:DateTime64}
-    order by e.created_at desc
-    limit 500
-    `,
-    { websiteId, sessionId, startDate, endDate },
-    FUNCTION_NAME,
-  );
 }
 
 async function clickhouseQuery(websiteId: string, sessionId: string, filters: QueryFilters) {
@@ -66,6 +50,5 @@ async function clickhouseQuery(websiteId: string, sessionId: string, filters: Qu
     limit 500
     `,
     { websiteId, sessionId, startDate, endDate },
-    FUNCTION_NAME,
   );
 }

src/queries/sql/sessions/getSessionData.ts

@@ -2,8 +2,6 @@ import prisma from '@/lib/prisma';
 import clickhouse from '@/lib/clickhouse';
 import { runQuery, PRISMA, CLICKHOUSE } from '@/lib/db';
 
-const FUNCTION_NAME = 'getSessionData';
-
 export async function getSessionData(...args: [websiteId: string, sessionId: string]) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
@@ -31,7 +29,6 @@ async function relationalQuery(websiteId: string, sessionId: string) {
     order by data_key asc
     `,
     { websiteId, sessionId },
-    FUNCTION_NAME,
   );
 }
 
@@ -55,6 +52,5 @@ async function clickhouseQuery(websiteId: string, sessionId: string) {
     order by data_key asc
     `,
     { websiteId, sessionId },
-    FUNCTION_NAME,
   );
 }

src/queries/sql/sessions/getSessionDataProperties.ts

@@ -3,8 +3,6 @@ import clickhouse from '@/lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
 import { QueryFilters } from '@/lib/types';
 
-const FUNCTION_NAME = 'getSessionDataProperties';
-
 export async function getSessionDataProperties(
   ...args: [websiteId: string, filters: QueryFilters & { propertyName?: string }]
 ) {
@@ -44,7 +42,6 @@ async function relationalQuery(
     limit 500
     `,
     queryParams,
-    FUNCTION_NAME,
   );
 }
 
@@ -78,6 +75,5 @@ async function clickhouseQuery(
     limit 500
     `,
     queryParams,
-    FUNCTION_NAME,
   );
 }

src/queries/sql/sessions/getSessionDataValues.ts

@@ -3,8 +3,6 @@ import clickhouse from '@/lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
 import { QueryFilters } from '@/lib/types';
 
-const FUNCTION_NAME = 'getSessionDataValues';
-
 export async function getSessionDataValues(
   ...args: [websiteId: string, filters: QueryFilters & { propertyName?: string }]
 ) {
@@ -47,7 +45,6 @@ async function relationalQuery(
     limit 100
     `,
     queryParams,
-    FUNCTION_NAME,
   );
 }
 
@@ -78,6 +75,5 @@ async function clickhouseQuery(
     limit 100
     `,
     queryParams,
-    FUNCTION_NAME,
   );
 }

src/queries/sql/sessions/getSessionExpandedMetrics.ts

@@ -4,8 +4,6 @@ import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
 import prisma from '@/lib/prisma';
 import { QueryFilters } from '@/lib/types';
 
-const FUNCTION_NAME = 'getSessionExpandedMetrics';
-
 export interface SessionExpandedMetricsParameters {
   type: string;
   limit?: number | string;
@@ -73,7 +71,6 @@ async function relationalQuery(
     offset ${offset}
     `,
     { ...queryParams, ...parameters },
-    FUNCTION_NAME,
   );
 }
 
@@ -131,6 +128,5 @@ async function clickhouseQuery(
     offset ${offset}
     `,
     { ...queryParams, ...parameters },
-    FUNCTION_NAME,
   );
 }

src/queries/sql/sessions/getSessionStats.ts

@@ -4,8 +4,6 @@ import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
 import prisma from '@/lib/prisma';
 import { QueryFilters } from '@/lib/types';
 
-const FUNCTION_NAME = 'getSessionStats';
-
 export async function getSessionStats(...args: [websiteId: string, filters: QueryFilters]) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
@@ -37,7 +35,6 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
     order by 1
     `,
     queryParams,
-    FUNCTION_NAME,
   );
 }
 
@@ -94,5 +91,5 @@ async function clickhouseQuery(
     `;
   }
 
-  return rawQuery(sql, queryParams, FUNCTION_NAME);
+  return rawQuery(sql, queryParams);
 }

src/queries/sql/sessions/getWebsiteSession.ts

@@ -2,8 +2,6 @@ import prisma from '@/lib/prisma';
 import clickhouse from '@/lib/clickhouse';
 import { runQuery, PRISMA, CLICKHOUSE } from '@/lib/db';
 
-const FUNCTION_NAME = 'getWebsiteSession';
-
 export async function getWebsiteSession(...args: [websiteId: string, sessionId: string]) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
@@ -58,7 +56,6 @@ async function relationalQuery(websiteId: string, sessionId: string) {
     group by id, distinct_id, website_id, browser, os, device, screen, language, country, region, city;
     `,
     { websiteId, sessionId },
-    FUNCTION_NAME,
   ).then(result => result?.[0]);
 }
 
@@ -108,6 +105,5 @@ async function clickhouseQuery(websiteId: string, sessionId: string) {
     group by id, websiteId, distinctId, browser, os, device, screen, language, country, region, city;
     `,
     { websiteId, sessionId },
-    FUNCTION_NAME,
   ).then(result => result?.[0]);
 }

src/queries/sql/sessions/getWebsiteSessionStats.ts

@@ -4,8 +4,6 @@ import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
 import prisma from '@/lib/prisma';
 import { QueryFilters } from '@/lib/types';
 
-const FUNCTION_NAME = 'getWebsiteSessionStats';
-
 export interface WebsiteSessionStatsData {
   pageviews: number;
   visitors: number;
@@ -49,7 +47,6 @@ async function relationalQuery(
       ${filterQuery}
     `,
     queryParams,
-    FUNCTION_NAME,
   );
 }
 
@@ -92,5 +89,5 @@ async function clickhouseQuery(
     `;
   }
 
-  return rawQuery(sql, queryParams, FUNCTION_NAME);
+  return rawQuery(sql, queryParams);
 }

src/queries/sql/sessions/getWebsiteSessions.ts

@@ -4,8 +4,6 @@ import { EVENT_COLUMNS } from '@/lib/constants';
 import prisma from '@/lib/prisma';
 import { QueryFilters } from '@/lib/types';
 
-const FUNCTION_NAME = 'getWebsiteSessions';
-
 export async function getWebsiteSessions(...args: [websiteId: string, filters: QueryFilters]) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
@@ -71,7 +69,6 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
     `,
     queryParams,
     filters,
-    FUNCTION_NAME,
   );
 }
 
@@ -150,5 +147,5 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
     `;
   }
 
-  return pagedRawQuery(sql, queryParams, filters, FUNCTION_NAME);
+  return pagedRawQuery(sql, queryParams, filters);
 }