m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-14 21:10:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix parseFilters

Browse Source
This commit is contained in:
Brian Cao 2022-07-22 19:50:43 -07:00
parent aa8057f9fe
commit 1c26581cd1
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
queries/analytics/pageview/getPageviewParams.js
View File

@ -1,15 +1,14 @@
import { getDatabase, parseFilters, rawQuery } from 'lib/db'; import { getDatabase, parseFilters, rawQuery, runAnalyticsQuery } from 'lib/db';
import { MYSQL, POSTGRESQL } from 'lib/constants'; import { MYSQL, POSTGRESQL, CLICKHOUSE, RELATIONAL } from 'lib/constants';
export function getPageviewParams( export async function getPageviewParams(...args) {
param, return runAnalyticsQuery({
website_id, [`${RELATIONAL}`]: () => relationalQuery(...args),
start_at, [`${CLICKHOUSE}`]: () => clickhouseQuery(...args),
end_at, });
column, }
table,
filters = {}, function relationalQuery(param, website_id, start_at, end_at, column, table, filters = {}) {
) {
const params = [param, website_id, start_at, end_at]; const params = [param, website_id, start_at, end_at];
const { pageviewQuery, sessionQuery, eventQuery, joinSession } = parseFilters( const { pageviewQuery, sessionQuery, eventQuery, joinSession } = parseFilters(
table, table,
@ -43,3 +42,7 @@ export function getPageviewParams(
params, params,
); );
} }
function clickhouseQuery() {
return Promise.reject(new Error('Not implemented.'));
}

1
queries/analytics/pageview/getPageviewStats.js
View File

@ -64,6 +64,7 @@ async function clickhouseQuery(
const params = [website_id]; const params = [website_id];
const { pageviewQuery, sessionQuery, joinSession } = parseFilters( const { pageviewQuery, sessionQuery, joinSession } = parseFilters(
'pageview', 'pageview',
null,
filters, filters,
params, params,
sessionKey, sessionKey,

1
queries/analytics/session/getSessionMetrics.js
View File

@ -47,6 +47,7 @@ async function clickhouseQuery(website_id, start_at, end_at, field, filters = {}
const params = [website_id]; const params = [website_id];
const { pageviewQuery, sessionQuery, joinSession } = parseFilters( const { pageviewQuery, sessionQuery, joinSession } = parseFilters(
'pageview', 'pageview',
null,
filters, filters,
params, params,
'session_uuid', 'session_uuid',

1
queries/analytics/stats/getWebsiteStats.js
View File

@ -59,6 +59,7 @@ async function clickhouseQuery(website_id, start_at, end_at, filters = {}) {
const params = [website_id]; const params = [website_id];
const { pageviewQuery, sessionQuery, joinSession } = parseFilters( const { pageviewQuery, sessionQuery, joinSession } = parseFilters(
'pageview', 'pageview',
null,
filters, filters,
params, params,
'session_uuid', 'session_uuid',