Feat/um 49 query builder api (#1573)

* add uuid to event. add indexes

* eventdata api

* add event data

* remove test data

* update list

queries/analytics/event/getEventData.js

@@ -0,0 +1,63 @@
+import clickhouse from 'lib/clickhouse';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import prisma from 'lib/prisma';
+
+export async function getEventData(...args) {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(websiteId, { startDate, endDate, event_name, columns, filters }) {
+  const { rawQuery, getEventDataColumnsQuery, getEventDataFilterQuery } = prisma;
+  const params = [startDate, endDate];
+
+  return rawQuery(
+    `select
+      ${getEventDataColumnsQuery('event_data.event_data', columns)}
+    from event
+      join website 
+        on event.website_id = website.website_id
+      join event_data
+        on event.event_id = event_data.event_id
+    where website_uuid='${websiteId}'
+      and event.created_at between $1 and $2
+      ${event_name ? `and event_name = ${event_name}` : ''}
+      ${
+        Object.keys(filters).length > 0
+          ? `and ${getEventDataFilterQuery('event_data.event_data', filters)}`
+          : ''
+      }`,
+    params,
+  ).then(results => {
+    return Object.keys(results[0]).map(a => {
+      return { x: a, y: results[0][`${a}`] };
+    });
+  });
+}
+
+async function clickhouseQuery(websiteId, { startDate, endDate, event_name, columns, filters }) {
+  const { rawQuery, getBetweenDates, getEventDataColumnsQuery, getEventDataFilterQuery } =
+    clickhouse;
+  const params = [websiteId];
+
+  return rawQuery(
+    `select
+      ${getEventDataColumnsQuery('event_data', columns)}
+    from event
+    where website_id= $1
+      ${event_name ? `and event_name = ${event_name}` : ''}
+      and ${getBetweenDates('created_at', startDate, endDate)}
+      ${
+        Object.keys(filters).length > 0
+          ? `and ${getEventDataFilterQuery('event_data', filters)}`
+          : ''
+      }`,
+    params,
+  ).then(results => {
+    return Object.keys(results[0]).map(a => {
+      return { x: a, y: results[0][`${a}`] };
+    });
+  });
+}

queries/analytics/event/getEventMetrics.js

@@ -18,7 +18,7 @@ async function relationalQuery(
   filters = {},
 ) {
   const { rawQuery, getDateQuery, getFilterQuery } = prisma;
-  const params = [websiteId, start_at, end_at];
+  const params = [start_at, end_at];
 
   return rawQuery(
     `select
@@ -29,7 +29,7 @@ async function relationalQuery(
       join website 
         on event.website_id = website.website_id
     where website_uuid='${websiteId}'
-      and event.created_at between $2 and $3
+      and event.created_at between $1 and $2
     ${getFilterQuery('event', filters, params)}
     group by 1, 2
     order by 2`,

queries/analytics/event/saveEvent.js

@@ -12,13 +12,14 @@ export async function saveEvent(...args) {
 
 async function relationalQuery(
   { websiteId },
-  { session: { id: sessionId }, url, eventName, eventData },
+  { session: { id: sessionId }, eventUuid, url, eventName, eventData },
 ) {
   const data = {
     websiteId,
     sessionId,
     url: url?.substring(0, URL_LENGTH),
     eventName: eventName?.substring(0, EVENT_NAME_LENGTH),
+    eventUuid,
   };
 
   if (eventData) {
@@ -47,7 +48,7 @@ async function clickhouseQuery(
     created_at: getDateFormat(new Date()),
     url: url?.substring(0, URL_LENGTH),
     event_name: eventName?.substring(0, EVENT_NAME_LENGTH),
-    event_data: JSON.stringify(eventData),
+    event_data: eventData ? JSON.stringify(eventData) : null,
     ...sessionArgs,
     country: country ? country : null,
   };

queries/analytics/pageview/getPageviewMetrics.js

@@ -11,7 +11,7 @@ export async function getPageviewMetrics(...args) {
 
 async function relationalQuery(websiteId, { startDate, endDate, column, table, filters = {} }) {
   const { rawQuery, parseFilters } = prisma;
-  const params = [websiteId, startDate, endDate];
+  const params = [startDate, endDate];
   const { pageviewQuery, sessionQuery, eventQuery, joinSession } = parseFilters(
     table,
     column,
@@ -25,7 +25,7 @@ async function relationalQuery(websiteId, { startDate, endDate, column, table, f
       ${` join website on ${table}.website_id = website.website_id`}
       ${joinSession}
     where website.website_uuid='${websiteId}'
-      and ${table}.created_at between $2 and $3
+      and ${table}.created_at between $1 and $2
       ${pageviewQuery}
       ${joinSession && sessionQuery}
       ${eventQuery}

queries/analytics/pageview/getPageviewParams.js

@@ -10,7 +10,7 @@ export async function getPageviewParams(...args) {
 
 async function relationalQuery(websiteId, start_at, end_at, column, table, filters = {}) {
   const { parseFilters, rawQuery } = prisma;
-  const params = [websiteId, start_at, end_at];
+  const params = [start_at, end_at];
   const { pageviewQuery, sessionQuery, eventQuery, joinSession } = parseFilters(
     table,
     column,
@@ -25,7 +25,7 @@ async function relationalQuery(websiteId, start_at, end_at, column, table, filte
       ${` join website on ${table}.website_id = website.website_id`}
       ${joinSession}
     where website.website_uuid='${websiteId}'
-      and ${table}.created_at between $2 and $3
+      and ${table}.created_at between $1 and $2
       and ${table}.url like '%?%'
       ${pageviewQuery}
       ${joinSession && sessionQuery}

queries/analytics/pageview/getPageviewStats.js

@@ -22,7 +22,7 @@ async function relationalQuery(
   },
 ) {
   const { getDateQuery, parseFilters, rawQuery } = prisma;
-  const params = [websiteId, start_at, end_at];
+  const params = [start_at, end_at];
   const { pageviewQuery, sessionQuery, joinSession } = parseFilters(
     'pageview',
     null,
@@ -38,7 +38,7 @@ async function relationalQuery(
             on pageview.website_id = website.website_id
         ${joinSession}
       where website.website_uuid='${websiteId}'
-        and pageview.created_at between $2 and $3
+        and pageview.created_at between $1 and $2
         ${pageviewQuery}
         ${sessionQuery}
       group by 1`,

queries/analytics/session/getSessionMetrics.js

@@ -11,7 +11,7 @@ export async function getSessionMetrics(...args) {
 
 async function relationalQuery(websiteId, { startDate, endDate, field, filters = {} }) {
   const { parseFilters, rawQuery } = prisma;
-  const params = [websiteId, startDate, endDate];
+  const params = [startDate, endDate];
   const { pageviewQuery, sessionQuery, joinSession } = parseFilters(null, filters, params);
 
   return rawQuery(
@@ -24,7 +24,7 @@ async function relationalQuery(websiteId, { startDate, endDate, field, filters =
           on pageview.website_id = website.website_id
         ${joinSession}
       where website.website_uuid='${websiteId}'
-      and pageview.created_at between $2 and $3
+      and pageview.created_at between $1 and $2
       ${pageviewQuery}
       ${sessionQuery}
     )

queries/analytics/stats/getActiveVisitors.js

@@ -12,7 +12,7 @@ export async function getActiveVisitors(...args) {
 
 async function relationalQuery(websiteId) {
   const date = subMinutes(new Date(), 5);
-  const params = [websiteId, date];
+  const params = [date];
 
   return prisma.rawQuery(
     `select count(distinct session_id) x
@@ -20,7 +20,7 @@ async function relationalQuery(websiteId) {
       join website 
         on pageview.website_id = website.website_id
     where website.website_uuid = '${websiteId}'
-    and pageview.created_at >= $2`,
+    and pageview.created_at >= $1`,
     params,
   );
 }

queries/analytics/stats/getWebsiteStats.js

@@ -11,7 +11,7 @@ export async function getWebsiteStats(...args) {
 
 async function relationalQuery(websiteId, { start_at, end_at, filters = {} }) {
   const { getDateQuery, getTimestampInterval, parseFilters, rawQuery } = prisma;
-  const params = [websiteId, start_at, end_at];
+  const params = [start_at, end_at];
   const { pageviewQuery, sessionQuery, joinSession } = parseFilters(
     'pageview',
     null,
@@ -34,7 +34,7 @@ async function relationalQuery(websiteId, { start_at, end_at, filters = {} }) {
             on pageview.website_id = website.website_id
           ${joinSession}
         where website.website_uuid='${websiteId}'
-          and pageview.created_at between $2 and $3
+          and pageview.created_at between $1 and $2
           ${pageviewQuery}
           ${sessionQuery}
         group by 1, 2

queries/index.js

@@ -17,6 +17,7 @@ export * from './admin/website/resetWebsite';
 export * from './admin/website/updateWebsite';
 export * from './analytics/event/getEventMetrics';
 export * from './analytics/event/getEvents';
+export * from './analytics/event/getEventData';
 export * from './analytics/event/saveEvent';
 export * from './analytics/pageview/getPageviewMetrics';
 export * from './analytics/pageview/getPageviewParams';