clickhouse inserts

lib/db.js

@@ -72,19 +72,6 @@ function initializeClickhouse() {
       database,
     },
   });
-
-  // return new ClickHouse({
-  //   url: 'http://164.92.95.2',
-  //   port: 8123,
-  //   basicAuth: {
-  //     username: 'default',
-  //     password: 'shhhthisissupersecret!',
-  //   },
-  //   format: 'json',
-  //   config: {
-  //     database: 'umami_dev',
-  //   },
-  // });
 }
 
 const prisma = initializePrisma(options);
@@ -243,7 +230,7 @@ export function getFilterQuery(table, filters = {}, params = []) {
   return query.join('\n');
 }
 
-export function parseFilters(table, filters = {}, params = []) {
+export function parseFilters(table, filters = {}, params = [], sessionKey = 'session_id') {
   const { domain, url, event_url, referrer, os, browser, device, country, event_type } = filters;
 
   const pageviewFilters = { domain, url, referrer };
@@ -257,7 +244,7 @@ export function parseFilters(table, filters = {}, params = []) {
     event: { event_type },
     joinSession:
       os || browser || device || country
-        ? `inner join session on ${table}.session_id = session.session_id`
+        ? `inner join session on ${table}.${sessionKey} = session.${sessionKey}`
         : '',
     pageviewQuery: getFilterQuery('pageview', pageviewFilters, params),
     sessionQuery: getFilterQuery('session', sessionFilters, params),

lib/session.js

@@ -37,6 +37,8 @@ export async function getSession(req) {
 
   let session = await getSessionByUuid(session_uuid);
 
+  session = Array.isArray(session) && session[0] ? session[0] : null;
+
   if (!session) {
     try {
       session = await createSession(website_id, {
@@ -50,6 +52,8 @@ export async function getSession(req) {
         device,
       });
 
+      console.log(session);
+
       if (!session) {
         return null;
       }
@@ -65,5 +69,6 @@ export async function getSession(req) {
   return {
     website_id,
     session_id,
+    session_uuid,
   };
 }