ambiser
/
umami
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix metrics.

pull/1862/head
Brian Cao 2023-03-31 14:53:48 -07:00
parent 2172dddd1c
commit d2687b6580
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/clickhouse.ts
View File

@ -104,7 +104,7 @@ function getEventDataFilterQuery(
return query.join('\n'); return query.join('\n');
} }
function getFilterQuery(filters = {}, params = {}) { function getFilterQuery(filters = {}, params = {}, field: string) {
const query = Object.keys(filters).reduce((arr, key) => { const query = Object.keys(filters).reduce((arr, key) => {
const filter = filters[key]; const filter = filters[key];
@ -112,6 +112,10 @@ function getFilterQuery(filters = {}, params = {}) {
return arr; return arr;
} }
if (key === field) {
return arr;
}
switch (key) { switch (key) {
case 'url': case 'url':
arr.push(`and url_path = {${key}:String}`); arr.push(`and url_path = {${key}:String}`);
@ -157,7 +161,7 @@ function getFilterQuery(filters = {}, params = {}) {
return query.join('\n'); return query.join('\n');
} }
function parseFilters(filters: any = {}, params: any = {}) { function parseFilters(filters: any = {}, params: any = {}, field?: string) {
const { const {
domain, domain,
url, url,
@ -184,7 +188,7 @@ function parseFilters(filters: any = {}, params: any = {}) {
sessionFilters, sessionFilters,
eventFilters, eventFilters,
event: { eventName }, event: { eventName },
filterQuery: getFilterQuery(filters, params), filterQuery: getFilterQuery(filters, params, field),
}; };
} }

9
lib/prisma.ts
View File

@ -106,7 +106,7 @@ function getEventDataFilterQuery(
return query.join('\n'); return query.join('\n');
} }
function getFilterQuery(filters = {}, params = []): string { function getFilterQuery(filters = {}, params = [], field: string): string {
const query = Object.keys(filters).reduce((arr, key) => { const query = Object.keys(filters).reduce((arr, key) => {
const filter = filters[key]; const filter = filters[key];
@ -114,6 +114,10 @@ function getFilterQuery(filters = {}, params = []): string {
return arr; return arr;
} }
if (key === field) {
return arr;
}
switch (key) { switch (key) {
case 'url': case 'url':
arr.push(`and url_path=$${params.length + 1}`); arr.push(`and url_path=$${params.length + 1}`);
@ -162,6 +166,7 @@ function getFilterQuery(filters = {}, params = []): string {
function parseFilters( function parseFilters(
filters: { [key: string]: any } = {}, filters: { [key: string]: any } = {},
params = [], params = [],
field?: string,
sessionKey = 'session_id', sessionKey = 'session_id',
) { ) {
const { const {
@ -194,7 +199,7 @@ function parseFilters(
os || browser || device || country || subdivision1 || subdivision2 || city os || browser || device || country || subdivision1 || subdivision2 || city
? `inner join session on website_event.${sessionKey} = session.${sessionKey}` ? `inner join session on website_event.${sessionKey} = session.${sessionKey}`
: '', : '',
filterQuery: getFilterQuery(filters, params), filterQuery: getFilterQuery(filters, params, field),
}; };
} }

2
queries/analytics/session/getSessionMetrics.ts
View File

@ -58,7 +58,7 @@ async function clickhouseQuery(
const website = await cache.fetchWebsite(websiteId); const website = await cache.fetchWebsite(websiteId);
const resetDate = website?.resetAt || website?.createdAt; const resetDate = website?.resetAt || website?.createdAt;
const params = { websiteId }; const params = { websiteId };
const { filterQuery } = parseFilters(filters, params); const { filterQuery } = parseFilters(filters, params, field);
return rawQuery( return rawQuery(
`select ${field} x, count(distinct session_id) y `select ${field} x, count(distinct session_id) y