watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-13 09:05:36 +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

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

@ -2,7 +2,8 @@ import { URL_LENGTH } from 'lib/constants';
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';
import { uuid } from 'lib/crypto';
export async function savePageView(...args) {
return runQuery({
@ -11,13 +12,11 @@ export async function savePageView(...args) {
});
}
async function relationalQuery(
websiteId,
{ pageViewId, session: { id: sessionId }, url, referrer },
) {
async function relationalQuery(data) {
const { websiteId, sessionId, url, referrer } = data;
return prisma.client.pageview.create({
data: {
id: pageViewId,
id: uuid(),
websiteId,
sessionId,
url: url?.substring(0, URL_LENGTH),
@ -26,22 +25,21 @@ async function relationalQuery(
});
}
async function clickhouseQuery(
websiteId,
{ session: { country, id: sessionId, ...sessionArgs }, url, referrer },
) {
const website = await redis.get(`website:${websiteId}`);
async function clickhouseQuery(data) {
const { websiteId, sessionId, url, referrer } = data;
const website = await cache.fetchWebsite(websiteId);
const { getDateFormat, sendMessage } = kafka;
const params = {
const msg = {
session_id: sessionId,
website_id: websiteId,
created_at: getDateFormat(new Date()),
url: url?.substring(0, URL_LENGTH),
referrer: referrer?.substring(0, URL_LENGTH),
rev_id: website?.revId || 0,
...sessionArgs,
country: country ? country : null,
created_at: getDateFormat(new Date()),
};
await sendMessage(params, 'event');
await sendMessage(msg, 'event');
return data;
}