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!

rm timebucket for user flow

Blue Mouse9a94bc881359
diff --git a/src/analytics/analytics.controller.ts b/src/analytics/analytics.controller.ts
index c86573683..e4c4b06ab 100644
--- a/src/analytics/analytics.controller.ts
+++ b/src/analytics/analytics.controller.ts
@@ -464,7 +464,6 @@ export class AnalyticsController {
const {
pid,
period,
- timeBucket,
from,
to,
timezone = DEFAULT_TIMEZONE,
@@ -475,13 +474,12 @@ export class AnalyticsController {
this.analyticsService.validatePeriod(period)
}
- this.analyticsService.validateTimebucket(timeBucket)
await this.analyticsService.checkProjectAccess(pid, uid)
const { groupFrom, groupTo } = this.analyticsService.getGroupFromTo(
from,
to,
- timeBucket,
+ null,
period,
timezone,
)
diff --git a/src/analytics/analytics.service.ts b/src/analytics/analytics.service.ts
index ceadd8e36..0606e87e6 100644
--- a/src/analytics/analytics.service.ts
+++ b/src/analytics/analytics.service.ts
@@ -333,7 +333,7 @@ export class AnalyticsService {
getGroupFromTo(
from: string,
to: string,
- timeBucket: TimeBucketType,
+ timeBucket: TimeBucketType | null,
period: string,
timezone: string,
): IGetGroupFromTo {
@@ -359,7 +359,9 @@ export class AnalyticsService {
)
}
- checkIfTBAllowed(timeBucket, from, to)
+ if (timeBucket) {
+ checkIfTBAllowed(timeBucket, from, to)
+ }
groupFrom = dayjs.tz(from, timezone).utc().format('YYYY-MM-DD HH:mm:ss')
@@ -412,7 +414,9 @@ export class AnalyticsService {
.format('YYYY-MM-DD')
groupTo = dayjs.utc().format('YYYY-MM-DD 23:59:59')
- checkIfTBAllowed(timeBucket, groupFrom, groupTo)
+ if (timeBucket) {
+ checkIfTBAllowed(timeBucket, from, to)
+ }
}
} else {
throw new BadRequestException(
diff --git a/src/analytics/dto/getUserFlow.dto.ts b/src/analytics/dto/getUserFlow.dto.ts
index 2929bd85b..121aa0613 100644
--- a/src/analytics/dto/getUserFlow.dto.ts
+++ b/src/analytics/dto/getUserFlow.dto.ts
@@ -2,13 +2,6 @@ import { ApiProperty } from '@nestjs/swagger'
import { IsNotEmpty } from 'class-validator'
import { DEFAULT_TIMEZONE } from '../../user/entities/user.entity'
-export enum TimeBucketType {
- HOUR = 'hour',
- DAY = 'day',
- WEEK = 'week',
- MONTH = 'month',
-}
-
// eslint-disable-next-line @typescript-eslint/naming-convention
export class GetUserFlowDTO {
@ApiProperty()
@@ -18,10 +11,6 @@ export class GetUserFlowDTO {
@ApiProperty()
period: string
- @ApiProperty({ enum: TimeBucketType })
- @IsNotEmpty()
- timeBucket: TimeBucketType
-
@ApiProperty()
from: string