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

Merge c924ef8582 into 860e6390f1

Browse source
This commit is contained in:
Bas Broekhuizen 2025-12-15 23:25:07 +11:00 • committed by GitHub
commit e7a8c3e1a9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/queries/sql/sessions/getWebsiteSessionStats.ts
View file

@ -36,11 +36,11 @@ async function relationalQuery(
return rawQuery(
`
select
count(*) as "pageviews",
count(distinct website_event.session_id) as "visitors",
count(distinct website_event.visit_id) as "visits",
count(distinct session.country) as "countries",
sum(case when website_event.event_type = 2 then 1 else 0 end) as "events"
count(*) filter (where website_event.event_type = 1) as "pageviews",
count(distinct website_event.session_id) filter (where website_event.event_type = 1) as "visitors",
count(distinct website_event.visit_id) filter (where website_event.event_type = 1) as "visits",
count(distinct session.country) filter (where website_event.event_type = 1) as "countries",
count(*) filter (where website_event.event_type = 2) as "events"
from website_event
${cohortQuery}
join session on website_event.session_id = session.session_id
@ -67,30 +67,30 @@ async function clickhouseQuery(
sql = `
select
sumIf(1, event_type = 1) as "pageviews",
uniq(session_id) as "visitors",
uniq(visit_id) as "visits",
uniq(country) as "countries",
sum(length(event_name)) as "events"
uniqIf(session_id, event_type = 1) as "visitors",
uniqIf(visit_id, event_type = 1) as "visits",
uniqIf(country, event_type = 1) as "countries",
sumIf(1, event_type = 2) as "events"
from website_event
${cohortQuery}
where website_id = {websiteId:UUID}
and created_at between {startDate:DateTime64} and {endDate:DateTime64}
${filterQuery}
`;
and created_at between {startDate:DateTime64} and {endDate:DateTime64}
${filterQuery}
`;
} else {
sql = `
select
sum(views) as "pageviews",
uniq(session_id) as "visitors",
uniq(visit_id) as "visits",
uniq(country) as "countries",
sum(length(event_name)) as "events"
sumIf(views, event_type = 1) as "pageviews",
uniqIf(session_id, event_type = 1) as "visitors",
uniqIf(visit_id, event_type = 1) as "visits",
uniqIf(country, event_type = 1) as "countries",
sumIf(1, event_type = 2) as "events"
from website_event_stats_hourly website_event
${cohortQuery}
where website_id = {websiteId:UUID}
and created_at between {startDate:DateTime64} and {endDate:DateTime64}
${filterQuery}
`;
and created_at between {startDate:DateTime64} and {endDate:DateTime64}
${filterQuery}
`;
}
return rawQuery(sql, queryParams, FUNCTION_NAME);