github/umami
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Mike Cao
2022-11-08 22:59:01 -08:00
parent 67732b9b5a 9067d51172
commit 1bce4f2174
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
queries/analytics/event/saveEvent.js
View File

@@ -39,7 +39,7 @@ async function relationalQuery(data) {
} }
async function clickhouseQuery(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 { getDateFormat, sendMessage } = kafka;
const website = await cache.fetchWebsite(websiteId); const website = await cache.fetchWebsite(websiteId);
@@ -52,6 +52,8 @@ async function clickhouseQuery(data) {
event_data: eventData ? JSON.stringify(eventData) : null, event_data: eventData ? JSON.stringify(eventData) : null,
rev_id: website?.revId || 0, rev_id: website?.revId || 0,
created_at: getDateFormat(new Date()), created_at: getDateFormat(new Date()),
country: country ? country : null,
...args,
}; };
await sendMessage(params, 'event'); await sendMessage(params, 'event');

4
queries/analytics/pageview/savePageView.js
View File

@@ -26,7 +26,7 @@ async function relationalQuery(data) {
} }
async function clickhouseQuery(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 website = await cache.fetchWebsite(websiteId);
const { getDateFormat, sendMessage } = kafka; const { getDateFormat, sendMessage } = kafka;
@@ -37,6 +37,8 @@ async function clickhouseQuery(data) {
referrer: referrer?.substring(0, URL_LENGTH), referrer: referrer?.substring(0, URL_LENGTH),
rev_id: website?.revId || 0, rev_id: website?.revId || 0,
created_at: getDateFormat(new Date()), created_at: getDateFormat(new Date()),
country: country ? country : null,
...args,
}; };
await sendMessage(msg, 'event'); await sendMessage(msg, 'event');