From 5aba9acb81be385a24715faa379548c06d7fa72d Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 20 Aug 2024 00:34:01 -0700
Subject: [PATCH] Fixed date value for properties.

---
 src/lib/clickhouse.ts                             | 2 +-
 src/queries/analytics/events/saveEventData.ts     | 4 ++--
 src/queries/analytics/sessions/saveSessionData.ts | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index 70f8d31d..24e6a3b6 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -49,7 +49,7 @@ function getClient() {
   return client;
 }
 
-function getUTCString(date?: Date) {
+function getUTCString(date?: Date | string | number) {
   return formatInTimeZone(date || new Date(), 'UTC', 'yyyy-MM-dd HH:mm:ss');
 }
 
diff --git a/src/queries/analytics/events/saveEventData.ts b/src/queries/analytics/events/saveEventData.ts
index fec4cae3..7e7db8b4 100644
--- a/src/queries/analytics/events/saveEventData.ts
+++ b/src/queries/analytics/events/saveEventData.ts
@@ -60,7 +60,7 @@ async function clickhouseQuery(data: {
 }) {
   const { websiteId, sessionId, eventId, urlPath, eventName, eventData, createdAt } = data;
 
-  const { insert } = clickhouse;
+  const { insert, getUTCString } = clickhouse;
   const { sendMessages } = kafka;
 
   const jsonKeys = flattenJSON(eventData);
@@ -76,7 +76,7 @@ async function clickhouseQuery(data: {
       data_type: dataType,
       string_value: getStringValue(value, dataType),
       number_value: dataType === DATA_TYPE.number ? value : null,
-      date_value: dataType === DATA_TYPE.date ? value?.toISOString() : null,
+      date_value: dataType === DATA_TYPE.date ? getUTCString(value) : null,
       created_at: createdAt,
     };
   });
diff --git a/src/queries/analytics/sessions/saveSessionData.ts b/src/queries/analytics/sessions/saveSessionData.ts
index 5259239a..f9f0276e 100644
--- a/src/queries/analytics/sessions/saveSessionData.ts
+++ b/src/queries/analytics/sessions/saveSessionData.ts
@@ -94,7 +94,7 @@ async function clickhouseQuery(data: {
       data_type: dataType,
       string_value: getStringValue(value, dataType),
       number_value: dataType === DATA_TYPE.number ? value : null,
-      date_value: dataType === DATA_TYPE.date ? value?.toISOString() : null,
+      date_value: dataType === DATA_TYPE.date ? getUTCString(value) : null,
       created_at: createdAt,
     };
   });