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

Added parseDateRangeQuery function.

Browse source
This commit is contained in:
Mike Cao 2023-07-25 23:59:08 -07:00
parent a0aaeeeb57
commit 09af33c77e
15 changed files with 139 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

8
queries/analytics/events/getEventMetrics.ts
View file

@ -3,8 +3,8 @@ import clickhouse from 'lib/clickhouse';
import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
import { WebsiteEventMetric } from 'lib/types';
import { DEFAULT_RESET_DATE, EVENT_TYPE } from 'lib/constants';
import { loadWebsite } from 'lib/query';
import { max } from 'date-fns';
import { loadWebsite } from 'lib/load';
import { maxDate } from 'lib/date';
export async function getEventMetrics(
...args: [
@ -67,7 +67,7 @@ async function relationalQuery(
{
...filters,
websiteId,
startDate: max([startDate, website.resetAt]),
startDate: maxDate(startDate, website.resetAt),
endDate,
eventType: EVENT_TYPE.customEvent,
},
@ -114,7 +114,7 @@ async function clickhouseQuery(
{
...filters,
websiteId,
startDate: max([startDate, website.resetAt]),
startDate: maxDate(startDate, website.resetAt),
endDate,
eventType: EVENT_TYPE.customEvent,
},