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

Updated filtering logic.

Browse Source
This commit is contained in:
Mike Cao
2023-08-07 12:43:43 -07:00
parent 112005212e
commit 9d86385f5c
8 changed files with 23 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/clickhouse.ts
View File

@@ -3,7 +3,7 @@ import dateFormat from 'dateformat';
import debug from 'debug';
import { CLICKHOUSE } from 'lib/db';
import { QueryFilters } from './types';
import { FILTER_COLUMNS, IGNORED_FILTERS } from './constants';
import { FILTER_COLUMNS } from './constants';
import { loadWebsite } from './load';
import { maxDate } from './date';
@@ -66,9 +66,9 @@ function getDateFormat(date) {
function getFilterQuery(filters = {}) {
const query = Object.keys(filters).reduce((arr, key) => {
const filter = filters[key];
const column = FILTER_COLUMNS[key];
if (filter !== undefined && !IGNORED_FILTERS.includes(key)) {
const column = FILTER_COLUMNS[key] || key;
if (filter !== undefined && column) {
arr.push(`and ${column} = {${key}:String}`);
}