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

Merge branch 'dev' into feat/um-66-update-clickhouse-schema-uuid

Browse Source
This commit is contained in:
Brian Cao
2022-10-10 16:20:07 -07:00
parent 96add409b6 78338205a3
commit ec6454aead
65 changed files with 436 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,9 +9,9 @@ export async function getWebsiteStats(...args) {
});
}
async function relationalQuery(website_id, { start_at, end_at, filters = {} }) {
async function relationalQuery(websiteId, { start_at, end_at, filters = {} }) {
const { getDateQuery, getTimestampInterval, parseFilters, rawQuery } = prisma;
const params = [website_id, start_at, end_at];
const params = [websiteId, start_at, end_at];
const { pageviewQuery, sessionQuery, joinSession } = parseFilters(
'pageview',
null,
@@ -41,9 +41,9 @@ async function relationalQuery(website_id, { start_at, end_at, filters = {} }) {
);
}
async function clickhouseQuery(website_uuid, { start_at, end_at, filters = {} }) {
async function clickhouseQuery(websiteId, { start_at, end_at, filters = {} }) {
const { rawQuery, getDateQuery, getBetweenDates, parseFilters } = clickhouse;
const params = [website_uuid];
const params = [websiteId];
const { pageviewQuery, sessionQuery } = parseFilters(null, filters, params);
return rawQuery(