watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-09 15:17:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

More updates to realtime.

Browse source
This commit is contained in:
Mike Cao 2023-02-15 02:27:18 -08:00
parent 28921a7cd5
commit 93b77672f3
28 changed files with 218 additions and 263 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,19 +3,17 @@ import clickhouse from 'lib/clickhouse';
import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
import { EVENT_TYPE } from 'lib/constants';
export function getEvents(...args: [websites: string[], startAt: Date]) {
export function getEvents(...args: [websiteId: string, startAt: Date]) {
return runQuery({
[PRISMA]: () => relationalQuery(...args),
[CLICKHOUSE]: () => clickhouseQuery(...args),
});
}
function relationalQuery(websites: string[], startAt: Date) {
return prisma.client.event.findMany({
function relationalQuery(websiteId: string, startAt: Date) {
return prisma.client.websiteEvent.findMany({
where: {
websiteId: {
in: websites,
},
websiteId,
createdAt: {
gte: startAt,
},
@ -23,7 +21,7 @@ function relationalQuery(websites: string[], startAt: Date) {
});
}
function clickhouseQuery(websites: string[], startAt: Date) {
function clickhouseQuery(websiteId: string, startAt: Date) {
const { rawQuery } = clickhouse;
return rawQuery(
@ -36,10 +34,10 @@ function clickhouseQuery(websites: string[], startAt: Date) {
event_name
from event
where event_type = ${EVENT_TYPE.customEvent}
and ${websites && websites.length > 0 ? `website_id in {websites:Array(UUID)}` : '0 = 0'}
and website_id = {websiteId:UUID}
and created_at >= {startAt:DateTime('UTC')}`,
{
websites,
websiteId,
startAt,
},
);

22
queries/analytics/pageview/getPageviews.ts
View file

@ -3,19 +3,17 @@ import clickhouse from 'lib/clickhouse';
import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
import { EVENT_TYPE } from 'lib/constants';
export async function getPageviews(...args: [websites: string[], startAt: Date]) {
export async function getPageviews(...args: [websiteId: string, startAt: Date]) {
return runQuery({
[PRISMA]: () => relationalQuery(...args),
[CLICKHOUSE]: () => clickhouseQuery(...args),
});
}
async function relationalQuery(websites: string[], startAt: Date) {
return prisma.client.pageview.findMany({
async function relationalQuery(websiteId: string, startAt: Date) {
return prisma.client.websiteEvent.findMany({
where: {
websiteId: {
in: websites,
},
websiteId,
createdAt: {
gte: startAt,
},
@ -23,21 +21,21 @@ async function relationalQuery(websites: string[], startAt: Date) {
});
}
async function clickhouseQuery(websites: string[], startAt: Date) {
async function clickhouseQuery(websiteId: string, startAt: Date) {
const { rawQuery } = clickhouse;
return rawQuery(
`select
website_id,
session_id,
created_at,
website_id as websiteId,
session_id as sessionId,
created_at as createdAt,
url
from event
where event_type = ${EVENT_TYPE.pageView}
and ${websites && websites.length > 0 ? `website_id in {websites:Array(UUID)}` : '0 = 0'}
and website_id = {websiteId:UUID}
and created_at >= {startAt:DateTime('UTC')}`,
{
websites,
websiteId,
startAt,
},
);

18
queries/analytics/session/getSessions.ts
View file

@ -2,23 +2,17 @@ import prisma from 'lib/prisma';
import clickhouse from 'lib/clickhouse';
import { runQuery, PRISMA, CLICKHOUSE } from 'lib/db';
export async function getSessions(...args: [websites: string[], startAt: Date]) {
export async function getSessions(...args: [websiteId: string, startAt: Date]) {
return runQuery({
[PRISMA]: () => relationalQuery(...args),
[CLICKHOUSE]: () => clickhouseQuery(...args),
});
}
async function relationalQuery(websites: string[], startAt: Date) {
async function relationalQuery(websiteId: string, startAt: Date) {
return prisma.client.session.findMany({
where: {
...(websites && websites.length > 0
? {
websiteId: {
in: websites,
},
}
: {}),
websiteId,
createdAt: {
gte: startAt,
},
@ -26,7 +20,7 @@ async function relationalQuery(websites: string[], startAt: Date) {
});
}
async function clickhouseQuery(websites: string[], startAt: Date) {
async function clickhouseQuery(websiteId: string, startAt: Date) {
const { rawQuery } = clickhouse;
return rawQuery(
@ -42,10 +36,10 @@ async function clickhouseQuery(websites: string[], startAt: Date) {
language,
country
from event
where ${websites && websites.length > 0 ? `website_id in {websites:Array(UUID)}` : '0 = 0'}
where website_id = {websiteId:UUID}
and created_at >= {startAt:DateTime('UTC')}`,
{
websites,
websiteId,
startAt,
},
);

8
queries/analytics/stats/getRealtimeData.ts
View file

@ -2,11 +2,11 @@ import { getPageviews } from '../pageview/getPageviews';
import { getSessions } from '../session/getSessions';
import { getEvents } from '../event/getEvents';
export async function getRealtimeData(websites, time) {
export async function getRealtimeData(websiteId, time) {
const [pageviews, sessions, events] = await Promise.all([
getPageviews(websites, time),
getSessions(websites, time),
getEvents(websites, time),
getPageviews(websiteId, time),
getSessions(websiteId, time),
getEvents(websiteId, time),
]);
return {