watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-06 05:37:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Updated cities table.

Browse source
This commit is contained in:
Mike Cao 2023-08-26 12:46:27 -07:00
parent c22fefaa2d
commit bb77c2ead6
8 changed files with 52 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/queries/analytics/sessions/getSessionMetrics.ts
View file

@ -28,14 +28,18 @@ async function relationalQuery(websiteId: string, column: string, filters: Query
return rawQuery(
`
select ${column} x, count(*) y
select
${column} x,
count(*) y
${column === 'city' ? ', country' : ''}
from website_event
${joinSession}
where website_event.website_id = {{websiteId::uuid}}
and website_event.created_at between {{startDate}} and {{endDate}}
and website_event.event_type = {{eventType}}
${filterQuery}
group by 1
group by 1
${column === 'city' ? ', 3' : ''}
order by 2 desc
limit 100`,
params,
@ -52,13 +56,16 @@ async function clickhouseQuery(websiteId: string, column: string, filters: Query
return rawQuery(
`
select
${column} x, count(distinct session_id) y
${column} x,
count(distinct session_id) y
${column === 'city' ? ', country' : ''}
from website_event
where website_id = {websiteId:UUID}
and created_at between {startDate:DateTime} and {endDate:DateTime}
and event_type = {eventType:UInt32}
${filterQuery}
group by x
group by x
${column === 'city' ? ', country' : ''}
order by y desc
limit 100
`,