Refactor ExecuteJobOptions interface to include new properties

- Added switchToProcessing property to ExecuteJobOptions interface
- Added targetState property to ExecuteJobOptions interface

Author: tacxou

src/core/backends/_dto/delete-identities.dto.ts

@@ -0,0 +1,8 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsArray } from 'class-validator';
+
+export class DeleteIdentitiesDto {
+  @IsArray()
+  @ApiProperty({ type: Array })
+  public payload: string[];
+}

src/core/backends/_interfaces/execute-job-options.interface.ts

@@ -8,6 +8,8 @@ export interface ExecuteJobOptions {
   syncTimeout?: number;
   timeoutDiscard?: boolean;
   updateStatus?: boolean;
+  switchToProcessing?: boolean;
   comment?: string;
+  targetState?: any;
   task?: Types.ObjectId;
 }

src/core/backends/backends.controller.ts

@@ -21,6 +21,7 @@ import { BackendsService } from './backends.service';
 import { SyncIdentitiesDto } from './_dto/sync-identities.dto';
 import { Types } from 'mongoose';
 import { ActionType } from './_enum/action-type.enum';
+import { DeleteIdentitiesDto } from './_dto/delete-identities.dto';
 
 function fireMessage(observer: Subscriber<MessageEvent>, channel: string, message: any, loggername: string) {
   try {
@@ -41,7 +42,22 @@ export class BackendsController {
   constructor(
     private backendsService: BackendsService,
     @InjectRedis() protected readonly redis: Redis,
-  ) {}
+  ) { }
+
+  @Post('delete')
+  @ApiOperation({ summary: "Supprime une liste d'identitées" })
+  public async deleteIdentities(
+    @Res() res: Response,
+    @Body() body: DeleteIdentitiesDto,
+    @Query('async') asyncQuery: string,
+  ) {
+    const async = /true|on|yes|1/i.test(asyncQuery);
+    const data = await this.backendsService.deleteIdentities(body.payload, {
+      async,
+    });
+
+    return res.status(HttpStatus.ACCEPTED).json({ async, data });
+  }
 
   @Post('sync')
   @ApiOperation({ summary: "Synchronise une liste d'identitées" })

src/core/backends/backends.service.ts

@@ -226,6 +226,48 @@ export class BackendsService extends AbstractQueueProcessor {
     return result;
   }
 
+  public async deleteIdentities(payload: string[], options?: ExecuteJobOptions): Promise<any> {
+    const identities: {
+      action: ActionType;
+      identity: Identities;
+    }[] = [];
+
+    if (!payload.length) throw new BadRequestException('No identities to disable');
+
+    for (const key of payload) {
+      const identity = await this.identitiesService.findById<Identities>(key);
+      if (!identity.lastSync) {
+        throw new BadRequestException({
+          status: HttpStatus.BAD_REQUEST,
+          message: `Identity ${key} is not in state TO_DELETE`,
+          identity,
+        });
+      }
+      identities.push({
+        action: ActionType.IDENTITY_DELETE,
+        identity,
+      });
+    }
+
+    const task: Tasks = await this.tasksService.create<Tasks>({
+      jobs: identities.map((identity) => identity.identity._id),
+    });
+
+    const result = {};
+    for (const identity of identities) {
+      const [executedJob, res] = await this.executeJob(identity.action, identity.identity._id, identity.identity, {
+        ...options,
+        updateStatus: true,
+        switchToProcessing: false,
+        targetState: IdentityState.DONT_SYNC,
+        task: task._id,
+      });
+      result[identity.identity._id] = executedJob;
+      console.log(res);
+    }
+    return result;
+  }
+
   public async executeJob(
     actionType: ActionType,
     concernedTo?: Types.ObjectId,
@@ -261,10 +303,10 @@ export class BackendsService extends AbstractQueueProcessor {
         params: payload,
         concernedTo: identity
           ? {
-              $ref: 'identities',
-              id: concernedTo,
-              name: identity?.inetOrgPerson?.cn,
-            }
+            $ref: 'identities',
+            id: concernedTo,
+            name: identity?.inetOrgPerson?.cn,
+          }
           : null,
         comment: options?.comment,
         task: options?.task,
@@ -273,7 +315,7 @@ export class BackendsService extends AbstractQueueProcessor {
       });
     }
 
-    if (concernedTo && !!options?.updateStatus) {
+    if (concernedTo && !!options?.switchToProcessing) {
       await this.identitiesService.model.findByIdAndUpdate(concernedTo, {
         $set: {
           state: IdentityState.PROCESSING,
@@ -310,7 +352,7 @@ export class BackendsService extends AbstractQueueProcessor {
         if (concernedTo && !!options?.updateStatus) {
           await this.identitiesService.model.findByIdAndUpdate(concernedTo, {
             $set: {
-              state: IdentityState.SYNCED,
+              state: options?.targetState || IdentityState.SYNCED,
             },
           });
         }

src/management/identities/identities.service.ts

@@ -442,7 +442,7 @@ export class IdentitiesService extends AbstractServiceSchema {
   // retourne l'id de na nouvelle identité créée
   public async fusion(id1, id2) {
     let identity1: Identities = null;
-    let identity2: Identities = null;
+    let identity2: Identities & any = null;
     try {
       identity1 = await this.findById<Identities>(id1);
     } catch (error) {
@@ -467,7 +467,7 @@ export class IdentitiesService extends AbstractServiceSchema {
     const plainIdentity2 = toPlainAndCrush(identity2.toJSON(), {
       excludePrefixes: ['_id', 'fingerprint', 'metadata'],
     });
-    const newObj: Partial<Identities> = construct({ ...plainIdentity2, ...plainIdentity1 });
+    const newObj: Partial<Identities> & any = construct({ ...plainIdentity2, ...plainIdentity1 });
     //const newIdentity = await this.create(newObj);
     newObj.inetOrgPerson.employeeType = 'FUSION';
     newObj.inetOrgPerson.employeeNumber =

src/management/passwd/passwd.service.ts

@@ -222,6 +222,7 @@ export class PasswdService extends AbstractService {
           async: false,
           timeoutDiscard: true,
           disableLogs: true,
+          switchToProcessing: false,
           updateStatus: false,
         },
       );
@@ -355,6 +356,7 @@ export class PasswdService extends AbstractService {
           async: false,
           timeoutDiscard: true,
           disableLogs: false,
+          switchToProcessing: false,
           updateStatus: false,
         },
       );
@@ -392,6 +394,7 @@ export class PasswdService extends AbstractService {
           async: false,
           timeoutDiscard: true,
           disableLogs: false,
+          switchToProcessing: false,
           updateStatus: false,
         },
       );