watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-06 21:57:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge remote-tracking branch 'origin/dev' into dev

Browse source 
# Conflicts:
#	src/app/share/[...shareId]/Header.tsx
This commit is contained in:
Mike Cao 2025-09-25 11:23:36 -07:00
commit dfc6161a53
5 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/queries/prisma/user.ts
View file

@ -136,7 +136,7 @@ export async function deleteUser(
const teams = await client.team.findMany({
where: {
teamUser: {
members: {
some: {
userId,
role: ROLES.teamOwner,

25
src/queries/sql/reports/getRetention.ts
View file

@ -46,11 +46,16 @@ async function relationalQuery(
return rawQuery(
`
WITH cohort_items AS (
select session_id,
${getDateSQL('created_at', unit)} as cohort_date
from session
where website_id = {{websiteId::uuid}}
and created_at between {{startDate}} and {{endDate}}
select
min(${getDateSQL('website_event.created_at', unit, timezone)}) as cohort_date,
website_event.session_id
from website_event
${cohortQuery}
${joinSessionQuery}
where website_event.website_id = {{websiteId::uuid}}
and website_event.created_at between {{startDate}} and {{endDate}}
${filterQuery}
group by website_event.session_id
),
user_activities AS (
select distinct
@ -59,11 +64,9 @@ async function relationalQuery(
from website_event
join cohort_items
on website_event.session_id = cohort_items.session_id
${cohortQuery}
${joinSessionQuery}
where website_id = {{websiteId::uuid}}
and created_at between {{startDate}} and {{endDate}}
${filterQuery}
),
cohort_size as (
select cohort_date,
@ -121,8 +124,10 @@ async function clickhouseQuery(
min(${getDateSQL('created_at', unit, timezone)}) as cohort_date,
session_id
from website_event
${cohortQuery}
where website_id = {websiteId:UUID}
and created_at between {startDate:DateTime64} and {endDate:DateTime64}
and created_at between {startDate:DateTime64} and {endDate:DateTime64}
${filterQuery}
group by session_id
),
user_activities AS (
@ -132,10 +137,8 @@ async function clickhouseQuery(
from website_event
join cohort_items
on website_event.session_id = cohort_items.session_id
${cohortQuery}
where website_id = {websiteId:UUID}
and created_at between {startDate:DateTime64} and {endDate:DateTime64}
${filterQuery}
),
cohort_size as (
select cohort_date,