Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Fixed session queries.
Mike Cao2559263e91da
diff --git a/queries/analytics/sessions/getSessionMetrics.ts b/queries/analytics/sessions/getSessionMetrics.tsindex 5ef387ecf..f9bc2e942 100644--- a/queries/analytics/sessions/getSessionMetrics.ts+++ b/queries/analytics/sessions/getSessionMetrics.ts@@ -21,15 +21,15 @@ async function relationalQuery(websiteId: string, column: string, filters: Query});return rawQuery(- `select ${column} x, count(*) y- from website_event- inner join session- on session.session_id = website_event.session_id- where website_event.website_id = {{websiteId::uuid}}- and website_event.created_at between {{startDate}} and {{endDate}}- and website_event.event_type = {{eventType}}- ${filterQuery}- ) as t+ `+ select ${column} x, count(*) y+ from website_event+ inner join session+ on session.session_id = website_event.session_id+ where website_event.website_id = {{websiteId::uuid}}+ and website_event.created_at between {{startDate}} and {{endDate}}+ and website_event.event_type = {{eventType}}+ ${filterQuery}group by 1order by 2 desclimit 100`,diff --git a/queries/analytics/sessions/getSessionStats.ts b/queries/analytics/sessions/getSessionStats.tsindex b8884a44e..9ed01a594 100644--- a/queries/analytics/sessions/getSessionStats.ts+++ b/queries/analytics/sessions/getSessionStats.ts@@ -14,7 +14,7 @@ export async function getSessionStats(...args: [websiteId: string, filters: Querasync function relationalQuery(websiteId: string, filters: QueryFilters) {const { timezone = 'utc', unit = 'day' } = filters;const { getDateQuery, parseFilters, rawQuery } = prisma;- const { filterQuery, params } = await parseFilters(websiteId, {+ const { filterQuery, joinSession, params } = await parseFilters(websiteId, {...filters,eventType: EVENT_TYPE.pageView,});@@ -25,8 +25,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {${getDateQuery('website_event.created_at', unit, timezone)} x,count(distinct website_event.session_id) yfrom website_event- inner join session- on session.session_id = website_event.session_id+ ${joinSession}where website_event.website_id = {{websiteId::uuid}}and website_event.created_at between {{startDate}} and {{endDate}}and event_type = {{eventType}}