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

update funnel dynamic built query

Browse source
This commit is contained in:
Francis Cao 2023-07-27 15:23:20 -07:00
parent a03574e8d4
commit cdf745b6b4
2 changed files with 6 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

15
queries/analytics/reports/getFunnel.ts
View file

@ -36,26 +36,19 @@ async function relationalQuery(
> {
const { windowMinutes, startDate, endDate, urls } = criteria;
const { rawQuery, getFunnelQuery, toUuid } = prisma;
const { levelQuery, sumQuery, urlParams } = getFunnelQuery(
urls,
endDate,
websiteId,
windowMinutes,
);
const params: any = [websiteId, startDate, endDate, ...urlParams];
const { levelQuery, sumQuery } = getFunnelQuery(urls, endDate, websiteId, windowMinutes);
return rawQuery(
`WITH level1 AS (
select distinct session_id, created_at
from website_event
where website_id = {{websiteId}}${toUuid()}
and created_at between {{startDate}} and {{endDate}}
and url_path = $4)
and created_at between {{startDate}} and {{endDate}}
and url_path = {{0}})
${levelQuery}
${sumQuery}
ORDER BY level;`,
params,
{ websiteId, startDate, endDate, ...urls },
).then(results => {
return urls.map((a, i) => ({
x: a,