WIP dto correctifs

Author: tacxou

service/src/_common/dto/parts/idfs.part.dto.ts

@@ -1,13 +1,15 @@
-import { IsMimeType, IsOptional, IsString } from 'class-validator'
+import { IsMimeType, IsNotEmpty, IsOptional, IsString } from 'class-validator'
 import { IdnamePartDto } from '~/_common/dto/parts/idname.part.dto'
 import { ApiProperty } from '@nestjs/swagger'
 
 export class IdfsPartDto extends IdnamePartDto {
   @IsString()
+  @IsNotEmpty()
   @ApiProperty()
   public namespace: string
 
   @IsString()
+  @IsNotEmpty()
   @ApiProperty()
   public path: string
 

service/src/_common/dto/parts/idname.part.dto.ts

@@ -1,13 +1,13 @@
-import { IsMongoId, IsString } from 'class-validator'
+import { IsMongoId, IsNotEmpty, IsString } from 'class-validator'
 import { ApiProperty } from '@nestjs/swagger'
 
 export class IdnamePartDto {
   @IsMongoId()
-  @IsString()
   @ApiProperty()
   public id: string
 
   @IsString()
+  @IsNotEmpty()
   @ApiProperty()
   public name: string
 }

service/src/_common/helpers/pick-projection.helper.ts

@@ -7,6 +7,7 @@ export function PickProjectionHelper<T, K extends keyof T>(
     [key in keyof T]?: number | 1 | 0
   },
 ): Type<Pick<T, (readonly K[])[number]>> {
+  //TODO: error in PickType to openapi
   const keys = Object.keys(projection).filter((key) => projection[key] === 1)
   return PickType(classRef, keys as K[])
 }

service/src/core/categories/_dto/categories.dto.ts

@@ -1,16 +1,17 @@
 import { ApiProperty, PartialType } from '@nestjs/swagger'
-import { IsString, IsNumber, IsOptional, IsBoolean, IsMongoId } from 'class-validator'
+import { IsString, IsNumber, IsOptional, IsBoolean, IsMongoId, IsNotEmpty } from 'class-validator'
 import { AbstractCustomFieldsDto } from '~/_common/abstracts/dto/abstract.custom-fields.dto'
 
 export class CategoriesCreateDto extends AbstractCustomFieldsDto {
   @IsString()
+  @IsNotEmpty()
   @ApiProperty()
   public name: string
 
   @IsString()
   @IsOptional()
   @ApiProperty()
-  public description: string
+  public description?: string
 
   @IsMongoId()
   @IsOptional()
@@ -20,17 +21,17 @@ export class CategoriesCreateDto extends AbstractCustomFieldsDto {
   @IsNumber()
   @IsOptional()
   @ApiProperty()
-  public order: number
+  public order?: number
 
   @IsBoolean()
   @IsOptional()
   @ApiProperty()
-  public selectable: boolean
+  public selectable?: boolean
 
   @IsBoolean()
   @IsOptional()
   @ApiProperty()
-  public disabled: boolean
+  public disabled?: boolean
 
   @IsString()
   @IsOptional()

service/src/core/categories/categories.controller.ts

@@ -27,9 +27,9 @@ export class CategoriesController extends AbstractController {
   protected static readonly projection: PartialProjectionType<CategoriesDto> = {
     name: 1,
     parentId: 1,
-    description: 1,
     color: 1,
     icon: 1,
+    disabled: 1,
   }
 
   constructor(private readonly _service: CategoriesService) {

service/src/core/crontabs/_dto/crontabs.dto.ts

@@ -22,7 +22,7 @@ export class CrontabsCreateDto {
   @IsArray()
   @ValidateNested({ each: true })
   @Type(() => Object)
-  @ApiProperty()
+  @ApiProperty({ type: [Object] })
   public actions: { [key: string]: any }[]
 
   @IsMongoId()

service/src/core/crontabs/crontabs.controller.ts

@@ -26,6 +26,7 @@ export class CrontabsController extends AbstractController {
   protected static readonly projection: PartialProjectionType<CrontabsDto> = {
     name: 1,
     interval: 1,
+    disabled: 1,
   }
 
   public constructor(private readonly _service: CrontabsService) {

service/src/core/entities/_dto/entites.dto.ts

@@ -1,26 +1,32 @@
 import { ApiProperty, PartialType } from '@nestjs/swagger'
 import { AbstractCustomFieldsDto } from '~/_common/abstracts/dto/abstract.custom-fields.dto'
 import { Type } from 'class-transformer'
-import { IsMongoId, IsNotEmpty, IsOptional, IsString, ValidateNested } from 'class-validator'
+import { IsEmail, IsEnum, IsMongoId, IsNotEmpty, IsOptional, ValidateNested } from 'class-validator'
 import { ProfilePartDto } from '~/core/entities/_dto/parts/profile.part.dto'
 import { StatePartDto } from '~/core/entities/_dto/parts/state.part.dto'
+import { EntityType, EntityTypeList } from '~/_common/enum/entity-type.enum'
 
 export class EntitiesCreateDto extends AbstractCustomFieldsDto {
-  @IsString()
+  @IsEmail()
   @IsNotEmpty()
   @ApiProperty()
   public publicEmail: string
 
+  @IsEnum(EntityTypeList)
+  @IsNotEmpty()
+  @ApiProperty({ enum: EntityTypeList })
+  public type: EntityType
+
   @ValidateNested()
   @Type(() => ProfilePartDto)
   @IsNotEmpty()
-  @ApiProperty()
+  @ApiProperty({ type: ProfilePartDto })
   public profile: ProfilePartDto
 
   @ValidateNested()
   @Type(() => StatePartDto)
   @IsOptional()
-  @ApiProperty()
+  @ApiProperty({ type: StatePartDto })
   public state?: StatePartDto
 }
 

service/src/core/entities/_dto/parts/phone.part.dto.ts

@@ -8,7 +8,6 @@ export class PhonePartDto {
   @ApiProperty({ enum: PhoneTypeList })
   public type: PhoneType
 
-  @IsString()
   @IsPhoneNumber()
   @IsNotEmpty()
   @ApiProperty()