Added more function names to queries.

src/queries/sql/sessions/getSessionActivity.ts

@@ -3,6 +3,8 @@ 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]
 ) {
@@ -13,17 +15,31 @@ export async function getSessionActivity(
 }
 
 async function relationalQuery(websiteId: string, sessionId: string, filters: QueryFilters) {
+  const { rawQuery } = prisma;
   const { startDate, endDate } = filters;
 
-  return prisma.client.websiteEvent.findMany({
-    where: {
-      sessionId,
-      websiteId,
-      createdAt: { gte: startDate, lte: endDate },
-    },
-    take: 500,
-    orderBy: { createdAt: 'desc' },
-  });
+  return rawQuery(
+    `
+    select
+      created_at as createdAt,
+      url_path as urlPath,
+      url_query as urlQuery,
+      referrer_domain as referrerDomain,
+      event_id as eventId,
+      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) {
@@ -50,5 +66,6 @@ async function clickhouseQuery(websiteId: string, sessionId: string, filters: Qu
     limit 500
     `,
     { websiteId, sessionId, startDate, endDate },
+    FUNCTION_NAME,
   );
 }

src/queries/sql/sessions/getSessionData.ts

@@ -2,6 +2,8 @@ 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),
@@ -29,6 +31,7 @@ async function relationalQuery(websiteId: string, sessionId: string) {
     order by data_key asc
     `,
     { websiteId, sessionId },
+    FUNCTION_NAME,
   );
 }
 
@@ -52,5 +55,6 @@ async function clickhouseQuery(websiteId: string, sessionId: string) {
     order by data_key asc
     `,
     { websiteId, sessionId },
+    FUNCTION_NAME,
   );
 }

src/queries/sql/sessions/getSessionDataProperties.ts

@@ -3,6 +3,8 @@ 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 }]
 ) {
@@ -42,6 +44,7 @@ async function relationalQuery(
     limit 500
     `,
     queryParams,
+    FUNCTION_NAME,
   );
 }
 
@@ -75,5 +78,6 @@ async function clickhouseQuery(
     limit 500
     `,
     queryParams,
+    FUNCTION_NAME,
   );
 }

src/queries/sql/sessions/getSessionDataValues.ts

@@ -3,6 +3,8 @@ 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 }]
 ) {
@@ -45,6 +47,7 @@ async function relationalQuery(
     limit 100
     `,
     queryParams,
+    FUNCTION_NAME,
   );
 }
 
@@ -75,5 +78,6 @@ async function clickhouseQuery(
     limit 100
     `,
     queryParams,
+    FUNCTION_NAME,
   );
 }

src/queries/sql/sessions/getSessionExpandedMetrics.ts

@@ -4,6 +4,8 @@ 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;
@@ -71,6 +73,7 @@ async function relationalQuery(
     offset ${offset}
     `,
     { ...queryParams, ...parameters },
+    FUNCTION_NAME,
   );
 }
 
@@ -128,5 +131,6 @@ async function clickhouseQuery(
     offset ${offset}
     `,
     { ...queryParams, ...parameters },
+    FUNCTION_NAME,
   );
 }

src/queries/sql/sessions/getSessionStats.ts

@@ -4,6 +4,8 @@ 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),
@@ -35,6 +37,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
     order by 1
     `,
     queryParams,
+    FUNCTION_NAME,
   );
 }
 
@@ -90,5 +93,5 @@ async function clickhouseQuery(
     `;
   }
 
-  return rawQuery(sql, queryParams);
+  return rawQuery(sql, queryParams, FUNCTION_NAME);
 }

src/queries/sql/sessions/getWebsiteSession.ts

@@ -2,6 +2,8 @@ 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),
@@ -56,6 +58,7 @@ 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]);
 }
 
@@ -105,5 +108,6 @@ 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,6 +4,8 @@ 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;
@@ -47,6 +49,7 @@ async function relationalQuery(
       ${filterQuery}
     `,
     queryParams,
+    FUNCTION_NAME,
   );
 }
 
@@ -89,5 +92,5 @@ async function clickhouseQuery(
     `;
   }
 
-  return rawQuery(sql, queryParams);
+  return rawQuery(sql, queryParams, FUNCTION_NAME);
 }

src/queries/sql/sessions/getWebsiteSessions.ts

@@ -4,6 +4,8 @@ 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),
@@ -69,6 +71,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
     `,
     queryParams,
     filters,
+    FUNCTION_NAME,
   );
 }
 
@@ -147,5 +150,5 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
     `;
   }
 
-  return pagedRawQuery(sql, queryParams, filters);
+  return pagedRawQuery(sql, queryParams, filters, FUNCTION_NAME);
 }