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!

Add ProjectViewEntity, validation for /log endpoint

Yehor Dremliuhabdc4f39dee37
diff --git a/apps/production/src/analytics/analytics.controller.ts b/apps/production/src/analytics/analytics.controller.ts
index 7a2e1fb45..12a83fb37 100644
--- a/apps/production/src/analytics/analytics.controller.ts
+++ b/apps/production/src/analytics/analytics.controller.ts
@@ -28,6 +28,8 @@ import {
ForbiddenException,
Response,
Header,
+ ConflictException,
+ NotFoundException,
} from '@nestjs/common'
import { ApiTags } from '@nestjs/swagger'
import * as UAParser from 'ua-parser-js'
@@ -90,6 +92,7 @@ import { GetErrorsDto } from './dto/get-errors.dto'
import { GetErrorDTO } from './dto/get-error.dto'
import { PatchStatusDTO } from './dto/patch-status.dto'
import { ProjectService } from '../project/project.service'
+import { ProjectsViewsRepository } from '../project/repositories/projects-views.repository'
// eslint-disable-next-line @typescript-eslint/no-var-requires
const mysql = require('mysql2')
@@ -368,6 +371,7 @@ export class AnalyticsController {
private readonly analyticsService: AnalyticsService,
private readonly logger: AppLoggerService,
private readonly projectService: ProjectService,
+ private readonly projectsViewsRepository: ProjectsViewsRepository,
) {}
@Get()
@@ -387,6 +391,7 @@ export class AnalyticsController {
filters,
timezone = DEFAULT_TIMEZONE,
mode = ChartRenderMode.PERIODICAL,
+ viewId,
} = data
this.analyticsService.validatePID(pid)
@@ -402,6 +407,20 @@ export class AnalyticsController {
await this.analyticsService.checkBillingAccess(pid)
+ // TODO make it smarter
+ if (
+ viewId &&
+ (period || timeBucket || from || to || filters || timezone || mode)
+ ) {
+ throw new ConflictException('Cannot specify both viewId and filters.')
+ }
+
+ const view = await this.projectsViewsRepository.findView(viewId)
+
+ if (pid !== view.projectId) {
+ throw new NotFoundException('View not found.')
+ }
+
let newTimebucket = timeBucket
let allowedTumebucketForPeriodAll
diff --git a/apps/production/src/analytics/dto/getData.dto.ts b/apps/production/src/analytics/dto/getData.dto.ts
index 870f59c98..48517920f 100644
--- a/apps/production/src/analytics/dto/getData.dto.ts
+++ b/apps/production/src/analytics/dto/getData.dto.ts
@@ -1,5 +1,5 @@
import { ApiProperty } from '@nestjs/swagger'
-import { IsNotEmpty } from 'class-validator'
+import { IsNotEmpty, IsOptional, IsString, IsUUID } from 'class-validator'
import { DEFAULT_TIMEZONE } from '../../user/entities/user.entity'
export enum TimeBucketType {
@@ -52,4 +52,10 @@ export class AnalyticsGET_DTO {
default: ChartRenderMode.PERIODICAL,
})
mode?: ChartRenderMode
+
+ @ApiProperty({ description: 'The id of the view' })
+ @IsUUID('4')
+ @IsString()
+ @IsOptional()
+ viewId: string
}
diff --git a/apps/production/src/project/entity/project-view-custom-event.entity.ts b/apps/production/src/project/entity/project-view-custom-event.entity.ts
new file mode 100644
index 000000000..8c4f8c4db
--- /dev/null
+++ b/apps/production/src/project/entity/project-view-custom-event.entity.ts
@@ -0,0 +1,56 @@
+import { ApiProperty } from '@nestjs/swagger'
+import {
+ Column,
+ CreateDateColumn,
+ Entity,
+ ManyToOne,
+ PrimaryGeneratedColumn,
+ UpdateDateColumn,
+} from 'typeorm'
+import { ProjectViewEntity } from './project-view.entity'
+
+export enum MetaValueType {
+ STRING = 'string',
+ INTEGER = 'integer',
+ FLOAT = 'float',
+}
+
+@Entity('projects_views_custom_events')
+export class ProjectViewCustomEventEntity {
+ @ApiProperty()
+ @PrimaryGeneratedColumn('uuid')
+ id: string
+
+ @ApiProperty()
+ @Column('varchar')
+ viewId: string
+
+ @ApiProperty()
+ @Column('varchar')
+ customEventName: string
+
+ @ApiProperty()
+ @Column('varchar')
+ metaKey: string
+
+ @ApiProperty()
+ @Column('varchar')
+ metaValue: string
+
+ @ApiProperty()
+ @Column('enum', { enum: MetaValueType, default: MetaValueType.STRING })
+ metaValueType: MetaValueType
+
+ @ApiProperty()
+ @CreateDateColumn()
+ createdAt: Date
+
+ @ApiProperty()
+ @UpdateDateColumn()
+ updatedAt: Date
+
+ @ManyToOne(() => ProjectViewEntity, projectView => projectView.id, {
+ onDelete: 'CASCADE',
+ })
+ view: ProjectViewEntity
+}
diff --git a/apps/production/src/project/entity/project-view.entity.ts b/apps/production/src/project/entity/project-view.entity.ts
index 182a9751f..342edc6f6 100644
--- a/apps/production/src/project/entity/project-view.entity.ts
+++ b/apps/production/src/project/entity/project-view.entity.ts
@@ -3,24 +3,30 @@ import {
CreateDateColumn,
Entity,
ManyToOne,
+ OneToMany,
PrimaryGeneratedColumn,
UpdateDateColumn,
} from 'typeorm'
import { ApiProperty } from '@nestjs/swagger'
import { Project } from './project.entity'
+import { ProjectViewCustomEventEntity } from './project-view-custom-event.entity'
export enum ProjectViewType {
TRAFFIC = 'traffic',
PERFORMANCE = 'performance',
}
-@Entity('project_views')
+@Entity('projects_views')
export class ProjectViewEntity {
@ApiProperty()
@PrimaryGeneratedColumn('uuid')
id: string
+ @ApiProperty()
+ @Column('varchar')
+ projectId: string
+
@ApiProperty()
@Column('varchar')
name: string
@@ -29,10 +35,6 @@ export class ProjectViewEntity {
@Column('enum', { enum: ProjectViewType })
type: ProjectViewType
- @ApiProperty()
- @Column()
- projectId: string
-
@ApiProperty()
@Column('varchar')
pg: string | null
@@ -93,6 +95,12 @@ export class ProjectViewEntity {
@UpdateDateColumn()
updatedAt: Date
- @ManyToOne(() => Project, project => project.views)
+ @ManyToOne(() => Project, project => project.views, { onDelete: 'CASCADE' })
project: Project
+
+ @OneToMany(
+ () => ProjectViewCustomEventEntity,
+ projectViewCustomEvent => projectViewCustomEvent.id,
+ )
+ customEvents: ProjectViewCustomEventEntity[]
}
diff --git a/apps/production/src/project/project.module.ts b/apps/production/src/project/project.module.ts
index c459e03ff..7a16710d8 100644
--- a/apps/production/src/project/project.module.ts
+++ b/apps/production/src/project/project.module.ts
@@ -10,6 +10,7 @@ import { AppLoggerModule } from '../logger/logger.module'
import { Project, ProjectSubscriber, Funnel, ProjectShare } from './entity'
import { ProjectsViewsRepository } from './repositories/projects-views.repository'
import { ProjectViewEntity } from './entity/project-view.entity'
+import { ProjectViewCustomEventEntity } from './entity/project-view-custom-event.entity'
@Module({
imports: [
@@ -19,6 +20,7 @@ import { ProjectViewEntity } from './entity/project-view.entity'
ProjectSubscriber,
Funnel,
ProjectViewEntity,
+ ProjectViewCustomEventEntity,
]),
forwardRef(() => UserModule),
AppLoggerModule,
@@ -26,7 +28,7 @@ import { ProjectViewEntity } from './entity/project-view.entity'
MailerModule,
],
providers: [ProjectService, ProjectsViewsRepository],
- exports: [ProjectService],
+ exports: [ProjectService, ProjectsViewsRepository],
controllers: [ProjectController],
})
export class ProjectModule {}
diff --git a/apps/production/src/project/repositories/projects-views.repository.ts b/apps/production/src/project/repositories/projects-views.repository.ts
index 5e9731b17..5de30ec9b 100644
--- a/apps/production/src/project/repositories/projects-views.repository.ts
+++ b/apps/production/src/project/repositories/projects-views.repository.ts
@@ -21,4 +21,8 @@ export class ProjectsViewsRepository {
...data,
})
}
+
+ async findView(id: string) {
+ return this.viewsRepository.findOne({ id })
+ }
}