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!

better type validation

Blue Mouse73764ffe3cb5
diff --git a/backend/apps/cloud/src/experiment/experiment.controller.ts b/backend/apps/cloud/src/experiment/experiment.controller.ts
index dd0171c4f..797812d85 100644
--- a/backend/apps/cloud/src/experiment/experiment.controller.ts
+++ b/backend/apps/cloud/src/experiment/experiment.controller.ts
@@ -38,6 +38,7 @@ import {
AnalyticsService,
getLowestPossibleTimeBucket,
} from '../analytics/analytics.service'
+import { TimeBucketType } from '../analytics/dto/getData.dto'
import { Auth } from '../auth/decorators'
import { CurrentUserId } from '../auth/decorators/current-user-id.decorator'
import { checkRateLimit, getIPFromHeaders } from '../common/utils'
@@ -790,7 +791,7 @@ export class ExperimentController {
@CurrentUserId() userId: string,
@Param('id') id: string,
@Query('period') period: string,
- @Query('timeBucket') timeBucketParam?: string,
+ @Query('timeBucket') timeBucketParam?: TimeBucketType,
@Query('from') from?: string,
@Query('to') to?: string,
@Query('timezone') timezone?: string,
@@ -815,7 +816,7 @@ export class ExperimentController {
let timeBucket =
timeBucketParam || getLowestPossibleTimeBucket(period, from, to)
- let allowedTimeBucketForPeriodAll: string[] | undefined
+ let allowedTimeBucketForPeriodAll: TimeBucketType[] | undefined
let diff: number | undefined
if (period === 'all') {
@@ -826,7 +827,7 @@ export class ExperimentController {
diff = res.diff
- timeBucket = res.timeBucket.includes(timeBucket as any)
+ timeBucket = res.timeBucket.includes(timeBucket)
? timeBucket
: res.timeBucket[0]
allowedTimeBucketForPeriodAll = res.timeBucket
@@ -836,7 +837,7 @@ export class ExperimentController {
this.analyticsService.getGroupFromTo(
from,
to,
- timeBucket as any,
+ timeBucket,
period,
safeTimezone,
diff,
@@ -1015,7 +1016,7 @@ export class ExperimentController {
try {
chart = await this.generateExperimentChart(
experiment,
- timeBucket as any,
+ timeBucket,
groupFrom,
groupTo,
groupFromUTC,
@@ -1046,7 +1047,7 @@ export class ExperimentController {
*/
private async generateExperimentChart(
experiment: Experiment,
- timeBucket: string,
+ timeBucket: TimeBucketType,
groupFrom: string,
groupTo: string,
groupFromUTC: string,
@@ -1054,7 +1055,7 @@ export class ExperimentController {
safeTimezone: string,
): Promise<{ x: string[]; winProbability: Record<string, number[]> }> {
const { xShifted } = this.analyticsService.generateXAxis(
- timeBucket as any,
+ timeBucket,
groupFrom,
groupTo,
safeTimezone,
diff --git a/backend/apps/cloud/src/revenue/dto/get-revenue.dto.ts b/backend/apps/cloud/src/revenue/dto/get-revenue.dto.ts
index 97f9c3ec4..6a0f3ec35 100644
--- a/backend/apps/cloud/src/revenue/dto/get-revenue.dto.ts
+++ b/backend/apps/cloud/src/revenue/dto/get-revenue.dto.ts
@@ -6,8 +6,10 @@ import {
IsInt,
Min,
Max,
+ IsEnum,
} from 'class-validator'
import { Type } from 'class-transformer'
+import { TimeBucketType } from '../../analytics/dto/getData.dto'
export class GetRevenueDto {
@ApiProperty({ description: 'Project ID' })
@@ -35,10 +37,13 @@ export class GetRevenueDto {
@IsString()
timezone?: string
- @ApiPropertyOptional({ description: 'Time bucket for chart data' })
+ @ApiPropertyOptional({
+ description: 'Time bucket for chart data',
+ enum: TimeBucketType,
+ })
@IsOptional()
- @IsString()
- timeBucket?: string
+ @IsEnum(TimeBucketType)
+ timeBucket?: TimeBucketType
}
export class GetRevenueTransactionsDto extends GetRevenueDto {
diff --git a/backend/apps/cloud/src/revenue/revenue.controller.ts b/backend/apps/cloud/src/revenue/revenue.controller.ts
index 2eea07fbe..a6b152380 100644
--- a/backend/apps/cloud/src/revenue/revenue.controller.ts
+++ b/backend/apps/cloud/src/revenue/revenue.controller.ts
@@ -301,13 +301,13 @@ export class RevenueAnalyticsController {
const { groupFromUTC, groupToUTC } = this.analyticsService.getGroupFromTo(
dto.from,
dto.to,
- timeBucket as any,
+ timeBucket,
dto.period,
safeTimezone,
)
const { xShifted } = this.analyticsService.generateXAxis(
- timeBucket as any,
+ timeBucket,
groupFromUTC,
groupToUTC,
safeTimezone,
@@ -365,7 +365,7 @@ export class RevenueAnalyticsController {
const { groupFromUTC, groupToUTC } = this.analyticsService.getGroupFromTo(
dto.from,
dto.to,
- timeBucket as any,
+ timeBucket,
dto.period,
safeTimezone,
)
@@ -411,7 +411,7 @@ export class RevenueAnalyticsController {
const { groupFromUTC, groupToUTC } = this.analyticsService.getGroupFromTo(
dto.from,
dto.to,
- timeBucket as any,
+ timeBucket,
dto.period,
safeTimezone,
)