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

8
queries/analytics/sessions/getSessionMetrics.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 getSessionMetrics(
...args: [
@ -35,14 +36,13 @@ async function relationalQuery(
on website_event.website_id = website.website_id
${joinSession}
where website.website_id = {{websiteId::uuid}}
and website_event.created_at >= {{dataStartDate}}
and website_event.created_at between {{startDate}} and {{endDate}}
${filterQuery}
)
group by 1
order by 2 desc
limit 100`,
{ ...filters, websiteId, startDate, endDate, dataStartDate: website.dataStartDate },
{ ...filters, websiteId, startDate: max([startDate, website.resetAt]), endDate },
);
}
@ -61,7 +61,6 @@ async function clickhouseQuery(
${column} x, count(distinct session_id) y
from website_event as x
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}
@ -72,9 +71,8 @@ async function clickhouseQuery(
{
...filters,
websiteId,
startDate,
startDate: max([startDate, website.resetAt]),
endDate,
dataStartDate: website.dataStartDate,
eventType: EVENT_TYPE.pageView,
},
);