convert analytics queries

queries/analytics/event/getEventMetrics.js

@@ -1,17 +1,23 @@
+import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
 import {
+  rawQueryClickhouse,
+  getBetweenDatesClickhouse,
   getDateQuery,
+  getDateQueryClickhouse,
   getDateStringQuery,
   getFilterQuery,
   rawQuery,
   runAnalyticsQuery,
-  clickhouse,
 } from 'lib/db';
 
-export function getEventMetrics(...args) {
-  return runAnalyticsQuery(relationalQuery(...args), clickhouseQuery(...args));
+export async function getEventMetrics(...args) {
+  return runAnalyticsQuery({
+    [`${RELATIONAL}`]: () => relationalQuery(...args),
+    [`${CLICKHOUSE}`]: () => clickhouseQuery(...args),
+  });
 }
 
-function relationalQuery(
+async function relationalQuery(
   website_id,
   start_at,
   end_at,
@@ -38,28 +44,28 @@ function relationalQuery(
   );
 }
 
-function clickhouseQuery(
+async function clickhouseQuery(
   website_id,
   start_at,
   end_at,
-  timezone = 'utc',
+  timezone = 'UTC',
   unit = 'day',
   filters = {},
 ) {
-  const params = [website_id, start_at, end_at];
+  const params = [website_id];
 
-  return clickhouse.query(
+  return rawQueryClickhouse(
     `
     select
       event_value x,
-      ${getDateStringQuery(getDateQuery('created_at', unit, timezone), unit)} t,
+      ${getDateQueryClickhouse('created_at', unit, timezone)} t,
       count(*) y
     from event
-    where website_id=$1
-    and created_at between $2 and $3
-    ${getFilterQuery('event', filters, params)}
-    group by 1, 2
-    order by 2
+    where website_id= $1
+      and ${getBetweenDatesClickhouse('created_at', start_at, end_at)}
+      ${getFilterQuery('event', filters, params)}
+    group by x, t
+    order by t
     `,
     params,
   );

queries/analytics/event/getEvents.js

@@ -1,6 +1,20 @@
-import { prisma, runQuery } from 'lib/db';
+import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
+import {
+  rawQueryClickhouse,
+  getDateFormatClickhouse,
+  prisma,
+  runAnalyticsQuery,
+  runQuery,
+} from 'lib/db';
 
-export async function getEvents(websites, start_at) {
+export function getEvents(...args) {
+  return runAnalyticsQuery({
+    [`${RELATIONAL}`]: () => relationalQuery(...args),
+    [`${CLICKHOUSE}`]: () => clickhouseQuery(...args),
+  });
+}
+
+function relationalQuery(websites, start_at) {
   return runQuery(
     prisma.event.findMany({
       where: {
@@ -16,3 +30,20 @@ export async function getEvents(websites, start_at) {
     }),
   );
 }
+
+function clickhouseQuery(websites, start_at) {
+  return rawQueryClickhouse(
+    `
+    select
+      event_id,
+      website_id, 
+      session_id,
+      created_at,
+      url,
+      event_type
+    from event
+    where website_id in (${websites.join[',']}
+      and created_at >= ${getDateFormatClickhouse(start_at)})
+    `,
+  );
+}