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

fix some components in realtime data

Browse source
This commit is contained in:
Francis Cao 2023-04-06 18:31:16 -07:00
parent 6dd90ce9ca
commit 05ece6a4d0
6 changed files with 21 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

10
queries/analytics/event/getEvents.ts
View file

@ -3,17 +3,18 @@ import clickhouse from 'lib/clickhouse';
import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
import { EVENT_TYPE } from 'lib/constants';
export function getEvents(...args: [websiteId: string, startAt: Date]) {
export function getEvents(...args: [websiteId: string, startAt: Date, eventType: number]) {
return runQuery({
[PRISMA]: () => relationalQuery(...args),
[CLICKHOUSE]: () => clickhouseQuery(...args),
});
}
function relationalQuery(websiteId: string, startAt: Date) {
function relationalQuery(websiteId: string, startAt: Date, eventType: number) {
return prisma.client.websiteEvent.findMany({
where: {
websiteId,
eventType,
createdAt: {
gte: startAt,
},
@ -21,7 +22,7 @@ function relationalQuery(websiteId: string, startAt: Date) {
});
}
function clickhouseQuery(websiteId: string, startAt: Date) {
function clickhouseQuery(websiteId: string, startAt: Date, eventType: number) {
const { rawQuery } = clickhouse;
return rawQuery(
@ -34,12 +35,13 @@ function clickhouseQuery(websiteId: string, startAt: Date) {
url_path,
event_name as eventName
from website_event
where event_type = ${EVENT_TYPE.customEvent}
where event_type = {eventType:Uint32}
and website_id = {websiteId:UUID}
and created_at >= {startAt:DateTime('UTC')}`,
{
websiteId,
startAt,
eventType,
},
);
}