watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-11 16:17:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Added "columns" to query options. Added events count to event data metrics.

Browse source
This commit is contained in:
Mike Cao 2023-08-07 13:28:32 -07:00
parent 9d86385f5c
commit 7da7f58cbe
7 changed files with 45 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/prisma.ts
View file

@ -67,10 +67,10 @@ function getTimestampIntervalQuery(field: string): string {
}
}
function getFilterQuery(filters = {}): string {
function getFilterQuery(filters: QueryFilters = {}, options: QueryOptions = {}): string {
const query = Object.keys(filters).reduce((arr, key) => {
const filter = filters[key];
const column = FILTER_COLUMNS[key];
const column = FILTER_COLUMNS[key] ?? options?.columns?.[key];
if (filter !== undefined && column) {
arr.push(`and ${column}={{${key}}}`);
@ -100,7 +100,7 @@ async function parseFilters(
options?.joinSession || Object.keys(filters).find(key => SESSION_COLUMNS.includes(key))
? `inner join session on website_event.session_id = session.session_id`
: '',
filterQuery: getFilterQuery(filters),
filterQuery: getFilterQuery(filters, options),
params: {
...filters,
websiteId,