watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2025-12-06 01:18:00 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix filter params

Browse source
This commit is contained in:
Francis Cao 2023-07-31 11:42:47 -07:00
parent 95d824542f
commit 7e112b8469
6 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/prisma.ts
View file

@ -70,7 +70,7 @@ function getFilterQuery(filters = {}, params = []): string {
if (filter !== undefined) {
const column = FILTER_COLUMNS[key] || key;
arr.push(`and ${column}=$${params.length + 1}`);
arr.push(`and ${column}={{${key}}}`);
params.push(decodeURIComponent(filter));
}

2
queries/analytics/events/getEventMetrics.ts
View file

@ -47,11 +47,11 @@ async function relationalQuery(websiteId: string, criteria: GetEventMetricsCrite
order by 2
`,
{
...filters,
websiteId,
startDate: maxDate(startDate, website.resetAt),
endDate,
eventType: EVENT_TYPE.customEvent,
...filters,
},
);
}

1
queries/analytics/pageviews/getPageviewMetrics.ts
View file

@ -39,6 +39,7 @@ async function relationalQuery(
startDate: maxDate(startDate, website.resetAt),
endDate,
eventType: column === 'event_name' ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
...filters,
};
let excludeDomain = '';

2
queries/analytics/pageviews/getPageviewStats.ts
View file

@ -52,11 +52,11 @@ async function relationalQuery(websiteId: string, criteria: PageviewStatsCriteri
group by 1
`,
{
...filters,
websiteId,
startDate: maxDate(startDate, website.resetAt),
endDate,
eventType: EVENT_TYPE.pageView,
...filters,
},
);
}

7
queries/analytics/sessions/getSessionMetrics.ts
View file

@ -42,7 +42,12 @@ async function relationalQuery(
group by 1
order by 2 desc
limit 100`,
{ ...filters, websiteId, startDate: maxDate(startDate, website.resetAt), endDate },
{
websiteId,
startDate: maxDate(startDate, website.resetAt),
endDate,
...filters,
},
);
}

2
queries/analytics/stats/getWebsiteStats.ts
View file

@ -51,11 +51,11 @@ async function relationalQuery(
) as t
`,
{
...filters,
websiteId,
startDate: maxDate(startDate, website.resetAt),
endDate,
eventType: EVENT_TYPE.pageView,
...filters,
},
);
}