not-node 5.1.27 → 5.1.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "not-node",
-  "version": "5.1.27",
+  "version": "5.1.28",
   "description": "node complimentary part for client side notFramework.",
   "main": "index.js",
   "scripts": {

package/src/generic/logic.js

@@ -619,5 +619,124 @@ module.exports = ({
                 shouldOwn: true,
             });
         }
+
+        static async _list({
+            query,
+            activeUser,
+            ip,
+            action,
+            root,
+            shouldOwn = false,
+        }) {
+            Log.debug(
+                `${MODULE_NAME}//Logic//${MODEL_NAME}//${action}`,
+                ip,
+                root
+            );
+            const { skip, size, sorter, filter } = query;
+            let populate = getPopulate(action, {
+                activeUser,
+                ip,
+            });
+            if (shouldOwn) {
+                notFilter.filter.modifyRules(filter, {
+                    [ownerFieldName]: activeUser._id,
+                });
+            }
+            const result = await getModel().listAndPopulate(
+                skip,
+                size,
+                sorter,
+                filter,
+                populate
+            );
+            LogAction({
+                action,
+                by: activeUser._id,
+                role: activeUser.role,
+                ip,
+                root,
+                shouldOwn,
+            });
+            return result;
+        }
+
+        static async list({ query, activeUser, ip, root }) {
+            return await this._list({
+                query,
+                activeUser,
+                ip,
+                root,
+                action: "list",
+                shouldOwn: false,
+            });
+        }
+
+        static async listOwn({ query, activeUser, ip, root }) {
+            return await this._list({
+                query,
+                activeUser,
+                ip,
+                root,
+                action: "listOwn",
+                shouldOwn: true,
+            });
+        }
+
+        static async _count({
+            query,
+            activeUser,
+            ip,
+            action,
+            root,
+            shouldOwn = false,
+        }) {
+            Log.debug(
+                `${MODULE_NAME}//Logic//${MODEL_NAME}//${action}`,
+                ip,
+                root
+            );
+            const { filter, search } = query;
+            if (shouldOwn) {
+                notFilter.filter.modifyRules(filter, {
+                    [ownerFieldName]: activeUser._id,
+                });
+            }
+            if (search) {
+                notFilter.filter.modifyRules(search, filter);
+            }
+            const result = await getModel().countWithFilter(search || filter);
+            LogAction({
+                action,
+                by: activeUser._id,
+                role: activeUser.role,
+                ip,
+                root,
+                shouldOwn,
+            });
+            return result;
+        }
+
+        static async count({ query, activeUser, ip, root }) {
+            return await this._count({
+                query,
+                activeUser,
+                ip,
+                root,
+                action: "count",
+                shouldOwn: false,
+            });
+        }
+
+        static async countOwn({ query, activeUser, ip, root }) {
+            return await this._count({
+                query,
+                activeUser,
+                ip,
+                root,
+                action: "countOwn",
+                shouldOwn: true,
+            });
+        }
     };
 };

package/src/generic/route.js

@@ -62,6 +62,24 @@ module.exports = ({ getLogic, before, after }) => {
             return await getLogic().listAndCountOwn(prepared);
         }
 
+        static async _list(req, res, next, prepared) {
+            prepared.root = true;
+            return await getLogic().list(prepared);
+        }
+
+        static async list(req, res, next, prepared) {
+            return await getLogic().listOwn(prepared);
+        }
+
+        static async _count(req, res, next, prepared) {
+            prepared.root = true;
+            return await getLogic().count(prepared);
+        }
+
+        static async count(req, res, next, prepared) {
+            return await getLogic().countOwn(prepared);
+        }
+
         static async _delete(req, res, next, prepared) {
             prepared.root = true;
             return await getLogic().delete(prepared);

package/src/model/increment.js

@@ -59,9 +59,9 @@ module.exports.formId = formId;
  **/
 function secureUpdate(thisModel, which, cmd, opts) {
     if (typeof thisModel.updateOne === "function") {
-        return thisModel.updateOne(which, cmd, opts).exec();
+        return thisModel.updateOne(which, cmd, opts);
     } else {
-        return thisModel.update(which, cmd, opts).exec();
+        return thisModel.update(which, cmd, opts);
     }
 }
 

package/src/model/routine.js

@@ -45,6 +45,7 @@ class ModelRoutine {
     }
 
     static async update(model, filter, data) {
+        if ("_id" in data) delete data._id;
         if (ModelRoutine.versioning(model)) {
             return ModelRoutine.updateWithVersion(model, filter, data);
         } else {
@@ -64,9 +65,9 @@ class ModelRoutine {
     static async updateWithVersion(model, filter, data) {
         filter.__latest = true;
         filter.__closed = false;
-        const result = await model
-            .updateOne(filter, data, { returnOriginal: false })
-            .exec();
+        const result = await model.updateOne(filter, data, {
+            returnOriginal: false,
+        });
         if (updateResponseSuccess(result, 1)) {
             return model.saveVersion(filter._id);
         } else {
@@ -75,6 +76,7 @@ class ModelRoutine {
     }
 
     static async updateMany(model, filter, data) {
+        if ("_id" in data) delete data._id;
         if (ModelRoutine.versioning(model)) {
             return ModelRoutine.updateManyWithVersion(model, filter, data);
         } else {
@@ -87,13 +89,11 @@ class ModelRoutine {
     }
 
     static async updateManyWithVersion(model, filter, data) {
-        const list = await model
-            .find({
-                __closed: false,
-                __latest: true,
-                ...filter,
-            })
-            .exec();
+        const list = await model.find({
+            __closed: false,
+            __latest: true,
+            ...filter,
+        });
         return await Promise.allSettled(
             list.map((item) => {
                 return ModelRoutine.updateWithVersion(

package/src/model/utils.js

@@ -7,7 +7,7 @@ function updateResponseSuccess(res, count = 1) {
         if (responseList.includes("ok")) {
             return res.ok === 1 && res.n === count;
         } else {
-            return res.matchedCount === count && res.modifiedCount === count;
+            return res.matchedCount === count && res.acknowledged;
         }
     } else {
         return false;