Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Fixed date value for properties.

Mike Cao5aba9acb81be
diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index 70f8d31d7..24e6a3b66 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 fec4cae39..7e7db8b46 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 5259239a7..f9f0276ec 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,
};
});