fix collect

queries/analytics/event/getEvents.js

@@ -13,7 +13,7 @@ function relationalQuery(websites, start_at) {
   return prisma.client.event.findMany({
     where: {
       website: {
-        id: {
+        websiteUuid: {
           in: websites,
         },
       },

queries/analytics/event/saveEvent.js

@@ -10,7 +10,10 @@ export async function saveEvent(...args) {
   });
 }
 
-async function relationalQuery(websiteId, { sessionId, url, eventName, eventData }) {
+async function relationalQuery(
+  { websiteId },
+  { session: { id: sessionId }, url, eventName, eventData },
+) {
   const data = {
     websiteId,
     sessionId,
@@ -32,7 +35,7 @@ async function relationalQuery(websiteId, { sessionId, url, eventName, eventData
 }
 
 async function clickhouseQuery(
-  websiteId,
+  { websiteUuid: websiteId },
   { session: { country, sessionUuid, ...sessionArgs }, eventUuid, url, eventName, eventData },
 ) {
   const { getDateFormat, sendMessage } = kafka;

queries/analytics/pageview/getPageviews.js

@@ -13,7 +13,7 @@ async function relationalQuery(websites, start_at) {
   return prisma.client.pageview.findMany({
     where: {
       website: {
-        id: {
+        websiteUuid: {
           in: websites,
         },
       },
@@ -25,9 +25,9 @@ async function relationalQuery(websites, start_at) {
 }
 
 async function clickhouseQuery(websites, start_at) {
-  const { getCommaSeparatedStringFormat } = clickhouse;
+  const { rawQuery, getCommaSeparatedStringFormat } = clickhouse;
 
-  return clickhouse.rawQuery(
+  return rawQuery(
     `select
         website_id,
         session_id,

queries/analytics/pageview/savePageView.js

@@ -10,7 +10,7 @@ export async function savePageView(...args) {
   });
 }
 
-async function relationalQuery(websiteId, { session: { sessionId }, url, referrer }) {
+async function relationalQuery({ websiteId }, { session: { id: sessionId }, url, referrer }) {
   return prisma.client.pageview.create({
     data: {
       websiteId,
@@ -22,7 +22,7 @@ async function relationalQuery(websiteId, { session: { sessionId }, url, referre
 }
 
 async function clickhouseQuery(
-  websiteId,
+  { websiteUuid: websiteId },
   { session: { country, sessionUuid, ...sessionArgs }, url, referrer },
 ) {
   const { getDateFormat, sendMessage } = kafka;

queries/analytics/session/createSession.js

@@ -18,7 +18,7 @@ async function relationalQuery(websiteId, data) {
         ...data,
       },
       select: {
-        sessionId: true,
+        id: true,
         sessionUuid: true,
         hostname: true,
         browser: true,
@@ -31,7 +31,7 @@ async function relationalQuery(websiteId, data) {
     })
     .then(async res => {
       if (redis.client && res) {
-        await redis.client.set(`session:${res.sessionUuid}`, res.id);
+        await redis.client.set(`session:${res.sessionUuid}`, 1);
       }
 
       return res;

queries/analytics/session/getSessionByUuid.js

@@ -19,7 +19,7 @@ async function relationalQuery(sessionUuid) {
     })
     .then(async res => {
       if (redis.client && res) {
-        await redis.client.set(`session:${res.sessionUuid}`, res.sessionId);
+        await redis.client.set(`session:${res.sessionUuid}`, 1);
       }
 
       return res;
@@ -32,7 +32,7 @@ async function clickhouseQuery(sessionUuid) {
 
   return rawQuery(
     `select distinct
-      session_uuid, 
+      session_id, 
       website_id, 
       created_at, 
       hostname, 
@@ -43,7 +43,7 @@ async function clickhouseQuery(sessionUuid) {
       language, 
       country 
     from event
-    where session_uuid = $1`,
+    where session_id = $1`,
     params,
   )
     .then(result => findFirst(result))

queries/analytics/session/getSessions.js

@@ -15,7 +15,7 @@ async function relationalQuery(websites, start_at) {
       ...(websites && websites.length > 0
         ? {
             website: {
-              id: {
+              websiteUuid: {
                 in: websites,
               },
             },
@@ -29,11 +29,11 @@ async function relationalQuery(websites, start_at) {
 }
 
 async function clickhouseQuery(websites, start_at) {
-  const { rawQuery, getDateFormat } = clickhouse;
+  const { rawQuery, getDateFormat, getCommaSeparatedStringFormat } = clickhouse;
 
   return rawQuery(
     `select distinct
-      session_uuid,
+      session_id,
       website_id,
       created_at,
       hostname,
@@ -44,7 +44,11 @@ async function clickhouseQuery(websites, start_at) {
       language,
       country
     from event
-    where ${websites && websites.length > 0 ? `website_id in (${websites.join(',')})` : '0 = 0'}
+    where ${
+      websites && websites.length > 0
+        ? `website_id in (${getCommaSeparatedStringFormat(websites)})`
+        : '0 = 0'
+    }
       and created_at >= ${getDateFormat(start_at)}`,
   );
 }