Split out session query.

queries/analytics/pageviews/getPageviewMetrics.ts

@@ -84,6 +84,7 @@ async function clickhouseQuery(
   const { rawQuery, parseFilters } = clickhouse;
   const website = await loadWebsite(websiteId);
   const params = {
+    ...filters,
     websiteId,
     startDate: maxDate(startDate, website.resetAt),
     endDate,
@@ -98,7 +99,7 @@ async function clickhouseQuery(
     params.domain = website.domain;
   }
 
-  const { filterQuery } = parseFilters(filters, params);
+  const { filterQuery } = parseFilters(filters);
 
   return rawQuery(
     `

queries/analytics/pageviews/getPageviewStats.ts

@@ -10,9 +10,19 @@ export interface PageviewStatsCriteria {
   endDate: Date;
   timezone?: string;
   unit?: string;
-  count?: string;
-  filters: object;
-  sessionKey?: string;
+  filters: {
+    url?: string;
+    referrer?: string;
+    title?: string;
+    browser?: string;
+    os?: string;
+    device?: string;
+    screen?: string;
+    language?: string;
+    country?: string;
+    region?: string;
+    city?: string;
+  };
 }
 
 export async function getPageviewStats(
@@ -25,15 +35,7 @@ export async function getPageviewStats(
 }
 
 async function relationalQuery(websiteId: string, criteria: PageviewStatsCriteria) {
-  const {
-    startDate,
-    endDate,
-    timezone = 'utc',
-    unit = 'day',
-    count = '*',
-    filters = {},
-    sessionKey = 'session_id',
-  } = criteria;
+  const { startDate, endDate, timezone = 'utc', unit = 'day', filters = {} } = criteria;
   const { getDateQuery, parseFilters, rawQuery } = prisma;
   const website = await loadWebsite(websiteId);
   const { filterQuery, joinSession } = parseFilters(filters);
@@ -42,7 +44,7 @@ async function relationalQuery(websiteId: string, criteria: PageviewStatsCriteri
     `
     select
       ${getDateQuery('website_event.created_at', unit, timezone)} x,
-      count(${count !== '*' ? `${count}${sessionKey}` : count}) y
+      count(*) y
     from website_event
       ${joinSession}
     where website_event.website_id = {{websiteId::uuid}}
@@ -52,24 +54,17 @@ async function relationalQuery(websiteId: string, criteria: PageviewStatsCriteri
     group by 1
     `,
     {
+      ...filters,
       websiteId,
       startDate: maxDate(startDate, website.resetAt),
       endDate,
       eventType: EVENT_TYPE.pageView,
-      ...filters,
     },
   );
 }
 
 async function clickhouseQuery(websiteId: string, criteria: PageviewStatsCriteria) {
-  const {
-    startDate,
-    endDate,
-    timezone = 'UTC',
-    unit = 'day',
-    count = '*',
-    filters = {},
-  } = criteria;
+  const { startDate, endDate, timezone = 'UTC', unit = 'day', filters = {} } = criteria;
   const { parseFilters, rawQuery, getDateStringQuery, getDateQuery } = clickhouse;
   const website = await loadWebsite(websiteId);
   const { filterQuery } = parseFilters(filters);
@@ -82,7 +77,7 @@ async function clickhouseQuery(websiteId: string, criteria: PageviewStatsCriteri
     from (
       select 
         ${getDateQuery('created_at', unit, timezone)} as t,
-        count(${count !== '*' ? 'distinct session_id' : count}) as y
+        count(*) as y
       from website_event
       where website_id = {websiteId:UUID}
         and created_at between {startDate:DateTime} and {endDate:DateTime}

queries/analytics/sessions/getSessionMetrics.ts

@@ -28,8 +28,8 @@ async function relationalQuery(
 
   return rawQuery(
     `select ${column} x, count(*) y
-    from session as x
-    where x.session_id in (
+    from session as s
+    where s.session_id in (
       select website_event.session_id
       from website_event
         join website 
@@ -38,7 +38,7 @@ async function relationalQuery(
       where website.website_id = {{websiteId::uuid}}
         and website_event.created_at between {{startDate}} and {{endDate}}
       ${filterQuery}
-    )
+    ) as t
     group by 1
     order by 2 desc
     limit 100`,
@@ -64,7 +64,7 @@ async function clickhouseQuery(
     `
     select
       ${column} x, count(distinct session_id) y
-    from website_event as x
+    from website_event
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime} and {endDate:DateTime}
       and event_type = {eventType:UInt32}

queries/analytics/sessions/getSessionStats.ts

@@ -0,0 +1,98 @@
+import clickhouse from 'lib/clickhouse';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import prisma from 'lib/prisma';
+import { EVENT_TYPE } from 'lib/constants';
+import { loadWebsite } from 'lib/load';
+import { maxDate } from 'lib/date';
+
+export interface SessionStatsCriteria {
+  startDate: Date;
+  endDate: Date;
+  timezone?: string;
+  unit?: string;
+  filters: {
+    url?: string;
+    referrer?: string;
+    title?: string;
+    browser?: string;
+    os?: string;
+    device?: string;
+    screen?: string;
+    language?: string;
+    country?: string;
+    region?: string;
+    city?: string;
+  };
+}
+
+export async function getSessionStats(
+  ...args: [websiteId: string, criteria: SessionStatsCriteria]
+) {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(websiteId: string, criteria: SessionStatsCriteria) {
+  const { startDate, endDate, timezone = 'utc', unit = 'day', filters = {} } = criteria;
+  const { getDateQuery, parseFilters, rawQuery } = prisma;
+  const website = await loadWebsite(websiteId);
+  const { filterQuery, joinSession } = parseFilters(filters);
+
+  return rawQuery(
+    `
+    select
+      ${getDateQuery('website_event.created_at', unit, timezone)} x,
+      count(distinct website_event.session_id) y
+    from website_event
+      ${joinSession}
+    where website_event.website_id = {{websiteId::uuid}}
+      and website_event.created_at between {{startDate}} and {{endDate}}
+      and event_type = {{eventType}}
+      ${filterQuery}
+    group by 1
+    `,
+    {
+      ...filters,
+      websiteId,
+      startDate: maxDate(startDate, website.resetAt),
+      endDate,
+      eventType: EVENT_TYPE.pageView,
+    },
+  );
+}
+
+async function clickhouseQuery(websiteId: string, criteria: SessionStatsCriteria) {
+  const { startDate, endDate, timezone = 'UTC', unit = 'day', filters = {} } = criteria;
+  const { parseFilters, rawQuery, getDateStringQuery, getDateQuery } = clickhouse;
+  const website = await loadWebsite(websiteId);
+  const { filterQuery } = parseFilters(filters);
+
+  return rawQuery(
+    `
+    select
+      ${getDateStringQuery('g.t', unit)} as x, 
+      g.y as y
+    from (
+      select 
+        ${getDateQuery('created_at', unit, timezone)} as t,
+        count(distinct session_id) as y
+      from website_event
+      where website_id = {websiteId:UUID}
+        and created_at between {startDate:DateTime} and {endDate:DateTime}
+        and event_type = {eventType:UInt32}
+        ${filterQuery}
+      group by t
+    ) as g
+    order by t
+    `,
+    {
+      ...filters,
+      websiteId,
+      startDate: maxDate(startDate, website.resetAt),
+      endDate,
+      eventType: EVENT_TYPE.pageView,
+    },
+  );
+}