fusion

Author: alainabbas

src/core/backends/backends.service.ts

@@ -136,6 +136,7 @@ export class BackendsService extends AbstractQueueProcessor {
       await this.identitiesService.model.findByIdAndUpdate(completedJob?.concernedTo?.id, {
         $set: {
           state: iState,
+          lastBackendSync: jState === JobState.COMPLETED ? new Date() : null,
         },
       });
       if (jState === JobState.COMPLETED) {
@@ -196,14 +197,18 @@ export class BackendsService extends AbstractQueueProcessor {
     if (!payload.length) throw new BadRequestException('No identities to sync');
 
     for (const key of payload) {
-      const identity = await this.identitiesService.findById<Identities>(key);
+      const identity = await this.identitiesService.findById<any>(key);
       if (identity.state !== IdentityState.TO_SYNC) {
         throw new BadRequestException({
           status: HttpStatus.BAD_REQUEST,
           message: `Identity ${key} is not in state TO_SYNC`,
           identity,
         });
       }
+      // cas des fusion l employeeNumber doit etre celui de l identite primaire
+      if (identity.primaryEmployeeNumber !== null) {
+        identity.inetOrgPerson.employeeNumber = identity.primaryEmployeeNumber;
+      }
       identities.push({
         action: ActionType.IDENTITY_UPDATE,
         identity,
@@ -236,7 +241,7 @@ export class BackendsService extends AbstractQueueProcessor {
 
     for (const key of payload) {
       const identity = await this.identitiesService.findById<Identities>(key);
-      if (!identity.lastSync) {
+      if (!identity.lastBackendSync) {
         throw new BadRequestException({
           status: HttpStatus.BAD_REQUEST,
           message: `Identity ${key} is not in state TO_DELETE`,

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

@@ -33,6 +33,9 @@ export class Identities extends AbstractSchema {
   @Prop({ type: Date })
   public lastSync?: Date;
 
+  @Prop({ type: Date, default: null })
+  public lastBackendSync: Date;
+
   @Prop({ type: Number, enum: InitStatesEnum, default: InitStatesEnum.NOSENT })
   public initState: InitStatesEnum;
 
@@ -45,7 +48,7 @@ export class Identities extends AbstractSchema {
   public customFields?: { [key: string]: MixedValue };
 
   //pour les identités fusionnées ont met les deux identités sources
-  @Prop({ type: Types.ObjectId, required: false })
+  @Prop({ type: Types.ObjectId, required: false, default: null })
   public srcFusionId: Types.ObjectId;
 
   //pour les identités qui on servit à une fusion on met la destination (la nouvelle identité fusionnée)

src/management/identities/identities.service.ts

@@ -51,10 +51,10 @@ export class IdentitiesService extends AbstractServiceSchema {
     data?: IdentitiesUpsertDto,
     options?: QueryOptions<T>,
   ): Promise<[HttpStatus.OK | HttpStatus.CREATED, ModifyResult<Query<T, T, any, T>>]> {
+
     data = this.transformNullsToString(data);
-    const identity = await this.model.findOne(filters).exec();
+    const identity = await this.model.findOne<Identities>(filters).exec();
     this.logger.log(`Upserting identity with filters ${JSON.stringify(filters)}`);
-
     const crushedUpdate = toPlainAndCrush(omit(data || {}, ['$setOnInsert']));
     const crushedSetOnInsert = toPlainAndCrush(data.$setOnInsert || {});
     data = construct({
@@ -76,6 +76,15 @@ export class IdentitiesService extends AbstractServiceSchema {
         'inetOrgPerson.employeeNumber and inetOrgPerson.employeeType are required for create identity.',
       );
     }
+    if ( data.inetOrgPerson?.employeeNumber.indexOf('174981') >= 0 || data.inetOrgPerson?.employeeNumber.indexOf('162982') >= 0 ){
+      console.log('test');
+    }
+    //controle si l identité est fusionnée si c est la bonne à mettre à jour puisqu elle a 2 employeeNumber
+    if (identity !== null && identity?.srcFusionId !== null) {
+      if (identity.primaryEmployeeNumber !== data?.inetOrgPerson?.employeeNumber[0]) {
+        throw new HttpException('Secondary identity', HttpStatus.SEE_OTHER);
+      }
+    }
 
     await this.checkInetOrgPersonJpegPhoto(data);
 
@@ -487,11 +496,16 @@ export class IdentitiesService extends AbstractServiceSchema {
     identity1.state = IdentityState.TO_VALIDATE;
     identity1.srcFusionId = identity2._id;
     identity2.destFusionId = identity1._id;
+    identity2.inetOrgPerson.employeeNumber[0] = 'F' + identity2.inetOrgPerson.employeeNumber[0];
+    //delete identity2 si elle a deja été synchro ?
+    if (identity2.lastBackendSync !== null) {
+      await this.backends.deleteIdentities([identity2._id.toString()]);
+    }
     identity2.state = IdentityState.DONT_SYNC;
+    // modification identité2
+    await super.update(identity2._id, identity2);
     // modification identité1
-    super.update(identity1._id, identity1);
-    // modification identité1
-    super.update(identity2._id, identity2);
+    await super.update(identity1._id, identity1);
     return identity1._id;
   }
 }