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

add relational migrations. update event_key references to data_key

Browse source
This commit is contained in:
Francis Cao 2024-04-08 20:24:15 -07:00
parent cc834083d9
commit 7381254cc2
10 changed files with 73 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/queries/analytics/eventData/getEventDataEvents.ts
View file

@ -22,7 +22,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
`
select
website_event.event_name as "eventName",
event_data.event_key as "fieldName",
event_data.data_key as "fieldName",
event_data.data_type as "dataType",
event_data.string_value as "fieldValue",
count(*) as "total"
@ -32,7 +32,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
where event_data.website_id = {{websiteId::uuid}}
and event_data.created_at between {{startDate}} and {{endDate}}
and website_event.event_name = {{event}}
group by website_event.event_name, event_data.event_key, event_data.data_type, event_data.string_value
group by website_event.event_name, event_data.data_key, event_data.data_type, event_data.string_value
order by 1 asc, 2 asc, 3 asc, 4 desc
`,
params,
@ -43,7 +43,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
`
select
website_event.event_name as "eventName",
event_data.event_key as "fieldName",
event_data.data_key as "fieldName",
event_data.data_type as "dataType",
count(*) as "total"
from event_data
@ -51,7 +51,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
on website_event.event_id = event_data.website_event_id
where event_data.website_id = {{websiteId::uuid}}
and event_data.created_at between {{startDate}} and {{endDate}}
group by website_event.event_name, event_data.event_key, event_data.data_type
group by website_event.event_name, event_data.data_key, event_data.data_type
order by 1 asc, 2 asc
limit 500
`,
@ -72,7 +72,7 @@ async function clickhouseQuery(
`
select
event_name as eventName,
event_key as fieldName,
data_key as fieldName,
data_type as dataType,
string_value as fieldValue,
count(*) as total
@ -80,7 +80,7 @@ async function clickhouseQuery(
where website_id = {websiteId:UUID}
and created_at between {startDate:DateTime64} and {endDate:DateTime64}
and event_name = {event:String}
group by event_key, data_type, string_value, event_name
group by data_key, data_type, string_value, event_name
order by 1 asc, 2 asc, 3 asc, 4 desc
limit 500
`,
@ -102,13 +102,13 @@ async function clickhouseQuery(
`
select
event_name as eventName,
event_key as fieldName,
data_key as fieldName,
data_type as dataType,
count(*) as total
from event_data
where website_id = {websiteId:UUID}
and created_at between {startDate:DateTime64} and {endDate:DateTime64}
group by event_key, data_type, event_name
group by data_key, data_type, event_name
order by 1 asc, 2 asc
limit 500
`,