watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 12:47:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

8
src/queries/sql/getChannelMetrics.ts
View file

@ -12,7 +12,7 @@ export async function getChannelMetrics(...args: [websiteId: string, filters?: Q
async function relationalQuery(websiteId: string, filters: QueryFilters) {
const { rawQuery, parseFilters } = prisma;
const { filterParams, filterQuery, dateQuery } = await parseFilters(websiteId, filters);
const { queryParams, filterQuery, dateQuery } = await parseFilters(filters);
return rawQuery(
`
@ -27,7 +27,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
group by 1, 2
order by visitors desc
`,
filterParams,
queryParams,
);
}
@ -36,7 +36,7 @@ async function clickhouseQuery(
filters: QueryFilters,
): Promise<{ x: string; y: number }[]> {
const { rawQuery, parseFilters } = clickhouse;
const { filterParams, filterQuery, dateQuery } = await parseFilters(websiteId, filters);
const { queryParams, filterQuery, dateQuery } = await parseFilters(filters);
const sql = `
select
@ -51,5 +51,5 @@ async function clickhouseQuery(
order by visitors desc
`;
return rawQuery(sql, filterParams);
return rawQuery(sql, queryParams);
}