Remove mongoose-duplicate-error and mongoose-unique-validator packages; refactor update handling in identity services

Author: tacxou

package.json

@@ -80,8 +80,6 @@
     "loglevel": "^1.9.1",
     "mjml": "^4.15.3",
     "mongoose": "^8.4.3",
-    "mongoose-duplicate-error": "^1.0.0",
-    "mongoose-unique-validator": "^4.0.1",
     "nest-commander": "^3.13.0",
     "nest-winston": "^1.10.0",
     "nestjs-request-context": "^3.0.0",
@@ -169,4 +167,4 @@
       "downloadUrl": "https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-debian10-5.0.22.tgz"
     }
   }
-}
+}

src/_common/abstracts/abstract.service.schema.ts

@@ -228,12 +228,11 @@ export abstract class AbstractServiceSchema extends AbstractService implements S
         if (beforeEvent?.options) options = { ...options, ...beforeEvent.options }
       }
     }
-    console.log('_id', update)
     let updated = await this._model
-      .findByIdAndUpdate<Query<T | null, T, any, T>>(
-        _id,
+      .findOneAndUpdate<Query<T | null, T, any, T>>(
+        { _id },
         {
-          ...omit(update, ['_id']),
+          ...update,
           $setOnInsert: {
             'metadata.createdBy': this.request?.user?.username || 'anonymous',
             'metadata.createdAt': new Date(),

src/config.ts

@@ -106,14 +106,6 @@ export default (): ConfigInstance => ({
       directConnection: true,
     },
     plugins: [
-      {
-        package: 'mongoose-duplicate-error',
-        enabled: true,
-      },
-      {
-        package: 'mongoose-unique-validator',
-        enabled: true,
-      },
     ],
   },
   factorydrive: {

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

@@ -54,21 +54,16 @@ export class IdentitiesCrudService extends AbstractIdentitiesService {
     }
 
     // if (update.state === IdentityState.TO_COMPLETE) {
-    update = {
-      ...update,
-      state: IdentityState.TO_VALIDATE,
-    };
+    update = { ...update, state: IdentityState.TO_VALIDATE };
 
     await this.checkInetOrgPersonJpegPhoto(update);
 
-    console.log('update', update, _id, options)
-
     // }
     // if (update.state === IdentityState.SYNCED) {
     //   update = { ...update, state: IdentityState.TO_VALIDATE };
     // }
     //update.state = IdentityState.TO_VALIDATE;
-    const updated = await super.update(_id, { $set: update }, options);
+    const updated = await super.update(_id, update, options);
     //TODO: add backends service logic here (TO_SYNC)
     return await this.generateFingerprint(updated as unknown as Identities);
   }

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

@@ -37,7 +37,7 @@ 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 !== null) {
+    if (identity !== null && identity?.srcFusionId) {
       if (identity.primaryEmployeeNumber !== data?.inetOrgPerson?.employeeNumber[0]) {
         throw new HttpException('Secondary identity', HttpStatus.SEE_OTHER);
       }

yarn.lock

@@ -8865,16 +8865,6 @@ lodash.defaults@^4.2.0:
   resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
   integrity sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==
 
-lodash.foreach@^4.1.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53"
-  integrity sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==
-
-lodash.get@^4.0.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
-  integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==
-
 lodash.includes@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f"
@@ -8925,7 +8915,7 @@ lodash.once@^4.0.0:
   resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
   integrity sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==
 
-lodash@4.17.21, lodash@^4.17.15, lodash@^4.17.21, lodash@^4.17.4:
+lodash@4.17.21, lodash@^4.17.15, lodash@^4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -9839,22 +9829,6 @@ mongodb@^5.9.1:
   optionalDependencies:
     "@mongodb-js/saslprep" "^1.1.0"
 
-mongoose-duplicate-error@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/mongoose-duplicate-error/-/mongoose-duplicate-error-1.0.0.tgz#bfd76ca0dea2bd9014e1398a4b58c3d6f830a747"
-  integrity sha512-gpx3BABwup473tM1vpotVOvtlyB6ZMgbdBUBjWDYb6JKJYojHrOa2ph27uVchxpShtvL+pxGpoDIPzx4bEKl2w==
-  dependencies:
-    lodash "^4.17.4"
-
-mongoose-unique-validator@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/mongoose-unique-validator/-/mongoose-unique-validator-4.0.1.tgz#fc63365ab8d223ad1b186e4018b0fea6a043476a"
-  integrity sha512-kd080ytRa6SmTOJlQPlAnsJHz7eH/b27dMHsN3WO2PeJc1lkcZ+ns6dLvcsu7Kx/f4SQEXu9JfL8kFkr4aFqFQ==
-  dependencies:
-    lodash.foreach "^4.1.0"
-    lodash.get "^4.0.2"
-    lodash.merge "^4.6.2"
-
 mongoose@^8.4.3:
   version "8.4.3"
   resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-8.4.3.tgz#f16ea170eeff60a8c8357bed9968e914a4156d1a"