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.

fix save event/pageview for CH

Brian Cao4fbcf68b22d5
diff --git a/queries/analytics/event/saveEvent.js b/queries/analytics/event/saveEvent.js
index 1122dfcfb..3bb3b0bf3 100644
--- a/queries/analytics/event/saveEvent.js
+++ b/queries/analytics/event/saveEvent.js
@@ -39,7 +39,7 @@ async function relationalQuery(data) {
}
async function clickhouseQuery(data) {
- const { websiteId, sessionId, url, eventName, eventData } = data;
+ const { websiteId, id: sessionId, url, eventName, eventData, country, ...args } = data;
const { getDateFormat, sendMessage } = kafka;
const website = await cache.fetchWebsite(websiteId);
@@ -52,6 +52,8 @@ async function clickhouseQuery(data) {
event_data: eventData ? JSON.stringify(eventData) : null,
rev_id: website?.revId || 0,
created_at: getDateFormat(new Date()),
+ country: country ? country : null,
+ ...args,
};
await sendMessage(params, 'event');
diff --git a/queries/analytics/pageview/savePageView.js b/queries/analytics/pageview/savePageView.js
index 7aedf6d20..adcb4b3fd 100644
--- a/queries/analytics/pageview/savePageView.js
+++ b/queries/analytics/pageview/savePageView.js
@@ -26,7 +26,7 @@ async function relationalQuery(data) {
}
async function clickhouseQuery(data) {
- const { websiteId, sessionId, url, referrer } = data;
+ const { websiteId, id: sessionId, url, referrer, country, ...args } = data;
const website = await cache.fetchWebsite(websiteId);
const { getDateFormat, sendMessage } = kafka;
@@ -37,6 +37,8 @@ async function clickhouseQuery(data) {
referrer: referrer?.substring(0, URL_LENGTH),
rev_id: website?.revId || 0,
created_at: getDateFormat(new Date()),
+ country: country ? country : null,
+ ...args,
};
await sendMessage(msg, 'event');