Merge branch 'dev' into feat/um-66-update-clickhouse-schema-uuid

queries/analytics/event/getEventMetrics.js

@@ -10,7 +10,7 @@ export async function getEventMetrics(...args) {
 }
 
 async function relationalQuery(
-  website_id,
+  websiteId,
   start_at,
   end_at,
   timezone = 'utc',
@@ -18,7 +18,7 @@ async function relationalQuery(
   filters = {},
 ) {
   const { rawQuery, getDateQuery, getFilterQuery } = prisma;
-  const params = [website_id, start_at, end_at];
+  const params = [websiteId, start_at, end_at];
 
   return rawQuery(
     `select
@@ -36,6 +36,7 @@ async function relationalQuery(
 }
 
 async function clickhouseQuery(
+  websiteId,
   website_uuid,
   start_at,
   end_at,
@@ -44,7 +45,7 @@ async function clickhouseQuery(
   filters = {},
 ) {
   const { rawQuery, getDateQuery, getBetweenDates, getFilterQuery } = clickhouse;
-  const params = [website_uuid];
+  const params = [websiteId];
 
   return rawQuery(
     `select

queries/analytics/event/getEvents.js

@@ -13,11 +13,11 @@ function relationalQuery(websites, start_at) {
   return prisma.client.event.findMany({
     where: {
       website: {
-        website_id: {
+        id: {
           in: websites,
         },
       },
-      created_at: {
+      createdAt: {
         gte: start_at,
       },
     },

queries/analytics/event/saveEvent.js

@@ -10,18 +10,18 @@ export async function saveEvent(...args) {
   });
 }
 
-async function relationalQuery(website_id, { session_id, url, event_name, event_data }) {
+async function relationalQuery(websiteId, { sessionId, url, eventName, eventData }) {
   const data = {
-    website_id,
-    session_id,
+    websiteId,
+    sessionId,
     url: url?.substring(0, URL_LENGTH),
-    event_name: event_name?.substring(0, EVENT_NAME_LENGTH),
+    eventName: eventName?.substring(0, EVENT_NAME_LENGTH),
   };
 
-  if (event_data) {
-    data.event_data = {
+  if (eventData) {
+    data.eventData = {
       create: {
-        event_data: event_data,
+        eventData: eventData,
       },
     };
   }
@@ -32,18 +32,21 @@ async function relationalQuery(website_id, { session_id, url, event_name, event_
 }
 
 async function clickhouseQuery(
+  websiteId,
+  { session: { country, sessionUuid, ...sessionArgs }, eventUuid, url, eventName, eventData },
   website_uuid,
-  { session: { country, ...sessionArgs }, event_uuid, url, event_name, event_data },
 ) {
   const { getDateFormat, sendMessage } = kafka;
 
   const params = {
-    event_uuid,
+    session_uuid: sessionUuid,
+    event_uuid: eventUuid,
+    website_id: websiteId,
     website_uuid,
     created_at: getDateFormat(new Date()),
     url: url?.substring(0, URL_LENGTH),
-    event_name: event_name?.substring(0, EVENT_NAME_LENGTH),
-    event_data: JSON.stringify(event_data),
+    event_name: eventName?.substring(0, EVENT_NAME_LENGTH),
+    event_data: JSON.stringify(eventData),
     ...sessionArgs,
     country: country ? country : null,
   };

queries/analytics/pageview/getPageviewMetrics.js

@@ -9,9 +9,9 @@ export async function getPageviewMetrics(...args) {
   });
 }
 
-async function relationalQuery(website_id, { startDate, endDate, column, table, filters = {} }) {
+async function relationalQuery(websiteId, { startDate, endDate, column, table, filters = {} }) {
   const { rawQuery, parseFilters } = prisma;
-  const params = [website_id, startDate, endDate];
+  const params = [websiteId, startDate, endDate];
   const { pageviewQuery, sessionQuery, eventQuery, joinSession } = parseFilters(
     table,
     column,
@@ -34,9 +34,9 @@ async function relationalQuery(website_id, { startDate, endDate, column, table,
   );
 }
 
-async function clickhouseQuery(website_uuid, { startDate, endDate, column, filters = {} }) {
+async function clickhouseQuery(websiteId, { startDate, endDate, column, filters = {} }) {
   const { rawQuery, parseFilters, getBetweenDates } = clickhouse;
-  const params = [website_uuid];
+  const params = [websiteId];
   const { pageviewQuery, sessionQuery, eventQuery } = parseFilters(column, filters, params);
 
   return rawQuery(

queries/analytics/pageview/getPageviewParams.js

@@ -8,9 +8,9 @@ export async function getPageviewParams(...args) {
   });
 }
 
-async function relationalQuery(website_id, start_at, end_at, column, table, filters = {}) {
+async function relationalQuery(websiteId, start_at, end_at, column, table, filters = {}) {
   const { parseFilters, rawQuery } = prisma;
-  const params = [website_id, start_at, end_at];
+  const params = [websiteId, start_at, end_at];
   const { pageviewQuery, sessionQuery, eventQuery, joinSession } = parseFilters(
     table,
     column,

queries/analytics/pageview/getPageviewStats.js

@@ -10,7 +10,7 @@ export async function getPageviewStats(...args) {
 }
 
 async function relationalQuery(
-  website_id,
+  websiteId,
   {
     start_at,
     end_at,
@@ -22,7 +22,7 @@ async function relationalQuery(
   },
 ) {
   const { getDateQuery, parseFilters, rawQuery } = prisma;
-  const params = [website_id, start_at, end_at];
+  const params = [websiteId, start_at, end_at];
   const { pageviewQuery, sessionQuery, joinSession } = parseFilters(
     'pageview',
     null,
@@ -45,11 +45,11 @@ async function relationalQuery(
 }
 
 async function clickhouseQuery(
-  website_uuid,
+  websiteId,
   { start_at, end_at, timezone = 'UTC', unit = 'day', count = '*', filters = {} },
 ) {
   const { parseFilters, rawQuery, getDateStringQuery, getDateQuery, getBetweenDates } = clickhouse;
-  const params = [website_uuid];
+  const params = [websiteId];
   const { pageviewQuery, sessionQuery } = parseFilters(null, filters, params);
 
   return rawQuery(

queries/analytics/pageview/getPageviews.js

@@ -13,11 +13,11 @@ async function relationalQuery(websites, start_at) {
   return prisma.client.pageview.findMany({
     where: {
       website: {
-        website_id: {
+        id: {
           in: websites,
         },
       },
-      created_at: {
+      createdAt: {
         gte: start_at,
       },
     },

queries/analytics/pageview/savePageView.js

@@ -10,11 +10,11 @@ export async function savePageView(...args) {
   });
 }
 
-async function relationalQuery(website_id, { session: { session_id }, url, referrer }) {
+async function relationalQuery(websiteId, { session: { sessionId }, url, referrer }) {
   return prisma.client.pageview.create({
     data: {
-      website_id,
-      session_id,
+      websiteId,
+      sessionId,
       url: url?.substring(0, URL_LENGTH),
       referrer: referrer?.substring(0, URL_LENGTH),
     },
@@ -22,12 +22,13 @@ async function relationalQuery(website_id, { session: { session_id }, url, refer
 }
 
 async function clickhouseQuery(
-  website_uuid,
-  { session: { country, ...sessionArgs }, url, referrer },
+  websiteId,
+  { session: { country, sessionUuid, ...sessionArgs }, url, referrer },
 ) {
   const { getDateFormat, sendMessage } = kafka;
   const params = {
-    website_id: website_uuid,
+    session_uuid: sessionUuid,
+    website_id: websiteId,
     created_at: getDateFormat(new Date()),
     url: url?.substring(0, URL_LENGTH),
     referrer: referrer?.substring(0, URL_LENGTH),

queries/analytics/session/createSession.js

@@ -10,16 +10,16 @@ export async function createSession(...args) {
   });
 }
 
-async function relationalQuery(website_id, data) {
+async function relationalQuery(websiteId, data) {
   return prisma.client.session
     .create({
       data: {
-        website_id,
+        websiteId,
         ...data,
       },
       select: {
-        session_id: true,
-        session_uuid: true,
+        sessionId: true,
+        sessionUuid: true,
         hostname: true,
         browser: true,
         os: true,
@@ -31,7 +31,7 @@ async function relationalQuery(website_id, data) {
     })
     .then(async res => {
       if (redis.client && res) {
-        await redis.client.set(`session:${res.session_uuid}`, res.session_id);
+        await redis.client.set(`session:${res.sessionUuid}`, res.id);
       }
 
       return res;
@@ -39,14 +39,14 @@ async function relationalQuery(website_id, data) {
 }
 
 async function clickhouseQuery(
-  website_uuid,
-  { session_uuid, hostname, browser, os, screen, language, country, device },
+  websiteId,
+  { sessionUuid, hostname, browser, os, screen, language, country, device },
 ) {
   const { getDateFormat, sendMessage } = kafka;
 
   const params = {
-    session_uuid,
-    website_uuid,
+    session_uuid: sessionUuid,
+    website_id: websiteId,
     created_at: getDateFormat(new Date()),
     hostname,
     browser,
@@ -60,6 +60,6 @@ async function clickhouseQuery(
   await sendMessage(params, 'event');
 
   if (redis.client) {
-    await redis.client.set(`session:${session_uuid}`, 1);
+    await redis.client.set(`session:${sessionUuid}`, 1);
   }
 }

queries/analytics/session/getSessionByUuid.js

@@ -10,25 +10,25 @@ export async function getSessionByUuid(...args) {
   });
 }
 
-async function relationalQuery(session_uuid) {
+async function relationalQuery(sessionUuid) {
   return prisma.client.session
     .findUnique({
       where: {
-        session_uuid,
+        sessionUuid,
       },
     })
     .then(async res => {
       if (redis.client && res) {
-        await redis.client.set(`session:${res.session_uuid}`, res.session_id);
+        await redis.client.set(`session:${res.sessionUuid}`, res.sessionId);
       }
 
       return res;
     });
 }
 
-async function clickhouseQuery(session_uuid) {
+async function clickhouseQuery(sessionUuid) {
   const { rawQuery, findFirst } = clickhouse;
-  const params = [session_uuid];
+  const params = [sessionUuid];
 
   return rawQuery(
     `select distinct

queries/analytics/session/getSessionMetrics.js

@@ -9,9 +9,9 @@ export async function getSessionMetrics(...args) {
   });
 }
 
-async function relationalQuery(website_id, { startDate, endDate, field, filters = {} }) {
+async function relationalQuery(websiteId, { startDate, endDate, field, filters = {} }) {
   const { parseFilters, rawQuery } = prisma;
-  const params = [website_id, startDate, endDate];
+  const params = [websiteId, startDate, endDate];
   const { pageviewQuery, sessionQuery, joinSession } = parseFilters(null, filters, params);
 
   return rawQuery(
@@ -32,9 +32,9 @@ async function relationalQuery(website_id, { startDate, endDate, field, filters
   );
 }
 
-async function clickhouseQuery(website_id, { startDate, endDate, field, filters = {} }) {
+async function clickhouseQuery(websiteId, { startDate, endDate, field, filters = {} }) {
   const { parseFilters, getBetweenDates, rawQuery } = clickhouse;
-  const params = [website_id];
+  const params = [websiteId];
   const { pageviewQuery, sessionQuery } = parseFilters(null, filters, params);
 
   return rawQuery(

queries/analytics/session/getSessions.js

@@ -15,13 +15,13 @@ async function relationalQuery(websites, start_at) {
       ...(websites && websites.length > 0
         ? {
             website: {
-              website_id: {
+              id: {
                 in: websites,
               },
             },
           }
         : {}),
-      created_at: {
+      createdAt: {
         gte: start_at,
       },
     },

queries/analytics/stats/getActiveVisitors.js

@@ -10,9 +10,9 @@ export async function getActiveVisitors(...args) {
   });
 }
 
-async function relationalQuery(website_id) {
+async function relationalQuery(websiteId) {
   const date = subMinutes(new Date(), 5);
-  const params = [website_id, date];
+  const params = [websiteId, date];
 
   return prisma.rawQuery(
     `select count(distinct session_id) x
@@ -23,9 +23,9 @@ async function relationalQuery(website_id) {
   );
 }
 
-async function clickhouseQuery(website_uuid) {
+async function clickhouseQuery(websiteId) {
   const { rawQuery, getDateFormat } = clickhouse;
-  const params = [website_uuid];
+  const params = [websiteId];
 
   return rawQuery(
     `select count(distinct session_id) x

queries/analytics/stats/getRealtimeData.js

@@ -10,19 +10,19 @@ export async function getRealtimeData(websites, time) {
   ]);
 
   return {
-    pageviews: pageviews.map(({ view_id, ...props }) => ({
-      __id: `p${view_id}`,
-      view_id,
+    pageviews: pageviews.map(({ pageviewId, ...props }) => ({
+      __id: `p${pageviewId}`,
+      pageviewId,
       ...props,
     })),
-    sessions: sessions.map(({ session_id, ...props }) => ({
-      __id: `s${session_id}`,
-      session_id,
+    sessions: sessions.map(({ sessionId, ...props }) => ({
+      __id: `s${sessionId}`,
+      sessionId,
       ...props,
     })),
-    events: events.map(({ event_id, ...props }) => ({
-      __id: `e${event_id}`,
-      event_id,
+    events: events.map(({ eventId, ...props }) => ({
+      __id: `e${eventId}`,
+      eventId,
       ...props,
     })),
     timestamp: Date.now(),

queries/analytics/stats/getWebsiteStats.js

@@ -9,9 +9,9 @@ export async function getWebsiteStats(...args) {
   });
 }
 
-async function relationalQuery(website_id, { start_at, end_at, filters = {} }) {
+async function relationalQuery(websiteId, { start_at, end_at, filters = {} }) {
   const { getDateQuery, getTimestampInterval, parseFilters, rawQuery } = prisma;
-  const params = [website_id, start_at, end_at];
+  const params = [websiteId, start_at, end_at];
   const { pageviewQuery, sessionQuery, joinSession } = parseFilters(
     'pageview',
     null,
@@ -41,9 +41,9 @@ async function relationalQuery(website_id, { start_at, end_at, filters = {} }) {
   );
 }
 
-async function clickhouseQuery(website_uuid, { start_at, end_at, filters = {} }) {
+async function clickhouseQuery(websiteId, { start_at, end_at, filters = {} }) {
   const { rawQuery, getDateQuery, getBetweenDates, parseFilters } = clickhouse;
-  const params = [website_uuid];
+  const params = [websiteId];
   const { pageviewQuery, sessionQuery } = parseFilters(null, filters, params);
 
   return rawQuery(