diff --git a/lib/prisma.ts b/lib/prisma.ts index 427578d6..08309e31 100644 --- a/lib/prisma.ts +++ b/lib/prisma.ts @@ -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)); } diff --git a/queries/analytics/events/getEventMetrics.ts b/queries/analytics/events/getEventMetrics.ts index 11a5c690..e9754036 100644 --- a/queries/analytics/events/getEventMetrics.ts +++ b/queries/analytics/events/getEventMetrics.ts @@ -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, }, ); } diff --git a/queries/analytics/pageviews/getPageviewMetrics.ts b/queries/analytics/pageviews/getPageviewMetrics.ts index 677de980..1032540b 100644 --- a/queries/analytics/pageviews/getPageviewMetrics.ts +++ b/queries/analytics/pageviews/getPageviewMetrics.ts @@ -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 = ''; diff --git a/queries/analytics/pageviews/getPageviewStats.ts b/queries/analytics/pageviews/getPageviewStats.ts index 31b0ebdd..f6d4158c 100644 --- a/queries/analytics/pageviews/getPageviewStats.ts +++ b/queries/analytics/pageviews/getPageviewStats.ts @@ -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, }, ); } diff --git a/queries/analytics/sessions/getSessionMetrics.ts b/queries/analytics/sessions/getSessionMetrics.ts index e037176b..aec2d8f1 100644 --- a/queries/analytics/sessions/getSessionMetrics.ts +++ b/queries/analytics/sessions/getSessionMetrics.ts @@ -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, + }, ); } diff --git a/queries/analytics/stats/getWebsiteStats.ts b/queries/analytics/stats/getWebsiteStats.ts index f44abafa..4d3730ee 100644 --- a/queries/analytics/stats/getWebsiteStats.ts +++ b/queries/analytics/stats/getWebsiteStats.ts @@ -51,11 +51,11 @@ async function relationalQuery( ) as t `, { - ...filters, websiteId, startDate: maxDate(startDate, website.resetAt), endDate, eventType: EVENT_TYPE.pageView, + ...filters, }, ); }