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

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

12
queries/analytics/pageview/savePageView.js
View file

@ -10,7 +10,7 @@ export async function savePageView(...args) {
});
}
async function relationalQuery(website_id, { session_id, url, referrer }) {
async function relationalQuery(website_id, { session: { session_id }, url, referrer }) {
return prisma.client.pageview.create({
data: {
website_id,
@ -21,15 +21,19 @@ async function relationalQuery(website_id, { session_id, url, referrer }) {
});
}
async function clickhouseQuery(website_id, { session_uuid, url, referrer }) {
async function clickhouseQuery(
website_id,
{ session: { country, ...sessionArgs }, url, referrer },
) {
const { getDateFormat, sendMessage } = kafka;
const params = {
website_id: website_id,
session_uuid: session_uuid,
created_at: getDateFormat(new Date()),
url: url?.substring(0, URL_LENGTH),
referrer: referrer?.substring(0, URL_LENGTH),
...sessionArgs,
country: country ? country : null,
};
await sendMessage(params, 'pageview');
await sendMessage(params, 'event');
}