Skip to content

📈 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!

small improvement & clg

Blue Mousec63ab283fda6
diff --git a/apps/production/src/analytics/analytics.controller.ts b/apps/production/src/analytics/analytics.controller.ts
index 053f6a6e2..611160b3e 100644
--- a/apps/production/src/analytics/analytics.controller.ts
+++ b/apps/production/src/analytics/analytics.controller.ts
@@ -29,8 +29,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,
@@ -295,6 +295,8 @@ export class AnalyticsController {
)
await this.analyticsService.checkProjectAccess(pid, uid)
+ console.log('GROUP FROM TO:', { groupFrom, groupTo, groupFromUTC, groupToUTC })
+
let queryCustoms = `SELECT ev, count() FROM customEV WHERE pid = {pid:FixedString(12)} ${filtersQuery} AND created BETWEEN {groupFrom:String} AND {groupTo:String} GROUP BY ev`
let subQuery = `FROM ${
isCaptcha ? 'captcha' : 'analytics'
diff --git a/apps/production/src/analytics/analytics.service.ts b/apps/production/src/analytics/analytics.service.ts
index 8e42f23d4..eb97d9cb8 100644
--- a/apps/production/src/analytics/analytics.service.ts
+++ b/apps/production/src/analytics/analytics.service.ts
@@ -144,7 +144,7 @@ const isValidTimezone = (timezone: string): boolean => {
}
}
-const isValidDate = (date: string, format = 'YYYY-MM-DD'): boolean => {
+export const isValidDate = (date: string, format = 'YYYY-MM-DD'): boolean => {
if (_isEmpty(date)) {
return false
}
@@ -434,11 +434,11 @@ export class AnalyticsService {
const groupToFormatted = groupTo.format(formatTo)
return {
- // UTC time
+ // Timezone shifted time
groupFrom: groupFromFormatted,
groupTo: groupToFormatted,
- // Timezone shifted time
- groupFromUTC: groupFrom.utc().format(formatFrom),
+ // UTC time
+ groupFromUTC: groupFrom.utc().startOf(timeBucket).format(formatFrom),
groupToUTC: groupTo.utc().format(formatFrom),
}
}
@@ -1208,6 +1208,7 @@ export class AnalyticsService {
avgSdur,
})
}
+
const query = this.generateAnalyticsAggregationQuery(
timeBucket,
filtersQuery,
@@ -1219,6 +1220,11 @@ export class AnalyticsService {
const { visits, uniques, sdur } = this.extractChartData(result, x)
+ console.log(x, xShifted)
+
+ console.log('----------------')
+ console.log(result)
+
return Promise.resolve({
chart: {
x: xShifted,