Update validation and DTO for employeeNumber field in inetOrgPerson

Author: tacxou

src/_common/pipes/dto-validation.pipe.ts

@@ -43,6 +43,7 @@ export class DtoValidationPipe extends ValidationPipe {
             return error;
           });
         }
+        console.log('validations', JSON.stringify(request.body));
         return new BadRequestException({
           statusCode: HttpStatus.BAD_REQUEST,
           message,

src/core/backends/backends.service.ts

@@ -43,7 +43,7 @@ export class BackendsService extends AbstractQueueProcessor {
         { new: true },
       );
       if (isSyncedJob) {
-        await this.identitiesService.model.findByIdAndUpdate(isSyncedJob.concernedTo, {
+        await this.identitiesService.model.findByIdAndUpdate(isSyncedJob.concernedTo.id, {
           $set: {
             state: IdentityState.SYNCED,
           },
@@ -80,7 +80,7 @@ export class BackendsService extends AbstractQueueProcessor {
         },
         { new: true },
       );
-      await this.identitiesService.model.findByIdAndUpdate(failedJob.concernedTo, {
+      await this.identitiesService.model.findByIdAndUpdate(failedJob.concernedTo.id, {
         $set: {
           state: IdentityState.ON_ERROR,
         },
@@ -99,7 +99,7 @@ export class BackendsService extends AbstractQueueProcessor {
         },
         { upsert: true, new: true },
       );
-      await this.identitiesService.model.findByIdAndUpdate(completedJob.concernedTo, {
+      await this.identitiesService.model.findByIdAndUpdate(completedJob.concernedTo.id, {
         $set: {
           state: IdentityState.SYNCED,
         },
@@ -202,11 +202,16 @@ export class BackendsService extends AbstractQueueProcessor {
       optionals['processedAt'] = new Date();
       optionals['state'] = JobState.IN_PROGRESS;
     }
+    const identity = await this.identitiesService.findById<Identities>(concernedTo);
     const jobStore = await this.jobsService.create<Jobs>({
       jobId: job.id,
       action: actionType,
       params: payload,
-      concernedTo: concernedTo,
+      concernedTo: {
+        $ref: 'identities',
+        id: concernedTo,
+        name: [identity.inetOrgPerson?.cn, identity.inetOrgPerson?.givenName].join(' '),
+      },
       comment: options?.comment,
       task: options?.task,
       state: JobState.CREATED,

src/core/jobs/_dto/_parts/concerned-to.part.dto.ts

@@ -0,0 +1,19 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsMongoId, IsNotEmpty, IsOptional, IsString } from 'class-validator';
+import { Types } from 'mongoose';
+
+export class ConcernedToPartDTO {
+  @IsString()
+  @IsNotEmpty()
+  @ApiProperty()
+  public $ref: string;
+
+  @IsMongoId()
+  @ApiProperty()
+  public id: Types.ObjectId;
+
+  @IsString()
+  @IsOptional()
+  @ApiProperty()
+  public name?: string;
+}

src/core/jobs/_dto/jobs.dto.ts

@@ -1,7 +1,9 @@
 import { ApiProperty, PartialType } from '@nestjs/swagger';
-import { IsMongoId, IsObject, IsString } from 'class-validator';
+import { Type } from 'class-transformer';
+import { IsMongoId, IsNotEmpty, IsObject, IsString, ValidateNested } from 'class-validator';
 import { Types } from 'mongoose';
 import { CustomFieldsDto } from '~/_common/abstracts/dto/custom-fields.dto';
+import { ConcernedToPartDTO } from './_parts/concerned-to.part.dto';
 
 export class JobsCreateDto extends CustomFieldsDto {
   @IsString()
@@ -12,9 +14,11 @@ export class JobsCreateDto extends CustomFieldsDto {
   @ApiProperty()
   public action: string;
 
-  @IsMongoId()
-  @ApiProperty()
-  public concernedTo: Types.ObjectId;
+  @ValidateNested()
+  @Type(() => ConcernedToPartDTO)
+  @IsNotEmpty()
+  @ApiProperty({ type: ConcernedToPartDTO })
+  public concernedTo: ConcernedToPartDTO;
 
   @IsMongoId()
   @ApiProperty()

src/core/jobs/_schemas/_parts/concerned-to.parts.schema.ts

@@ -0,0 +1,16 @@
+import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
+import { Document, Types } from 'mongoose';
+
+@Schema({ _id: false })
+export class ConcernedToPart extends Document {
+  @Prop({ type: String, required: true })
+  public $ref: string;
+
+  @Prop({ type: Types.ObjectId, required: true })
+  public id: Types.ObjectId;
+
+  @Prop({ type: String })
+  public name?: string;
+}
+
+export const ConcernedToPartSchema = SchemaFactory.createForClass(ConcernedToPart);

src/core/jobs/_schemas/jobs.schema.ts

@@ -2,6 +2,7 @@ import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
 import { Document, Types } from 'mongoose';
 import { AbstractSchema } from '~/_common/abstracts/schemas/abstract.schema';
 import { JobState } from '../_enums/state.enum';
+import { ConcernedToPart, ConcernedToPartSchema } from './_parts/concerned-to.parts.schema';
 
 export type JobsDocument = Jobs & Document;
 
@@ -20,10 +21,10 @@ export class Jobs extends AbstractSchema {
   public action: string;
 
   @Prop({
-    type: Types.ObjectId,
+    type: ConcernedToPartSchema,
     required: true,
   })
-  public concernedTo?: Types.ObjectId;
+  public concernedTo?: ConcernedToPart;
 
   @Prop({ type: Types.ObjectId })
   public task?: Types.ObjectId;

src/core/jobs/jobs.controller.ts

@@ -15,10 +15,11 @@ import { JobsService } from './jobs.service';
 @ApiTags('core')
 @Controller('jobs')
 export class JobsController extends AbstractController {
-  protected static readonly projection: PartialProjectionType<JobsDto> = {
+  protected static readonly projection: PartialProjectionType<JobsDto & { metadata: any }> = {
     jobId: 1,
     action: 1,
     concernedTo: 1,
+    metadata: 1,
     params: 1,
     result: 1,
   };