Add Property filters for booleans, dates, arrays
This commit is contained in:
1 parent
877945e721
commit
9da332c489
21 files changed
+499
-163
No files matched your search
@@ -33,8 +33,9 @@ async function relationalQuery(
|
||||
const { filterQuery, cohortQuery, joinSessionQuery, queryParams } = parseFilters({
|
||||
...filters,
|
||||
websiteId,
|
||||
timezone,
|
||||
});
|
||||
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters);
|
||||
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters, timezone);
|
||||
|
||||
return rawQuery(
|
||||
`
|
||||
@@ -74,8 +75,8 @@ async function clickhouseQuery(
|
||||
): Promise<EventDataSeriesPoint[]> {
|
||||
const { timezone = 'UTC', unit = 'day' } = filters;
|
||||
const { rawQuery, getDateSQL, parseFilters, getEventPropertyFilterQuery } = clickhouse;
|
||||
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId });
|
||||
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters);
|
||||
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });
|
||||
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters, timezone);
|
||||
|
||||
return rawQuery(
|
||||
`
|
||||
|
||||
@@ -28,13 +28,14 @@ async function relationalQuery(
|
||||
filters: QueryFilters,
|
||||
eventFilters: EventPropertyFilter[] = [],
|
||||
) : Promise<EventDataDateSeriesPoint[]> {
|
||||
const { timezone = 'UTC' } = filters;
|
||||
const { timezone = 'utc' } = filters;
|
||||
const { rawQuery, parseFilters, getDateStringSQL, getEventPropertyFilterQuery } = prisma;
|
||||
const { filterQuery, cohortQuery, joinSessionQuery, queryParams } = parseFilters({
|
||||
...filters,
|
||||
websiteId,
|
||||
timezone,
|
||||
});
|
||||
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters);
|
||||
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters, timezone);
|
||||
|
||||
return rawQuery(
|
||||
`
|
||||
@@ -72,8 +73,8 @@ async function clickhouseQuery(
|
||||
): Promise<EventDataDateSeriesPoint[]> {
|
||||
const { timezone = 'UTC' } = filters;
|
||||
const { rawQuery, parseFilters, getDateStringSQL, getEventPropertyFilterQuery } = clickhouse;
|
||||
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId });
|
||||
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters);
|
||||
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });
|
||||
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters, timezone);
|
||||
|
||||
return rawQuery(
|
||||
`
|
||||
|
||||
@@ -92,10 +92,10 @@ async function clickhouseQuery(
|
||||
return rawQuery(
|
||||
`
|
||||
select
|
||||
event_name as eventName,
|
||||
data_key as propertyName,
|
||||
data_type as dataType,
|
||||
string_value as propertyValue,
|
||||
event_data.event_name as eventName,
|
||||
event_data.data_key as propertyName,
|
||||
event_data.data_type as dataType,
|
||||
event_data.string_value as propertyValue,
|
||||
count(*) as total
|
||||
from event_data
|
||||
any left join (
|
||||
@@ -111,7 +111,11 @@ async function clickhouseQuery(
|
||||
where event_data.website_id = {websiteId:UUID}
|
||||
and event_data.created_at between {startDate:DateTime64} and {endDate:DateTime64}
|
||||
${filterQuery}
|
||||
group by data_key, data_type, string_value, event_name
|
||||
group by
|
||||
event_data.data_key,
|
||||
event_data.data_type,
|
||||
event_data.string_value,
|
||||
event_data.event_name
|
||||
order by 1 asc, 2 asc, 3 asc, 5 desc
|
||||
limit 500
|
||||
`,
|
||||
@@ -123,9 +127,9 @@ async function clickhouseQuery(
|
||||
return rawQuery(
|
||||
`
|
||||
select
|
||||
event_name as eventName,
|
||||
data_key as propertyName,
|
||||
data_type as dataType,
|
||||
event_data.event_name as eventName,
|
||||
event_data.data_key as propertyName,
|
||||
event_data.data_type as dataType,
|
||||
count(*) as total
|
||||
from event_data
|
||||
any left join (
|
||||
@@ -141,7 +145,7 @@ async function clickhouseQuery(
|
||||
where event_data.website_id = {websiteId:UUID}
|
||||
and event_data.created_at between {startDate:DateTime64} and {endDate:DateTime64}
|
||||
${filterQuery}
|
||||
group by data_key, data_type, event_name
|
||||
group by event_data.data_key, event_data.data_type, event_data.event_name
|
||||
order by 1 asc, 2 asc
|
||||
limit 500
|
||||
`,
|
||||
|
||||
@@ -34,8 +34,9 @@ async function relationalQuery(
|
||||
const { filterQuery, cohortQuery, joinSessionQuery, queryParams } = parseFilters({
|
||||
...filters,
|
||||
websiteId,
|
||||
timezone,
|
||||
});
|
||||
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters);
|
||||
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters, timezone);
|
||||
const aggSql =
|
||||
metric === 'avg' ? 'avg(cast(event_data.number_value as decimal))' :
|
||||
metric === 'count' ? 'count(*)' :
|
||||
@@ -78,8 +79,8 @@ async function clickhouseQuery(
|
||||
): Promise<{ t: string; y: number }[]> {
|
||||
const { timezone = 'UTC', unit = 'day' } = filters;
|
||||
const { rawQuery, getDateSQL, parseFilters, getEventPropertyFilterQuery } = clickhouse;
|
||||
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId });
|
||||
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters);
|
||||
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });
|
||||
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters, timezone);
|
||||
const aggSql =
|
||||
metric === 'avg' ? 'avg(event_data.number_value)' :
|
||||
metric === 'count' ? 'count()' :
|
||||
|
||||
@@ -27,12 +27,14 @@ async function relationalQuery(
|
||||
filters: QueryFilters,
|
||||
eventFilters: EventPropertyFilter[] = [],
|
||||
) {
|
||||
const { timezone = 'utc' } = filters;
|
||||
const { rawQuery, parseFilters, getEventPropertyFilterQuery } = prisma;
|
||||
const { filterQuery, cohortQuery, joinSessionQuery, queryParams } = parseFilters({
|
||||
...filters,
|
||||
websiteId,
|
||||
timezone,
|
||||
});
|
||||
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters);
|
||||
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters, timezone);
|
||||
|
||||
return rawQuery(
|
||||
`
|
||||
@@ -69,9 +71,10 @@ async function clickhouseQuery(
|
||||
filters: QueryFilters,
|
||||
eventFilters: EventPropertyFilter[] = [],
|
||||
): Promise<EventDataNumericStats[]> {
|
||||
const { timezone = 'UTC' } = filters;
|
||||
const { rawQuery, parseFilters, getEventPropertyFilterQuery } = clickhouse;
|
||||
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId });
|
||||
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters);
|
||||
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });
|
||||
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters, timezone);
|
||||
|
||||
return rawQuery(
|
||||
`
|
||||
|
||||
@@ -21,6 +21,7 @@ export async function getEventDataPivot(
|
||||
}
|
||||
|
||||
async function relationalQuery(websiteId: string, eventName: string, filters: QueryFilters, eventFilters: EventPropertyFilter[] = []) {
|
||||
const { timezone = 'utc' } = filters;
|
||||
const { rawQuery, parseFilters, getEventPropertyFilterQuery } = prisma;
|
||||
const { page = 1, pageSize } = filters;
|
||||
const size = +pageSize || DEFAULT_PAGE_SIZE;
|
||||
@@ -29,8 +30,9 @@ async function relationalQuery(websiteId: string, eventName: string, filters: Qu
|
||||
const { filterQuery, cohortQuery, joinSessionQuery, queryParams } = parseFilters({
|
||||
...filters,
|
||||
websiteId,
|
||||
timezone,
|
||||
});
|
||||
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters);
|
||||
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters, timezone);
|
||||
|
||||
const countResult = await rawQuery(
|
||||
`
|
||||
@@ -81,7 +83,9 @@ async function relationalQuery(websiteId: string, eventName: string, filters: Qu
|
||||
coalesce(
|
||||
case when event_data.data_type = 1 then event_data.string_value end,
|
||||
case when event_data.data_type = 2 then cast(event_data.number_value as varchar) end,
|
||||
case when event_data.data_type = 3 then event_data.string_value end,
|
||||
case when event_data.data_type = 4 then cast(event_data.date_value as varchar) end,
|
||||
case when event_data.data_type = 5 then event_data.string_value end,
|
||||
''
|
||||
) as "value",
|
||||
event_data.data_type as "dataType"
|
||||
@@ -115,13 +119,14 @@ async function relationalQuery(websiteId: string, eventName: string, filters: Qu
|
||||
}
|
||||
|
||||
async function clickhouseQuery(websiteId: string, eventName: string, filters: QueryFilters, eventFilters: EventPropertyFilter[] = []) {
|
||||
const { timezone = 'UTC' } = filters;
|
||||
const { rawQuery, parseFilters, getEventPropertyFilterQuery } = clickhouse;
|
||||
const { page = 1, pageSize } = filters;
|
||||
const size = +pageSize || DEFAULT_PAGE_SIZE;
|
||||
const offset = +size * (+page - 1);
|
||||
|
||||
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId });
|
||||
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters);
|
||||
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });
|
||||
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters, timezone);
|
||||
|
||||
const count = await rawQuery(
|
||||
`
|
||||
@@ -149,11 +154,11 @@ async function clickhouseQuery(websiteId: string, eventName: string, filters: Qu
|
||||
const data = await rawQuery(
|
||||
`
|
||||
select
|
||||
event_id as eventId,
|
||||
session_id as sessionId,
|
||||
event_name as eventName,
|
||||
url_path as urlPath,
|
||||
created_at as createdAt,
|
||||
event_data_pivot.event_id as eventId,
|
||||
event_data_pivot.session_id as sessionId,
|
||||
event_data_pivot.event_name as eventName,
|
||||
event_data_pivot.url_path as urlPath,
|
||||
event_data_pivot.created_at as createdAt,
|
||||
groupArrayMerge(property_keys) as propertyKeys,
|
||||
groupArrayMerge(property_values) as propertyValues
|
||||
from umami.event_data_pivot
|
||||
@@ -172,8 +177,13 @@ async function clickhouseQuery(websiteId: string, eventName: string, filters: Qu
|
||||
and event_data_pivot.created_at between {startDate:DateTime64} and {endDate:DateTime64}
|
||||
${filterQuery}
|
||||
${epfSQL}
|
||||
group by event_id, session_id, event_name, url_path, created_at
|
||||
order by created_at desc
|
||||
group by
|
||||
event_data_pivot.event_id,
|
||||
event_data_pivot.session_id,
|
||||
event_data_pivot.event_name,
|
||||
event_data_pivot.url_path,
|
||||
event_data_pivot.created_at
|
||||
order by event_data_pivot.created_at desc
|
||||
limit ${size} offset ${offset}
|
||||
`,
|
||||
{ ...queryParams, eventName, ...epfParams },
|
||||
|
||||
@@ -66,9 +66,9 @@ async function clickhouseQuery(
|
||||
return rawQuery(
|
||||
`
|
||||
select
|
||||
event_name as eventName,
|
||||
data_key as propertyName,
|
||||
data_type as dataType,
|
||||
event_data.event_name as eventName,
|
||||
event_data.data_key as propertyName,
|
||||
event_data.data_type as dataType,
|
||||
count(*) as total
|
||||
from event_data
|
||||
any left join (
|
||||
@@ -84,7 +84,7 @@ async function clickhouseQuery(
|
||||
where event_data.website_id = {websiteId:UUID}
|
||||
and event_data.created_at between {startDate:DateTime64} and {endDate:DateTime64}
|
||||
${filterQuery}
|
||||
group by event_name, data_key, data_type
|
||||
group by event_data.event_name, event_data.data_key, event_data.data_type
|
||||
order by 1, 4 desc
|
||||
limit 500
|
||||
`,
|
||||
|
||||
@@ -33,8 +33,9 @@ async function relationalQuery(
|
||||
const { filterQuery, cohortQuery, joinSessionQuery, queryParams } = parseFilters({
|
||||
...filters,
|
||||
websiteId,
|
||||
timezone,
|
||||
});
|
||||
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters);
|
||||
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters, timezone);
|
||||
|
||||
return rawQuery(
|
||||
`
|
||||
@@ -73,8 +74,8 @@ async function clickhouseQuery(
|
||||
): Promise<EventDataSeriesPoint[]> {
|
||||
const { timezone = 'UTC', unit = 'day' } = filters;
|
||||
const { rawQuery, getDateSQL, parseFilters, getEventPropertyFilterQuery } = clickhouse;
|
||||
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId });
|
||||
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters);
|
||||
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });
|
||||
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters, timezone);
|
||||
|
||||
return rawQuery(
|
||||
`
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import clickhouse from '@/lib/clickhouse';
|
||||
import { DATA_TYPE } from '@/lib/constants';
|
||||
import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
|
||||
import prisma from '@/lib/prisma';
|
||||
import type { QueryFilters } from '@/lib/types';
|
||||
@@ -11,7 +12,7 @@ interface WebsiteEventData {
|
||||
}
|
||||
|
||||
export async function getEventDataValues(
|
||||
...args: [websiteId: string, filters: QueryFilters & { propertyName?: string }]
|
||||
...args: [websiteId: string, filters: QueryFilters & { propertyName?: string; dataType?: number }]
|
||||
): Promise<WebsiteEventData[]> {
|
||||
return runQuery({
|
||||
[PRISMA]: () => relationalQuery(...args),
|
||||
@@ -21,14 +22,42 @@ export async function getEventDataValues(
|
||||
|
||||
async function relationalQuery(
|
||||
websiteId: string,
|
||||
filters: QueryFilters & { propertyName?: string },
|
||||
filters: QueryFilters & { propertyName?: string; dataType?: number },
|
||||
) {
|
||||
const { rawQuery, parseFilters, getDateSQL } = prisma;
|
||||
const { dataType } = filters;
|
||||
const { filterQuery, joinSessionQuery, cohortQuery, queryParams } = parseFilters({
|
||||
...filters,
|
||||
websiteId,
|
||||
});
|
||||
|
||||
if (dataType === DATA_TYPE.array) {
|
||||
return rawQuery(
|
||||
`
|
||||
select
|
||||
array_item.value as "value",
|
||||
count(*) as "total"
|
||||
from event_data
|
||||
join website_event on website_event.event_id = event_data.website_event_id
|
||||
and website_event.website_id = {{websiteId::uuid}}
|
||||
and website_event.created_at between {{startDate}} and {{endDate}}
|
||||
cross join lateral jsonb_array_elements_text(coalesce(event_data.string_value, '[]')::jsonb) as array_item(value)
|
||||
${cohortQuery}
|
||||
${joinSessionQuery}
|
||||
where event_data.website_id = {{websiteId::uuid}}
|
||||
and event_data.created_at between {{startDate}} and {{endDate}}
|
||||
and event_data.data_key = {{propertyName}}
|
||||
and event_data.data_type = ${DATA_TYPE.array}
|
||||
${filterQuery}
|
||||
group by array_item.value
|
||||
order by 2 desc
|
||||
limit 100
|
||||
`,
|
||||
queryParams,
|
||||
FUNCTION_NAME,
|
||||
);
|
||||
}
|
||||
|
||||
return rawQuery(
|
||||
`
|
||||
select
|
||||
@@ -59,11 +88,43 @@ async function relationalQuery(
|
||||
|
||||
async function clickhouseQuery(
|
||||
websiteId: string,
|
||||
filters: QueryFilters & { propertyName?: string },
|
||||
filters: QueryFilters & { propertyName?: string; dataType?: number },
|
||||
): Promise<{ value: string; total: number }[]> {
|
||||
const { rawQuery, parseFilters } = clickhouse;
|
||||
const { dataType } = filters;
|
||||
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId });
|
||||
|
||||
if (dataType === DATA_TYPE.array) {
|
||||
return rawQuery(
|
||||
`
|
||||
select
|
||||
arrayJoin(JSONExtract(ifNull(event_data.string_value, '[]'), 'Array(String)')) as "value",
|
||||
count(*) as "total"
|
||||
from event_data
|
||||
any left join (
|
||||
select *
|
||||
from website_event
|
||||
where website_id = {websiteId:UUID}
|
||||
and created_at between {startDate:DateTime64} and {endDate:DateTime64}
|
||||
and event_type = 2) website_event
|
||||
on website_event.event_id = event_data.event_id
|
||||
and website_event.session_id = event_data.session_id
|
||||
and website_event.website_id = event_data.website_id
|
||||
${cohortQuery}
|
||||
where event_data.website_id = {websiteId:UUID}
|
||||
and event_data.created_at between {startDate:DateTime64} and {endDate:DateTime64}
|
||||
and event_data.data_key = {propertyName:String}
|
||||
and event_data.data_type = ${DATA_TYPE.array}
|
||||
${filterQuery}
|
||||
group by value
|
||||
order by 2 desc
|
||||
limit 100
|
||||
`,
|
||||
queryParams,
|
||||
FUNCTION_NAME,
|
||||
);
|
||||
}
|
||||
|
||||
return rawQuery(
|
||||
`
|
||||
select
|
||||
|
||||
Reference in new issue
Block a user