From 971ccb6e417eec230ef63c61bbe05cd80e361e8c Mon Sep 17 00:00:00 2001
From: Viet-Tien Ngoc <tiena2cva@gmail.com>
Date: Mon, 5 Aug 2024 11:52:51 +0700
Subject: [PATCH] save visit id and fix event id

---
 src/lib/clickhouse.ts                            | 2 +-
 src/queries/analytics/eventData/saveEventData.ts | 5 ++++-
 src/queries/analytics/events/saveEvent.ts        | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index cbcbd57aa..d80e13ec6 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -136,7 +136,7 @@ async function rawQuery<T = unknown>(
     format: 'JSONEachRow',
   });
 
-  return resultSet.json();
+  return resultSet.json() as T;
 }
 
 async function findUnique(data: any[]) {
diff --git a/src/queries/analytics/eventData/saveEventData.ts b/src/queries/analytics/eventData/saveEventData.ts
index d3f434bec..0cbc750e7 100644
--- a/src/queries/analytics/eventData/saveEventData.ts
+++ b/src/queries/analytics/eventData/saveEventData.ts
@@ -11,6 +11,7 @@ export async function saveEventData(data: {
   websiteId: string;
   eventId: string;
   sessionId?: string;
+  visitId?: string;
   urlPath?: string;
   eventName?: string;
   eventData: DynamicData;
@@ -52,12 +53,13 @@ async function clickhouseQuery(data: {
   websiteId: string;
   eventId: string;
   sessionId?: string;
+  visitId?: string;
   urlPath?: string;
   eventName?: string;
   eventData: DynamicData;
   createdAt?: string;
 }) {
-  const { websiteId, sessionId, eventId, urlPath, eventName, eventData, createdAt } = data;
+  const { websiteId, sessionId, visitId, eventId, urlPath, eventName, eventData, createdAt } = data;
 
   const { getDateFormat, sendMessages } = kafka;
 
@@ -68,6 +70,7 @@ async function clickhouseQuery(data: {
       website_id: websiteId,
       session_id: sessionId,
       event_id: eventId,
+      visitId: visitId,
       url_path: urlPath,
       event_name: eventName,
       data_key: key,
diff --git a/src/queries/analytics/events/saveEvent.ts b/src/queries/analytics/events/saveEvent.ts
index 25bcf9e7a..4367e7ae4 100644
--- a/src/queries/analytics/events/saveEvent.ts
+++ b/src/queries/analytics/events/saveEvent.ts
@@ -83,6 +83,7 @@ async function relationalQuery(data: {
     await saveEventData({
       websiteId,
       sessionId,
+      visitId,
       eventId: websiteEventId,
       urlPath: urlPath?.substring(0, URL_LENGTH),
       eventName: eventName?.substring(0, EVENT_NAME_LENGTH),
@@ -143,7 +144,7 @@ async function clickhouseQuery(data: {
     website_id: websiteId,
     session_id: sessionId,
     visit_id: visitId,
-    event_id: uuid(),
+    event_id: eventId,
     country: country,
     subdivision1:
       country && subdivision1
@@ -170,6 +171,7 @@ async function clickhouseQuery(data: {
     await saveEventData({
       websiteId,
       sessionId,
+      visitId,
       eventId,
       urlPath: urlPath?.substring(0, URL_LENGTH),
       eventName: eventName?.substring(0, EVENT_NAME_LENGTH),