validations Upsert

Author: alainabbas

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

@@ -55,14 +55,8 @@ export class IdentitiesUpsertService extends AbstractIdentitiesService {
       this.logger.log(`${logPrefix} Starting additionalFields transformation.`);
       await this._validation.transform(data.additionalFields);
       this.logger.log(`${logPrefix} Starting additionalFields validation.`);
-      let validations = await this._validation.validate(data.additionalFields);
-      //validation email and uid
-      if (await this.checkMail(data) === false){
-        validations['inetOrgPerson.mail']="Email déjà présent dans une autre identité"
-      }
-      if (await this.checkUid(data) === false){
-        validations['inetOrgPerson.uid']="Uid déjà présent dans une autre identité"
-      }
+
+      let validations = await this._validation.validate(data.additionalFields,true);
       this.logger.log(`${logPrefix} AdditionalFields validation successful.`);
       this.logger.log(`Validations : ${JSON.stringify(validations)}`);
       crushedUpdate['state'] = IdentityState.TO_VALIDATE;
@@ -72,6 +66,15 @@ export class IdentitiesUpsertService extends AbstractIdentitiesService {
       crushedUpdate['state'] = data.state;
       crushedUpdate['additionalFields.validations'] = data.additionalFields.validations;
     }
+    //validation email and uid
+    if (await this.checkMail(data) === false){
+      crushedUpdate['additionalFields.validations']['inetOrgPerson']={mail:"Email déjà présent dans une autre identité"}
+      crushedUpdate['state'] = data.state;
+    }
+    if (await this.checkUid(data) === false){
+      crushedUpdate['additionalFields.validations']['inetOrgPerson']= {uid:"Uid déjà présent dans une autre identité"}
+      crushedUpdate['state'] = data.state;
+    }
 
     const fingerprint = await this.previewFingerprint(
       construct({

src/management/identities/validations/identities.validation.service.ts

@@ -227,7 +227,7 @@ export class IdentitiesValidationService implements OnApplicationBootstrap {
    * @param data - The additional fields data to validate.
    * @returns A promise that resolves if validation succeeds, or rejects with validation errors.
    */
-  public async validate(data: AdditionalFieldsPart | additionalFieldsPartDto): Promise<object> {
+  public async validate(data: AdditionalFieldsPart | additionalFieldsPartDto,callException:boolean=true): Promise<object> {
     if (!data.objectClasses) {
       data.objectClasses = [];
     }
@@ -294,7 +294,7 @@ export class IdentitiesValidationService implements OnApplicationBootstrap {
       }
     }
 
-    if (reject) {
+    if (reject && callException) {
       throw new ValidationSchemaException({ validations });
     }
     return Promise.resolve({ message: 'Validation succeeded' });