📈 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) Minute TB (#178)
Andrii Romasiun5a133b476763
diff --git a/apps/production/src/analytics/analytics.service.ts b/apps/production/src/analytics/analytics.service.tsindex c2db8cf7d..0821739a4 100644--- a/apps/production/src/analytics/analytics.service.ts+++ b/apps/production/src/analytics/analytics.service.ts@@ -93,7 +93,7 @@ const GMT_0_TIMEZONES = []export const validPeriods = [- 'thishour',+ '1h','today','yesterday','1d',@@ -486,9 +486,6 @@ export class AnalyticsService {if (period === 'today') {groupFrom = djsNow.startOf('d')groupTo = djsNow- } else if (period === 'thishour') {- groupFrom = djsNow.subtract(1, 'hour').startOf('h')- groupTo = djsNow} else if (period === 'yesterday') {groupFrom = djsNow.subtract(1, 'day').startOf('d')groupTo = djsNow.subtract(1, 'day').endOf('d')@@ -499,7 +496,7 @@ export class AnalyticsService {groupFrom = djsNow.subtract(diff - 1, 'day').startOf(timeBucket)groupTo = djsNow} else {- if (period === '1d') {+ if (period === '1d' || period === '1h') {groupFrom = djsNow.subtract(parseInt(period, 10), _last(period))} else {groupFrom = djsNow.subtract(parseInt(period, 10) - 1, _last(period))@@ -1106,7 +1103,7 @@ export class AnalyticsService {}generateDateString(row: { [key: string]: number }): string {- const { year, month, day, hour } = row+ const { year, month, day, hour, minute } = rowlet dateString = `${year}-${month < 10 ? `0${month}` : month}`@@ -1119,10 +1116,17 @@ export class AnalyticsService {}if (typeof hour === 'number') {+ const strMinute =+ typeof minute === 'number'+ ? minute < 10+ ? `0${minute}`+ : minute+ : '00'+if (hour < 10) {- dateString += ` 0${hour}:00:00`+ dateString += ` 0${hour}:${strMinute}:00`} else {- dateString += ` ${hour}:00:00`+ dateString += ` ${hour}:${strMinute}:00`}}diff --git a/migrations/clickhouse/2023_05_07.js b/migrations/clickhouse/2023_05_07.jsindex 844158130..32579c4b4 100644--- a/migrations/clickhouse/2023_05_07.js+++ b/migrations/clickhouse/2023_05_07.js@@ -14,7 +14,7 @@ const queries = [)ENGINE = MergeTree()PARTITION BY toYYYYMM(created)- ORDER BY (pid, created)`+ ORDER BY (pid, created)`,`INSERT INTO ${dbName}.captcha_temp (pid, dv, br, os, cc, manuallyPassed, created)SELECT pid, dv, br, os, cc, manuallyPassed, created FROM ${dbName}.captcha`,