📈 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 timezones for selfhosted too
Blue Mousebd8dd84273a4
diff --git a/apps/selfhosted/src/analytics/analytics.controller.ts b/apps/selfhosted/src/analytics/analytics.controller.tsindex 95972434a..dd9b7ebb5 100644--- a/apps/selfhosted/src/analytics/analytics.controller.ts+++ b/apps/selfhosted/src/analytics/analytics.controller.ts@@ -28,8 +28,8 @@ import { ApiTags } from '@nestjs/swagger'import * as UAParser from 'ua-parser-js'import * as isbot from 'isbot'-import { OptionalJwtAccessTokenGuard } from 'src/auth/guards'-import { Auth, Public } from 'src/auth/decorators'+import { OptionalJwtAccessTokenGuard } from '../auth/guards'+import { Auth, Public } from '../auth/decorators'import {AnalyticsService,getSessionKey,diff --git a/apps/selfhosted/src/analytics/analytics.service.ts b/apps/selfhosted/src/analytics/analytics.service.tsindex 4d6ba1684..a4337029f 100644--- a/apps/selfhosted/src/analytics/analytics.service.ts+++ b/apps/selfhosted/src/analytics/analytics.service.ts@@ -956,9 +956,12 @@ export class AnalyticsService {generateAnalyticsAggregationQuery(timeBucket: TimeBucketType,filtersQuery: string,+ safeTimezone: string,): string {const timeBucketFunc = timeBucketConversion[timeBucket]const [selector, groupBy] = this.getGroupSubquery(timeBucket)+ const tzFromDate = `toTimeZone(parseDateTimeBestEffort({groupFrom:String}), '${safeTimezone}')`+ const tzToDate = `toTimeZone(parseDateTimeBestEffort({groupTo:String}), '${safeTimezone}')`return `SELECT@@ -968,11 +971,11 @@ export class AnalyticsService {sumIf(1, unique = 1) as uniquesFROM (SELECT *,- ${timeBucketFunc}(created) as tz_created+ ${timeBucketFunc}(toTimeZone(created, '${safeTimezone}')) as tz_createdFROM analyticsWHEREpid = {pid:FixedString(12)}- AND created BETWEEN {groupFrom:String} AND {groupTo:String}+ AND created BETWEEN ${tzFromDate} AND ${tzToDate}${filtersQuery}) as subqueryGROUP BY ${groupBy}@@ -980,13 +983,17 @@ export class AnalyticsService {`}+generateCustomEventsAggregationQuery(timeBucket: TimeBucketType,filtersQuery: string,paramsData: any,+ safeTimezone: string,): string {const timeBucketFunc = timeBucketConversion[timeBucket]const [selector, groupBy] = this.getGroupSubquery(timeBucket)+ const tzFromDate = `toTimeZone(parseDateTimeBestEffort({groupFrom:String}), '${safeTimezone}')`+ const tzToDate = `toTimeZone(parseDateTimeBestEffort({groupTo:String}), '${safeTimezone}')`return `SELECT@@ -994,11 +1001,11 @@ export class AnalyticsService {count() as countFROM (SELECT *,- ${timeBucketFunc}(created) as tz_created+ ${timeBucketFunc}(toTimeZone(created, '${safeTimezone}')) as tz_createdFROM customEVWHERE ${paramsData.params.ev_exclusive ? 'NOT' : ''} ev = {ev:String}AND pid = {pid:FixedString(12)}- AND created BETWEEN {groupFrom:String} AND {groupTo:String}+ AND created BETWEEN ${tzFromDate} AND ${tzToDate}${filtersQuery}) as subqueryGROUP BY ${groupBy}@@ -1009,9 +1016,12 @@ export class AnalyticsService {generatePerformanceAggregationQuery(timeBucket: TimeBucketType,filtersQuery: string,+ safeTimezone,): string {const timeBucketFunc = timeBucketConversion[timeBucket]const [selector, groupBy] = this.getGroupSubquery(timeBucket)+ const tzFromDate = `toTimeZone(parseDateTimeBestEffort({groupFrom:String}), '${safeTimezone}')`+ const tzToDate = `toTimeZone(parseDateTimeBestEffort({groupTo:String}), '${safeTimezone}')`return `SELECT@@ -1025,11 +1035,11 @@ export class AnalyticsService {avg(ttfb) as ttfbFROM (SELECT *,- ${timeBucketFunc}(created) as tz_created+ ${timeBucketFunc}(toTimeZone(created, '${safeTimezone}')) as tz_createdFROM performanceWHEREpid = {pid:FixedString(12)}- AND created BETWEEN {groupFrom:String} AND {groupTo:String}+ AND created BETWEEN ${tzFromDate} AND ${tzToDate}${filtersQuery}) as subqueryGROUP BY ${groupBy}@@ -1040,9 +1050,12 @@ export class AnalyticsService {generateCaptchaAggregationQuery(timeBucket: TimeBucketType,filtersQuery: string,+ safeTimezone: string,): string {const timeBucketFunc = timeBucketConversion[timeBucket]const [selector, groupBy] = this.getGroupSubquery(timeBucket)+ const tzFromDate = `toTimeZone(parseDateTimeBestEffort({groupFrom:String}), '${safeTimezone}')`+ const tzToDate = `toTimeZone(parseDateTimeBestEffort({groupTo:String}), '${safeTimezone}')`return `SELECT@@ -1050,11 +1063,11 @@ export class AnalyticsService {count() as countFROM (SELECT *,- ${timeBucketFunc}(created) as tz_created+ ${timeBucketFunc}(toTimeZone(created, '${safeTimezone}')) as tz_createdFROM captchaWHEREpid = {pid:FixedString(12)}- AND created BETWEEN {groupFrom:String} AND {groupTo:String}+ AND created BETWEEN ${tzFromDate} AND ${tzToDate}${filtersQuery}) as subqueryGROUP BY ${groupBy}@@ -1154,7 +1167,7 @@ export class AnalyticsService {? 0: await this.calculateAverageSessionDuration(subQuery, paramsData)- const { x, xShifted } = this.generateXAxis(+ const { xShifted } = this.generateXAxis(timeBucket,from,to,@@ -1166,6 +1179,7 @@ export class AnalyticsService {timeBucket,filtersQuery,paramsData,+ safeTimezone,)const result = <Array<TrafficCEFilterCHResponse>>(@@ -1173,9 +1187,9 @@ export class AnalyticsService {)const uniques =- this.extractCustomEventsChartData(result, x)?._unknown_event || []+ this.extractCustomEventsChartData(result, xShifted)?._unknown_event || []- const sdur = Array(_size(x)).fill(0)+ const sdur = Array(_size(xShifted)).fill(0)return Promise.resolve({chart: {@@ -1190,13 +1204,14 @@ export class AnalyticsService {const query = this.generateAnalyticsAggregationQuery(timeBucket,filtersQuery,+ safeTimezone,)const result = <Array<TrafficCHResponse>>(await clickhouse.query(query, paramsData).toPromise())- const { visits, uniques, sdur } = this.extractChartData(result, x)+ const { visits, uniques, sdur } = this.extractChartData(result, xShifted)return Promise.resolve({chart: {@@ -1260,7 +1275,7 @@ export class AnalyticsService {// Getting CAPTCHA chart data(async () => {- const { x, xShifted } = this.generateXAxis(+ const { xShifted } = this.generateXAxis(timeBucket,from,to,@@ -1270,12 +1285,13 @@ export class AnalyticsService {const query = this.generateCaptchaAggregationQuery(timeBucket,filtersQuery,+ safeTimezone,)const result = <Array<TrafficCEFilterCHResponse>>(await clickhouse.query(query, paramsData).toPromise())- const { count } = this.extractCaptchaChartData(result, x)+ const { count } = this.extractCaptchaChartData(result, xShifted)chart = {x: xShifted,@@ -1336,7 +1352,7 @@ export class AnalyticsService {paramsData: object,safeTimezone: string,) {- const { x, xShifted } = this.generateXAxis(+ const { xShifted } = this.generateXAxis(timeBucket,from,to,@@ -1346,6 +1362,7 @@ export class AnalyticsService {const query = this.generatePerformanceAggregationQuery(timeBucket,filtersQuery,+ safeTimezone,)const result = <Array<PerformanceCHResponse>>(@@ -1354,7 +1371,7 @@ export class AnalyticsService {return {x: xShifted,- ...this.extractPerformanceChartData(result, x),+ ...this.extractPerformanceChartData(result, xShifted),}}@@ -1439,7 +1456,7 @@ export class AnalyticsService {paramsData: object,safeTimezone: string,): Promise<object | void> {- const { x, xShifted } = this.generateXAxis(+ const { xShifted } = this.generateXAxis(timeBucket,from,to,@@ -1471,7 +1488,7 @@ export class AnalyticsService {await clickhouse.query(query, paramsData).toPromise())- const events = this.extractCustomEventsChartData(result, x)+ const events = this.extractCustomEventsChartData(result, xShifted)return Promise.resolve({chart: {