m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-14 21:10:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix relational queries for new screens

Browse Source
This commit is contained in:
Francis Cao 2024-08-19 10:28:10 -07:00
parent 66510fd441
commit 7ae3c790cd
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/queries/analytics/events/getEventDataProperties.ts
View File

@ -24,14 +24,15 @@ async function relationalQuery(
return rawQuery( return rawQuery(
` `
select select
event_name as "eventName", we.event_name as "eventName",
data_key as "propertyName", ed.data_key as "propertyName",
count(*) as "total" count(*) as "total"
from event_data from event_data ed
where website_id = {{websiteId::uuid}} join website_event we on we.event_id = ed.website_event_id
and created_at between {{startDate}} and {{endDate}} where ed.website_id = {{websiteId::uuid}}
and ed.created_at between {{startDate}} and {{endDate}}
${filterQuery} ${filterQuery}
group by event_name, data_key group by we.event_name, ed.data_key
order by 3 desc order by 3 desc
limit 500 limit 500
`, `,

8
src/queries/analytics/sessions/getWebsiteSessionStats.ts
View File

@ -29,10 +29,10 @@ async function relationalQuery(
` `
select select
count(*) as "pageviews", count(*) as "pageviews",
count(distinct t.session_id) as "visitors", count(distinct website_event.session_id) as "visitors",
count(distinct t.visit_id) as "visits", count(distinct website_event.visit_id) as "visits",
count(distinct t.country) as "countries", count(distinct session.country) as "countries",
sum(case when event_type = 2 then 1 else 0 end) as "events" sum(case when website_event.event_type = 2 then 1 else 0 end) as "events"
from website_event from website_event
join session on website_event.session_id = session.session_id join session on website_event.session_id = session.session_id
where website_event.website_id = {{websiteId::uuid}} where website_event.website_id = {{websiteId::uuid}}

2
src/queries/analytics/sessions/getWebsiteSessionsWeekly.ts
View File

@ -21,7 +21,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
select select
${getDateWeeklySQL('created_at')} as time, ${getDateWeeklySQL('created_at')} as time,
count(distinct session_id) as value count(distinct session_id) as value
from website_event_stats_hourly from website_event
where website_id = {{websiteId::uuid}} where website_id = {{websiteId::uuid}}
and created_at between {{startDate}} and {{endDate}} and created_at between {{startDate}} and {{endDate}}
group by time group by time