m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-14 21:10:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/umami-software/umami into dev

Browse Source
This commit is contained in:
Mike Cao 2024-08-20 13:59:14 -07:00
commit 17e2658fdc
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/queries/analytics/events/getWebsiteEvents.ts
View File

@ -15,13 +15,22 @@ export function getWebsiteEvents(
async function relationalQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) { async function relationalQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
const { pagedQuery } = prisma; const { pagedQuery } = prisma;
const { query } = pageParams; const { query } = pageParams;
const { startDate, endDate } = filters;
const where = { const where = {
id: websiteId, websiteId,
createdAt: {
lte: endDate,
gte: startDate,
},
...prisma.getSearchParameters(query, [{ eventName: 'contains' }, { urlPath: 'contains' }]), ...prisma.getSearchParameters(query, [{ eventName: 'contains' }, { urlPath: 'contains' }]),
}; };
return pagedQuery('WebsiteEvent', { where }, pageParams); return pagedQuery(
'websiteEvent',
{ where },
{ orderBy: 'createdAt', sortDescending: true, ...pageParams },
);
} }
async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) { async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {