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

Refactor filter handling for queries.

Browse Source
This commit is contained in:
Mike Cao
2025-07-02 01:44:12 -07:00
parent 5b300f1ff5
commit ee6c68d27c
107 changed files with 731 additions and 835 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/queries/sql/events/getEventDataEvents.ts
View File

@@ -23,7 +23,7 @@ export async function getEventDataEvents(
async function relationalQuery(websiteId: string, filters: QueryFilters) {
const { rawQuery, parseFilters } = prisma;
const { event } = filters;
const { filterParams } = await parseFilters(websiteId, filters);
const { queryParams } = await parseFilters(filters);
if (event) {
return rawQuery(
@@ -43,7 +43,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
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, 5 desc
`,
filterParams,
queryParams,
);
}
@@ -63,7 +63,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
order by 1 asc, 2 asc
limit 500
`,
filterParams,
queryParams,
);
}
@@ -73,7 +73,7 @@ async function clickhouseQuery(
): Promise<{ eventName: string; propertyName: string; dataType: number; total: number }[]> {
const { rawQuery, parseFilters } = clickhouse;
const { event } = filters;
const { filterParams } = await parseFilters(websiteId, filters);
const { queryParams } = await parseFilters(filters);
if (event) {
return rawQuery(
@@ -92,7 +92,7 @@ async function clickhouseQuery(
order by 1 asc, 2 asc, 3 asc, 5 desc
limit 500
`,
filterParams,
queryParams,
);
}
@@ -110,6 +110,6 @@ async function clickhouseQuery(
order by 1 asc, 2 asc
limit 500
`,
filterParams,
queryParams,
);
}

8
src/queries/sql/events/getEventDataFields.ts
View File

@@ -12,7 +12,7 @@ export async function getEventDataFields(...args: [websiteId: string, filters: Q
async function relationalQuery(websiteId: string, filters: QueryFilters) {
const { rawQuery, parseFilters, getDateSQL } = prisma;
const { filterQuery, filterParams } = await parseFilters(websiteId, filters);
const { filterQuery, queryParams } = await parseFilters(filters);
return rawQuery(
`
@@ -34,7 +34,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
order by 2 desc
limit 100
`,
filterParams,
queryParams,
);
}
@@ -43,7 +43,7 @@ async function clickhouseQuery(
filters: QueryFilters,
): Promise<{ propertyName: string; dataType: number; propertyValue: string; total: number }[]> {
const { rawQuery, parseFilters } = clickhouse;
const { filterQuery, filterParams } = await parseFilters(websiteId, filters);
const { filterQuery, queryParams } = await parseFilters(filters);
return rawQuery(
`
@@ -62,6 +62,6 @@ async function clickhouseQuery(
order by 2 desc
limit 100
`,
filterParams,
queryParams,
);
}

12
src/queries/sql/events/getEventDataProperties.ts
View File

@@ -1,11 +1,11 @@
import prisma from '@/lib/prisma';
import clickhouse from '@/lib/clickhouse';
import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
import { QueryFilters, WebsiteEventData } from '@/lib/types';
import { QueryFilters } from '@/lib/types';
export async function getEventDataProperties(
...args: [websiteId: string, filters: QueryFilters & { propertyName?: string }]
): Promise<WebsiteEventData[]> {
) {
return runQuery({
[PRISMA]: () => relationalQuery(...args),
[CLICKHOUSE]: () => clickhouseQuery(...args),
@@ -17,7 +17,7 @@ async function relationalQuery(
filters: QueryFilters & { propertyName?: string },
) {
const { rawQuery, parseFilters } = prisma;
const { filterQuery, filterParams } = await parseFilters(websiteId, filters, {
const { filterQuery, queryParams } = await parseFilters(filters, {
columns: { propertyName: 'data_key' },
});
@@ -36,7 +36,7 @@ async function relationalQuery(
order by 3 desc
limit 500
`,
filterParams,
queryParams,
);
}
@@ -45,7 +45,7 @@ async function clickhouseQuery(
filters: QueryFilters & { propertyName?: string },
): Promise<{ eventName: string; propertyName: string; total: number }[]> {
const { rawQuery, parseFilters } = clickhouse;
const { filterQuery, filterParams } = await parseFilters(websiteId, filters, {
const { filterQuery, queryParams } = await parseFilters(filters, {
columns: { propertyName: 'data_key' },
});
@@ -63,6 +63,6 @@ async function clickhouseQuery(
order by 1, 3 desc
limit 500
`,
filterParams,
queryParams,
);
}

8
src/queries/sql/events/getEventDataStats.ts
View File

@@ -18,7 +18,7 @@ export async function getEventDataStats(
async function relationalQuery(websiteId: string, filters: QueryFilters) {
const { rawQuery, parseFilters } = prisma;
const { filterQuery, filterParams } = await parseFilters(websiteId, filters);
const { filterQuery, queryParams } = await parseFilters({ ...filters, websiteId });
return rawQuery(
`
@@ -38,7 +38,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
group by website_event_id, data_key
) as t
`,
filterParams,
queryParams,
);
}
@@ -47,7 +47,7 @@ async function clickhouseQuery(
filters: QueryFilters,
): Promise<{ events: number; properties: number; records: number }[]> {
const { rawQuery, parseFilters } = clickhouse;
const { filterQuery, filterParams } = await parseFilters(websiteId, filters);
const { filterQuery, queryParams } = await parseFilters({ ...filters, websiteId });
return rawQuery(
`
@@ -67,6 +67,6 @@ async function clickhouseQuery(
group by event_id, data_key
) as t
`,
filterParams,
queryParams,
);
}

7
src/queries/sql/events/getEventDataUsage.ts
View File

@@ -1,7 +1,8 @@
import clickhouse from '@/lib/clickhouse';
import { CLICKHOUSE, PRISMA, runQuery, notImplemented } from '@/lib/db';
import { QueryFilters } from '@/lib/types';
export function getEventDataUsage(...args: [websiteIds: string[], startDate: Date, endDate: Date]) {
export function getEventDataUsage(...args: [websiteIds: string[], filters: QueryFilters]) {
return runQuery({
[PRISMA]: notImplemented,
[CLICKHOUSE]: () => clickhouseQuery(...args),
@@ -10,10 +11,10 @@ export function getEventDataUsage(...args: [websiteIds: string[], startDate: Dat
function clickhouseQuery(
websiteIds: string[],
startDate: Date,
endDate: Date,
filters: QueryFilters,
): Promise<{ websiteId: string; count: number }[]> {
const { rawQuery } = clickhouse;
const { startDate, endDate } = filters;
return rawQuery(
`

8
src/queries/sql/events/getEventDataValues.ts
View File

@@ -25,7 +25,7 @@ async function relationalQuery(
filters: QueryFilters & { eventName?: string; propertyName?: string },
) {
const { rawQuery, parseFilters, getDateSQL } = prisma;
const { filterQuery, filterParams } = await parseFilters(websiteId, filters);
const { filterQuery, queryParams } = await parseFilters({ ...filters, websiteId });
return rawQuery(
`
@@ -47,7 +47,7 @@ async function relationalQuery(
order by 2 desc
limit 100
`,
filterParams,
queryParams,
);
}
@@ -56,7 +56,7 @@ async function clickhouseQuery(
filters: QueryFilters & { eventName?: string; propertyName?: string },
): Promise<{ value: string; total: number }[]> {
const { rawQuery, parseFilters } = clickhouse;
const { filterQuery, filterParams } = await parseFilters(websiteId, filters);
const { filterQuery, queryParams } = await parseFilters({ ...filters, websiteId });
return rawQuery(
`
@@ -75,6 +75,6 @@ async function clickhouseQuery(
order by 2 desc
limit 100
`,
filterParams,
queryParams,
);
}

10
src/queries/sql/events/getEventMetrics.ts
View File

@@ -22,7 +22,7 @@ export async function getEventMetrics(
async function relationalQuery(websiteId: string, filters: QueryFilters) {
const { timezone = 'utc', unit = 'day' } = filters;
const { rawQuery, getDateSQL, parseFilters } = prisma;
const { filterQuery, joinSession, filterParams } = await parseFilters(websiteId, {
const { filterQuery, joinSessionQuery, queryParams } = await parseFilters({
...filters,
eventType: EVENT_TYPE.customEvent,
});
@@ -34,7 +34,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
${getDateSQL('website_event.created_at', unit, timezone)} t,
count(*) y
from website_event
${joinSession}
${joinSessionQuery}
where website_event.website_id = {{websiteId::uuid}}
and website_event.created_at between {{startDate}} and {{endDate}}
and event_type = {{eventType}}
@@ -42,7 +42,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
group by 1, 2
order by 2
`,
filterParams,
queryParams,
);
}
@@ -52,7 +52,7 @@ async function clickhouseQuery(
): Promise<{ x: string; t: string; y: number }[]> {
const { timezone = 'UTC', unit = 'day' } = filters;
const { rawQuery, getDateSQL, parseFilters } = clickhouse;
const { filterQuery, filterParams } = await parseFilters(websiteId, {
const { filterQuery, queryParams } = await parseFilters({
...filters,
eventType: EVENT_TYPE.customEvent,
});
@@ -92,5 +92,5 @@ async function clickhouseQuery(
`;
}
return rawQuery(sql, filterParams);
return rawQuery(sql, queryParams);
}

7
src/queries/sql/events/getEventUsage.ts
View File

@@ -1,7 +1,8 @@
import clickhouse from '@/lib/clickhouse';
import { CLICKHOUSE, PRISMA, runQuery, notImplemented } from '@/lib/db';
import { QueryFilters } from '@/lib/types';
export function getEventUsage(...args: [websiteIds: string[], startDate: Date, endDate: Date]) {
export function getEventUsage(...args: [websiteIds: string[], filters: QueryFilters]) {
return runQuery({
[PRISMA]: notImplemented,
[CLICKHOUSE]: () => clickhouseQuery(...args),
@@ -10,10 +11,10 @@ export function getEventUsage(...args: [websiteIds: string[], startDate: Date, e
function clickhouseQuery(
websiteIds: string[],
startDate: Date,
endDate: Date,
filters: QueryFilters,
): Promise<{ websiteId: string; count: number }[]> {
const { rawQuery } = clickhouse;
const { startDate, endDate } = filters;
return rawQuery(
`

60
src/queries/sql/events/getWebsiteEvents.ts
View File

@@ -1,26 +1,27 @@
import clickhouse from '@/lib/clickhouse';
import { CLICKHOUSE, getDatabaseType, POSTGRESQL, PRISMA, runQuery } from '@/lib/db';
import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
import prisma from '@/lib/prisma';
import { PageParams, QueryFilters } from '@/lib/types';
import { QueryFilters } from '@/lib/types';
export function getWebsiteEvents(
...args: [websiteId: string, filters: QueryFilters, pageParams?: PageParams]
) {
export function getWebsiteEvents(...args: [websiteId: string, filters: QueryFilters]) {
return runQuery({
[PRISMA]: () => relationalQuery(...args),
[CLICKHOUSE]: () => clickhouseQuery(...args),
});
}
async function relationalQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
async function relationalQuery(websiteId: string, filters: QueryFilters) {
const { pagedRawQuery, parseFilters } = prisma;
const { search } = pageParams;
const { filterQuery, filterParams } = await parseFilters(websiteId, {
const { search } = filters;
const { filterQuery, queryParams } = await parseFilters({
...filters,
websiteId,
});
const db = getDatabaseType();
const like = db === POSTGRESQL ? 'ilike' : 'like';
const searchQuery = filters.search
? `and ((event_name ilike {{search}} and event_type = 2)
or (url_path ilike {{search}} and event_type = 1))`
: '';
return pagedRawQuery(
`
@@ -41,25 +42,27 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, pagePar
where website_id = {{websiteId::uuid}}
and created_at between {{startDate}} and {{endDate}}
${filterQuery}
${
search
? `and ((event_name ${like} {{search}} and event_type = 2)
or (url_path ${like} {{search}} and event_type = 1))`
: ''
}
${searchQuery}
order by created_at desc
`,
{ ...filterParams, search: `%${search}%` },
pageParams,
{ ...queryParams, search: `%${search}%` },
filters,
);
}
async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
const { pagedQuery, parseFilters } = clickhouse;
const { filterParams, dateQuery, filterQuery } = await parseFilters(websiteId, filters);
const { search } = pageParams;
async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
const { pagedRawQuery, parseFilters } = clickhouse;
const { queryParams, dateQuery, filterQuery } = await parseFilters({
...filters,
websiteId,
});
return pagedQuery(
const searchQuery = filters.search
? `and ((positionCaseInsensitive(event_name, {search:String}) > 0 and event_type = 2)
or (positionCaseInsensitive(url_path, {search:String}) > 0 and event_type = 1))`
: '';
return pagedRawQuery(
`
select
event_id as id,
@@ -78,15 +81,10 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
where website_id = {websiteId:UUID}
${dateQuery}
${filterQuery}
${
search
? `and ((positionCaseInsensitive(event_name, {search:String}) > 0 and event_type = 2)
or (positionCaseInsensitive(url_path, {search:String}) > 0 and event_type = 1))`
: ''
}
${searchQuery}
order by created_at desc
`,
{ ...filterParams, search },
pageParams,
queryParams,
filters,
);
}