ambiser
/
umami
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allowed filtering events in MetricsCard by url.

pull/1464/head
Guillermo Grau 2022-08-29 07:37:52 +02:00
parent 32be101044
commit 18aa31db45
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
queries/analytics/stats/getWebsiteStats.js
View File

@ -25,7 +25,12 @@ async function relationalQuery(website_id, start_at, end_at, filters = {}) {
filters, filters,
params, params,
); );
const { joinSession: joinEventSession } = parseFilters('event', null, filters, params); const { eventQuery, joinSession: joinEventSession } = parseFilters(
'event',
null,
{ ...filters, event_url: filters.url },
params,
);
return rawQuery( return rawQuery(
` `
@ -54,6 +59,7 @@ async function relationalQuery(website_id, start_at, end_at, filters = {}) {
${joinEventSession} ${joinEventSession}
where event.website_id=$1 where event.website_id=$1
and event.created_at between $2 and $3 and event.created_at between $2 and $3
${eventQuery}
${sessionQuery} ${sessionQuery}
) stats_events ) stats_events
`, `,
@ -70,7 +76,12 @@ async function clickhouseQuery(website_id, start_at, end_at, filters = {}) {
params, params,
'session_uuid', 'session_uuid',
); );
const { joinSession: joinEventSession } = parseFilters('event', null, filters, params); const { eventQuery, joinSession: joinEventSession } = parseFilters(
'event',
null,
filters,
params,
);
return rawQueryClickhouse( return rawQueryClickhouse(
` `
@ -101,6 +112,7 @@ async function clickhouseQuery(website_id, start_at, end_at, filters = {}) {
${joinEventSession} ${joinEventSession}
where event.website_id=$1 where event.website_id=$1
and ${getBetweenDatesClickhouse('event.created_at', start_at, end_at)} and ${getBetweenDatesClickhouse('event.created_at', start_at, end_at)}
${eventQuery}
${sessionQuery} ${sessionQuery}
) stats_events ) stats_events
`, `,