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

update getSessionActivity / getWebsiteSession

Browse source
This commit is contained in:
Francis Cao 2024-08-09 15:49:30 -07:00
parent c7d39a3e94
commit a1c0ec9c81
7 changed files with 69 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/queries/analytics/sessions/getSessionActivity.ts
View file

@ -1,24 +1,37 @@
import prisma from 'lib/prisma';
import clickhouse from 'lib/clickhouse';
import { runQuery, PRISMA, CLICKHOUSE } from 'lib/db';
import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
import prisma from 'lib/prisma';
export async function getSessionActivity(...args: [websiteId: string, sessionId: string]) {
export async function getSessionActivity(
...args: [websiteId: string, sessionId: string, startDate: Date, endDate: Date]
) {
return runQuery({
[PRISMA]: () => relationalQuery(...args),
[CLICKHOUSE]: () => clickhouseQuery(...args),
});
}
async function relationalQuery(websiteId: string, sessionId: string) {
async function relationalQuery(
websiteId: string,
sessionId: string,
startDate: Date,
endDate: Date,
) {
return prisma.client.websiteEvent.findMany({
where: {
id: sessionId,
websiteId,
createdAt: { gte: startDate, lte: endDate },
},
});
}
async function clickhouseQuery(websiteId: string, sessionId: string) {
async function clickhouseQuery(
websiteId: string,
sessionId: string,
startDate: Date,
endDate: Date,
) {
const { rawQuery } = clickhouse;
return rawQuery(
@ -36,9 +49,10 @@ async function clickhouseQuery(websiteId: string, sessionId: string) {
visit_id as visitId
from website_event
where website_id = {websiteId:UUID}
and session_id = {sessionId:UUID}
and session_id = {sessionId:UUID}
and created_at between {startDate:DateTime64} and {endDate:DateTime64}
order by created_at desc
`,
{ websiteId, sessionId },
{ websiteId, sessionId, startDate, endDate },
);
}