From 99d5e7cb41e94ffc1f449b12bf32d64ef77c579f Mon Sep 17 00:00:00 2001
From: Viet-Tien Ngoc <tiena2cva@gmail.com>
Date: Mon, 26 Aug 2024 15:54:00 +0700
Subject: [PATCH] fix query

---
 src/queries/analytics/events/saveEventData.ts            | 6 +++++-
 src/queries/analytics/getWebsiteStats.ts                 | 4 ++--
 src/queries/analytics/sessions/getWebsiteSessionStats.ts | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/queries/analytics/events/saveEventData.ts b/src/queries/analytics/events/saveEventData.ts
index 0680d8970..33c86b198 100644
--- a/src/queries/analytics/events/saveEventData.ts
+++ b/src/queries/analytics/events/saveEventData.ts
@@ -108,7 +108,11 @@ async function clickhouseQuery(data: {
     message[`double${i + 1}`] = double;
   });
 
-  await sendMessage('event_data_blob', message);
+  if (kafka.enabled) {
+    await sendMessage('event_data_blob', message);
+  } else {
+    await insert('event_data_blob', [message]);
+  }
 
   return data;
 }
diff --git a/src/queries/analytics/getWebsiteStats.ts b/src/queries/analytics/getWebsiteStats.ts
index 061d487ea..075787e81 100644
--- a/src/queries/analytics/getWebsiteStats.ts
+++ b/src/queries/analytics/getWebsiteStats.ts
@@ -1,9 +1,9 @@
 import clickhouse from 'lib/clickhouse';
 import { EVENT_TYPE } from 'lib/constants';
+import { EVENT_COLUMNS } from 'lib/constants';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import prisma from 'lib/prisma';
 import { QueryFilters } from 'lib/types';
-import { EVENT_COLUMNS } from 'lib/constants';
 
 export async function getWebsiteStats(
   ...args: [websiteId: string, filters: QueryFilters]
@@ -107,7 +107,7 @@ async function clickhouseQuery(
             sum(views) c,
             min(min_time) min_time,
             max(max_time) max_time
-        from umami.website_event_stats_hourly "website_event"
+        from website_event_stats_hourly "website_event"
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime64} and {endDate:DateTime64}
       and event_type = {eventType:UInt32}
diff --git a/src/queries/analytics/sessions/getWebsiteSessionStats.ts b/src/queries/analytics/sessions/getWebsiteSessionStats.ts
index 648be1400..e8c5021b8 100644
--- a/src/queries/analytics/sessions/getWebsiteSessionStats.ts
+++ b/src/queries/analytics/sessions/getWebsiteSessionStats.ts
@@ -62,7 +62,7 @@ async function clickhouseQuery(
       uniq(visit_id) as "visits",
       uniq(country) as "countries",
       sum(length(event_name)) as "events"
-    from umami.website_event_stats_hourly "website_event"
+    from website_event_stats_hourly "website_event"
     where website_id = {websiteId:UUID}
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}
         ${filterQuery}