From adc65e4487447f2fcc869add42381b8e9c60498f Mon Sep 17 00:00:00 2001 From: Francis Cao Date: Tue, 20 Aug 2024 13:57:40 -0700 Subject: [PATCH] fix websiteEvent query --- src/queries/analytics/events/getWebsiteEvents.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/queries/analytics/events/getWebsiteEvents.ts b/src/queries/analytics/events/getWebsiteEvents.ts index e558c609..60a932f5 100644 --- a/src/queries/analytics/events/getWebsiteEvents.ts +++ b/src/queries/analytics/events/getWebsiteEvents.ts @@ -15,13 +15,22 @@ export function getWebsiteEvents( async function relationalQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) { const { pagedQuery } = prisma; const { query } = pageParams; + const { startDate, endDate } = filters; const where = { - id: websiteId, + websiteId, + createdAt: { + lte: endDate, + gte: startDate, + }, ...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) {