Made filters work for all reports.

This commit is contained in:
Mike Cao
2025-06-29 23:57:11 -07:00
parent ea83afbc13
commit 8b64029409
46 changed files with 328 additions and 275 deletions

View File

@@ -21,7 +21,7 @@ async function relationalQuery(
{ pageviews: number; visitors: number; visits: number; countries: number; events: number }[]
> {
const { parseFilters, rawQuery } = prisma;
const { filterQuery, params } = await parseFilters(websiteId, {
const { filterQuery, filterParams } = await parseFilters(websiteId, {
...filters,
});
@@ -39,7 +39,7 @@ async function relationalQuery(
and website_event.created_at between {{startDate}} and {{endDate}}
${filterQuery}
`,
params,
filterParams,
);
}
@@ -50,7 +50,7 @@ async function clickhouseQuery(
{ pageviews: number; visitors: number; visits: number; countries: number; events: number }[]
> {
const { rawQuery, parseFilters } = clickhouse;
const { filterQuery, params } = await parseFilters(websiteId, {
const { filterQuery, filterParams } = await parseFilters(websiteId, {
...filters,
});
@@ -67,6 +67,6 @@ async function clickhouseQuery(
and created_at between {startDate:DateTime64} and {endDate:DateTime64}
${filterQuery}
`,
params,
filterParams,
);
}