Skip to content

armgit / umami

Public Imported from GitHub
0

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.

fix parseFilters

Brian Cao1c26581cd117
diff --git a/queries/analytics/pageview/getPageviewParams.js b/queries/analytics/pageview/getPageviewParams.js
index 827141b95..fd25c77e5 100644
--- a/queries/analytics/pageview/getPageviewParams.js
+++ b/queries/analytics/pageview/getPageviewParams.js
@@ -1,15 +1,14 @@
-import { getDatabase, parseFilters, rawQuery } from 'lib/db';
-import { MYSQL, POSTGRESQL } from 'lib/constants';
+import { getDatabase, parseFilters, rawQuery, runAnalyticsQuery } from 'lib/db';
+import { MYSQL, POSTGRESQL, CLICKHOUSE, RELATIONAL } from 'lib/constants';
-export function getPageviewParams(
- param,
- website_id,
- start_at,
- end_at,
- column,
- table,
- filters = {},
-) {
+export async function getPageviewParams(...args) {
+ return runAnalyticsQuery({
+ [`${RELATIONAL}`]: () => relationalQuery(...args),
+ [`${CLICKHOUSE}`]: () => clickhouseQuery(...args),
+ });
+}
+
+function relationalQuery(param, website_id, start_at, end_at, column, table, filters = {}) {
const params = [param, website_id, start_at, end_at];
const { pageviewQuery, sessionQuery, eventQuery, joinSession } = parseFilters(
table,
@@ -43,3 +42,7 @@ export function getPageviewParams(
params,
);
}
+
+function clickhouseQuery() {
+ return Promise.reject(new Error('Not implemented.'));
+}
diff --git a/queries/analytics/pageview/getPageviewStats.js b/queries/analytics/pageview/getPageviewStats.js
index 1591e5d2d..1cca2fca7 100644
--- a/queries/analytics/pageview/getPageviewStats.js
+++ b/queries/analytics/pageview/getPageviewStats.js
@@ -64,6 +64,7 @@ async function clickhouseQuery(
const params = [website_id];
const { pageviewQuery, sessionQuery, joinSession } = parseFilters(
'pageview',
+ null,
filters,
params,
sessionKey,
diff --git a/queries/analytics/session/getSessionMetrics.js b/queries/analytics/session/getSessionMetrics.js
index 5defb207b..b9bbc708e 100644
--- a/queries/analytics/session/getSessionMetrics.js
+++ b/queries/analytics/session/getSessionMetrics.js
@@ -47,6 +47,7 @@ async function clickhouseQuery(website_id, start_at, end_at, field, filters = {}
const params = [website_id];
const { pageviewQuery, sessionQuery, joinSession } = parseFilters(
'pageview',
+ null,
filters,
params,
'session_uuid',
diff --git a/queries/analytics/stats/getWebsiteStats.js b/queries/analytics/stats/getWebsiteStats.js
index 815bacddc..53e90b519 100644
--- a/queries/analytics/stats/getWebsiteStats.js
+++ b/queries/analytics/stats/getWebsiteStats.js
@@ -59,6 +59,7 @@ async function clickhouseQuery(website_id, start_at, end_at, filters = {}) {
const params = [website_id];
const { pageviewQuery, sessionQuery, joinSession } = parseFilters(
'pageview',
+ null,
filters,
params,
'session_uuid',