refactor: update device

d-rec · Nov 28, 2024 · 3afaa09 · 3afaa09
1 parent 2717eb3
commit 3afaa09
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/apps/drec-api/src/pods/device/device.controller.ts b/apps/drec-api/src/pods/device/device.controller.ts
@@ -479,8 +479,10 @@ export class DeviceController {
     @Param('externalId') externalId: string,
     @Body() deviceToUpdate: UpdateDeviceDTO,
   ): Promise<DeviceDTO> {
+    console.log(deviceToUpdate);
     this.logger.verbose(`With in update`);
     const org = await this.organizationService.findOne(deviceToUpdate.organizationId);
+    console.log(org)
     if (user.role === Role.ApiUser) {
       if (
         user.api_user_id != org.api_user_id ||
@@ -493,6 +495,7 @@ export class DeviceController {
         });
       }
       user.organizationId = deviceToUpdate.organizationId;
+      console.log(user.organizationId)
     }
 
     if (user.role != Role.Admin && user.organizationId != org.id) {

diff --git a/apps/drec-api/src/pods/device/dto/new-device.dto.ts b/apps/drec-api/src/pods/device/dto/new-device.dto.ts
@@ -16,6 +16,7 @@ import { OffTaker, FuelCode, DevicetypeCode } from '../../../utils/enums';
 import { DeviceDescription, IDevice } from '../../../models';
 import { Exclude, Transform } from 'class-transformer';
 import { IsValidCommissioningDate } from '../../../validations/commissioning-date.validator';
+import { Trim } from '../../../transformers/trim-string';
 
 export class NewDeviceDTO
   implements
@@ -25,7 +26,7 @@ export class NewDeviceDTO
     >
 {
   @ApiProperty()
-  @Transform((value, obj) => obj.externalId?.trim())
+  @Trim()
   @IsNotEmpty({ message: 'externalId should not be empty' })
   @IsString()
   @Matches(/^[a-zA-Z\d\-_\s]+$/, {
@@ -191,7 +192,7 @@ export class NewDeviceDTO
   @ApiProperty({ default: '1.0' })
   @IsString()
   @IsOptional()
-  @Transform(({ value }) => value?.trim() || '')
+  @Trim()
   @ValidateIf((o) => o.version === null || o.version === undefined)
   version = '1.0';
 

diff --git a/apps/drec-api/src/pods/device/dto/update-device.dto.ts b/apps/drec-api/src/pods/device/dto/update-device.dto.ts
@@ -15,6 +15,7 @@ import { OffTaker, FuelCode, DevicetypeCode } from '../../../utils/enums';
 import { IDevice } from '../../../models';
 import { Exclude, Transform } from 'class-transformer';
 import { IsValidCommissioningDate } from '../../../validations/commissioning-date.validator';
+import { Trim } from '../../../transformers/trim-string';
 export class UpdateDeviceDTO
   implements
     Omit<
@@ -29,7 +30,7 @@ export class UpdateDeviceDTO
 {
   @ApiProperty()
   @IsOptional()
-  @Transform((value, obj) => obj.externalId?.trim())
+  @Trim()
   @IsString({message: "externalId should not be empty"})
   @Matches(/^[a-zA-Z\d\-_\s]+$/, {
     message:
@@ -185,6 +186,5 @@ export class UpdateDeviceDTO
   @IsOptional()
   IREC_ID?: string;
 
-  @IsOptional()
   organizationId?: number;
 }
diff --git a/apps/drec-api/src/transformers/trim-string.ts b/apps/drec-api/src/transformers/trim-string.ts
@@ -0,0 +1,5 @@
+import { applyDecorators } from '@nestjs/common';
+import { Transform } from 'class-transformer';
+
+export const Trim = (): PropertyDecorator =>
+  applyDecorators(Transform((value?: string) => value?.trim()));