📈 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) Errors API timezones support (#234)
Andrii Romasiuna87e14870cdf
diff --git a/apps/production/src/analytics/analytics.controller.ts b/apps/production/src/analytics/analytics.controller.tsindex 5b2332a5f..094e317ab 100644--- a/apps/production/src/analytics/analytics.controller.ts+++ b/apps/production/src/analytics/analytics.controller.ts@@ -1702,7 +1702,7 @@ export class AnalyticsController {this.analyticsService.getFiltersQuery(filters, DataType.ANALYTICS)const safeTimezone = this.analyticsService.getSafeTimezone(timezone)- const { groupFrom, groupTo } = this.analyticsService.getGroupFromTo(+ const { groupFromUTC, groupToUTC } = this.analyticsService.getGroupFromTo(from,to,timeBucket,@@ -1714,8 +1714,8 @@ export class AnalyticsController {const paramsData = {params: {pid,- groupFrom,- groupTo,+ groupFrom: groupFromUTC,+ groupTo: groupToUTC,...filtersParams,},}@@ -1787,7 +1787,7 @@ export class AnalyticsController {this.analyticsService.validateTimebucket(timeBucket)const safeTimezone = this.analyticsService.getSafeTimezone(timezone)- const { groupFrom, groupTo } = this.analyticsService.getGroupFromTo(+ const { groupFromUTC, groupToUTC } = this.analyticsService.getGroupFromTo(from,to,timeBucket,@@ -1800,8 +1800,8 @@ export class AnalyticsController {pid,eid,safeTimezone,- groupFrom,- groupTo,+ groupFromUTC,+ groupToUTC,timeBucket,)diff --git a/apps/production/src/analytics/analytics.service.ts b/apps/production/src/analytics/analytics.service.tsindex 38902ee21..66b79a16e 100644--- a/apps/production/src/analytics/analytics.service.ts+++ b/apps/production/src/analytics/analytics.service.ts@@ -2249,13 +2249,10 @@ export class AnalyticsService {generateErrorsAggregationQuery(timeBucket: TimeBucketType,filtersQuery: string,- safeTimezone: string,mode: ChartRenderMode,): 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}')`const baseQuery = `SELECT@@ -2263,11 +2260,11 @@ export class AnalyticsService {count() as countFROM (SELECT pg, dv, br, os, lc, cc, rg, ct,- ${timeBucketFunc}(toTimeZone(created, '${safeTimezone}')) as tz_created+ ${timeBucketFunc}(created) as tz_createdFROM errorsWHEREpid = {pid:FixedString(12)}- AND created BETWEEN ${tzFromDate} AND ${tzToDate}+ AND created BETWEEN {groupFrom:String} AND {groupTo:String}${filtersQuery}) as subqueryGROUP BY ${groupBy}@@ -2653,27 +2650,21 @@ export class AnalyticsService {// Chart data(async () => {- const { xShifted } = this.generateXAxis(- timeBucket,- from,- to,- safeTimezone,- )+ const { x, format } = this.generateUTCXAxis(timeBucket, from, to)const query = this.generateErrorsAggregationQuery(timeBucket,filtersQuery,- safeTimezone,mode,)const result = <Array<TrafficCEFilterCHResponse>>(await clickhouse.query(query, paramsData).toPromise())- const { count } = this.extractCaptchaChartData(result, xShifted)+ const { count } = this.extractCaptchaChartData(result, x)chart = {- x: xShifted,+ x: this.shiftToTimezone(x, safeTimezone, format),occurrences: count,}})(),@@ -3208,9 +3199,6 @@ export class AnalyticsService {take = 30,skip = 0,): Promise<object | void> {- const tzFromDate = `toTimeZone(parseDateTimeBestEffort({groupFrom:String}), '${safeTimezone}')`- const tzToDate = `toTimeZone(parseDateTimeBestEffort({groupTo:String}), '${safeTimezone}')`-let parsedOptions: {showResolved?: boolean} = {}@@ -3231,10 +3219,10 @@ export class AnalyticsService {max(created) as last_seen,status.statusFROM (- SELECT eid, name, message, filename, created+ SELECT eid, name, message, filename, toTimeZone(errors.created, '${safeTimezone}') AS createdFROM errorsWHERE pid = {pid:FixedString(12)}- AND created BETWEEN ${tzFromDate} AND ${tzToDate}+ AND created BETWEEN {groupFrom:String} AND {groupTo:String}${filtersQuery}) AS errorsLEFT JOIN (@@ -3269,9 +3257,6 @@ export class AnalyticsService {groupTo: string,timeBucket: any,): Promise<any> {- const tzFromDate = `toTimeZone(parseDateTimeBestEffort({groupFrom:String}), '${safeTimezone}')`- const tzToDate = `toTimeZone(parseDateTimeBestEffort({groupTo:String}), '${safeTimezone}')`-const queryErrorDetails = `SELECTsubquery.eid,@@ -3293,7 +3278,7 @@ export class AnalyticsService {FROM errorsWHERE pid = {pid:FixedString(12)}AND eid = {eid:FixedString(32)}- AND created BETWEEN ${tzFromDate} AND ${tzToDate}+ AND created BETWEEN {groupFrom:String} AND {groupTo:String}) AS subqueryLEFT JOIN (SELECTdiff --git a/apps/selfhosted/src/analytics/analytics.controller.ts b/apps/selfhosted/src/analytics/analytics.controller.tsindex 5fd8abef7..1b1725c87 100644--- a/apps/selfhosted/src/analytics/analytics.controller.ts+++ b/apps/selfhosted/src/analytics/analytics.controller.ts@@ -1650,7 +1650,7 @@ export class AnalyticsController {this.analyticsService.getFiltersQuery(filters, DataType.ANALYTICS)const safeTimezone = this.analyticsService.getSafeTimezone(timezone)- const { groupFrom, groupTo } = this.analyticsService.getGroupFromTo(+ const { groupFromUTC, groupToUTC } = this.analyticsService.getGroupFromTo(from,to,timeBucket,@@ -1662,8 +1662,8 @@ export class AnalyticsController {const paramsData = {params: {pid,- groupFrom,- groupTo,+ groupFrom: groupFromUTC,+ groupTo: groupToUTC,...filtersParams,},}@@ -1728,7 +1728,7 @@ export class AnalyticsController {this.analyticsService.validateTimebucket(timeBucket)const safeTimezone = this.analyticsService.getSafeTimezone(timezone)- const { groupFrom, groupTo } = this.analyticsService.getGroupFromTo(+ const { groupFromUTC, groupToUTC } = this.analyticsService.getGroupFromTo(from,to,timeBucket,@@ -1741,8 +1741,8 @@ export class AnalyticsController {pid,eid,safeTimezone,- groupFrom,- groupTo,+ groupFromUTC,+ groupToUTC,timeBucket,)diff --git a/apps/selfhosted/src/analytics/analytics.service.ts b/apps/selfhosted/src/analytics/analytics.service.tsindex 824723ee3..4d986e33a 100644--- a/apps/selfhosted/src/analytics/analytics.service.ts+++ b/apps/selfhosted/src/analytics/analytics.service.ts@@ -1968,13 +1968,10 @@ export class AnalyticsService {generateErrorsAggregationQuery(timeBucket: TimeBucketType,filtersQuery: string,- safeTimezone: string,mode: ChartRenderMode,): 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}')`const baseQuery = `SELECT@@ -1982,11 +1979,11 @@ export class AnalyticsService {count() as countFROM (SELECT pg, dv, br, os, lc, cc, rg, ct,- ${timeBucketFunc}(toTimeZone(created, '${safeTimezone}')) as tz_created+ ${timeBucketFunc}(created) as tz_createdFROM errorsWHEREpid = {pid:FixedString(12)}- AND created BETWEEN ${tzFromDate} AND ${tzToDate}+ AND created BETWEEN {groupFrom:String} AND {groupTo:String}${filtersQuery}) as subqueryGROUP BY ${groupBy}@@ -2305,27 +2302,21 @@ export class AnalyticsService {// Chart data(async () => {- const { xShifted } = this.generateXAxis(- timeBucket,- from,- to,- safeTimezone,- )+ const { x, format } = this.generateUTCXAxis(timeBucket, from, to)const query = this.generateErrorsAggregationQuery(timeBucket,filtersQuery,- safeTimezone,mode,)const result = <Array<TrafficCEFilterCHResponse>>(await clickhouse.query(query, paramsData).toPromise())- const { count } = this.extractErrorsChartData(result, xShifted)+ const { count } = this.extractErrorsChartData(result, x)chart = {- x: xShifted,+ x: this.shiftToTimezone(x, safeTimezone, format),occurrences: count,}})(),@@ -2827,9 +2818,6 @@ export class AnalyticsService {take = 30,skip = 0,): Promise<object | void> {- const tzFromDate = `toTimeZone(parseDateTimeBestEffort({groupFrom:String}), '${safeTimezone}')`- const tzToDate = `toTimeZone(parseDateTimeBestEffort({groupTo:String}), '${safeTimezone}')`-let parsedOptions: {showResolved?: boolean} = {}@@ -2850,10 +2838,10 @@ export class AnalyticsService {max(created) as last_seen,status.statusFROM (- SELECT eid, name, message, filename, created+ SELECT eid, name, message, filename, toTimeZone(errors.created, '${safeTimezone}') AS createdFROM errorsWHERE pid = {pid:FixedString(12)}- AND created BETWEEN ${tzFromDate} AND ${tzToDate}+ AND created BETWEEN {groupFrom:String} AND {groupTo:String}${filtersQuery}) AS errorsLEFT JOIN (@@ -2888,9 +2876,6 @@ export class AnalyticsService {groupTo: string,timeBucket: any,): Promise<any> {- const tzFromDate = `toTimeZone(parseDateTimeBestEffort({groupFrom:String}), '${safeTimezone}')`- const tzToDate = `toTimeZone(parseDateTimeBestEffort({groupTo:String}), '${safeTimezone}')`-const queryErrorDetails = `SELECTsubquery.eid,@@ -2912,7 +2897,7 @@ export class AnalyticsService {FROM errorsWHERE pid = {pid:FixedString(12)}AND eid = {eid:FixedString(32)}- AND created BETWEEN ${tzFromDate} AND ${tzToDate}+ AND created BETWEEN {groupFrom:String} AND {groupTo:String}) AS subqueryLEFT JOIN (SELECT