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

Added rev_id column. Updated redis calls.

Browse source
This commit is contained in:
Mike Cao 2022-11-07 16:22:49 -08:00
parent a9112f39ec
commit 3485b6268b
18 changed files with 133 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

56
queries/analytics/session/createSession.js
View file

@ -7,34 +7,32 @@ export async function createSession(...args) {
return runQuery({
[PRISMA]: () => relationalQuery(...args),
[CLICKHOUSE]: () => clickhouseQuery(...args),
}).then(async data => {
if (redis.enabled && data) {
await redis.set(`session:${data.id}`, data);
}
return data;
});
}
async function relationalQuery(websiteId, data) {
return prisma.client.session
.create({
data: {
websiteId,
...data,
},
select: {
id: true,
hostname: true,
browser: true,
os: true,
screen: true,
language: true,
country: true,
device: true,
},
})
.then(async res => {
if (redis.enabled && res) {
await redis.set(`session:${res.id}`, 1);
}
return res;
});
return prisma.client.session.create({
data: {
websiteId,
...data,
},
select: {
id: true,
hostname: true,
browser: true,
os: true,
screen: true,
language: true,
country: true,
device: true,
},
});
}
async function clickhouseQuery(
@ -42,10 +40,12 @@ async function clickhouseQuery(
{ sessionId, hostname, browser, os, screen, language, country, device },
) {
const { getDateFormat, sendMessage } = kafka;
const website = await redis.get(`website:${websiteId}`);
const params = {
const data = {
sessionId,
website_id: websiteId,
rev_id: website?.revId || 0,
created_at: getDateFormat(new Date()),
hostname,
browser,
@ -56,9 +56,7 @@ async function clickhouseQuery(
country: country ? country : null,
};
await sendMessage(params, 'event');
await sendMessage(data, 'event');
if (redis.enabled) {
await redis.set(`session:${sessionId}`, 1);
}
return data;
}

34
queries/analytics/session/getSession.js
View file

@ -7,26 +7,24 @@ export async function getSession(...args) {
return runQuery({
[PRISMA]: () => relationalQuery(...args),
[CLICKHOUSE]: () => clickhouseQuery(...args),
}).then(async data => {
if (redis.enabled && data) {
await redis.set(`session:${data.id}`, data);
}
return data;
});
}
async function relationalQuery(where) {
return prisma.client.session
.findUnique({
where,
})
.then(async res => {
if (redis.enabled && res) {
await redis.set(`session:${res.sessionUuid}`, 1);
}
return res;
});
return prisma.client.session.findUnique({
where,
});
}
async function clickhouseQuery(sessionUuid) {
async function clickhouseQuery(sessionId) {
const { rawQuery, findFirst } = clickhouse;
const params = [sessionUuid];
const params = [sessionId];
return rawQuery(
`select distinct
@ -43,13 +41,5 @@ async function clickhouseQuery(sessionUuid) {
from event
where session_id = $1`,
params,
)
.then(result => findFirst(result))
.then(async res => {
if (redis.enabled && res) {
await redis.set(`session:${res.id}`, 1);
}
return res;
});
).then(result => findFirst(result));
}

7
queries/analytics/session/getSessionMetrics.js
View file

@ -1,6 +1,7 @@
import prisma from 'lib/prisma';
import clickhouse from 'lib/clickhouse';
import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
import redis from 'lib/redis';
export async function getSessionMetrics(...args) {
return runQuery({
@ -36,13 +37,15 @@ async function relationalQuery(websiteId, { startDate, endDate, field, filters =
async function clickhouseQuery(websiteId, { startDate, endDate, field, filters = {} }) {
const { parseFilters, getBetweenDates, rawQuery } = clickhouse;
const params = [websiteId];
const website = await redis.get(`website:${websiteId}`);
const params = [websiteId, website?.revId || 0];
const { pageviewQuery, sessionQuery } = parseFilters(null, filters, params);
return rawQuery(
`select ${field} x, count(*) y
from event as x
where website_id=$1
where website_id = $1
and rev_id = $2
and event_name = ''
and ${getBetweenDates('created_at', startDate, endDate)}
${pageviewQuery}