📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
Fix PR reviews
Blue Mouseae2f78bba4f4
diff --git a/backend/apps/cloud/src/analytics/analytics.service.ts b/backend/apps/cloud/src/analytics/analytics.service.tsindex 0d818ddcf..b0a7e0641 100644--- a/backend/apps/cloud/src/analytics/analytics.service.ts+++ b/backend/apps/cloud/src/analytics/analytics.service.ts@@ -6908,22 +6908,23 @@ export class AnalyticsService {),filtered_sessions AS (SELECT- toString(ifNull(e.psid, 0)) AS psidCasted,- e.pid AS pid,+ ms.psidCasted AS psidCasted,+ ms.pid AS pid,argMaxIf(e.profileId, toTimeZone(e.created, {timezone:String}), e.profileId IS NOT NULL AND e.profileId != '') AS profileId,- any(e.cc) AS cc,- any(e.os) AS os,- any(e.br) AS br,- min(toTimeZone(e.created, {timezone:String})) AS sessionStart,- max(toTimeZone(e.created, {timezone:String})) AS lastActivity- FROM events e- INNER JOIN matched_sessions ms ON toString(ifNull(e.psid, 0)) = ms.psidCasted AND e.pid = ms.pid- WHERE e.pid = {pid:FixedString(12)}+ anyIf(e.cc, e.psid IS NOT NULL AND e.psid != 0) AS cc,+ anyIf(e.os, e.psid IS NOT NULL AND e.psid != 0) AS os,+ anyIf(e.br, e.psid IS NOT NULL AND e.psid != 0) AS br,+ minOrNull(if(e.psid IS NOT NULL AND e.psid != 0, toTimeZone(e.created, {timezone:String}), NULL)) AS sessionStart,+ maxOrNull(if(e.psid IS NOT NULL AND e.psid != 0, toTimeZone(e.created, {timezone:String}), NULL)) AS lastActivity+ FROM matched_sessions ms+ LEFT JOIN events e ON toString(ifNull(e.psid, 0)) = ms.psidCasted+ AND e.pid = ms.pidAND e.type IN ('pageview', 'custom_event', 'error')AND e.psid IS NOT NULLAND e.psid != 0AND e.created BETWEEN {groupFrom:String} AND {groupTo:String}- GROUP BY psidCasted, pid+ WHERE ms.pid = {pid:FixedString(12)}+ GROUP BY ms.psidCasted, ms.pid)`const query = `@@ -7187,7 +7188,7 @@ export class AnalyticsService {toTimeZone(matching_custom_events.created, {timezone:String}) AS created_for_groupingFROM sessions AS s FINALINNER JOIN (- SELECT pid, profileId, cc, os, br, created+ SELECT pid, psid, profileId, cc, os, br, createdFROM eventsWHEREpid = {pid:FixedString(12)}@@ -7205,6 +7206,7 @@ export class AnalyticsService {) AS matching_custom_eventsON s.pid = matching_custom_events.pidAND s.profileId = matching_custom_events.profileId+ AND (matching_custom_events.psid IS NULL OR matching_custom_events.psid = 0 OR matching_custom_events.psid = s.psid)WHERE matching_custom_events.created BETWEEN s.firstSeen AND addSeconds(s.lastSeen, 1)`}