implementation corbeille

Author: alainabbas

src/_common/abstracts/abstract.service.schema.ts

@@ -47,6 +47,15 @@ export abstract class AbstractServiceSchema extends AbstractService implements S
     return await this._model.countDocuments(filter, options).exec()
   }
 
+  public async trashAndCount<T extends AbstractSchema | Document>(
+    projection?: ProjectionType<T> | null | undefined,
+    options?: QueryOptions<T> | null | undefined,
+  ):Promise<[Array<T & Query<T, T, any, T>>, number]> {
+    const filter={deletedFlag : true}
+    let count = await this._model.countDocuments(filter).exec()
+    let data = await this._model.find<T & Query<T, T, any, T>>(filter, projection, options).exec()
+    return [data, count]
+  }
   public async findAndCount<T extends AbstractSchema | Document>(
     filter?: FilterQuery<T>,
     projection?: ProjectionType<T> | null | undefined,
@@ -66,6 +75,8 @@ export abstract class AbstractServiceSchema extends AbstractService implements S
         if (beforeEvent?.options) options = { ...options, ...beforeEvent.options }
       }
     }
+    const softDelete={deletedFlag : {$ne: true}}
+    filter= {...filter,...softDelete}
     let count = await this._model.countDocuments(filter).exec()
     let data = await this._model.find<T & Query<T, T, any, T>>(filter, projection, options).exec()
     if (this.eventEmitter) {

src/core/backends/backends.service.ts

@@ -111,12 +111,14 @@ export class BackendsService extends AbstractQueueProcessor {
     });
 
     this.queueEvents.on('completed', async (payload) => {
-      let jState = JobState.COMPLETED;
-      let iState = IdentityState.SYNCED;
+
       const result = <WorkerResultInterface>(<unknown>payload.returnvalue);
+
       if (result.jobName === ActionType.DUMP_PACKAGE_CONFIG || result?.options?.disableLogs === true) {
         return;
       }
+      let jState = JobState.COMPLETED;
+      let iState = IdentityState.SYNCED;
       if (result.status !== 0) {
         jState = JobState.FAILED;
         iState = IdentityState.ON_ERROR;
@@ -135,8 +137,9 @@ export class BackendsService extends AbstractQueueProcessor {
 
       await this.identitiesService.model.findByIdAndUpdate(completedJob?.concernedTo?.id, {
         $set: {
-          state: iState,
+          state: result.jobName === ActionType.IDENTITY_DELETE ? IdentityState.DONT_SYNC : IdentityState.SYNCED,
           lastBackendSync: jState === JobState.COMPLETED ? new Date() : null,
+          deletedFlag: result.jobName === ActionType.IDENTITY_DELETE,
         },
       });
       if (jState === JobState.COMPLETED) {

src/management/identities/_schemas/identities.schema.ts

@@ -25,6 +25,9 @@ export class Identities extends AbstractSchema {
   @Prop({ type: Number, enum: DataStatusEnum, default: DataStatusEnum.ACTIVE })
   public dataStatus: DataStatusEnum;
 
+  @Prop({ type: Boolean, default: false })
+  public deletedFlag: boolean;
+
   @Prop({ type: inetOrgPersonSchema, required: true })
   public inetOrgPerson: inetOrgPerson;
 

src/management/identities/identities-activation.service.ts

@@ -1,6 +1,6 @@
 import { AbstractIdentitiesService } from '~/management/identities/abstract-identities.service';
 import { Identities } from '~/management/identities/_schemas/identities.schema';
-import {BadRequestException, HttpException} from '@nestjs/common';
+import { BadRequestException, HttpException } from '@nestjs/common';
 import { DataStatusEnum } from '~/management/identities/_enums/data-status';
 import { JobState } from '~/core/jobs/_enums/state.enum';
 

src/management/identities/identities-crud.controller.ts

@@ -21,7 +21,6 @@ import { Response } from 'express';
 import { Document, Types } from 'mongoose';
 import { AbstractController } from '~/_common/abstracts/abstract.controller';
 import { ApiCreateDecorator } from '~/_common/decorators/api-create.decorator';
-import { ApiDeletedResponseDecorator } from '~/_common/decorators/api-deleted-response.decorator';
 import { ApiPaginatedDecorator } from '~/_common/decorators/api-paginated.decorator';
 import { ApiReadResponseDecorator } from '~/_common/decorators/api-read-response.decorator';
 import { ApiUpdateDecorator } from '~/_common/decorators/api-update.decorator';
@@ -98,6 +97,30 @@ export class IdentitiesCrudController extends AbstractController {
       message,
     });
   }
+  @Get('getdeleted')
+  @ApiPaginatedDecorator(PickProjectionHelper(IdentitiesDto, IdentitiesCrudController.projection))
+  public async getdeleted(
+    @Res() res: Response,
+    @SearchFilterOptions() searchFilterOptions: FilterOptions,
+  ): Promise<
+    Response<
+      {
+        statusCode: number;
+        data?: Document<Identities, any, Identities>;
+        total?: number;
+        message?: string;
+        validations?: MixedValue;
+      },
+      any
+    >
+  > {
+    const [data, total] = await this._service.trashAndCount(IdentitiesCrudController.projection, searchFilterOptions);
+    return res.status(HttpStatus.OK).json({
+      statusCode: HttpStatus.OK,
+      total,
+      data,
+    });
+  }
 
   @Get()
   @ApiPaginatedDecorator(PickProjectionHelper(IdentitiesDto, IdentitiesCrudController.projection))
@@ -224,9 +247,9 @@ export class IdentitiesCrudController extends AbstractController {
     });
   }
 
-  @Delete(':_id([0-9a-fA-F]{24})')
-  @ApiParam({ name: '_id', type: String })
-  @ApiDeletedResponseDecorator(IdentitiesDto)
+  //@Delete(':_id([0-9a-fA-F]{24})')
+  //@ApiParam({ name: '_id', type: String })
+  //@ApiDeletedResponseDecorator(IdentitiesDto)
   public async remove(
     @Param('_id', ObjectIdValidationPipe) _id: Types.ObjectId,
     @Res() res: Response,

src/management/identities/identities-crud.service.ts

@@ -15,7 +15,6 @@ export class IdentitiesCrudService extends AbstractIdentitiesService {
     await this.checkInetOrgPersonJpegPhoto(data);
     const created: Document<T, any, T> = await super.create(data, options);
     return created;
-    //TODO: add backends service logic here
   }
   public async update<T extends AbstractSchema | Document>(
     _id: Types.ObjectId | any,
@@ -91,15 +90,13 @@ export class IdentitiesCrudService extends AbstractIdentitiesService {
 
     return updated as any;
   }
-
+  //Attention le front appelle backend/delete pour deleter l identite. La methode ci dessous n est pas utilisée
   public async delete<T extends AbstractSchema | Document>(
     _id: Types.ObjectId | any,
     options?: QueryOptions<T> | null | undefined,
   ): Promise<Query<T, T, any, T>> {
     // noinspection UnnecessaryLocalVariableJS
-    //TODO: soft delete
     const deleted = await super.delete(_id, options);
-    //TODO: add backends service logic here (TO_SYNC)
     return deleted;
   }
 }