correction check uid et email

Author: alainabbas

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

@@ -230,12 +230,17 @@ export abstract class AbstractIdentitiesService extends AbstractServiceSchema {
     }
   }
 
-  protected async checkMail(data): Promise<boolean> {
+  protected async checkMail(identity,data): Promise<boolean> {
     let dataDup = 0;
     if (data.inetOrgPerson.hasOwnProperty('mail') && data.inetOrgPerson.mail !== '') {
-      const id = new Types.ObjectId(data['_id']);
-      const f: any = { '_id': { $ne: id }, 'inetOrgPerson.mail': data.inetOrgPerson.mail };
-      dataDup = await this._model.countDocuments(f).exec()
+      if (identity){
+        const f: any = { '_id': { $ne: identity._id }, 'inetOrgPerson.mail': identity.inetOrgPerson.mail };
+        dataDup = await this._model.countDocuments(f).exec()
+      }else{
+        const f: any = { 'inetOrgPerson.mail': data.inetOrgPerson.mail };
+        dataDup = await this._model.countDocuments(f).exec()
+      }
+
     }
     if (dataDup > 0) {
       return false
@@ -244,11 +249,16 @@ export abstract class AbstractIdentitiesService extends AbstractServiceSchema {
     }
   }
 
-  protected async checkUid(data): Promise<boolean> {
+  protected async checkUid(identity,data): Promise<boolean> {
     let dataDup = 0;
-    const id = new Types.ObjectId(data['_id']);
-    const f: any = { '_id': { $ne: id }, 'inetOrgPerson.uid': data.inetOrgPerson.uid };
-    dataDup = await this._model.countDocuments(f).exec()
+    if (identity){
+      const f: any = { '_id': { $ne: identity._id }, 'inetOrgPerson.uid': identity.inetOrgPerson.uid };
+      dataDup = await this._model.countDocuments(f).exec()
+    }else{
+      const f: any = { 'inetOrgPerson.uid': data.inetOrgPerson.uid };
+      dataDup = await this._model.countDocuments(f).exec()
+    }
+
     if (dataDup > 0) {
       return false
     } else {

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

@@ -61,10 +61,10 @@ export class IdentitiesUpsertService extends AbstractIdentitiesService {
       this.logger.log(`${logPrefix} Starting additionalFields validation.`);
       let validations = await this._validation.validate(data.additionalFields,true);
       //validation email and uid
-      if (await this.checkMail(data) === false) {
+      if (await this.checkMail(identity,data) === false) {
         validations['inetOrgPerson.mail'] = "Email déjà présent dans une autre identité"
       }
-      if (await this.checkUid(data) === false) {
+      if (await this.checkUid(identity,data) === false) {
         validations['inetOrgPerson.uid'] = "Uid déjà présent dans une autre identité"
       }
       this.logger.log(`${logPrefix} AdditionalFields validation successful.`);
@@ -73,17 +73,17 @@ export class IdentitiesUpsertService extends AbstractIdentitiesService {
       crushedUpdate['additionalFields.validations'] = {};
     } catch (error) {
       data = this.handleValidationError(error, data, logPrefix);
-      crushedUpdate['state'] = data.state;
+      crushedUpdate['state'] = IdentityState.TO_COMPLETE;
       crushedUpdate['additionalFields.validations'] = data.additionalFields.validations;
     }
     //validation email and uid
-    if (await this.checkMail(data) === false){
+    if (await this.checkMail(identity,data) === false){
       crushedUpdate['additionalFields.validations']['inetOrgPerson']={mail:"Email déjà présent dans une autre identité"}
-      crushedUpdate['state'] = data.state;
+      crushedUpdate['state'] = IdentityState.TO_COMPLETE;
     }
-    if (await this.checkUid(data) === false){
+    if (await this.checkUid(identity,data) === false){
       crushedUpdate['additionalFields.validations']['inetOrgPerson']= {uid:"Uid déjà présent dans une autre identité"}
-      crushedUpdate['state'] = data.state;
+      crushedUpdate['state'] = IdentityState.TO_COMPLETE;
     }
 
     const fingerprint = await this.previewFingerprint(