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
Merge branch 'dev' into jajaja
Mike Cao2f7f8911cd98
diff --cc src/queries/sql/pageviews/getPageviewMetrics.tsindex a73f4e4d0,c3ff10fe1..59ca63094--- a/src/queries/sql/pageviews/getPageviewMetrics.ts+++ b/src/queries/sql/pageviews/getPageviewMetrics.ts@@@ -168,8 -164,9 +168,11 @@@ async function clickhouseQueryselect g.t as x,uniq(s) as yfrom (+ select session_id s,+ ${columnQuery} as t+ from website_event_stats_hourly website_event+ select ${columnQuery} as t+ from website_event_stats_hourly as website_event${cohortQuery}where website_id = {websiteId:UUID}and created_at between {startDate:DateTime64} and {endDate:DateTime64}diff --cc src/queries/sql/reports/getJourney.tsindex 4145c14da,e831a96dd..e7ab14ad7--- a/src/queries/sql/reports/getJourney.ts+++ b/src/queries/sql/reports/getJourney.ts@@@ -220,9 -229,8 +220,9 @@@ async function clickhouseQueryvisit_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}+ ${filterQuery}and created_at between {startDate:DateTime64} and {endDate:DateTime64}),${sequenceQuery}select *diff --cc src/queries/sql/sessions/getWebsiteSessionStats.tsindex 0f4c17973,4adaf0717..5718037fd--- a/src/queries/sql/sessions/getWebsiteSessionStats.ts+++ b/src/queries/sql/sessions/getWebsiteSessionStats.ts@@@ -49,12 -48,32 +50,28 @@@ async function relationalQueryasync function clickhouseQuery(websiteId: string,filters: QueryFilters,-): Promise<- { pageviews: number; visitors: number; visits: number; countries: number; events: number }[]-> {+): Promise<WebsiteSessionStatsData[]> {const { rawQuery, parseFilters } = clickhouse;- const { filterQuery, cohortQuery, params } = await parseFilters(websiteId, {- ...filters,- });+ const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId });- 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",@@@ -66,7 -85,8 +83,8 @@@where website_id = {websiteId:UUID}and created_at between {startDate:DateTime64} and {endDate:DateTime64}${filterQuery}- `,- queryParams,- );+ `;+ }+- return rawQuery(sql, params);++ return rawQuery(sql, queryParams);}diff --cc src/queries/sql/sessions/getWebsiteSessions.tsindex 19b6cf93b,db2ea5aa3..fdc1bf9cd--- a/src/queries/sql/sessions/getWebsiteSessions.ts+++ b/src/queries/sql/sessions/getWebsiteSessions.ts@@@ -1,9 -1,12 +1,10 @@@import clickhouse from '@/lib/clickhouse';+import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';+ 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';+import { QueryFilters } from '@/lib/types';-export async function getWebsiteSessions(- ...args: [websiteId: string, filters?: QueryFilters, pageParams?: PageParams]-) {+export async function getWebsiteSessions(...args: [websiteId: string, filters: QueryFilters]) {return runQuery({[PRISMA]: () => relationalQuery(...args),[CLICKHOUSE]: () => clickhouseQuery(...args),@@@ -65,18 -73,50 +66,47 @@@ async function relationalQuery(websiteI);}-async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {- const { pagedQuery, parseFilters, getDateStringSQL } = clickhouse;- const { params, dateQuery, filterQuery, cohortQuery } = await parseFilters(websiteId, filters);- const { search } = pageParams;+async function clickhouseQuery(websiteId: string, filters: QueryFilters) {+ const { pagedRawQuery, parseFilters, getDateStringSQL } = clickhouse;+ const { search } = filters;+ const { filterQuery, dateQuery, cohortQuery, queryParams } = parseFilters({+ ...filters,+ websiteId,+ });++ const searchQuery = search ? `and positionCaseInsensitive(distinct_id, {search:String}) > 0` : '';- return pagedRawQuery(- `+ 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))`- : ''- }++ ${searchQuery}+ 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,@@@ -99,11 -138,19 +129,11 @@@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+ ${searchQuery}+ group by session_id, website_id, hostname, browser, os, device, screen, language, country, region, cityorder by lastAt desc- `,- queryParams,- filters,- );+ `;+ }+- return pagedQuery(sql, { ...params, search }, pageParams);++ return pagedRawQuery(sql, queryParams, filters);}diff --cc src/queries/sql/sessions/getWebsiteSessionsWeekly.tsindex 1be8d1226,4d1b4fbce..895967371--- a/src/queries/sql/sessions/getWebsiteSessionsWeekly.ts+++ b/src/queries/sql/sessions/getWebsiteSessionsWeekly.ts@@@ -2,9 -2,10 +2,10 @@@ 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]+ ...args: [websiteId: string, filters: QueryFilters]) {return runQuery({[PRISMA]: () => relationalQuery(...args),@@@ -35,21 -36,39 +36,39 @@@ async function relationalQuery(websiteIasync function clickhouseQuery(websiteId: string, filters: QueryFilters) {const { timezone = 'utc' } = filters;const { rawQuery, parseFilters } = clickhouse;- const { queryParams } = parseFilters(filters);- const { filterQuery, cohortQuery, params } = await parseFilters(websiteId, filters);++ const { filterQuery, cohortQuery, queryParams } = await parseFilters({ ...filters, websiteId });- 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- `,- queryParams,- ).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);++ return rawQuery(sql, queryParams).then(formatResults);}function formatResults(data: any) {