github/umami
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

implement cohorts to clickhouse/pg library and all relevant queries

Browse Source
This commit is contained in:
Francis Cao
2025-07-03 12:06:49 -07:00
parent a753809a74
commit e75d009df3
22 changed files with 220 additions and 10983 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/queries/sql/getChannelMetrics.ts
View File

@@ -12,7 +12,7 @@ export async function getChannelMetrics(...args: [websiteId: string, filters?: Q
async function relationalQuery(websiteId: string, filters: QueryFilters) {
const { rawQuery, parseFilters } = prisma;
const { params, filterQuery, dateQuery } = await parseFilters(websiteId, filters);
const { params, filterQuery, cohortQuery, dateQuery } = await parseFilters(websiteId, filters);
return rawQuery(
`
@@ -21,6 +21,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
url_query as query,
count(distinct session_id) as visitors
from website_event
${cohortQuery}
where website_id = {{websiteId::uuid}}
${filterQuery}
${dateQuery}
@@ -36,7 +37,7 @@ async function clickhouseQuery(
filters: QueryFilters,
): Promise<{ x: string; y: number }[]> {
const { rawQuery, parseFilters } = clickhouse;
const { params, filterQuery, dateQuery } = await parseFilters(websiteId, filters);
const { params, filterQuery, cohortQuery, dateQuery } = await parseFilters(websiteId, filters);
const sql = `
select
@@ -44,6 +45,7 @@ async function clickhouseQuery(
url_query as query,
uniq(session_id) as visitors
from website_event
${cohortQuery}
where website_id = {websiteId:UUID}
${filterQuery}
${dateQuery}