ambiser
/
umami
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into analytics

pull/1915/head
Mike Cao 2023-04-07 11:49:31 -07:00
parent 459fbc03ce 6424100223
commit a33706585b
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
queries/admin/user.ts
View File

@ -161,6 +161,9 @@ export async function deleteUser(
return prisma return prisma
.transaction([ .transaction([
client.eventData.deleteMany({
where: { websiteId: { in: websiteIds } },
}),
client.websiteEvent.deleteMany({ client.websiteEvent.deleteMany({
where: { websiteId: { in: websiteIds } }, where: { websiteId: { in: websiteIds } },
}), }),

3
queries/admin/website.ts
View File

@ -78,6 +78,9 @@ export async function deleteWebsite(
const cloudMode = process.env.CLOUD_MODE; const cloudMode = process.env.CLOUD_MODE;
return transaction([ return transaction([
client.eventData.deleteMany({
where: { websiteId },
}),
client.websiteEvent.deleteMany({ client.websiteEvent.deleteMany({
where: { websiteId }, where: { websiteId },
}), }),

2
queries/analytics/event/getEvents.ts
View File

@ -35,7 +35,7 @@ function clickhouseQuery(websiteId: string, startAt: Date, eventType: number) {
url_path, url_path,
event_name as eventName event_name as eventName
from website_event from website_event
where event_type = {eventType:Uint32} where event_type = {eventType:UInt32}
and website_id = {websiteId:UUID} and website_id = {websiteId:UUID}
and created_at >= {startAt:DateTime('UTC')}`, and created_at >= {startAt:DateTime('UTC')}`,
{ {