add event-data support and charts for arrays, booleans, dates

This commit is contained in:
Francis Cao committed 2026-04-24 15:04:59 -07:00
1 parent 43fb351ac7
commit 5a1ef5e674
25 files changed
+1205 -62

No files matched your search

@@ -0,0 +1,110 @@
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 { EventDataSeriesPoint, EventPropertyFilter, QueryFilters } from '@/lib/types';
const FUNCTION_NAME = 'getEventDataArraySeries';
export async function getEventDataArraySeries(
...args: [
websiteId: string,
eventName: string,
propertyName: string,
filters: QueryFilters,
eventFilters?: EventPropertyFilter[],
]
): Promise<EventDataSeriesPoint[]> {
return runQuery({
[PRISMA]: () => relationalQuery(...args),
[CLICKHOUSE]: () => clickhouseQuery(...args),
});
}
async function relationalQuery(
websiteId: string,
eventName: string,
propertyName: string,
filters: QueryFilters,
eventFilters: EventPropertyFilter[] = [],
): Promise<EventDataSeriesPoint[]> {
const { timezone = 'utc', unit = 'day' } = filters;
const { rawQuery, getDateSQL, parseFilters, getEventPropertyFilterQuery } = prisma;
const { filterQuery, cohortQuery, joinSessionQuery, queryParams } = parseFilters({
...filters,
websiteId,
});
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters);
return rawQuery(
`
select
array_item.value as x,
${getDateSQL('event_data.created_at', unit, timezone)} as t,
count(*) as y
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}}
and website_event.event_type = 2
and website_event.event_name = {{eventName}}
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}
${epfSQL}
group by 1, 2
order by 2
`,
{ ...queryParams, eventName, propertyName, ...epfParams },
FUNCTION_NAME,
);
}
async function clickhouseQuery(
websiteId: string,
eventName: string,
propertyName: string,
filters: QueryFilters,
eventFilters: EventPropertyFilter[] = [],
): 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);
return rawQuery(
`
select
arrayJoin(JSONExtract(ifNull(event_data.string_value, '[]'), 'Array(String)')) as x,
${getDateSQL('event_data.created_at', unit, timezone)} as t,
count() as y
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
and event_name = {eventName:String}) 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}
${epfSQL}
group by x, t
order by t
`,
{ ...queryParams, eventName, propertyName, ...epfParams },
FUNCTION_NAME,
);
}
@@ -0,0 +1,107 @@
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 { EventDataDateSeriesPoint, EventPropertyFilter, QueryFilters } from '@/lib/types';
const FUNCTION_NAME = 'getEventDataDateSeries';
export async function getEventDataDateSeries(
...args: [
websiteId: string,
eventName: string,
propertyName: string,
filters: QueryFilters,
eventFilters?: EventPropertyFilter[],
]
): Promise<EventDataDateSeriesPoint[]> {
return runQuery({
[PRISMA]: () => relationalQuery(...args),
[CLICKHOUSE]: () => clickhouseQuery(...args),
});
}
async function relationalQuery(
websiteId: string,
eventName: string,
propertyName: string,
filters: QueryFilters,
eventFilters: EventPropertyFilter[] = [],
) : Promise<EventDataDateSeriesPoint[]> {
const { timezone = 'UTC' } = filters;
const { rawQuery, parseFilters, getDateStringSQL, getEventPropertyFilterQuery } = prisma;
const { filterQuery, cohortQuery, joinSessionQuery, queryParams } = parseFilters({
...filters,
websiteId,
});
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters);
return rawQuery(
`
select
${getDateStringSQL('event_data.date_value', 'second', timezone)} as t,
count(*) as y
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}}
and website_event.event_type = 2
and website_event.event_name = {{eventName}}
${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.date}
${filterQuery}
${epfSQL}
group by 1
order by 1
`,
{ ...queryParams, eventName, propertyName, ...epfParams },
FUNCTION_NAME,
);
}
async function clickhouseQuery(
websiteId: string,
eventName: string,
propertyName: string,
filters: QueryFilters,
eventFilters: EventPropertyFilter[] = [],
): 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);
return rawQuery(
`
select
${getDateStringSQL('event_data.date_value', 'second', timezone)} as t,
count() as y
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
and event_name = {eventName:String}) 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.date}
${filterQuery}
${epfSQL}
group by t
order by t
`,
{ ...queryParams, eventName, propertyName, ...epfParams },
FUNCTION_NAME,
);
}
@@ -10,7 +10,7 @@ export async function getEventDataNumericSeries(
websiteId: string,
eventName: string,
propertyName: string,
metric: 'sum' | 'avg',
metric: 'sum' | 'avg' | 'count',
filters: QueryFilters,
eventFilters?: EventPropertyFilter[],
]
@@ -25,7 +25,7 @@ async function relationalQuery(
websiteId: string,
eventName: string,
propertyName: string,
metric: 'sum' | 'avg',
metric: 'sum' | 'avg' | 'count',
filters: QueryFilters,
eventFilters: EventPropertyFilter[] = [],
) {
@@ -36,13 +36,16 @@ async function relationalQuery(
websiteId,
});
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters);
const aggFn = metric === 'avg' ? 'avg' : 'sum';
const aggSql =
metric === 'avg' ? 'avg(cast(event_data.number_value as decimal))' :
metric === 'count' ? 'count(*)' :
'sum(cast(event_data.number_value as decimal))';
return rawQuery(
`
select
${getDateSQL('event_data.created_at', unit, timezone)} t,
${aggFn}(cast(event_data.number_value as decimal)) y
${aggSql} y
from event_data
join website_event on website_event.event_id = event_data.website_event_id
and website_event.website_id = {{websiteId::uuid}}
@@ -69,7 +72,7 @@ async function clickhouseQuery(
websiteId: string,
eventName: string,
propertyName: string,
metric: 'sum' | 'avg',
metric: 'sum' | 'avg' | 'count',
filters: QueryFilters,
eventFilters: EventPropertyFilter[] = [],
): Promise<{ t: string; y: number }[]> {
@@ -77,13 +80,16 @@ async function clickhouseQuery(
const { rawQuery, getDateSQL, parseFilters, getEventPropertyFilterQuery } = clickhouse;
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId });
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters);
const aggFn = metric === 'avg' ? 'avg' : 'sum';
const aggSql =
metric === 'avg' ? 'avg(event_data.number_value)' :
metric === 'count' ? 'count()' :
'sum(event_data.number_value)';
return rawQuery(
`
select
${getDateSQL('event_data.created_at', unit, timezone)} as t,
${aggFn}(event_data.number_value) as y
${aggSql} as y
from event_data
any left join (
select *
@@ -0,0 +1,106 @@
import clickhouse from '@/lib/clickhouse';
import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
import prisma from '@/lib/prisma';
import type { EventDataNumericStats, EventPropertyFilter, QueryFilters } from '@/lib/types';
const FUNCTION_NAME = 'getEventDataNumericStats';
export async function getEventDataNumericStats(
...args: [
websiteId: string,
eventName: string,
propertyName: string,
filters: QueryFilters,
eventFilters?: EventPropertyFilter[],
]
): Promise<EventDataNumericStats> {
return runQuery({
[PRISMA]: () => relationalQuery(...args),
[CLICKHOUSE]: () => clickhouseQuery(...args),
}).then(results => results?.[0]);
}
async function relationalQuery(
websiteId: string,
eventName: string,
propertyName: string,
filters: QueryFilters,
eventFilters: EventPropertyFilter[] = [],
) {
const { rawQuery, parseFilters, getEventPropertyFilterQuery } = prisma;
const { filterQuery, cohortQuery, joinSessionQuery, queryParams } = parseFilters({
...filters,
websiteId,
});
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters);
return rawQuery(
`
select
coalesce(sum(cast(event_data.number_value as decimal)), 0) as "total",
coalesce(avg(cast(event_data.number_value as decimal)), 0) as "average",
coalesce(percentile_cont(0.5) within group (order by event_data.number_value), 0) as "median",
coalesce(max(event_data.number_value), 0) as "max",
coalesce(min(event_data.number_value), 0) as "min"
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}}
and website_event.event_type = 2
and website_event.event_name = {{eventName}}
${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 = 2
${filterQuery}
${epfSQL}
`,
{ ...queryParams, eventName, propertyName, ...epfParams },
FUNCTION_NAME,
);
}
async function clickhouseQuery(
websiteId: string,
eventName: string,
propertyName: string,
filters: QueryFilters,
eventFilters: EventPropertyFilter[] = [],
): Promise<EventDataNumericStats[]> {
const { rawQuery, parseFilters, getEventPropertyFilterQuery } = clickhouse;
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId });
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters);
return rawQuery(
`
select
if(count() = 0, 0, sum(event_data.number_value)) as total,
if(count() = 0, 0, avg(event_data.number_value)) as average,
if(count() = 0, 0, median(event_data.number_value)) as median,
if(count() = 0, 0, max(event_data.number_value)) as max,
if(count() = 0, 0, min(event_data.number_value)) as min
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
and event_name = {eventName:String}) 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 = 2
${filterQuery}
${epfSQL}
`,
{ ...queryParams, eventName, propertyName, ...epfParams },
FUNCTION_NAME,
);
}
@@ -1,7 +1,8 @@
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 { EventPropertyFilter, QueryFilters } from '@/lib/types';
import type { EventDataSeriesPoint, EventPropertyFilter, QueryFilters } from '@/lib/types';
const FUNCTION_NAME = 'getEventDataPropertySeries';
@@ -13,7 +14,7 @@ export async function getEventDataPropertySeries(
filters: QueryFilters,
eventFilters?: EventPropertyFilter[],
]
) {
): Promise<EventDataSeriesPoint[]> {
return runQuery({
[PRISMA]: () => relationalQuery(...args),
[CLICKHOUSE]: () => clickhouseQuery(...args),
@@ -26,7 +27,7 @@ async function relationalQuery(
propertyName: string,
filters: QueryFilters,
eventFilters: EventPropertyFilter[] = [],
) {
): Promise<EventDataSeriesPoint[]> {
const { timezone = 'utc', unit = 'day' } = filters;
const { rawQuery, getDateSQL, parseFilters, getEventPropertyFilterQuery } = prisma;
const { filterQuery, cohortQuery, joinSessionQuery, queryParams } = parseFilters({
@@ -52,7 +53,7 @@ async function relationalQuery(
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 = 1
and event_data.data_type in (${DATA_TYPE.string}, ${DATA_TYPE.boolean})
${filterQuery}
${epfSQL}
group by 1, 2
@@ -69,7 +70,7 @@ async function clickhouseQuery(
propertyName: string,
filters: QueryFilters,
eventFilters: EventPropertyFilter[] = [],
): Promise<{ x: string; t: string; y: number }[]> {
): Promise<EventDataSeriesPoint[]> {
const { timezone = 'UTC', unit = 'day' } = filters;
const { rawQuery, getDateSQL, parseFilters, getEventPropertyFilterQuery } = clickhouse;
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId });
@@ -96,7 +97,7 @@ async function clickhouseQuery(
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 = 1
and event_data.data_type in (${DATA_TYPE.string}, ${DATA_TYPE.boolean})
${filterQuery}
${epfSQL}
group by x, t
+3
View File
@@ -1,7 +1,10 @@
export * from './events/getEventDataArraySeries';
export * from './events/getEventDataById';
export * from './events/getEventDataDateSeries';
export * from './events/getEventDataEvents';
export * from './events/getEventDataFields';
export * from './events/getEventDataNumericSeries';
export * from './events/getEventDataNumericStats';
export * from './events/getEventDataPivot';
export * from './events/getEventDataProperties';
export * from './events/getEventDataPropertySeries';