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

Display correct date for events/sessions.

Browse source
This commit is contained in:
Mike Cao 2024-08-12 23:54:21 -07:00
parent 78728b8706
commit b11b2e3524
6 changed files with 39 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/lib/clickhouse.ts
View file

@ -9,12 +9,12 @@ import { filtersToArray } from './params';
import { PageParams, QueryFilters, QueryOptions } from './types';
export const CLICKHOUSE_DATE_FORMATS = {
second: '%Y-%m-%dT%H:%i:%S',
minute: '%Y-%m-%dT%H:%i:00',
hour: '%Y-%m-%dT%H:00:00',
day: '%Y-%m-%dT00:00:00',
month: '%Y-%m-01T00:00:00',
year: '%Y-01-01T00:00:00',
second: '%Y-%m-%d %H:%i:%S',
minute: '%Y-%m-%d %H:%i:00',
hour: '%Y-%m-%d %H:00:00',
day: '%Y-%m-%d',
month: '%Y-%m-01',
year: '%Y-01-01',
};
const log = debug('umami:clickhouse');
@ -101,12 +101,18 @@ function getFilterQuery(filters: QueryFilters = {}, options: QueryOptions = {})
}
function getDateQuery(filters: QueryFilters = {}) {
const { startDate, endDate } = filters;
const { startDate, endDate, timezone } = filters;
if (startDate) {
if (endDate) {
if (timezone) {
return `and created_at between toTimezone({startDate:DateTime64},{timezone:String}) and toTimezone({endDate:DateTime64},{timezone:String})`;
}
return `and created_at between {startDate:DateTime64} and {endDate:DateTime64}`;
} else {
if (timezone) {
return `and created_at >= toTimezone({startDate:DateTime64},{timezone:String})`;
}
return `and created_at >= {startDate:DateTime64}`;
}
}