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

Refactored startDate usage.

Browse source
This commit is contained in:
Mike Cao 2023-07-25 22:50:55 -07:00
parent 0f98fb5959
commit a0aaeeeb57
9 changed files with 30 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

5
queries/analytics/stats/getWebsiteDateRange.ts
View file

@ -3,6 +3,7 @@ import clickhouse from 'lib/clickhouse';
import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
import { loadWebsite } from 'lib/query';
import { DEFAULT_RESET_DATE } from 'lib/constants';
import { max } from 'date-fns';
export async function getWebsiteDateRange(...args: [websiteId: string]) {
return runQuery({
@ -40,8 +41,8 @@ async function clickhouseQuery(websiteId: string) {
max(created_at) as max
from website_event
where website_id = {websiteId:UUID}
and created_at >= {dataStartDate:DateTime}
and created_at >= {startDate:DateTime}
`,
{ websiteId, dataStartDate: website.dataStartDate },
{ websiteId, startDate: max([new Date('2000-01-01'), website.resetAt]) },
);
}

9
queries/analytics/stats/getWebsiteStats.ts
View file

@ -3,6 +3,7 @@ import clickhouse from 'lib/clickhouse';
import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
import { DEFAULT_RESET_DATE, EVENT_TYPE } from 'lib/constants';
import { loadWebsite } from 'lib/query';
import { max } from 'date-fns';
export async function getWebsiteStats(
...args: [
@ -44,7 +45,6 @@ async function relationalQuery(
${joinSession}
where event_type = {{eventType}}
and website.website_id = {{websiteId::uuid}}
and website_event.created_at >= {{dataStartDate}}
and website_event.created_at between {{startDate}} and {{endDate}}
${filterQuery}
group by 1, 2
@ -53,9 +53,8 @@ async function relationalQuery(
{
...filters,
websiteId,
startDate,
startDate: max([startDate, website.resetAt]),
endDate,
dataStartDate: website.dataStartDate,
eventType: EVENT_TYPE.pageView,
},
);
@ -86,7 +85,6 @@ async function clickhouseQuery(
max(created_at) max_time
from website_event
where website_id = {websiteId:UUID}
and created_at >= {dataStartDate:DateTime}
and created_at between {startDate:DateTime} and {endDate:DateTime}
and event_type = {eventType:UInt32}
${filterQuery}
@ -96,9 +94,8 @@ async function clickhouseQuery(
{
...filters,
websiteId,
startDate,
startDate: max([startDate, website.resetAt]),
endDate,
dataStartDate: website.dataStartDate,
eventType: EVENT_TYPE.pageView,
},
);