watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-08 06:37:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

remove parse session filters

Browse source
This commit is contained in:
Francis Cao 2024-08-01 22:57:54 -07:00
parent 3207b0ce06
commit d02dc6f997
4 changed files with 75 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/lib/clickhouse.ts
View file

@ -2,11 +2,11 @@ import { ClickHouseClient, createClient } from '@clickhouse/client';
import dateFormat from 'dateformat';
import debug from 'debug';
import { CLICKHOUSE } from 'lib/db';
import { PageParams, QueryFilters, QueryOptions } from './types';
import { EVENT_COLUMNS, DEFAULT_PAGE_SIZE, OPERATORS } from './constants';
import { fetchWebsite } from './load';
import { DEFAULT_PAGE_SIZE, OPERATORS } from './constants';
import { maxDate } from './date';
import { fetchWebsite } from './load';
import { filtersToArray } from './params';
import { PageParams, QueryFilters, QueryOptions } from './types';
export const CLICKHOUSE_DATE_FORMATS = {
second: '%Y-%m-%dT%H:%i:%S',
@ -100,26 +100,6 @@ function getFilterQuery(filters: QueryFilters = {}, options: QueryOptions = {})
return query.join('\n');
}
function getSessionFilterQuery(filters: QueryFilters = {}, options: QueryOptions = {}) {
const query = filtersToArray(filters, options).reduce((arr, { name, column, operator }) => {
if (column) {
if (EVENT_COLUMNS.includes(name)) {
arr.push(`and has(${column}, {${name}:String})`);
if (name === 'referrer') {
arr.push('and not has(referrer_domain, {websiteDomain:String})');
}
} else {
arr.push(`and ${mapFilter(column, operator, name)}`);
}
}
return arr;
}, []);
return query.join('\n');
}
function getDateQuery(filters: QueryFilters = {}) {
const { startDate, endDate } = filters;
@ -159,25 +139,6 @@ async function parseFilters(websiteId: string, filters: QueryFilters = {}, optio
};
}
async function parseSessionFilters(
websiteId: string,
filters: QueryFilters = {},
options?: QueryOptions,
) {
const website = await fetchWebsite(websiteId);
return {
filterQuery: getSessionFilterQuery(filters, options),
dateQuery: getDateQuery(filters),
params: {
...getFilterParams(filters),
websiteId,
startDate: maxDate(filters.startDate, new Date(website?.resetAt)),
websiteDomain: website.domain,
},
};
}
async function pagedQuery(
query: string,
queryParams: { [key: string]: any },
@ -260,7 +221,6 @@ export default {
getDateFormat,
getFilterQuery,
parseFilters,
parseSessionFilters,
pagedQuery,
findUnique,
findFirst,