@e22m4u/js-repository-mongodb-adapter 0.0.22 → 0.0.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e22m4u/js-repository-mongodb-adapter",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "description": "MongoDB адаптер для @e22m4u/js-repository",
   "type": "module",
   "main": "src/index.js",
@@ -38,22 +38,22 @@
   "peerDependencies": {
     "@e22m4u/js-format": "*",
     "@e22m4u/js-service": "*",
-    "@e22m4u/js-repository": "~0.0.36"
+    "@e22m4u/js-repository": "~0.0.41"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.7.1",
-    "@commitlint/config-conventional": "^17.7.0",
+    "@commitlint/cli": "^17.8.0",
+    "@commitlint/config-conventional": "^17.8.0",
     "c8": "^8.0.1",
-    "chai": "^4.3.7",
+    "chai": "^4.3.10",
     "chai-as-promised": "^7.1.1",
     "chai-spies": "^1.0.0",
     "dotenv": "^16.3.1",
-    "eslint": "^8.47.0",
+    "eslint": "^8.51.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-chai-expect": "^3.0.0",
-    "eslint-plugin-mocha": "^10.1.0",
+    "eslint-plugin-mocha": "^10.2.0",
     "husky": "^8.0.3",
     "mocha": "^10.2.0",
-    "prettier": "^3.0.1"
+    "prettier": "^3.0.3"
   }
 }

package/src/mongodb-adapter.js

@@ -160,6 +160,20 @@ export class MongodbAdapter extends Adapter {
     return value;
   }
 
+  /**
+   * Coerce date.
+   *
+   * @param value
+   * @returns {Date|*}
+   * @private
+   */
+  _coerceDate(value) {
+    if (value == null) return value;
+    if (value instanceof Date) return value;
+    if (isIsoDate(value)) return new Date(value);
+    return value;
+  }
+
   /**
    * To database.
    *
@@ -401,6 +415,7 @@ export class MongodbAdapter extends Adapter {
       // string
       if (typeof cond === 'string') {
         query[key] = this._coerceId(cond);
+        query[key] = this._coerceDate(query[key]);
         return;
       }
       // ObjectId
@@ -413,27 +428,35 @@ export class MongodbAdapter extends Adapter {
         const opConds = [];
         // eq
         if ('eq' in cond) {
-          opConds.push({$eq: this._coerceId(cond.eq)});
+          let eq = this._coerceId(cond.eq);
+          eq = this._coerceDate(eq);
+          opConds.push({$eq: eq});
         }
         // neq
         if ('neq' in cond) {
-          opConds.push({$ne: this._coerceId(cond.neq)});
+          let neq = this._coerceId(cond.neq);
+          neq = this._coerceDate(neq);
+          opConds.push({$ne: neq});
         }
         // gt
         if ('gt' in cond) {
-          opConds.push({$gt: cond.gt});
+          const gt = this._coerceDate(cond.gt);
+          opConds.push({$gt: gt});
         }
         // lt
         if ('lt' in cond) {
-          opConds.push({$lt: cond.lt});
+          const lt = this._coerceDate(cond.lt);
+          opConds.push({$lt: lt});
         }
         // gte
         if ('gte' in cond) {
-          opConds.push({$gte: cond.gte});
+          const gte = this._coerceDate(cond.gte);
+          opConds.push({$gte: gte});
         }
         // lte
         if ('lte' in cond) {
-          opConds.push({$lte: cond.lte});
+          const lte = this._coerceDate(cond.lte);
+          opConds.push({$lte: lte});
         }
         // inq
         if ('inq' in cond) {
@@ -443,7 +466,12 @@ export class MongodbAdapter extends Adapter {
               'an Array of possible values',
               cond.inq,
             );
-          opConds.push({$in: cond.inq.map(v => this._coerceId(v))});
+          const inq = cond.inq.map(v => {
+            v = this._coerceId(v);
+            v = this._coerceDate(v);
+            return v;
+          });
+          opConds.push({$in: inq});
         }
         // nin
         if ('nin' in cond) {
@@ -453,7 +481,12 @@ export class MongodbAdapter extends Adapter {
               'an Array of possible values',
               cond,
             );
-          opConds.push({$nin: cond.nin.map(v => this._coerceId(v))});
+          const nin = cond.nin.map(v => {
+            v = this._coerceId(v);
+            v = this._coerceDate(v);
+            return v;
+          });
+          opConds.push({$nin: nin});
         }
         // between
         if ('between' in cond) {
@@ -463,7 +496,9 @@ export class MongodbAdapter extends Adapter {
               'an Array of 2 elements',
               cond.between,
             );
-          opConds.push({$gte: cond.between[0], $lte: cond.between[1]});
+          const gte = this._coerceDate(cond.between[0]);
+          const lte = this._coerceDate(cond.between[1]);
+          opConds.push({$gte: gte, $lte: lte});
         }
         // exists
         if ('exists' in cond) {
@@ -615,6 +650,24 @@ export class MongodbAdapter extends Adapter {
     return this._fromDatabase(modelName, replacedData);
   }
 
+  /**
+   * Patch.
+   *
+   * @param {string} modelName
+   * @param {object} modelData
+   * @param {object|undefined} where
+   * @return {Promise<number>}
+   */
+  async patch(modelName, modelData, where = undefined) {
+    const idPropName = this._getIdPropName(modelName);
+    delete modelData[idPropName];
+    const query = this._buildQuery(modelName, where) || {};
+    const tableData = this._toDatabase(modelName, modelData);
+    const table = this._getCollection(modelName);
+    const {matchedCount} = await table.updateMany(query, {$set: tableData});
+    return matchedCount;
+  }
+
   /**
    * Patch by id.
    *