📈 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
Add 'All time' and 'This hour' timebuckets
Maksim Mrugfe0cff088f52
diff --git a/apps/production/src/analytics/analytics.controller.ts b/apps/production/src/analytics/analytics.controller.tsindex ba5048eb6..3599b92f9 100644--- a/apps/production/src/analytics/analytics.controller.ts+++ b/apps/production/src/analytics/analytics.controller.ts@@ -35,6 +35,7 @@ import {getSessionKey,getHeartbeatKey,DataType,+ validPeriods,} from './analytics.service'import { TaskManagerService } from '../task-manager/task-manager.service'import { CurrentUserId } from '../auth/decorators/current-user-id.decorator'@@ -289,7 +290,21 @@ export class AnalyticsController {this.analyticsService.validatePeriod(period)}- this.analyticsService.validateTimebucket(timeBucket)+ let newTimebucket = timeBucket+ let diff++ if (period === validPeriods[validPeriods.length - 1]) {+ const res = await this.analyticsService.getTimeBucketForAllTime(+ pid,+ period,+ timeBucket,+ )++ diff = res.diff+ newTimebucket = res.timeBucket+ }++ this.analyticsService.validateTimebucket(newTimebucket)const [filtersQuery, filtersParams, appliedFilters, customEVFilterApplied] =this.analyticsService.getFiltersQuery(filters,@@ -304,6 +319,7 @@ export class AnalyticsController {timeBucket,period,safeTimezone,+ diff,)await this.analyticsService.checkProjectAccess(pid,diff --git a/apps/production/src/analytics/analytics.service.ts b/apps/production/src/analytics/analytics.service.tsindex 155072f6d..b46b5496d 100644--- a/apps/production/src/analytics/analytics.service.ts+++ b/apps/production/src/analytics/analytics.service.ts@@ -92,7 +92,8 @@ const GMT_0_TIMEZONES = [// 'Africa/Casablanca',]-const validPeriods = [+export const validPeriods = [+ 'thishour','today','yesterday','1d',@@ -101,6 +102,7 @@ const validPeriods = ['3M','12M','24M',+ 'all',]const validTimebuckets = [@@ -122,6 +124,7 @@ const timeBucketToDays = [}, // 4 weeks{ lt: 366, tb: [TimeBucketType.MONTH] }, // 12 months{ lt: 732, tb: [TimeBucketType.MONTH] }, // 24 months+ { lt: 999999, tb: [TimeBucketType.MONTH] }, // more than 24 months]// Smaller than 64 characters, must start with an English letter and contain only letters (a-z A-Z), numbers (0-9), underscores (_) and dots (.)@@ -407,6 +410,7 @@ export class AnalyticsService {timeBucket: TimeBucketType | null,period: string,safeTimezone: string,+ diff?: number,): IGetGroupFromTo {let groupFrom: dayjs.Dayjslet groupTo: dayjs.Dayjs@@ -473,9 +477,15 @@ export class AnalyticsService {if (period === 'today') {groupFrom = djsNow.startOf('d')groupTo = djsNow+ } else if (period === 'thishour') {+ groupFrom = djsNow.startOf('h')+ groupTo = djsNow} else if (period === 'yesterday') {groupFrom = djsNow.subtract(1, 'day').startOf('d')groupTo = djsNow.subtract(1, 'day').endOf('d')+ } else if (period === 'all' && diff === 0) {+ groupFrom = djsNow.subtract(1, 'day').startOf('d')+ groupTo = djsNow} else {if (period === '1d') {groupFrom = djsNow.subtract(parseInt(period, 10), _last(period))@@ -487,6 +497,11 @@ export class AnalyticsService {groupTo = djsNow}+ console.log(+ 'groupFrom',+ groupFrom.format(formatFrom),+ groupTo.format(formatTo),+ )if (!_isEmpty(timeBucket)) {checkIfTBAllowed(timeBucket,@@ -630,6 +645,54 @@ export class AnalyticsService {}}+ async getTimeBucketForAllTime(+ pid: string,+ period: string,+ timeBucket: TimeBucketType,+ ): Promise<{+ timeBucket: TimeBucketType+ diff: number+ }> {+ if (period !== validPeriods[validPeriods.length - 1]) {+ return null+ }++ const from: any = await clickhouse+ .query(+ 'SELECT created as from FROM analytics where pid = {pid:FixedString(12)} ORDER BY created ASC LIMIT 1',+ { params: { pid } },+ )+ .toPromise()+ const to: any = await clickhouse+ .query(+ 'SELECT created as to FROM analytics where pid = {pid:FixedString(12)} ORDER BY created DESC LIMIT 1',+ { params: { pid } },+ )+ .toPromise()+ let newTimeBucket = TimeBucketType.MONTH+ let diff = null++ if (from && to) {+ diff = dayjs(to[0].to).diff(dayjs(from[0].from), 'days')++ const tbMap = _find(timeBucketToDays, ({ lt }) => diff <= lt)++ if (_isEmpty(tbMap)) {+ throw new PreconditionFailedException(+ "The difference between 'from' and 'to' is greater than allowed",+ )+ }++ // eslint-disable-next-line prefer-destructuring+ newTimeBucket = _includes(tbMap.tb, timeBucket) ? timeBucket : tbMap.tb[0]+ }++ return {+ timeBucket: newTimeBucket,+ diff,+ }+ }+postProcessParsedFilters(parsedFilters: any[]): any[] {return _reduce(parsedFilters,