Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Increase resetWebsite timeout. fix retention bug returning decimal day_number in CH.
Francis Caocc8254985b65
diff --git a/src/queries/prisma/website.ts b/src/queries/prisma/website.tsindex 5f5404d5d..cc5f2e6f4 100644--- a/src/queries/prisma/website.ts+++ b/src/queries/prisma/website.ts@@ -135,26 +135,31 @@ export async function resetWebsite(websiteId: string) {const { client, transaction } = prisma;const cloudMode = !!process.env.CLOUD_MODE;- return transaction([- client.eventData.deleteMany({- where: { websiteId },- }),- client.sessionData.deleteMany({- where: { websiteId },- }),- client.websiteEvent.deleteMany({- where: { websiteId },- }),- client.session.deleteMany({- where: { websiteId },- }),- client.website.update({- where: { id: websiteId },- data: {- resetAt: new Date(),- },- }),- ]).then(async data => {+ return transaction(+ [+ client.eventData.deleteMany({+ where: { websiteId },+ }),+ client.sessionData.deleteMany({+ where: { websiteId },+ }),+ client.websiteEvent.deleteMany({+ where: { websiteId },+ }),+ client.session.deleteMany({+ where: { websiteId },+ }),+ client.website.update({+ where: { id: websiteId },+ data: {+ resetAt: new Date(),+ },+ }),+ ],+ {+ timeout: 30000,+ },+ ).then(async data => {if (cloudMode) {await redis.client.set(`website:${websiteId}`,diff --git a/src/queries/sql/reports/getRetention.ts b/src/queries/sql/reports/getRetention.tsindex 15984cd36..d99098c00 100644--- a/src/queries/sql/reports/getRetention.ts+++ b/src/queries/sql/reports/getRetention.ts@@ -133,7 +133,7 @@ async function clickhouseQuery(user_activities AS (select distinctwebsite_event.session_id,- (${getDateSQL('created_at', unit, timezone)} - cohort_items.cohort_date) / 86400 as day_number+ toInt32((${getDateSQL('created_at', unit, timezone)} - cohort_items.cohort_date) / 86400) as day_numberfrom website_eventjoin cohort_itemson website_event.session_id = cohort_items.session_id