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

10
src/queries/sql/getWebsiteDateRange.ts
View File

@@ -12,8 +12,9 @@ export async function getWebsiteDateRange(...args: [websiteId: string]) {
async function relationalQuery(websiteId: string) {
const { rawQuery, parseFilters } = prisma;
const { filterParams } = await parseFilters(websiteId, {
const { queryParams } = await parseFilters({
startDate: new Date(DEFAULT_RESET_DATE),
websiteId,
});
const result = await rawQuery(
@@ -25,7 +26,7 @@ async function relationalQuery(websiteId: string) {
where website_id = {{websiteId::uuid}}
and created_at >= {{startDate}}
`,
filterParams,
queryParams,
);
return result[0] ?? null;
@@ -33,8 +34,9 @@ async function relationalQuery(websiteId: string) {
async function clickhouseQuery(websiteId: string) {
const { rawQuery, parseFilters } = clickhouse;
const { filterParams } = await parseFilters(websiteId, {
const { queryParams } = await parseFilters({
startDate: new Date(DEFAULT_RESET_DATE),
websiteId,
});
const result = await rawQuery(
@@ -46,7 +48,7 @@ async function clickhouseQuery(websiteId: string) {
where website_id = {websiteId:UUID}
and created_at >= {startDate:DateTime64}
`,
filterParams,
queryParams,
);
return result[0] ?? null;