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 Caoc0ef8dace4f6
diff --git a/pages/api/websites/[id]/pageviews.ts b/pages/api/websites/[id]/pageviews.tsindex 87c60d58e..c5532e76e 100644--- a/pages/api/websites/[id]/pageviews.ts+++ b/pages/api/websites/[id]/pageviews.ts@@ -4,9 +4,8 @@ import { badRequest, methodNotAllowed, ok, unauthorized } from 'next-basics';import { NextApiRequestQueryBody, WebsitePageviews } from 'lib/types';import { canViewWebsite } from 'lib/auth';import { useAuth, useCors } from 'lib/middleware';-import { getPageviewStats } from 'queries';+import { getPageviewStats, getSessionStats } from 'queries';import { parseDateRangeQuery } from 'lib/query';-import { getSessionStats } from '../../../../queries/analytics/sessions/getSessionStats';export interface WebsitePageviewRequestQuery {id: string;diff --git a/queries/analytics/sessions/getSessionMetrics.ts b/queries/analytics/sessions/getSessionMetrics.tsindex 910c9785a..5ef387ecf 100644--- a/queries/analytics/sessions/getSessionMetrics.ts+++ b/queries/analytics/sessions/getSessionMetrics.ts@@ -15,7 +15,7 @@ export async function getSessionMetrics(async function relationalQuery(websiteId: string, column: string, filters: QueryFilters) {const { parseFilters, rawQuery } = prisma;- const { filterQuery, joinSession, params } = await parseFilters(websiteId, {+ const { filterQuery, params } = await parseFilters(websiteId, {...filters,eventType: EVENT_TYPE.pageView,});@@ -23,7 +23,8 @@ async function relationalQuery(websiteId: string, column: string, filters: Queryreturn rawQuery(`select ${column} x, count(*) yfrom website_event- ${joinSession}+ inner join session+ on session.session_id = website_event.session_idwhere website_event.website_id = {{websiteId::uuid}}and website_event.created_at between {{startDate}} and {{endDate}}and website_event.event_type = {{eventType}}diff --git a/queries/analytics/sessions/getSessionStats.ts b/queries/analytics/sessions/getSessionStats.tsindex 9ed01a594..b8884a44e 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, joinSession, params } = await parseFilters(websiteId, {+ const { filterQuery, params } = await parseFilters(websiteId, {...filters,eventType: EVENT_TYPE.pageView,});@@ -25,7 +25,8 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {${getDateQuery('website_event.created_at', unit, timezone)} x,count(distinct website_event.session_id) yfrom website_event- ${joinSession}+ inner join session+ on session.session_id = website_event.session_idwhere website_event.website_id = {{websiteId::uuid}}and website_event.created_at between {{startDate}} and {{endDate}}and event_type = {{eventType}}diff --git a/queries/index.js b/queries/index.jsindex f509e0392..474ab31ee 100644--- a/queries/index.js+++ b/queries/index.js@@ -19,6 +19,7 @@ export * from './analytics/sessions/createSession';export * from './analytics/sessions/getSession';export * from './analytics/sessions/getSessionMetrics';export * from './analytics/sessions/getSessions';+export * from './analytics/sessions/getSessionStats';export * from './analytics/sessions/saveSessionData';export * from './analytics/stats/getActiveVisitors';export * from './analytics/stats/getRealtimeData';