From 175dfe66110fbf1f94669243216c98100acf0112 Mon Sep 17 00:00:00 2001 From: "thong.nguyen5" Date: Thu, 11 Apr 2024 20:55:54 +0700 Subject: [PATCH] Add name to monitor --- .../onebox/src/modules/monitor/dto/monitor.dto.ts | 12 ++++++++++++ .../onebox/src/modules/monitor/monitor.service.ts | 3 +++ .../src/monitor/schemas/monitor.schema.ts | 3 +++ 3 files changed, 18 insertions(+) diff --git a/app/apps/onebox/src/modules/monitor/dto/monitor.dto.ts b/app/apps/onebox/src/modules/monitor/dto/monitor.dto.ts index de14c06..511c385 100644 --- a/app/apps/onebox/src/modules/monitor/dto/monitor.dto.ts +++ b/app/apps/onebox/src/modules/monitor/dto/monitor.dto.ts @@ -150,11 +150,16 @@ export class CreateMonitorDto { @ApiProperty() tags: string[]; + @ApiProperty() + @IsNotEmpty() + name: string; + toMonitor(createdBy: string): Monitor { return Builder() .projectId(this.projectId) .monitorId(generateMonitorId()) .network(this.network) + .name(this.name) .condition( Builder() .native(this.condition.native) @@ -185,6 +190,9 @@ export class MonitorResponseDto { @ApiResponseProperty() network: MonitorNetwork; + @ApiResponseProperty() + name: string; + @ApiResponseProperty() condition: MonitorCondition; @@ -208,6 +216,7 @@ export class MonitorResponseDto { .projectId(monitor.projectId) .monitorId(monitor.monitorId) .network(monitor.network) + .name(monitor.name) .condition(monitor.condition) .notification(monitor.notification) .type(monitor.type) @@ -232,6 +241,9 @@ export class DeleteMonitorResponseDto { export class UpdateMonitorDto { monitorId: string; + @ApiProperty() + name: string; + @ApiProperty({ example: { native: true, diff --git a/app/apps/onebox/src/modules/monitor/monitor.service.ts b/app/apps/onebox/src/modules/monitor/monitor.service.ts index f16099b..2eb42f1 100644 --- a/app/apps/onebox/src/modules/monitor/monitor.service.ts +++ b/app/apps/onebox/src/modules/monitor/monitor.service.ts @@ -130,6 +130,9 @@ export class MonitorService { throw new ServiceException('not authorized', 401); } const updateMonitor = new Map(); + if (request.name) { + updateMonitor['name'] = request.name; + } if (request.condition) { if (request.condition.native != undefined) { updateMonitor['condition.native'] = request.condition.native; diff --git a/app/libs/shared_modules/src/monitor/schemas/monitor.schema.ts b/app/libs/shared_modules/src/monitor/schemas/monitor.schema.ts index 78086c2..2f9fae9 100644 --- a/app/libs/shared_modules/src/monitor/schemas/monitor.schema.ts +++ b/app/libs/shared_modules/src/monitor/schemas/monitor.schema.ts @@ -74,6 +74,9 @@ export class Monitor { @Prop({ required: true }) network: MonitorNetwork; + @Prop({ required: true }) + name: string; + @Prop() condition: MonitorCondition;