watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-09 23:27:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'dev' into feat/um-66-update-clickhouse-schema-uuid

Browse source
This commit is contained in:
Brian Cao 2022-10-10 16:20:07 -07:00
commit ec6454aead
65 changed files with 436 additions and 441 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,18 +10,18 @@ export async function saveEvent(...args) {
});
}
async function relationalQuery(website_id, { session_id, url, event_name, event_data }) {
async function relationalQuery(websiteId, { sessionId, url, eventName, eventData }) {
const data = {
website_id,
session_id,
websiteId,
sessionId,
url: url?.substring(0, URL_LENGTH),
event_name: event_name?.substring(0, EVENT_NAME_LENGTH),
eventName: eventName?.substring(0, EVENT_NAME_LENGTH),
};
if (event_data) {
data.event_data = {
if (eventData) {
data.eventData = {
create: {
event_data: event_data,
eventData: eventData,
},
};
}
@ -32,18 +32,21 @@ async function relationalQuery(website_id, { session_id, url, event_name, event_
}
async function clickhouseQuery(
websiteId,
{ session: { country, sessionUuid, ...sessionArgs }, eventUuid, url, eventName, eventData },
website_uuid,
{ session: { country, ...sessionArgs }, event_uuid, url, event_name, event_data },
) {
const { getDateFormat, sendMessage } = kafka;
const params = {
event_uuid,
session_uuid: sessionUuid,
event_uuid: eventUuid,
website_id: websiteId,
website_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),
event_name: eventName?.substring(0, EVENT_NAME_LENGTH),
event_data: JSON.stringify(eventData),
...sessionArgs,
country: country ? country : null,
};