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
route to view or raw table based on filters
Francis Cao954404f8dfc8
diff --git a/src/queries/sql/getWebsiteStats.ts b/src/queries/sql/getWebsiteStats.tsindex 6933d3f7a..9a6d8b19a 100644--- a/src/queries/sql/getWebsiteStats.ts+++ b/src/queries/sql/getWebsiteStats.ts@@ -109,7 +109,7 @@ async function clickhouseQuery(sum(views) c,min(min_time) min_time,max(max_time) max_time- from umami.website_event_stats_hourly "website_event"+ from website_event_stats_hourly "website_event"${cohortQuery}where website_id = {websiteId:UUID}and created_at between {startDate:DateTime64} and {endDate:DateTime64}diff --git a/src/queries/sql/pageviews/getPageviewMetrics.ts b/src/queries/sql/pageviews/getPageviewMetrics.tsindex 67e18b75d..c3ff10fe1 100644--- a/src/queries/sql/pageviews/getPageviewMetrics.ts+++ b/src/queries/sql/pageviews/getPageviewMetrics.ts@@ -142,18 +142,18 @@ async function clickhouseQuery(`;} else {let groupByQuery = '';- let columnQuery = `session_id s, arrayJoin(${column})`;+ let columnQuery = `arrayJoin(${column})`;if (column === 'referrer_domain') {excludeDomain = `and t != ''`;}if (type === 'entry') {- columnQuery = `session_id s, argMinMerge(entry_url)`;+ columnQuery = `argMinMerge(entry_url)`;}if (type === 'exit') {- columnQuery = `session_id s, argMaxMerge(exit_url)`;+ columnQuery = `argMaxMerge(exit_url)`;}if (type === 'entry' || type === 'exit') {@@ -164,7 +164,8 @@ async function clickhouseQuery(select g.t as x,uniq(s) as yfrom (- select ${columnQuery} as t+ select session_id s,+ ${columnQuery} as tfrom website_event_stats_hourly website_event${cohortQuery}where website_id = {websiteId:UUID}diff --git a/src/queries/sql/reports/getFunnel.ts b/src/queries/sql/reports/getFunnel.tsindex 70b51a9d5..d1abd1fed 100644--- a/src/queries/sql/reports/getFunnel.ts+++ b/src/queries/sql/reports/getFunnel.ts@@ -228,7 +228,7 @@ async function clickhouseQuery(`WITH level0 AS (select distinct session_id, url_path, referrer_path, event_name, created_at- from umami.website_event+ from website_eventwhere (${stepFilterQuery})and website_id = {websiteId:UUID}and created_at between {startDate:DateTime64} and {endDate:DateTime64}diff --git a/src/queries/sql/reports/getJourney.ts b/src/queries/sql/reports/getJourney.tsindex 4c43cc03d..e831a96dd 100644--- a/src/queries/sql/reports/getJourney.ts+++ b/src/queries/sql/reports/getJourney.ts@@ -229,7 +229,7 @@ async function clickhouseQuery(visit_id,coalesce(nullIf(event_name, ''), url_path) event,row_number() OVER (PARTITION BY visit_id ORDER BY created_at) AS event_number- from umami.website_event+ from website_eventwhere website_id = {websiteId:UUID}and created_at between {startDate:DateTime64} and {endDate:DateTime64}),${sequenceQuery}diff --git a/src/queries/sql/sessions/getWebsiteSessionStats.ts b/src/queries/sql/sessions/getWebsiteSessionStats.tsindex 695cec6c7..4adaf0717 100644--- a/src/queries/sql/sessions/getWebsiteSessionStats.ts+++ b/src/queries/sql/sessions/getWebsiteSessionStats.ts@@ -1,4 +1,5 @@import clickhouse from '@/lib/clickhouse';+import { EVENT_COLUMNS } from '@/lib/constants';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';import { QueryFilters } from '@/lib/types';@@ -55,20 +56,37 @@ async function clickhouseQuery(...filters,});- return rawQuery(- `+ let sql = '';++ if (EVENT_COLUMNS.some(item => Object.keys(filters).includes(item))) {+ sql = `+ select+ sumIf(1, event_type = 1) as "pageviews",+ uniq(session_id) as "visitors",+ uniq(visit_id) as "visits",+ uniq(country) as "countries",+ sum(length(event_name)) as "events"+ from website_event+ ${cohortQuery}+ where website_id = {websiteId:UUID}+ and created_at between {startDate:DateTime64} and {endDate:DateTime64}+ ${filterQuery}+ `;+ } else {+ sql = `selectsum(views) as "pageviews",uniq(session_id) as "visitors",uniq(visit_id) as "visits",uniq(country) as "countries",sum(length(event_name)) as "events"- from umami.website_event_stats_hourly "website_event"+ from website_event_stats_hourly website_event${cohortQuery}where website_id = {websiteId:UUID}and created_at between {startDate:DateTime64} and {endDate:DateTime64}${filterQuery}- `,- params,- );+ `;+ }++ return rawQuery(sql, params);}diff --git a/src/queries/sql/sessions/getWebsiteSessions.ts b/src/queries/sql/sessions/getWebsiteSessions.tsindex 6171e5146..db2ea5aa3 100644--- a/src/queries/sql/sessions/getWebsiteSessions.ts+++ b/src/queries/sql/sessions/getWebsiteSessions.ts@@ -1,4 +1,5 @@import clickhouse from '@/lib/clickhouse';+import { EVENT_COLUMNS } from '@/lib/constants';import { CLICKHOUSE, getDatabaseType, POSTGRESQL, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';import { PageParams, QueryFilters } from '@/lib/types';@@ -77,8 +78,45 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParconst { params, dateQuery, filterQuery, cohortQuery } = await parseFilters(websiteId, filters);const { search } = pageParams;- return pagedQuery(- `+ let sql = '';++ if (EVENT_COLUMNS.some(item => Object.keys(filters).includes(item))) {+ sql = `+ select+ session_id as id,+ website_id as websiteId,+ browser,+ os,+ device,+ screen,+ language,+ country,+ region,+ city,+ ${getDateStringSQL('min(created_at)')} as firstAt,+ ${getDateStringSQL('max(created_at)')} as lastAt,+ uniq(visit_id) as visits,+ sumIf(views, event_type = 1) as views,+ lastAt as createdAt+ from website_event+ ${cohortQuery}+ where website_id = {websiteId:UUID}+ ${dateQuery}+ ${filterQuery}+ ${+ search+ ? `and ((positionCaseInsensitive(distinct_id, {search:String}) > 0)+ or (positionCaseInsensitive(city, {search:String}) > 0)+ or (positionCaseInsensitive(browser, {search:String}) > 0)+ or (positionCaseInsensitive(os, {search:String}) > 0)+ or (positionCaseInsensitive(device, {search:String}) > 0))`+ : ''+ }+ group by session_id, website_id, browser, os, device, screen, language, country, region, city+ order by lastAt desc+ `;+ } else {+ sql = `selectsession_id as id,website_id as websiteId,@@ -111,8 +149,8 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar}group by session_id, website_id, browser, os, device, screen, language, country, region, cityorder by lastAt desc- `,- { ...params, search },- pageParams,- );+ `;+ }++ return pagedQuery(sql, { ...params, search }, pageParams);}diff --git a/src/queries/sql/sessions/getWebsiteSessionsWeekly.ts b/src/queries/sql/sessions/getWebsiteSessionsWeekly.tsindex 58f8d6922..4d1b4fbce 100644--- a/src/queries/sql/sessions/getWebsiteSessionsWeekly.ts+++ b/src/queries/sql/sessions/getWebsiteSessionsWeekly.ts@@ -2,6 +2,7 @@ import prisma from '@/lib/prisma';import clickhouse from '@/lib/clickhouse';import { runQuery, PRISMA, CLICKHOUSE } from '@/lib/db';import { QueryFilters } from '@/lib/types';+import { EVENT_COLUMNS } from '@/lib/constants';export async function getWebsiteSessionsWeekly(...args: [websiteId: string, filters?: QueryFilters]@@ -35,21 +36,39 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {async function clickhouseQuery(websiteId: string, filters: QueryFilters) {const { timezone = 'utc' } = filters;const { rawQuery, parseFilters } = clickhouse;- const { params } = await parseFilters(websiteId, filters);+ const { filterQuery, cohortQuery, params } = await parseFilters(websiteId, filters);- return rawQuery(- `+ let sql = '';++ if (EVENT_COLUMNS.some(item => Object.keys(filters).includes(item))) {+ sql = `selectformatDateTime(toDateTime(created_at, '${timezone}'), '%w:%H') as time,count(distinct session_id) as value- from website_event_stats_hourly+ from website_event+ ${cohortQuery}where website_id = {websiteId:UUID}and created_at between {startDate:DateTime64} and {endDate:DateTime64}+ ${filterQuery}group by timeorder by time- `,- params,- ).then(formatResults);+ `;+ } else {+ sql = `+ select+ formatDateTime(toDateTime(created_at, '${timezone}'), '%w:%H') as time,+ count(distinct session_id) as value+ from website_event_stats_hourly website_event+ ${cohortQuery}+ where website_id = {websiteId:UUID}+ and created_at between {startDate:DateTime64} and {endDate:DateTime64}+ ${filterQuery}+ group by time+ order by time+ `;+ }++ return rawQuery(sql, params).then(formatResults);}function formatResults(data: any) {