From 7e9c4b7c73c9405101321868216cdd01b1cc84cc Mon Sep 17 00:00:00 2001
From: Viet-Tien Ngoc <tiena2cva@gmail.com>
Date: Wed, 28 Aug 2024 17:20:19 +0700
Subject: [PATCH] fix: clickhouse query

---
 src/queries/analytics/sessions/getSessionData.ts           | 6 +++---
 src/queries/analytics/sessions/getSessionDataProperties.ts | 4 ++--
 src/queries/analytics/sessions/getSessionDataValues.ts     | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/queries/analytics/sessions/getSessionData.ts b/src/queries/analytics/sessions/getSessionData.ts
index ce80b0351..e2949e6a0 100644
--- a/src/queries/analytics/sessions/getSessionData.ts
+++ b/src/queries/analytics/sessions/getSessionData.ts
@@ -1,6 +1,6 @@
-import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
-import { runQuery, PRISMA, CLICKHOUSE } from 'lib/db';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import prisma from 'lib/prisma';
 
 export async function getSessionData(...args: [websiteId: string, sessionId: string]) {
   return runQuery({
@@ -46,7 +46,7 @@ async function clickhouseQuery(websiteId: string, sessionId: string) {
         number_value as numberValue,
         date_value as dateValue,
         created_at as createdAt
-    from session_data final
+    from session_data
     where website_id = {websiteId:UUID}
     and session_id = {sessionId:UUID}
     order by data_key asc
diff --git a/src/queries/analytics/sessions/getSessionDataProperties.ts b/src/queries/analytics/sessions/getSessionDataProperties.ts
index 1d15ea8de..aff5d83e1 100644
--- a/src/queries/analytics/sessions/getSessionDataProperties.ts
+++ b/src/queries/analytics/sessions/getSessionDataProperties.ts
@@ -1,6 +1,6 @@
-import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import prisma from 'lib/prisma';
 import { QueryFilters, WebsiteEventData } from 'lib/types';
 
 export async function getSessionDataProperties(
@@ -52,7 +52,7 @@ async function clickhouseQuery(
     select
       data_key as propertyName,
       count(*) as total
-    from session_data final
+    from session_data
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime64} and {endDate:DateTime64}
     ${filterQuery}
diff --git a/src/queries/analytics/sessions/getSessionDataValues.ts b/src/queries/analytics/sessions/getSessionDataValues.ts
index c02e4adb0..7a0a4db58 100644
--- a/src/queries/analytics/sessions/getSessionDataValues.ts
+++ b/src/queries/analytics/sessions/getSessionDataValues.ts
@@ -1,6 +1,6 @@
-import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import prisma from 'lib/prisma';
 import { QueryFilters, WebsiteEventData } from 'lib/types';
 
 export async function getSessionDataValues(
@@ -55,7 +55,7 @@ async function clickhouseQuery(
               data_type = 4, toString(date_trunc('hour', date_value)),
               string_value) as "value",
       count(*) as "total"
-    from session_data final
+    from session_data
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime64} and {endDate:DateTime64}
       and data_key = {propertyName:String}