Updated session and events queries. Added sessions page.

src/queries/analytics/events/getEventMetrics.ts

@@ -15,7 +15,7 @@ export async function getEventMetrics(
 
 async function relationalQuery(websiteId: string, filters: QueryFilters) {
   const { timezone = 'utc', unit = 'day' } = filters;
-  const { rawQuery, getDateQuery, parseFilters } = prisma;
+  const { rawQuery, getDateSQL, parseFilters } = prisma;
   const { filterQuery, joinSession, params } = await parseFilters(websiteId, {
     ...filters,
     eventType: EVENT_TYPE.customEvent,
@@ -25,7 +25,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
     `
     select
       event_name x,
-      ${getDateQuery('website_event.created_at', unit, timezone)} t,
+      ${getDateSQL('website_event.created_at', unit, timezone)} t,
       count(*) y
     from website_event
     ${joinSession}
@@ -45,7 +45,7 @@ async function clickhouseQuery(
   filters: QueryFilters,
 ): Promise<{ x: string; t: string; y: number }[]> {
   const { timezone = 'UTC', unit = 'day' } = filters;
-  const { rawQuery, getDateQuery, parseFilters } = clickhouse;
+  const { rawQuery, getDateSQL, parseFilters } = clickhouse;
   const { filterQuery, params } = await parseFilters(websiteId, {
     ...filters,
     eventType: EVENT_TYPE.customEvent,
@@ -55,7 +55,7 @@ async function clickhouseQuery(
     `
     select
       event_name x,
-      ${getDateQuery('created_at', unit, timezone)} t,
+      ${getDateSQL('created_at', unit, timezone)} t,
       count(*) y
     from website_event
     where website_id = {websiteId:UUID}

src/queries/analytics/events/getEvents.ts

@@ -1,45 +1,33 @@
 import clickhouse from 'lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import prisma from 'lib/prisma';
-import { QueryFilters } from 'lib/types';
+import { PageParams, QueryFilters } from 'lib/types';
 
-export function getEvents(...args: [websiteId: string, filters: QueryFilters]) {
+export function getEvents(
+  ...args: [websiteId: string, filters: QueryFilters, pageParams?: PageParams]
+) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
   });
 }
 
-function relationalQuery(websiteId: string, filters: QueryFilters) {
-  const { startDate } = filters;
+async function relationalQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
+  const { pagedQuery } = prisma;
 
-  return prisma.client.websiteEvent
-    .findMany({
-      where: {
-        websiteId,
-        createdAt: {
-          gte: startDate,
-        },
-      },
-      orderBy: {
-        createdAt: 'desc',
-      },
-    })
-    .then(a => {
-      return Object.values(a).map(a => {
-        return {
-          ...a,
-          timestamp: new Date(a.createdAt).getTime() / 1000,
-        };
-      });
-    });
+  const where = {
+    ...filters,
+    id: websiteId,
+  };
+
+  return pagedQuery('website_event', { where }, pageParams);
 }
 
-function clickhouseQuery(websiteId: string, filters: QueryFilters) {
-  const { rawQuery } = clickhouse;
-  const { startDate } = filters;
+async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
+  const { pagedQuery, parseFilters } = clickhouse;
+  const { params, dateQuery, filterQuery } = await parseFilters(websiteId, filters);
 
-  return rawQuery(
+  return pagedQuery(
     `
     select
       event_id as id,
@@ -48,16 +36,20 @@ function clickhouseQuery(websiteId: string, filters: QueryFilters) {
       created_at as createdAt,
       toUnixTimestamp(created_at) as timestamp,
       url_path as urlPath,
+      url_query as urlQuery,
+      referrer_path as referrerPath,
+      referrer_query as referrerQuery,
       referrer_domain as referrerDomain,
+      page_title as pageTitle,
+      event_type as eventType,
       event_name as eventName
     from website_event
     where website_id = {websiteId:UUID}
-      and created_at >= {startDate:DateTime64}
+    ${dateQuery}
+    ${filterQuery}
     order by created_at desc
     `,
-    {
-      websiteId,
-      startDate,
-    },
+    params,
+    pageParams,
   );
 }

src/queries/analytics/getRealtimeData.ts

@@ -19,15 +19,15 @@ export async function getRealtimeData(
   const { startDate, timezone } = criteria;
   const filters = { startDate, endDate: new Date(), unit: 'minute', timezone };
   const [events, sessions, pageviews, sessionviews] = await Promise.all([
-    getEvents(websiteId, { startDate }),
-    getSessions(websiteId, { startDate }),
+    getEvents(websiteId, { startDate }, { pageSize: 10000 }),
+    getSessions(websiteId, { startDate }, { pageSize: 10000 }),
     getPageviewStats(websiteId, filters),
     getSessionStats(websiteId, filters),
   ]);
 
   const uniques = new Set();
 
-  const sessionStats = sessions.reduce(
+  const sessionStats = sessions.data.reduce(
     (obj: { visitors: any; countries: any }, session: { id: any; country: any }) => {
       const { countries, visitors } = obj;
       const { id, country } = session;
@@ -49,7 +49,7 @@ export async function getRealtimeData(
     },
   );
 
-  const eventStats = events.reduce(
+  const eventStats = events.data.reduce(
     (
       obj: { urls: any; referrers: any; events: any },
       event: { urlPath: any; referrerDomain: any },
@@ -81,9 +81,9 @@ export async function getRealtimeData(
       visitors: sessionviews,
     },
     totals: {
-      views: events.filter(e => !e.eventName).length,
+      views: events.data.filter(e => !e.eventName).length,
       visitors: uniques.size,
-      events: events.filter(e => e.eventName).length,
+      events: events.data.filter(e => e.eventName).length,
       countries: Object.keys(sessionStats.countries).length,
     },
     timestamp: Date.now(),

src/queries/analytics/getValues.ts

@@ -18,11 +18,11 @@ async function relationalQuery(
   endDate: Date,
   search: string,
 ) {
-  const { rawQuery, getSearchQuery } = prisma;
+  const { rawQuery, getSearchSQL } = prisma;
   let searchQuery = '';
 
   if (search) {
-    searchQuery = getSearchQuery(column);
+    searchQuery = getSearchSQL(column);
   }
 
   return rawQuery(

src/queries/analytics/getWebsiteStats.ts

@@ -21,7 +21,7 @@ async function relationalQuery(
 ): Promise<
   { pageviews: number; visitors: number; visits: number; bounces: number; totaltime: number }[]
 > {
-  const { getTimestampDiffQuery, parseFilters, rawQuery } = prisma;
+  const { getTimestampDiffSQL, parseFilters, rawQuery } = prisma;
   const { filterQuery, joinSession, params } = await parseFilters(websiteId, {
     ...filters,
     eventType: EVENT_TYPE.pageView,
@@ -34,7 +34,7 @@ async function relationalQuery(
       count(distinct t.session_id) as "visitors",
       count(distinct t.visit_id) as "visits",
       sum(case when t.c = 1 then 1 else 0 end) as "bounces",
-      sum(${getTimestampDiffQuery('t.min_time', 't.max_time')}) as "totaltime"
+      sum(${getTimestampDiffSQL('t.min_time', 't.max_time')}) as "totaltime"
     from (
       select
         website_event.session_id,

src/queries/analytics/pageviews/getPageviewMetrics.ts

@@ -42,15 +42,18 @@ async function relationalQuery(
     const aggregrate = type === 'entry' ? 'min' : 'max';
 
     entryExitQuery = `
-    JOIN (select visit_id,
-        ${aggregrate}(created_at) target_created_at
-    from website_event
-    where website_event.website_id = {{websiteId::uuid}}
-      and website_event.created_at between {{startDate}} and {{endDate}}
-      and event_type = {{eventType}}
-    group by visit_id) x
-    ON x.visit_id = website_event.visit_id
-        and x.target_created_at = website_event.created_at`;
+      join (
+        select visit_id,
+            ${aggregrate}(created_at) target_created_at
+        from website_event
+        where website_event.website_id = {{websiteId::uuid}}
+          and website_event.created_at between {{startDate}} and {{endDate}}
+          and event_type = {{eventType}}
+        group by visit_id
+      ) x
+      on x.visit_id = website_event.visit_id
+          and x.target_created_at = website_event.created_at
+    `;
   }
 
   return rawQuery(
@@ -97,15 +100,18 @@ async function clickhouseQuery(
     const aggregrate = type === 'entry' ? 'min' : 'max';
 
     entryExitQuery = `
-    JOIN (select visit_id,
-        ${aggregrate}(created_at) target_created_at
-    from website_event
-    where website_id = {websiteId:UUID}
-      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
-      and event_type = {eventType:UInt32}
-    group by visit_id) x
-    ON x.visit_id = website_event.visit_id
-        and x.target_created_at = website_event.created_at`;
+      join (
+        select visit_id,
+            ${aggregrate}(created_at) target_created_at
+        from website_event
+        where website_id = {websiteId:UUID}
+          and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+          and event_type = {eventType:UInt32}
+        group by visit_id
+      ) x
+      on x.visit_id = website_event.visit_id
+          and x.target_created_at = website_event.created_at
+    `;
   }
 
   return rawQuery(

src/queries/analytics/pageviews/getPageviewStats.ts

@@ -13,7 +13,7 @@ export async function getPageviewStats(...args: [websiteId: string, filters: Que
 
 async function relationalQuery(websiteId: string, filters: QueryFilters) {
   const { timezone = 'utc', unit = 'day' } = filters;
-  const { getDateQuery, parseFilters, rawQuery } = prisma;
+  const { getDateSQL, parseFilters, rawQuery } = prisma;
   const { filterQuery, joinSession, params } = await parseFilters(websiteId, {
     ...filters,
     eventType: EVENT_TYPE.pageView,
@@ -22,7 +22,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
   return rawQuery(
     `
     select
-      ${getDateQuery('website_event.created_at', unit, timezone)} x,
+      ${getDateSQL('website_event.created_at', unit, timezone)} x,
       count(*) y
     from website_event
       ${joinSession}
@@ -41,7 +41,7 @@ async function clickhouseQuery(
   filters: QueryFilters,
 ): Promise<{ x: string; y: number }[]> {
   const { timezone = 'UTC', unit = 'day' } = filters;
-  const { parseFilters, rawQuery, getDateStringQuery, getDateQuery } = clickhouse;
+  const { parseFilters, rawQuery, getDateStringSQL, getDateSQL } = clickhouse;
   const { filterQuery, params } = await parseFilters(websiteId, {
     ...filters,
     eventType: EVENT_TYPE.pageView,
@@ -50,11 +50,11 @@ async function clickhouseQuery(
   return rawQuery(
     `
     select
-      ${getDateStringQuery('g.t', unit)} as x, 
+      ${getDateStringSQL('g.t', unit)} as x, 
       g.y as y
     from (
       select 
-        ${getDateQuery('created_at', unit, timezone)} as t,
+        ${getDateSQL('created_at', unit, timezone)} as t,
         count(*) as y
       from website_event
       where website_id = {websiteId:UUID}

src/queries/analytics/reports/getInsights.ts

@@ -23,7 +23,7 @@ async function relationalQuery(
     y: number;
   }[]
 > {
-  const { getTimestampDiffQuery, parseFilters, rawQuery } = prisma;
+  const { getTimestampDiffSQL, parseFilters, rawQuery } = prisma;
   const { filterQuery, joinSession, params } = await parseFilters(
     websiteId,
     {
@@ -42,7 +42,7 @@ async function relationalQuery(
       count(distinct t.session_id) as "visitors",
       count(distinct t.visit_id) as "visits",
       sum(case when t.c = 1 then 1 else 0 end) as "bounces",
-      sum(${getTimestampDiffQuery('t.min_time', 't.max_time')}) as "totaltime",
+      sum(${getTimestampDiffSQL('t.min_time', 't.max_time')}) as "totaltime",
       ${parseFieldsByName(fields)}
     from (
       select

src/queries/analytics/reports/getRetention.ts

@@ -35,14 +35,14 @@ async function relationalQuery(
   }[]
 > {
   const { startDate, endDate, timezone = 'UTC' } = filters;
-  const { getDateQuery, getDayDiffQuery, getCastColumnQuery, rawQuery } = prisma;
+  const { getDateSQL, getDayDiffQuery, getCastColumnQuery, rawQuery } = prisma;
   const unit = 'day';
 
   return rawQuery(
     `
     WITH cohort_items AS (
       select session_id,
-        ${getDateQuery('created_at', unit, timezone)} as cohort_date  
+        ${getDateSQL('created_at', unit, timezone)} as cohort_date  
       from session 
       where website_id = {{websiteId::uuid}}
         and created_at between {{startDate}} and {{endDate}}
@@ -50,10 +50,7 @@ async function relationalQuery(
     user_activities AS (
       select distinct
         w.session_id,
-        ${getDayDiffQuery(
-          getDateQuery('created_at', unit, timezone),
-          'c.cohort_date',
-        )} as day_number
+        ${getDayDiffQuery(getDateSQL('created_at', unit, timezone), 'c.cohort_date')} as day_number
       from website_event w
       join cohort_items c
       on w.session_id = c.session_id
@@ -115,14 +112,14 @@ async function clickhouseQuery(
   }[]
 > {
   const { startDate, endDate, timezone = 'UTC' } = filters;
-  const { getDateQuery, getDateStringQuery, rawQuery } = clickhouse;
+  const { getDateSQL, getDateStringSQL, rawQuery } = clickhouse;
   const unit = 'day';
 
   return rawQuery(
     `
     WITH cohort_items AS (
       select
-        min(${getDateQuery('created_at', unit, timezone)}) as cohort_date,
+        min(${getDateSQL('created_at', unit, timezone)}) as cohort_date,
         session_id
       from website_event
       where website_id = {websiteId:UUID}
@@ -132,7 +129,7 @@ async function clickhouseQuery(
     user_activities AS (
       select distinct
         w.session_id,
-        (${getDateQuery('created_at', unit, timezone)} - c.cohort_date) / 86400 as day_number
+        (${getDateSQL('created_at', unit, timezone)} - c.cohort_date) / 86400 as day_number
       from website_event w
       join cohort_items c
       on w.session_id = c.session_id
@@ -157,7 +154,7 @@ async function clickhouseQuery(
       group by 1, 2
     )
     select
-      ${getDateStringQuery('c.cohort_date', unit)} as date,
+      ${getDateStringSQL('c.cohort_date', unit)} as date,
       c.day_number as day,
       s.visitors as visitors,
       c.visitors returnVisitors,

src/queries/analytics/reports/getRevenue.ts

@@ -46,12 +46,12 @@ async function relationalQuery(
     timezone = 'UTC',
     unit = 'day',
   } = criteria;
-  const { getDateQuery, rawQuery } = prisma;
+  const { getDateSQL, rawQuery } = prisma;
 
   const chartRes = await rawQuery(
     `
     select
-      ${getDateQuery('website_event.created_at', unit, timezone)} time,
+      ${getDateSQL('website_event.created_at', unit, timezone)} time,
       sum(case when data_key = {{revenueProperty}} then number_value else 0 end) sum,
       avg(case when data_key = {{revenueProperty}} then number_value else 0 end) avg,
       count(case when data_key = {{revenueProperty}} then 1 else 0 end) count,
@@ -110,7 +110,7 @@ async function clickhouseQuery(
     timezone = 'UTC',
     unit = 'day',
   } = criteria;
-  const { getDateStringQuery, getDateQuery, rawQuery } = clickhouse;
+  const { getDateStringSQL, getDateSQL, rawQuery } = clickhouse;
 
   const chartRes = await rawQuery<{
     time: string;
@@ -121,14 +121,14 @@ async function clickhouseQuery(
   }>(
     `
     select
-      ${getDateStringQuery('g.time', unit)} as time, 
+      ${getDateStringSQL('g.time', unit)} as time, 
       g.sum as sum,
       g.avg as avg,
       g.count as count,
       g.uniqueCount as uniqueCount
     from (
       select 
-        ${getDateQuery('created_at', unit, timezone)} as time,
+        ${getDateSQL('created_at', unit, timezone)} as time,
         sumIf(number_value, data_key = {revenueProperty:String}) as sum,
         avgIf(number_value, data_key = {revenueProperty:String}) as avg,
         countIf(data_key = {revenueProperty:String}) as count,

src/queries/analytics/sessions/getSessionStats.ts

@@ -13,7 +13,7 @@ export async function getSessionStats(...args: [websiteId: string, filters: Quer
 
 async function relationalQuery(websiteId: string, filters: QueryFilters) {
   const { timezone = 'utc', unit = 'day' } = filters;
-  const { getDateQuery, parseFilters, rawQuery } = prisma;
+  const { getDateSQL, parseFilters, rawQuery } = prisma;
   const { filterQuery, joinSession, params } = await parseFilters(websiteId, {
     ...filters,
     eventType: EVENT_TYPE.pageView,
@@ -22,7 +22,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
   return rawQuery(
     `
     select
-      ${getDateQuery('website_event.created_at', unit, timezone)} x,
+      ${getDateSQL('website_event.created_at', unit, timezone)} x,
       count(distinct website_event.session_id) y
     from website_event
       ${joinSession}
@@ -41,7 +41,7 @@ async function clickhouseQuery(
   filters: QueryFilters,
 ): Promise<{ x: string; y: number }[]> {
   const { timezone = 'UTC', unit = 'day' } = filters;
-  const { parseFilters, rawQuery, getDateStringQuery, getDateQuery } = clickhouse;
+  const { parseFilters, rawQuery, getDateStringSQL, getDateSQL } = clickhouse;
   const { filterQuery, params } = await parseFilters(websiteId, {
     ...filters,
     eventType: EVENT_TYPE.pageView,
@@ -50,11 +50,11 @@ async function clickhouseQuery(
   return rawQuery(
     `
     select
-      ${getDateStringQuery('g.t', unit)} as x, 
+      ${getDateStringSQL('g.t', unit)} as x, 
       g.y as y
     from (
       select 
-        ${getDateQuery('created_at', unit, timezone)} as t,
+        ${getDateSQL('created_at', unit, timezone)} as t,
         count(distinct session_id) as y
       from website_event
       where website_id = {websiteId:UUID}

src/queries/analytics/sessions/getSessions.ts

@@ -1,45 +1,33 @@
 import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
 import { runQuery, PRISMA, CLICKHOUSE } from 'lib/db';
-import { QueryFilters } from 'lib/types';
+import { PageParams, QueryFilters } from 'lib/types';
 
-export async function getSessions(...args: [websiteId: string, filters: QueryFilters]) {
+export async function getSessions(
+  ...args: [websiteId: string, filters?: QueryFilters, pageParams?: PageParams]
+) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
   });
 }
 
-async function relationalQuery(websiteId: string, filters: QueryFilters) {
-  const { startDate } = filters;
+async function relationalQuery(websiteId: string, filters: QueryFilters, pageParams: PageParams) {
+  const { pagedQuery } = prisma;
 
-  return prisma.client.session
-    .findMany({
-      where: {
-        websiteId,
-        createdAt: {
-          gte: startDate,
-        },
-      },
-      orderBy: {
-        createdAt: 'desc',
-      },
-    })
-    .then(a => {
-      return Object.values(a).map(a => {
-        return {
-          ...a,
-          timestamp: new Date(a.createdAt).getTime() / 1000,
-        };
-      });
-    });
+  const where = {
+    ...filters,
+    id: websiteId,
+  };
+
+  return pagedQuery('session', { where }, pageParams);
 }
 
-async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
-  const { rawQuery } = clickhouse;
-  const { startDate } = filters;
+async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
+  const { pagedQuery, parseFilters } = clickhouse;
+  const { params, dateQuery, filterQuery } = await parseFilters(websiteId, filters);
 
-  return rawQuery(
+  return pagedQuery(
     `
     select
       session_id as id,
@@ -58,12 +46,11 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
       city
     from website_event
     where website_id = {websiteId:UUID}
-    and created_at >= {startDate:DateTime64}
+    ${dateQuery}
+    ${filterQuery}
     order by created_at desc
     `,
-    {
-      websiteId,
-      startDate,
-    },
+    params,
+    pageParams,
   );
 }

src/queries/index.ts

@@ -1,8 +1,8 @@
-export * from './admin/report';
-export * from './admin/team';
-export * from './admin/teamUser';
-export * from './admin/user';
-export * from './admin/website';
+export * from 'queries/prisma/report';
+export * from 'queries/prisma/team';
+export * from 'queries/prisma/teamUser';
+export * from 'queries/prisma/user';
+export * from 'queries/prisma/website';
 export * from './analytics/events/getEventMetrics';
 export * from './analytics/events/getEventUsage';
 export * from './analytics/events/getEvents';

src/queries/prisma/report.ts

@@ -17,9 +17,9 @@ export async function getReport(reportId: string): Promise<Report> {
 
 export async function getReports(
   criteria: ReportFindManyArgs,
-  filters: PageParams = {},
+  pageParams: PageParams = {},
 ): Promise<PageResult<Report[]>> {
-  const { query } = filters;
+  const { query } = pageParams;
 
   const where: Prisma.ReportWhereInput = {
     ...criteria.where,
@@ -45,7 +45,7 @@ export async function getReports(
     ]),
   };
 
-  return prisma.pagedQuery('report', { ...criteria, where }, filters);
+  return prisma.pagedQuery('report', { ...criteria, where }, pageParams);
 }
 
 export async function getUserReports(

src/queries/prisma/user.ts

@@ -49,9 +49,9 @@ export async function getUserByUsername(username: string, options: GetUserOption
 
 export async function getUsers(
   criteria: UserFindManyArgs,
-  filters?: PageParams,
+  pageParams?: PageParams,
 ): Promise<PageResult<User[]>> {
-  const { query } = filters;
+  const { query } = pageParams;
 
   const where: Prisma.UserWhereInput = {
     ...criteria.where,
@@ -68,7 +68,7 @@ export async function getUsers(
     {
       orderBy: 'createdAt',
       sortDescending: true,
-      ...filters,
+      ...pageParams,
     },
   );
 }

src/queries/prisma/website.ts

@@ -27,9 +27,9 @@ export async function getSharedWebsite(shareId: string) {
 
 export async function getWebsites(
   criteria: WebsiteFindManyArgs,
-  filters: PageParams,
+  pageParams: PageParams,
 ): Promise<PageResult<Website[]>> {
-  const { query } = filters;
+  const { query } = pageParams;
 
   const where: Prisma.WebsiteWhereInput = {
     ...criteria.where,
@@ -42,7 +42,7 @@ export async function getWebsites(
     deletedAt: null,
   };
 
-  return prisma.pagedQuery('website', { ...criteria, where }, filters);
+  return prisma.pagedQuery('website', { ...criteria, where }, pageParams);
 }
 
 export async function getAllWebsites(userId: string) {