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

Fix funnel report.

Browse source
This commit is contained in:
Brian Cao 2023-06-20 10:22:12 -07:00
parent 56f3134936
commit 414854b064
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
queries/analytics/pageview/getPageviewFunnel.ts
View file

@ -41,23 +41,23 @@ async function relationalQuery(
return rawQuery(
`WITH level0 AS (
select session_id, url_path, referrer_path, created_at
select distinct session_id, url_path, referrer_path, created_at
from website_event
where url_path in (${urlFilterQuery})
and website_id = $1${toUuid()}
and created_at between $2 and $3
),level1 AS (
select session_id, url_path as level_1_url, created_at as level_1_created_at
select distinct session_id, url_path as level_1_url, created_at as level_1_created_at
from level0
where url_path = $4
)${levelQuery}
SELECT ${sumQuery}
from level3;
from level${urls.length};
`,
params,
).then((a: { [key: string]: number }) => {
return urls.map((b, i) => ({ x: b, y: a[`level${i + 1}`] || 0 }));
return urls.map((b, i) => ({ x: b, y: a[0][`level${i + 1}`] || 0 }));
});
}
@ -91,7 +91,7 @@ async function clickhouseQuery(
count(*) AS count
FROM (
SELECT session_id,
windowFunnel({window:UInt32}, 'strict_order')
windowFunnel({window:UInt32})
(
created_at
${columnsQuery}
@ -99,7 +99,6 @@ async function clickhouseQuery(
FROM website_event
WHERE website_id = {websiteId:UUID}
and ${getBetweenDates('created_at', startDate, endDate)}
AND (url_path in [${conditionQuery}])
GROUP BY 1
)
GROUP BY level