watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-10 15:47:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Brian Cao 2023-08-11 11:37:03 -07:00
commit 0a81a4a728
10 changed files with 129 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

6
queries/analytics/reports/getInsights.ts
View file

@ -1,7 +1,7 @@
import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
import prisma from 'lib/prisma';
import clickhouse from 'lib/clickhouse';
import { EVENT_TYPE, SESSION_COLUMNS } from 'lib/constants';
import { EVENT_TYPE, FILTER_COLUMNS, SESSION_COLUMNS } from 'lib/constants';
import { QueryFilters } from 'lib/types';
export async function getInsights(
@ -91,7 +91,7 @@ function parseFields(fields) {
(arr, field) => {
const { name } = field;
return arr.concat(name);
return arr.concat(`${FILTER_COLUMNS[name]} as "${name}"`);
},
['count(*) as views', 'count(distinct website_event.session_id) as visitors'],
);
@ -103,5 +103,5 @@ function parseGroupBy(fields) {
if (!fields.length) {
return '';
}
return `group by ${fields.map(({ name }) => name).join(',')}`;
return `group by ${fields.map(({ name }) => FILTER_COLUMNS[name]).join(',')}`;
}