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

Refactored redis usage. Added lib/cache.

Browse source
This commit is contained in:
Mike Cao 2022-11-07 22:35:51 -08:00
parent 3485b6268b
commit f118bc95c1
22 changed files with 236 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,62 +1,45 @@
import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
import kafka from 'lib/kafka';
import prisma from 'lib/prisma';
import redis from 'lib/redis';
import cache from 'lib/cache';
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);
if (cache.enabled) {
await cache.storeSession(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,
},
});
async function relationalQuery(data) {
return prisma.client.session.create({ data });
}
async function clickhouseQuery(
websiteId,
{ sessionId, hostname, browser, os, screen, language, country, device },
) {
async function clickhouseQuery(data) {
const { id, websiteId, hostname, browser, os, device, screen, language, country } = data;
const { getDateFormat, sendMessage } = kafka;
const website = await redis.get(`website:${websiteId}`);
const website = await cache.fetchWebsite(websiteId);
const data = {
sessionId,
const msg = {
session_id: id,
website_id: websiteId,
rev_id: website?.revId || 0,
created_at: getDateFormat(new Date()),
hostname,
browser,
os,
device,
screen,
language,
country: country ? country : null,
country,
rev_id: website?.revId || 0,
created_at: getDateFormat(new Date()),
};
await sendMessage(data, 'event');
await sendMessage(msg, 'event');
return data;
}

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

@ -1,18 +1,11 @@
import clickhouse from 'lib/clickhouse';
import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
import prisma from 'lib/prisma';
import redis from 'lib/redis';
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;
});
}
@ -27,7 +20,7 @@ async function clickhouseQuery(sessionId) {
const params = [sessionId];
return rawQuery(
`select distinct
`select
session_id,
website_id,
created_at,
@ -39,7 +32,8 @@ async function clickhouseQuery(sessionId) {
language,
country
from event
where session_id = $1`,
where session_id = $1
limit 1`,
params,
).then(result => findFirst(result));
}

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

@ -1,7 +1,7 @@
import prisma from 'lib/prisma';
import clickhouse from 'lib/clickhouse';
import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
import redis from 'lib/redis';
import cache from 'lib/cache';
export async function getSessionMetrics(...args) {
return runQuery({
@ -37,7 +37,7 @@ async function relationalQuery(websiteId, { startDate, endDate, field, filters =
async function clickhouseQuery(websiteId, { startDate, endDate, field, filters = {} }) {
const { parseFilters, getBetweenDates, rawQuery } = clickhouse;
const website = await redis.get(`website:${websiteId}`);
const website = await cache.fetchWebsite(websiteId);
const params = [websiteId, website?.revId || 0];
const { pageviewQuery, sessionQuery } = parseFilters(null, filters, params);