📈 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
Move multiple project ids validation to ValidateProjectIds decorator
Blue Mouseec34bd5e0a06
diff --git a/backend/apps/production/src/analytics/decorators/validate-project-ids.decorator.ts b/backend/apps/production/src/analytics/decorators/validate-project-ids.decorator.tsnew file mode 100644index 000000000..c7048ef44--- /dev/null+++ b/backend/apps/production/src/analytics/decorators/validate-project-ids.decorator.ts@@ -0,0 +1,37 @@+import { registerDecorator, ValidationOptions } from 'class-validator'+import { PID_REGEX } from '../../common/constants'++export function ValidateProjectIds(validationOptions?: ValidationOptions) {+ return (object: object, propertyName: string) => {+ registerDecorator({+ name: 'validateProjectIds',+ target: object.constructor,+ propertyName,+ options: validationOptions,+ validator: {+ validate(value: any) {+ if (value === undefined || value === '') {+ return true // Allow empty or undefined values+ }++ if (typeof value === 'string') {+ try {+ value = JSON.parse(value)+ } catch {+ value = value.split(',')+ }+ }++ if (!Array.isArray(value)) {+ return false+ }++ return value.every(pid => PID_REGEX.test(pid))+ },+ defaultMessage() {+ return 'One of the provided Project IDs (pids) is incorrect'+ },+ },+ })+ }+}diff --git a/backend/apps/production/src/analytics/dto/get-heartbeat-stats.ts b/backend/apps/production/src/analytics/dto/get-heartbeat-stats.tsindex a65be160e..da5513721 100644--- a/backend/apps/production/src/analytics/dto/get-heartbeat-stats.ts+++ b/backend/apps/production/src/analytics/dto/get-heartbeat-stats.ts@@ -1,15 +1,13 @@-import { IsOptional, Matches, ValidateIf } from 'class-validator'+import { IsOptional, ValidateIf, Matches } from 'class-validator'import { ApiProperty } from '@nestjs/swagger'import { PID_REGEX } from '../../common/constants'+import { ValidateProjectIds } from '../decorators/validate-project-ids.decorator'export class GetHeartbeatStatsDto {@ApiProperty({ description: 'Array of project IDs', required: false })@ValidateIf(o => o.pids || !o.pid)@IsOptional()- @Matches(PID_REGEX, {- message: 'One of the provided Project IDs (pids) is incorrect',- each: true,- })+ @ValidateProjectIds()pids?: string[]@ApiProperty({ description: 'Single project ID', required: false })diff --git a/backend/apps/production/src/analytics/dto/get-overall-stats.dto.ts b/backend/apps/production/src/analytics/dto/get-overall-stats.dto.tsindex 80b008912..3b1e39f22 100644--- a/backend/apps/production/src/analytics/dto/get-overall-stats.dto.ts+++ b/backend/apps/production/src/analytics/dto/get-overall-stats.dto.ts@@ -3,15 +3,13 @@ import { IsOptional, IsString, Matches, ValidateIf } from 'class-validator'import { DEFAULT_TIMEZONE } from '../../user/entities/user.entity'import { ValidatePeriod } from '../decorators/validate-period.decorator'import { PID_REGEX } from '../../common/constants'+import { ValidateProjectIds } from '../decorators/validate-project-ids.decorator'export class GetOverallStatsDto {@ApiProperty({ description: 'Array of project IDs', required: false })@ValidateIf(o => o.pids || !o.pid)@IsOptional()- @Matches(PID_REGEX, {- message: 'One of the provided Project IDs (pids) is incorrect',- each: true,- })+ @ValidateProjectIds()pids?: string[]@ApiProperty({ description: 'Single project ID', required: false })diff --git a/backend/apps/selfhosted/src/analytics/decorators/validate-project-ids.decorator.ts b/backend/apps/selfhosted/src/analytics/decorators/validate-project-ids.decorator.tsnew file mode 100644index 000000000..c7048ef44--- /dev/null+++ b/backend/apps/selfhosted/src/analytics/decorators/validate-project-ids.decorator.ts@@ -0,0 +1,37 @@+import { registerDecorator, ValidationOptions } from 'class-validator'+import { PID_REGEX } from '../../common/constants'++export function ValidateProjectIds(validationOptions?: ValidationOptions) {+ return (object: object, propertyName: string) => {+ registerDecorator({+ name: 'validateProjectIds',+ target: object.constructor,+ propertyName,+ options: validationOptions,+ validator: {+ validate(value: any) {+ if (value === undefined || value === '') {+ return true // Allow empty or undefined values+ }++ if (typeof value === 'string') {+ try {+ value = JSON.parse(value)+ } catch {+ value = value.split(',')+ }+ }++ if (!Array.isArray(value)) {+ return false+ }++ return value.every(pid => PID_REGEX.test(pid))+ },+ defaultMessage() {+ return 'One of the provided Project IDs (pids) is incorrect'+ },+ },+ })+ }+}diff --git a/backend/apps/selfhosted/src/analytics/dto/get-heartbeat-stats.ts b/backend/apps/selfhosted/src/analytics/dto/get-heartbeat-stats.tsindex a65be160e..d073b574d 100644--- a/backend/apps/selfhosted/src/analytics/dto/get-heartbeat-stats.ts+++ b/backend/apps/selfhosted/src/analytics/dto/get-heartbeat-stats.ts@@ -1,15 +1,13 @@import { IsOptional, Matches, ValidateIf } from 'class-validator'import { ApiProperty } from '@nestjs/swagger'import { PID_REGEX } from '../../common/constants'+import { ValidateProjectIds } from '../decorators/validate-project-ids.decorator'export class GetHeartbeatStatsDto {@ApiProperty({ description: 'Array of project IDs', required: false })@ValidateIf(o => o.pids || !o.pid)@IsOptional()- @Matches(PID_REGEX, {- message: 'One of the provided Project IDs (pids) is incorrect',- each: true,- })+ @ValidateProjectIds()pids?: string[]@ApiProperty({ description: 'Single project ID', required: false })diff --git a/backend/apps/selfhosted/src/analytics/dto/get-overall-stats.dto.ts b/backend/apps/selfhosted/src/analytics/dto/get-overall-stats.dto.tsindex 80b008912..3b1e39f22 100644--- a/backend/apps/selfhosted/src/analytics/dto/get-overall-stats.dto.ts+++ b/backend/apps/selfhosted/src/analytics/dto/get-overall-stats.dto.ts@@ -3,15 +3,13 @@ import { IsOptional, IsString, Matches, ValidateIf } from 'class-validator'import { DEFAULT_TIMEZONE } from '../../user/entities/user.entity'import { ValidatePeriod } from '../decorators/validate-period.decorator'import { PID_REGEX } from '../../common/constants'+import { ValidateProjectIds } from '../decorators/validate-project-ids.decorator'export class GetOverallStatsDto {@ApiProperty({ description: 'Array of project IDs', required: false })@ValidateIf(o => o.pids || !o.pid)@IsOptional()- @Matches(PID_REGEX, {- message: 'One of the provided Project IDs (pids) is incorrect',- each: true,- })+ @ValidateProjectIds()pids?: string[]@ApiProperty({ description: 'Single project ID', required: false })