checkpoint

queries/admin/account/createAccount.js

@@ -1,5 +1,4 @@
-import { runQuery } from 'lib/queries';
-import prisma from 'lib/db';
+import { prisma, runQuery } from 'lib/db';
 
 export async function createAccount(data) {
   return runQuery(

queries/admin/account/deleteAccount.js

@@ -1,5 +1,4 @@
-import { runQuery } from 'lib/queries';
-import prisma from 'lib/db';
+import { prisma, runQuery } from 'lib/db';
 
 export async function deleteAccount(user_id) {
   return runQuery(

queries/admin/account/getAccountById.js

@@ -1,5 +1,4 @@
-import { runQuery } from 'lib/queries';
-import prisma from 'lib/db';
+import { prisma, runQuery } from 'lib/db';
 
 export async function getAccountById(user_id) {
   return runQuery(

queries/admin/account/getAccountByUsername.js

@@ -1,5 +1,4 @@
-import { runQuery } from 'lib/queries';
-import prisma from 'lib/db';
+import { prisma, runQuery } from 'lib/db';
 
 export async function getAccountByUsername(username) {
   return runQuery(

queries/admin/account/getAccounts.js

@@ -1,5 +1,4 @@
-import { runQuery } from 'lib/queries';
-import prisma from 'lib/db';
+import { prisma, runQuery } from 'lib/db';
 
 export async function getAccounts() {
   return runQuery(

queries/admin/account/updateAccount.js

@@ -1,5 +1,4 @@
-import { runQuery } from 'lib/queries';
-import prisma from 'lib/db';
+import { prisma, runQuery } from 'lib/db';
 
 export async function updateAccount(user_id, data) {
   return runQuery(

queries/admin/website/createWebsite.js

@@ -1,5 +1,4 @@
-import { runQuery } from 'lib/queries';
-import prisma from 'lib/db';
+import { prisma, runQuery } from 'lib/db';
 
 export async function createWebsite(user_id, data) {
   return runQuery(

queries/admin/website/deleteWebsite.js

@@ -1,5 +1,4 @@
-import { runQuery } from 'lib/queries';
-import prisma from 'lib/db';
+import { prisma, runQuery } from 'lib/db';
 
 export async function deleteWebsite(website_id) {
   return runQuery(

queries/admin/website/getAllWebsites.js

@@ -1,5 +1,4 @@
-import { runQuery } from 'lib/queries';
-import prisma from 'lib/db';
+import { prisma, runQuery } from 'lib/db';
 
 export async function getAllWebsites() {
   let data = await runQuery(

queries/admin/website/getUserWebsites.js

@@ -1,5 +1,4 @@
-import { runQuery } from 'lib/queries';
-import prisma from 'lib/db';
+import { prisma, runQuery } from 'lib/db';
 
 export async function getUserWebsites(user_id) {
   return runQuery(

queries/admin/website/getWebsiteById.js

@@ -1,5 +1,4 @@
-import { runQuery } from 'lib/queries';
-import prisma from 'lib/db';
+import { prisma, runQuery } from 'lib/db';
 
 export async function getWebsiteById(website_id) {
   return runQuery(

queries/admin/website/getWebsiteByShareId.js

@@ -1,5 +1,4 @@
-import { runQuery } from 'lib/queries';
-import prisma from 'lib/db';
+import { prisma, runQuery } from 'lib/db';
 
 export async function getWebsiteByShareId(share_id) {
   return runQuery(

queries/admin/website/getWebsiteByUuid.js

@@ -1,5 +1,4 @@
-import { runQuery } from 'lib/queries';
-import prisma from 'lib/db';
+import { prisma, runQuery } from 'lib/db';
 
 export async function getWebsiteByUuid(website_uuid) {
   return runQuery(

queries/admin/website/resetWebsite.js

@@ -1,5 +1,4 @@
-import { runQuery } from 'lib/queries';
-import prisma from 'lib/db';
+import { prisma, runQuery } from 'lib/db';
 
 export async function resetWebsite(website_id) {
   return runQuery(prisma.$queryRaw`delete from session where website_id=${website_id}`);

queries/admin/website/updateWebsite.js

@@ -1,5 +1,4 @@
-import { runQuery } from 'lib/queries';
-import prisma from 'lib/db';
+import { prisma, runQuery } from 'lib/db';
 
 export async function updateWebsite(website_id, data) {
   return runQuery(

queries/analytics/event/getEventMetrics.js

@@ -1,6 +1,17 @@
-import { getDateQuery, getDateStringQuery, getFilterQuery, rawQuery } from 'lib/queries';
+import {
+  getDateQuery,
+  getDateStringQuery,
+  getFilterQuery,
+  rawQuery,
+  runAnalyticsQuery,
+  clickhouse,
+} from 'lib/db';
 
-export function getEventMetrics(
+export function getEventMetrics(...args) {
+  return runAnalyticsQuery(relationalQuery(...args), clickhouseQuery(...args));
+}
+
+function relationalQuery(
   website_id,
   start_at,
   end_at,
@@ -26,3 +37,30 @@ export function getEventMetrics(
     params,
   );
 }
+
+function clickhouseQuery(
+  website_id,
+  start_at,
+  end_at,
+  timezone = 'utc',
+  unit = 'day',
+  filters = {},
+) {
+  const params = [website_id, start_at, end_at];
+
+  return clickhouse.query(
+    `
+    select
+      event_value x,
+      ${getDateStringQuery(getDateQuery('created_at', unit, timezone), unit)} 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
+    `,
+    params,
+  );
+}

queries/analytics/event/getEvents.js

@@ -1,5 +1,4 @@
-import { runQuery } from 'lib/queries';
-import prisma from 'lib/db';
+import { prisma, runQuery } from 'lib/db';
 
 export async function getEvents(websites, start_at) {
   return runQuery(

queries/analytics/event/saveEvent.js

@@ -1,5 +1,5 @@
-import { runQuery } from 'lib/queries';
-import prisma from 'lib/db';
+import { prisma, runQuery } from 'lib/db';
+
 import { URL_LENGTH } from 'lib/constants';
 
 export async function saveEvent(website_id, session_id, url, event_type, event_value) {

queries/analytics/pageview/getPageviewMetrics.js

@@ -1,4 +1,4 @@
-import { parseFilters, rawQuery } from 'lib/queries';
+import { parseFilters, rawQuery } from 'lib/db';
 
 export function getPageviewMetrics(website_id, start_at, end_at, field, table, filters = {}) {
   const params = [website_id, start_at, end_at];

queries/analytics/pageview/getPageviewStats.js

@@ -1,4 +1,4 @@
-import { parseFilters, rawQuery, getDateQuery, getDateStringQuery } from 'lib/queries';
+import { parseFilters, rawQuery, getDateQuery, getDateStringQuery } from 'lib/db';
 
 export function getPageviewStats(
   website_id,

queries/analytics/pageview/getPageviews.js

@@ -1,5 +1,4 @@
-import { runQuery } from 'lib/queries';
-import prisma from 'lib/db';
+import { prisma, runQuery } from 'lib/db';
 
 export async function getPageviews(websites, start_at) {
   return runQuery(

queries/analytics/pageview/savePageView.js

@@ -1,5 +1,5 @@
-import { runQuery } from 'lib/queries';
-import prisma from 'lib/db';
+import { prisma, runQuery } from 'lib/db';
+
 import { URL_LENGTH } from 'lib/constants';
 
 export async function savePageView(website_id, session_id, url, referrer) {

queries/analytics/session/createSession.js

@@ -1,5 +1,4 @@
-import { runQuery } from 'lib/queries';
-import prisma from 'lib/db';
+import { prisma, runQuery } from 'lib/db';
 
 export async function createSession(website_id, data) {
   return runQuery(

queries/analytics/session/getSessionByUuid.js

@@ -1,5 +1,4 @@
-import { runQuery } from 'lib/queries';
-import prisma from 'lib/db';
+import { prisma, runQuery } from 'lib/db';
 
 export async function getSessionByUuid(session_uuid) {
   return runQuery(

queries/analytics/session/getSessionMetrics.js

@@ -1,4 +1,4 @@
-import { parseFilters, rawQuery } from 'lib/queries';
+import { parseFilters, rawQuery } from 'lib/db';
 
 export function getSessionMetrics(website_id, start_at, end_at, field, filters = {}) {
   const params = [website_id, start_at, end_at];

queries/analytics/session/getSessions.js

@@ -1,5 +1,4 @@
-import { runQuery } from 'lib/queries';
-import prisma from 'lib/db';
+import { prisma, runQuery } from 'lib/db';
 
 export async function getSessions(websites, start_at) {
   return runQuery(

queries/analytics/stats/getActiveVisitors.js

@@ -1,4 +1,4 @@
-import { rawQuery } from 'lib/queries';
+import { rawQuery } from 'lib/db';
 import { subMinutes } from 'date-fns';
 
 export function getActiveVisitors(website_id) {

queries/analytics/stats/getWebsiteStats.js

@@ -1,4 +1,4 @@
-import { parseFilters, rawQuery, getDateQuery, getTimestampInterval } from 'lib/queries';
+import { parseFilters, rawQuery, getDateQuery, getTimestampInterval } from 'lib/db';
 
 export function getWebsiteStats(website_id, start_at, end_at, filters = {}) {
   const params = [website_id, start_at, end_at];