watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 04:37:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge Session/Event/Pageview CH

Browse source
This commit is contained in:
Brian Cao 2022-09-12 09:55:34 -07:00
parent d377ef86e7
commit 52e036964b
18 changed files with 237 additions and 294 deletions
Download patch file Download diff file Expand all files Collapse all files

2
queries/analytics/event/getEvents.js
View file

@ -29,7 +29,7 @@ function clickhouseQuery(websites, start_at) {
return rawQuery(
`select
event_id,
event_uuid,
website_id,
session_id,
created_at,

6
queries/analytics/event/saveEvent.js
View file

@ -33,17 +33,19 @@ async function relationalQuery(website_id, { session_id, url, event_name, event_
async function clickhouseQuery(
website_id,
{ event_uuid, session_uuid, url, event_name, event_data },
{ session: { country, ...sessionArgs }, event_uuid, url, event_name, event_data },
) {
const { getDateFormat, sendMessage } = kafka;
const params = {
event_uuid,
website_id,
session_uuid,
created_at: getDateFormat(new Date()),
url: url?.substring(0, URL_LENGTH),
event_name: event_name?.substring(0, EVENT_NAME_LENGTH),
event_data: JSON.stringify(event_data),
...sessionArgs,
country: country ? country : null,
};
await sendMessage(params, 'event');