watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-17 11:05:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'dev' into jajaja

Browse source 
# Conflicts:
#	pnpm-lock.yaml
#	src/queries/sql/getWebsiteStats.ts
#	src/queries/sql/pageviews/getPageviewMetrics.ts
#	src/queries/sql/sessions/getWebsiteSessionStats.ts
#	src/queries/sql/sessions/getWebsiteSessions.ts
#	src/queries/sql/sessions/getWebsiteSessionsWeekly.ts
This commit is contained in:
Mike Cao 2025-07-18 10:13:21 -07:00
commit 2f7f8911cd
7 changed files with 96 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/queries/sql/sessions/getWebsiteSessions.ts
View file

@ -1,5 +1,6 @@
import clickhouse from '@/lib/clickhouse';
import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
import { EVENT_COLUMNS } from '@/lib/constants';
import prisma from '@/lib/prisma';
import { QueryFilters } from '@/lib/types';
@ -75,8 +76,37 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
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}
${searchQuery}
group by session_id, website_id, browser, os, device, screen, language, country, region, city
order by lastAt desc
`;
} else {
sql = `
select
session_id as id,
website_id as websiteId,
@ -102,8 +132,8 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
${searchQuery}
group by session_id, website_id, hostname, browser, os, device, screen, language, country, region, city
order by lastAt desc
`,
queryParams,
filters,
);
`;
}
return pagedRawQuery(sql, queryParams, filters);
}