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

Merge Session/Event/Pageview CH

Browse source
This commit is contained in:
Brian Cao 2022-09-12 09:55:34 -07:00
parent d377ef86e7
commit 52e036964b
18 changed files with 237 additions and 294 deletions
Download patch file Download diff file Expand all files Collapse all files

42
queries/analytics/pageview/getPageviewStats.js
View file

@ -11,13 +11,15 @@ export async function getPageviewStats(...args) {
async function relationalQuery(
website_id,
start_at,
end_at,
timezone = 'utc',
unit = 'day',
count = '*',
filters = {},
sessionKey = 'session_id',
{
start_at,
end_at,
timezone = 'utc',
unit = 'day',
count = '*',
filters = {},
sessionKey = 'session_id',
},
) {
const { getDateQuery, parseFilters, rawQuery } = prisma;
const params = [website_id, start_at, end_at];
@ -44,23 +46,11 @@ async function relationalQuery(
async function clickhouseQuery(
website_id,
start_at,
end_at,
timezone = 'UTC',
unit = 'day',
count = '*',
filters = {},
sessionKey = 'session_uuid',
{ start_at, end_at, timezone = 'UTC', unit = 'day', count = '*', filters = {} },
) {
const { parseFilters, rawQuery, getDateStringQuery, getDateQuery, getBetweenDates } = clickhouse;
const params = [website_id];
const { pageviewQuery, sessionQuery, joinSession } = parseFilters(
'pageview',
null,
filters,
params,
sessionKey,
);
const { pageviewQuery, sessionQuery } = parseFilters(null, filters, params);
return rawQuery(
`select
@ -69,11 +59,11 @@ async function clickhouseQuery(
from
(select
${getDateQuery('created_at', unit, timezone)} t,
count(${count !== '*' ? `${count}${sessionKey}` : count}) y
from pageview
${joinSession}
where pageview.website_id= $1
and ${getBetweenDates('pageview.created_at', start_at, end_at)}
count(${count !== '*' ? 'session_uuid' : count}) y
from event
where website_id= $1
and ${getBetweenDates('created_at', start_at, end_at)}
${pageviewQuery}
${sessionQuery}
group by t) g