pb tri doublons, check mail detecte les enrs deletés

Author: alainabbas

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

@@ -217,11 +217,11 @@ export abstract class AbstractIdentitiesService extends AbstractServiceSchema {
     let dataDup = [];
     if (data.inetOrgPerson.hasOwnProperty('mail') && data.inetOrgPerson.mail !== '') {
       const id = new Types.ObjectId(data['_id']);
-      const f: any = { '_id': { $ne: id }, $or: [{ 'inetOrgPerson.uid': data.inetOrgPerson.uid }, { 'inetOrgPerson.mail': data.inetOrgPerson.mail }] };
+      const f: any = { '_id': { $ne: id },'deletedFlag':{$ne:true}, $or: [{ 'inetOrgPerson.uid': data.inetOrgPerson.uid }, { 'inetOrgPerson.mail': data.inetOrgPerson.mail }] };
       dataDup = await this._model.find(f).exec()
     } else {
       const id = new Types.ObjectId(data['_id']);
-      const f: any = { '_id': { $ne: id }, 'inetOrgPerson.uid': data.inetOrgPerson.uid };
+      const f: any = { '_id': { $ne: id },'deletedFlag':{$ne:true}, 'inetOrgPerson.uid': data.inetOrgPerson.uid };
       dataDup = await this._model.find(f).exec()
     }
     if (dataDup.length > 0) {

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

@@ -2,7 +2,7 @@ import { AbstractIdentitiesService } from '~/management/identities/abstract-iden
 import { IdentityState } from '~/management/identities/_enums/states.enum';
 import { Identities } from '~/management/identities/_schemas/identities.schema';
 import { BadRequestException } from '@nestjs/common';
-
+import { sort } from 'radash'
 export class IdentitiesDoublonService extends AbstractIdentitiesService {
   public async searchDoubles() {
     const agg1 = [
@@ -48,7 +48,7 @@ export class IdentitiesDoublonService extends AbstractIdentitiesService {
             $gt: 1,
           },
         },
-      },
+      }
     ];
     const agg2 = [
       {
@@ -104,6 +104,11 @@ export class IdentitiesDoublonService extends AbstractIdentitiesService {
         result3.push(x);
       }
     });
+    result3.sort((a, b) => {
+      const cnA = a.data[0].cn?.toLowerCase() ?? '';
+      const cnB = b.data[0].cn?.toLowerCase() ?? '';
+      return cnA.localeCompare(cnB);
+    });
     return result3;
   }
   //fusionne les deux identités id2 > id1 les champs presents dans id2 et non present dans id1 seront ajoutés