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!

Added support for 'Custom metric key' property

Blue Mouse4ef79444b617
diff --git a/apps/production/src/project/dto/create-project-view.dto.ts b/apps/production/src/project/dto/create-project-view.dto.ts
index 557c08490..2445ae9c0 100644
--- a/apps/production/src/project/dto/create-project-view.dto.ts
+++ b/apps/production/src/project/dto/create-project-view.dto.ts
@@ -23,17 +23,22 @@ export class ProjectViewCustomEventDto {
@ApiProperty()
@MaxLength(100)
- @MinLength(1)
@IsString()
- @IsNotEmpty()
+ @IsOptional()
metaKey: string
+ @ApiProperty()
+ @MaxLength(100)
+ @IsString()
+ @IsOptional()
+ metaValue: string
+
@ApiProperty()
@MaxLength(100)
@MinLength(1)
@IsString()
@IsNotEmpty()
- metaValue: string
+ metricKey: string
@ApiProperty({ enum: ProjectViewCustomEventMetaValueType })
@IsEnum(ProjectViewCustomEventMetaValueType)
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
index 8185f58fe..bf5d908d8 100644
--- a/apps/production/src/project/entity/project-view-custom-event.entity.ts
+++ b/apps/production/src/project/entity/project-view-custom-event.entity.ts
@@ -30,13 +30,21 @@ export class ProjectViewCustomEventEntity {
customEventName: string
@ApiProperty()
- @Column('varchar')
+ @Column('varchar', {
+ nullable: true,
+ })
metaKey: string
@ApiProperty()
- @Column('varchar')
+ @Column('varchar', {
+ nullable: true,
+ })
metaValue: string
+ @ApiProperty()
+ @Column('varchar')
+ metricKey: string
+
@ApiProperty()
@Column('enum', {
enum: ProjectViewCustomEventMetaValueType,
diff --git a/apps/production/src/project/repositories/projects-views.repository.ts b/apps/production/src/project/repositories/projects-views.repository.ts
index f55f44c83..8e1e87fb4 100644
--- a/apps/production/src/project/repositories/projects-views.repository.ts
+++ b/apps/production/src/project/repositories/projects-views.repository.ts
@@ -34,6 +34,8 @@ export class ProjectsViewsRepository {
...data,
})
+ console.log('createProjectView:', data)
+
if (data.customEvents) {
const customEventPromises = data.customEvents.map(customEvent => {
// @ts-expect-error - mass assignment
diff --git a/migrations/mysql/2024_08_02.sql b/migrations/mysql/2024_08_02.sql
index 7045f91db..13ff382ad 100644
--- a/migrations/mysql/2024_08_02.sql
+++ b/migrations/mysql/2024_08_02.sql
@@ -1,4 +1,5 @@
DROP TABLE projects_views;
+DROP TABLE projects_views_custom_events;
CREATE TABLE `projects_views` (
`id` varchar(36) NOT NULL,
@@ -11,3 +12,17 @@ CREATE TABLE `projects_views` (
PRIMARY KEY (`id`),
FOREIGN KEY (`projectId`) REFERENCES `project` (`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE `projects_views_custom_events` (
+ `id` varchar(36) NOT NULL,
+ `viewId` varchar(255) NOT NULL,
+ `customEventName` varchar(255) NOT NULL,
+ `metaKey` varchar(255) DEFAULT NULL,
+ `metaValue` varchar(255) DEFAULT NULL,
+ `metricKey` varchar(255) NOT NULL,
+ `metaValueType` enum('string','integer','float') NOT NULL DEFAULT 'string',
+ `createdAt` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6),
+ `updatedAt` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6),
+ PRIMARY KEY (`id`),
+ FOREIGN KEY (`viewId`) REFERENCES `projects_views` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;