Merge Session/Event/Pageview CH

queries/analytics/session/createSession.js

@@ -19,6 +19,14 @@ async function relationalQuery(website_id, data) {
       },
       select: {
         session_id: true,
+        session_uuid: true,
+        hostname: true,
+        browser: true,
+        os: true,
+        screen: true,
+        language: true,
+        country: true,
+        device: true,
       },
     })
     .then(async res => {
@@ -35,20 +43,21 @@ async function clickhouseQuery(
   { session_uuid, hostname, browser, os, screen, language, country, device },
 ) {
   const { getDateFormat, sendMessage } = kafka;
+
   const params = {
-    session_uuid: session_uuid,
-    website_id: website_id,
+    session_uuid,
+    website_id,
     created_at: getDateFormat(new Date()),
-    hostname: hostname,
-    browser: browser,
-    os: os,
-    device: device,
-    screen: screen,
-    language: language,
+    hostname,
+    browser,
+    os,
+    device,
+    screen,
+    language,
     country: country ? country : null,
   };
 
-  await sendMessage(params, 'session');
+  await sendMessage(params, 'event');
 
   if (redis.client) {
     await redis.client.set(`session:${session_uuid}`, 1);

queries/analytics/session/getSessionByUuid.js

@@ -31,7 +31,7 @@ async function clickhouseQuery(session_uuid) {
   const params = [session_uuid];
 
   return rawQuery(
-    `select 
+    `select distinct
       session_uuid, 
       website_id, 
       created_at, 
@@ -42,7 +42,7 @@ async function clickhouseQuery(session_uuid) {
       screen,
       language, 
       country 
-    from session
+    from event
     where session_uuid = $1`,
     params,
   )

queries/analytics/session/getSessionMetrics.js

@@ -9,15 +9,10 @@ export async function getSessionMetrics(...args) {
   });
 }
 
-async function relationalQuery(website_id, start_at, end_at, field, filters = {}) {
+async function relationalQuery(website_id, { startDate, endDate, field, filters = {} }) {
   const { parseFilters, rawQuery } = prisma;
-  const params = [website_id, start_at, end_at];
-  const { pageviewQuery, sessionQuery, joinSession } = parseFilters(
-    'pageview',
-    null,
-    filters,
-    params,
-  );
+  const params = [website_id, startDate, endDate];
+  const { pageviewQuery, sessionQuery, joinSession } = parseFilters(null, filters, params);
 
   return rawQuery(
     `select ${field} x, count(*) y
@@ -37,29 +32,19 @@ async function relationalQuery(website_id, start_at, end_at, field, filters = {}
   );
 }
 
-async function clickhouseQuery(website_id, start_at, end_at, field, filters = {}) {
+async function clickhouseQuery(website_id, { startDate, endDate, field, filters = {} }) {
   const { parseFilters, getBetweenDates, rawQuery } = clickhouse;
   const params = [website_id];
-  const { pageviewQuery, sessionQuery, joinSession } = parseFilters(
-    'pageview',
-    null,
-    filters,
-    params,
-    'session_uuid',
-  );
+  const { pageviewQuery, sessionQuery } = parseFilters(null, filters, params);
 
   return rawQuery(
     `select ${field} x, count(*) y
-    from session as x
-    where x.session_uuid in (
-      select pageview.session_uuid
-      from pageview
-        ${joinSession}
-      where pageview.website_id=$1
-      and ${getBetweenDates('pageview.created_at', start_at, end_at)}
+    from event as x
+    where website_id=$1
+      and event_name = ''
+      and ${getBetweenDates('created_at', startDate, endDate)}
       ${pageviewQuery}
       ${sessionQuery}
-    )
     group by x
     order by y desc`,
     params,

queries/analytics/session/getSessions.js

@@ -32,7 +32,7 @@ async function clickhouseQuery(websites, start_at) {
   const { rawQuery, getDateFormat } = clickhouse;
 
   return rawQuery(
-    `select
+    `select distinct
       session_uuid,
       website_id,
       created_at,
@@ -43,7 +43,7 @@ async function clickhouseQuery(websites, start_at) {
       screen,
       language,
       country
-    from session
+    from event
     where ${websites && websites.length > 0 ? `(website_id in (${websites.join[',']})` : '0 = 0'}
       and created_at >= ${getDateFormat(start_at)}`,
   );