github/umami
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed event data query.

Browse Source
This commit is contained in:
Mike Cao
2023-08-07 13:43:44 -07:00
parent 7da7f58cbe
commit a71cf675ae
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
queries/analytics/eventData/getEventDataEvents.ts
View File

@@ -14,10 +14,10 @@ export async function getEventDataEvents(
async function relationalQuery(websiteId: string, filters: QueryFilters) { async function relationalQuery(websiteId: string, filters: QueryFilters) {
const { rawQuery, parseFilters } = prisma; const { rawQuery, parseFilters } = prisma;
const { eventName } = filters; const { event } = filters;
const { params } = await parseFilters(websiteId, filters); const { params } = await parseFilters(websiteId, filters);
if (eventName) { if (event) {
return rawQuery( return rawQuery(
` `
select select
@@ -31,7 +31,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
on website_event.event_id = event_data.website_event_id on website_event.event_id = event_data.website_event_id
where event_data.website_id = {{websiteId::uuid}} where event_data.website_id = {{websiteId::uuid}}
and event_data.created_at between {{startDate}} and {{endDate}} and event_data.created_at between {{startDate}} and {{endDate}}
and websit_event.event_name = {{eventName}} 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.event_key, event_data.data_type, event_data.string_value
order by 1 asc, 2 asc, 3 asc, 4 desc order by 1 asc, 2 asc, 3 asc, 4 desc
`, `,
@@ -61,10 +61,10 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
async function clickhouseQuery(websiteId: string, filters: QueryFilters) { async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
const { rawQuery, parseFilters } = clickhouse; const { rawQuery, parseFilters } = clickhouse;
const { eventName } = filters; const { event } = filters;
const { params } = await parseFilters(websiteId, filters); const { params } = await parseFilters(websiteId, filters);
if (eventName) { if (event) {
return rawQuery( return rawQuery(
` `
select select
@@ -76,7 +76,7 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
from event_data from event_data
where website_id = {websiteId:UUID} where website_id = {websiteId:UUID}
and created_at between {startDate:DateTime} and {endDate:DateTime} and created_at between {startDate:DateTime} and {endDate:DateTime}
and event_name = {eventName:String} and event_name = {event:String}
group by event_key, data_type, string_value, event_name group by event_key, data_type, string_value, event_name
order by 1 asc, 2 asc, 3 asc, 4 desc order by 1 asc, 2 asc, 3 asc, 4 desc
limit 100 limit 100