Merge pull request #46 from Libertech-FR/transform

Transform

Author: alainabbas

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sesame-orchestrator",
-  "version": "1.2.53",
+  "version": "1.2.56",
   "description": "Synchronisation d'Identités Multi-sources",
   "private": true,
   "contributors": [
@@ -63,6 +63,7 @@
     "@the-software-compagny/nestjs_module_restools": "^0.0.11",
     "ajv": "^8.16.0",
     "ajv-errors": "^3.0.0",
+    "ajv-formats": "^3.0.1",
     "argon2": "^0.41.1",
     "awesome-phonenumber": "^6.10.0",
     "bullmq": "^5.8.2",

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

@@ -34,6 +34,8 @@ export class IdentitiesCrudService extends AbstractIdentitiesService {
     //TODO : add validation logic here
     const logPrefix = `Validation [${update.inetOrgPerson.cn}]:`;
     try {
+      this.logger.log(`${logPrefix} Starting additionalFields transformation.`);
+      await this._validation.transform(update.additionalFields);
       this.logger.log(`${logPrefix} Starting additionalFields validation.`);
       const validations = await this._validation.validate(update.additionalFields);
       this.logger.log(`${logPrefix} AdditionalFields validation successful.`);

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

@@ -133,18 +133,26 @@ export class IdentitiesDoublonService extends AbstractIdentitiesService {
       ...identity1.inetOrgPerson.employeeNumber,
       ...identity2.inetOrgPerson.employeeNumber,
     ];
+    identity1.inetOrgPerson.departmentNumber = [
+      ...identity1.inetOrgPerson.departmentNumber,
+      ...identity2.inetOrgPerson.departmentNumber,
+    ];
     // si supann est present
     if (
       identity1.additionalFields.objectClasses.includes('supannPerson') &&
       identity2.additionalFields.objectClasses.includes('supannPerson')
     ) {
-      identity2.additionalFields.attributes.supannPerson.supannTypeEntiteAffectation.forEach((depN) => {
-        (identity1.additionalFields.attributes.supannPerson as any).supannTypeEntiteAffectation.push(depN);
-      });
+      if (identity2.additionalFields.attributes.supannPerson.includes('supannTypeEntiteAffectation') ) {
+        identity2.additionalFields.attributes.supannPerson.supannTypeEntiteAffectation.forEach((depN) => {
+          (identity1.additionalFields.attributes.supannPerson as any).supannTypeEntiteAffectation.push(depN);
+        });
+      }
       // supannRefId
-      identity2.additionalFields.attributes.supannPerson.supannRefId.forEach((depN) => {
-        (identity1.additionalFields.attributes.supannPerson as any).supannRefId.push(depN);
-      });
+      if (identity2.additionalFields.attributes.supannPerson.includes('supannRefId') ){
+        identity2.additionalFields.attributes.supannPerson.supannRefId.forEach((depN) => {
+          (identity1.additionalFields.attributes.supannPerson as any).supannRefId.push(depN);
+        });
+      }
     }
     identity1.state = IdentityState.TO_VALIDATE;
     identity1.srcFusionId = identity2._id;

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

@@ -52,6 +52,8 @@ export class IdentitiesUpsertService extends AbstractIdentitiesService {
 
     const logPrefix = `Validation [${data?.inetOrgPerson?.employeeType}:${data?.inetOrgPerson?.employeeNumber}]:`;
     try {
+      this.logger.log(`${logPrefix} Starting additionalFields transformation.`);
+      await this._validation.transform(data.additionalFields);
       this.logger.log(`${logPrefix} Starting additionalFields validation.`);
       const validations = await this._validation.validate(data.additionalFields);
       this.logger.log(`${logPrefix} AdditionalFields validation successful.`);

src/management/identities/validations/_config/validSchema.ts

@@ -28,8 +28,8 @@ const validSchema = {
             },
             format: {
               type: 'string',
-              enum: ['date', 'email'],
-              errorMessage: "Le 'format' doit être 'date' ou 'email'.",
+              enum: ['date', 'email','number','time','date-time','duration','uri','uri-reference','hostname','ipv4','ipv6','regex','uuid'],
+              errorMessage: "Format invalide",
             },
             items: {
               type: 'object',
@@ -118,7 +118,7 @@ const validSchema = {
             camelCase: {
               type: 'boolean',
               errorMessage: "L'option 'camelCase' doit être un booléen.",
-            },
+            }
           },
           required: ['type'],
           additionalProperties: false,

src/management/identities/validations/_dto/config.dto.ts

@@ -1,4 +1,4 @@
-import { IsString, ArrayNotEmpty, ValidateNested, IsEnum, IsBoolean } from 'class-validator';
+import {IsString, ArrayNotEmpty, ValidateNested, IsEnum, IsBoolean, IsOptional} from 'class-validator';
 import { Type } from 'class-transformer';
 import { ConfigObjectType } from '../_enums/config.object';
 
@@ -15,6 +15,10 @@ export class ConfigObjectAttributeDTO {
 
   @IsBoolean()
   public required: boolean;
+
+  @IsString()
+  @IsOptional()
+  public format: string;
 }
 
 export class ConfigObjectObjectClassDTO {