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

More resetDate conversion.

Browse source
This commit is contained in:
Mike Cao 2023-04-19 21:16:56 -07:00
parent e63591e35d
commit 03ba225587
6 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
queries/analytics/pageview/getPageviewMetrics.ts
View file

@ -33,7 +33,7 @@ async function relationalQuery(
const { startDate, endDate, filters = {}, column } = criteria;
const { rawQuery, parseFilters, toUuid } = prisma;
const website = await loadWebsite(websiteId);
const resetDate = website?.resetAt || website?.createdAt;
const resetDate = new Date(website?.resetAt || website?.createdAt);
const params: any = [
websiteId,
resetDate,
@ -80,7 +80,7 @@ async function clickhouseQuery(
const { startDate, endDate, filters = {}, column } = criteria;
const { rawQuery, getDateFormat, parseFilters, getBetweenDates } = clickhouse;
const website = await loadWebsite(websiteId);
const resetDate = website?.resetAt || website?.createdAt;
const resetDate = new Date(website?.resetAt || website?.createdAt);
const params = {
websiteId,
eventType: column === 'event_name' ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,

4
queries/analytics/pageview/getPageviewStats.ts
View file

@ -47,7 +47,7 @@ async function relationalQuery(
} = criteria;
const { toUuid, getDateQuery, parseFilters, rawQuery } = prisma;
const website = await loadWebsite(websiteId);
const resetDate = website?.resetAt || website?.createdAt;
const resetDate = new Date(website?.resetAt || website?.createdAt);
const params: any = [websiteId, resetDate, startDate, endDate];
const { filterQuery, joinSession } = parseFilters(filters, params);
@ -95,7 +95,7 @@ async function clickhouseQuery(
getBetweenDates,
} = clickhouse;
const website = await loadWebsite(websiteId);
const resetDate = website?.resetAt || website?.createdAt;
const resetDate = new Date(website?.resetAt || website?.createdAt);
const params = { websiteId };
const { filterQuery } = parseFilters(filters, params);