not-node 6.5.22 → 6.5.24

package/package.json

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

package/src/generic/logic.js

@@ -321,12 +321,12 @@ module.exports = ({
          * @param {import('../types').PreparedData}  prepared
          * @returns {Promise<Object>}               requested document
          **/
-        static async getOwnRaw({ targetId, identity }) {
+        static async getRawOwn({ targetId, identity }) {
             return await this._getOneRaw({
                 targetId,
                 identity,
                 shouldOwn: true,
-                action: "getOwnRaw",
+                action: "getRawOwn",
             });
         }
 

package/src/generic/route.js

@@ -76,14 +76,14 @@ module.exports = ({ getLogic, before, after }) => {
                 );
             }
             if (this.rootAsUser) {
-                return await getLogic(prepared).getOwnRaw(prepared);
+                return await getLogic(prepared).getRawOwn(prepared);
             } else {
                 return await getLogic(prepared).getRaw(prepared);
             }
         }
 
         static async getRaw(req, res, next, prepared) {
-            return await getLogic(prepared).getOwnRaw(prepared);
+            return await getLogic(prepared).getRawOwn(prepared);
         }
 
         static async _update(req, res, next, prepared) {

package/src/logic/actions/index.js

@@ -3,6 +3,9 @@ const ActionsSetsLibrary = require("../actions.lib");
 let actionsSetsLibrary = new ActionsSetsLibrary();
 
 actionsSetsLibrary.add("standart", require("./standart"));
+
+actionsSetsLibrary.add("standartOwn", require("./standart.own"));
+
 actionsSetsLibrary.add("increment", require("./increment"));
 
 module.exports = actionsSetsLibrary;

package/src/logic/actions/standart.own.js

@@ -0,0 +1,18 @@
+/**
+ * Duplicates standart set with names postpended with 'Own'
+ * Work with:
+ * beforeActionsOnCondition = [
+ *       require("./actions.before/ownage/ownage.js").ifActionNameEndsWith_Own(),
+ *   ],
+ * It modifies filtering queries before actions with names ended with 'Own'
+ */
+
+const standartSet = require("./standart");
+
+const standartOwnSet = {};
+Object.keys(standartSet).forEach((actionName) => {
+    standartOwnSet[`${actionName}Own`] = standartSet[actionName];
+});
+
+Object.freeze(standartOwnSet);
+module.exports = standartOwnSet;

package/src/logic/actions.before/ownage/ownage.js

@@ -1,4 +1,3 @@
-const notFilter = require("not-filter");
 const {
     DOCUMENT_OWNER_FIELD_NAME,
     DOCUMENT_SESSION_FIELD_NAME,
@@ -6,7 +5,8 @@ const {
 const {
     OwnageExceptionIdentityUserIdIsNotDefined,
 } = require("../../../exceptions/action.js");
-const ModelRoutine = require("../../../model/routine.js");
+
+const StandartQueriesBeforeAction = require("../standart.queries.js");
 
 //checks that
 module.exports = class OwnageBeforeAction {
@@ -21,37 +21,6 @@ module.exports = class OwnageBeforeAction {
         return this.#sessionFieldName;
     }
 
-    static setOwnage(logic, actionName, args, ownageFilter) {
-        const { query, targetId, targetID } = args;
-        let { filter, search } = query;
-        if (filter) {
-            filter = notFilter.filter.modifyRules(filter, ownageFilter);
-            if (search) {
-                search = notFilter.filter.modifyRules(search, filter);
-            }
-        }
-        args.defaultQueryById = {
-            _id: targetId,
-            ...ownageFilter,
-        };
-        const Model = logic.getModel();
-        const incFieldName = ModelRoutine.incremental(Model);
-        if (incFieldName) {
-            args.defaultQueryByID = {
-                [incFieldName]: targetID,
-                ...ownageFilter,
-            };
-        }
-
-        args.defaultQueryMany = {
-            ...ownageFilter,
-        };
-        //mark data as owned by
-        if (typeof args.data == "object" && args.data) {
-            Object.assign(args.data, ownageFilter);
-        }
-    }
-
     static createOwnageFilterForUser(identity) {
         return Object.freeze({
             [OwnageBeforeAction.ownerFieldName]: identity.uid,
@@ -105,7 +74,7 @@ module.exports = class OwnageBeforeAction {
                 args.identity
             );
         }
-        OwnageBeforeAction.setOwnage(logic, actionName, args, ownageFilter);
+        StandartQueriesBeforeAction.modifyQueries(args, ownageFilter);
     }
 
     static ifActionNameEndsWith_Own() {

package/src/logic/actions.before/standart.queries.js

@@ -1,7 +1,41 @@
+const notFilter = require("not-filter");
 const ModelRoutine = require("../../model/routine.js");
 
 //adds to args object few basic queries
 module.exports = class StandartQueriesBeforeAction {
+    static modifyQueries(args, modificationFilter) {
+        const { query } = args;
+        let { filter, search } = query;
+        if (filter) {
+            filter = notFilter.filter.modifyRules(filter, modificationFilter);
+            if (search) {
+                search = notFilter.filter.modifyRules(search, filter);
+            }
+        }
+        if (args.defaultQueryById) {
+            args.defaultQueryById = notFilter.filter.modifyRules(
+                args.defaultQueryById,
+                modificationFilter
+            );
+        }
+        if (args.defaultQueryByID) {
+            args.defaultQueryByID = notFilter.filter.modifyRules(
+                args.defaultQueryByID,
+                modificationFilter
+            );
+        }
+
+        args.defaultQueryMany = notFilter.filter.modifyRules(
+            args.defaultQueryMany,
+            modificationFilter
+        );
+
+        //mark data as owned by
+        if (typeof args.data == "object" && args.data) {
+            Object.assign(args.data, modificationFilter);
+        }
+    }
+
     static async run(logic, actionName, args) {
         try {
             const { targetId, targetID } = args;

package/src/logic/generic.js

@@ -8,7 +8,7 @@ module.exports = ({
     MODEL_NAME,
     USER_MODEL_NAME = "not-user//User",
     actionRunner = undefined,
-    actionsSets = ["standart"],
+    actionsSets = ["standart", "standartOwn"],
     actions = {},
     beforeActions = {},
     beforeActionsOnCondition = [