corrections upsert

Author: alainabbas

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

@@ -234,7 +234,7 @@ export abstract class AbstractIdentitiesService extends AbstractServiceSchema {
     let dataDup = 0;
     if (data.inetOrgPerson.hasOwnProperty('mail') && data.inetOrgPerson.mail !== '') {
       if (identity){
-        const f: any = { '_id': { $ne: identity._id }, 'inetOrgPerson.mail': identity.inetOrgPerson.mail };
+        const f: any = { '_id': { $ne: identity._id },'state':{$ne:IdentityState.DONT_SYNC},'deletedFlag':{$ne:true}, 'inetOrgPerson.mail': identity.inetOrgPerson.mail };
         dataDup = await this._model.countDocuments(f).exec()
       }else{
         const f: any = { 'inetOrgPerson.mail': data.inetOrgPerson.mail };
@@ -252,7 +252,7 @@ export abstract class AbstractIdentitiesService extends AbstractServiceSchema {
   protected async checkUid(identity,data): Promise<boolean> {
     let dataDup = 0;
     if (identity){
-      const f: any = { '_id': { $ne: identity._id }, 'inetOrgPerson.uid': identity.inetOrgPerson.uid };
+      const f: any = { '_id': { $ne: identity._id } ,'state':{$ne:IdentityState.DONT_SYNC},'deletedFlag':{$ne:true},'inetOrgPerson.uid': identity.inetOrgPerson.uid };
       dataDup = await this._model.countDocuments(f).exec()
     }else{
       const f: any = { 'inetOrgPerson.uid': data.inetOrgPerson.uid };

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

@@ -142,13 +142,13 @@ export class IdentitiesDoublonService extends AbstractIdentitiesService {
       identity1.additionalFields.objectClasses.includes('supannPerson') &&
       identity2.additionalFields.objectClasses.includes('supannPerson')
     ) {
-      if (identity2.additionalFields.attributes.supannPerson.includes('supannTypeEntiteAffectation') ) {
+      if (identity2.additionalFields.attributes.supannPerson.supannTypeEntiteAffectation ) {
         identity2.additionalFields.attributes.supannPerson.supannTypeEntiteAffectation.forEach((depN) => {
           (identity1.additionalFields.attributes.supannPerson as any).supannTypeEntiteAffectation.push(depN);
         });
       }
       // supannRefId
-      if (identity2.additionalFields.attributes.supannPerson.includes('supannRefId') ){
+      if (identity2.additionalFields.attributes.supannPerson.supannRefId ){
         identity2.additionalFields.attributes.supannPerson.supannRefId.forEach((depN) => {
           (identity1.additionalFields.attributes.supannPerson as any).supannRefId.push(depN);
         });

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

@@ -24,6 +24,13 @@ export class IdentitiesUpsertService extends AbstractIdentitiesService {
     this.logger.log(`Upserting identity with filters ${JSON.stringify(filters)}`);
     const crushedUpdate = toPlainAndCrush(omit(data || {}, ['$setOnInsert']));
     const crushedSetOnInsert = toPlainAndCrush(data.$setOnInsert || {});
+    let employeeNumber=""
+    if (data?.$setOnInsert.inetOrgPerson.employeeNumber){
+      employeeNumber=data.$setOnInsert.inetOrgPerson.employeeNumber[0];
+    }else{
+      employeeNumber=data.inetOrgPerson.employeeNumber[0];
+    }
+
     data = construct({
       ...crushedSetOnInsert,
       ...toPlainAndCrush(identity?.toJSON() || {}, {
@@ -42,8 +49,8 @@ export class IdentitiesUpsertService extends AbstractIdentitiesService {
       );
     }
     //controle si l identité est fusionnée si c est la bonne à mettre à jour puisqu elle a 2 employeeNumber
-    if (identity !== null && identity?.srcFusionId) {
-      if (identity.primaryEmployeeNumber !== data?.inetOrgPerson?.employeeNumber[0]) {
+    if (identity !== null){
+      if (identity.primaryEmployeeNumber !== null && identity.primaryEmployeeNumber !== employeeNumber) {
         throw new HttpException('Secondary identity', HttpStatus.SEE_OTHER);
       }
     }