dbm-graph-api 1.1.38 → 1.1.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dbm-graph-api",
-  "version": "1.1.38",
+  "version": "1.1.40",
   "main": "index.js",
   "type": "module",
   "scripts": {
@@ -13,7 +13,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.741.0",
     "@aws-sdk/s3-request-presigner": "^3.741.0",
-    "dbm": "^1.2.7",
+    "dbm": "^1.2.9",
     "mime": "^4.0.6",
     "sharp": "^0.33.5",
     "ws": "^8.18.0"

package/src/dbm-graph-api/Api.js

@@ -46,7 +46,7 @@ export default class Api extends Dbm.core.BaseObject {
                 let [key, value] = currentArray[i].split("=");
                 if(key === "dbm_session" || key === " dbm_session") {
                     let userId = 1*value.split(":")[1];
-                    let user = Dbm.getInstance().repository.getItem("graphDatabase").controller.getUser(userId);
+                    let user = Dbm.getRepositoryItem("graphDatabase").controller.getUser(userId);
     
                     user.verifySession(value).then(function(aIsValidSession) {
                         //console.log("verifySession", aIsValidSession);

package/src/dbm-graph-api/action/cron/ProcessActions.js

@@ -8,7 +8,7 @@ export default class ProcessActions extends Dbm.core.BaseObject {
     async performAction(aData, aEncodeSession) {
         let returnObject = {};
 
-        let database = Dbm.getInstance().repository.getItem("graphDatabase").controller;
+        let database = Dbm.getRepositoryItem("graphDatabase").controller;
 
         let actionStatus = await database.getTypeObject("status/actionStatus", "readyToProcess");
         let actions = await actionStatus.objectRelationQuery("out:for:action");
@@ -17,24 +17,18 @@ export default class ProcessActions extends Dbm.core.BaseObject {
             let action = actions[0];
             returnObject["processed"] = action.id;
 
-            let processingActionStatus = await database.getTypeObject("status/actionStatus", "processing");
-            await action.replaceIncomingRelation(processingActionStatus, "for", "status/actionStatus");
+            await action.changeLinkedType("status/actionStatus", "processing");
 
-            let actionType = await (await action.singleObjectRelationQuery("in:for:type/actionType")).getIdentifier();
-            console.log(actionType);
+            let actionType = await action.getSingleLinkedType("type/actionType");
             
             let processActionItem = Dbm.getInstance().repository.getItemIfExists("graphApi/processAction/" + actionType);
 
             if(processActionItem) {
-
                 await processActionItem.controller.process(action);
-
-                let doneActionStatus = await database.getTypeObject("status/actionStatus", "done");
-                await action.replaceIncomingRelation(doneActionStatus, "for", "status/actionStatus");
+                await action.changeLinkedType("status/actionStatus", "done");
             }
             else {
-                let doneActionStatus = await database.getTypeObject("status/actionStatus", "noAction");
-                await action.replaceIncomingRelation(doneActionStatus, "for", "status/actionStatus");
+                await action.changeLinkedType("status/actionStatus", "noAction");
             }
 
             returnObject["remaining"] = actions.length-1;

package/src/dbm-graph-api/index.js

@@ -57,6 +57,12 @@ let fullSelectSetup = function() {
         let currentSelect = new DbmGraphApi.range.select.GlobalObjectRelationQuery();
         currentSelect.item.register(selectPrefix + name);
     }
+
+    {
+        let name = "withIdentifier";
+        let currentSelect = new DbmGraphApi.range.select.WithIdentifier();
+        currentSelect.item.register(selectPrefix + name);
+    }
 }
 
 
@@ -226,6 +232,12 @@ let fullEncodeSetup = function() {
     registerEncoding("language", DbmGraphApi.range.encode.SingleRelation.create("language", "in:for:language", "type"));
     registerEncodingClass(DbmGraphApi.range.encode.TranslatedName);
     registerEncoding("translationGroup", new DbmGraphApi.range.encode.TranslationGroup());
+
+    registerEncoding("menuLocation", new DbmGraphApi.range.encode.MenuLocation());
+    registerEncoding("menu", new DbmGraphApi.range.encode.Menu());
+    registerEncoding("menuItem", new DbmGraphApi.range.encode.MenuItem());
+
+    registerEncoding("action", new DbmGraphApi.range.encode.Action());
 }
 
 export {fullEncodeSetup};
@@ -303,14 +315,14 @@ let fullProcessActionSetup = function() {
 export {fullProcessActionSetup};
 
 let setupInternalTaskRunner = function() {
-    Dbm.getInstance().repository.getItem("taskRunner").requireProperty("runners", []);
+    Dbm.getRepositoryItem("taskRunner").requireProperty("runners", []);
 
     let runner = new DbmGraphApi.taskrunner.InternalTaskRunner();
     runner.startAtStartup();
 
-    let runners = [].concat(Dbm.getInstance().repository.getItem("taskRunner").runners);
+    let runners = [].concat(Dbm.getRepositoryItem("taskRunner").runners);
     runners.push(runner);
-    Dbm.getInstance().repository.getItem("taskRunner").runners = runners; 
+    Dbm.getRepositoryItem("taskRunner").runners = runners; 
     
 }
 
@@ -336,7 +348,7 @@ export const setupEndpoints = function(aServer) {
 
 		let username = aRequest.body['username'];
 
-		let user = await Dbm.getInstance().repository.getItem("graphDatabase").controller.getUserByUsername(username);
+		let user = await Dbm.getRepositoryItem("graphDatabase").controller.getUserByUsername(username);
 
 		if(!user) {
 			//METODO: get user by email

package/src/dbm-graph-api/range/encode/Action.js

@@ -0,0 +1,36 @@
+import Dbm from "dbm";
+import EncodeBaseObject from "./EncodeBaseObject.js";
+
+export default class Action extends EncodeBaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async getEncodedData(aId, aEncodingSession) {
+
+        let returnObject = {};
+
+        let object = Dbm.getRepositoryItem("graphDatabase").controller.getObject(aId);
+
+        let fields = await object.getFields();
+        returnObject["data"] = fields["data"] ? fields["data"] : null;
+
+        {
+            let relatedItems = await object.objectRelationQuery("out:from:*");
+            returnObject["from"] = await aEncodingSession.encodeObjects(relatedItems, "id");
+        }
+
+        {
+            let relatedObject = await object.singleObjectRelationQuery("in:for:type/actionType");
+            returnObject["type"] = await aEncodingSession.encodeObjectOrNull(relatedObject, "type");
+        }
+
+        {
+            let relatedObject = await object.singleObjectRelationQuery("in:for:status/actionStatus");
+            returnObject["status"] = await aEncodingSession.encodeObjectOrNull(relatedObject, "type");
+        }
+        
+
+        return returnObject;
+    }
+}

package/src/dbm-graph-api/range/encode/Breadcrumb.js

@@ -7,7 +7,7 @@ export default class Breadcrumb extends EncodeBaseObject {
     }
 
     async getEncodedData(aId, aEncodingSession) {
-        console.log("Breadcrumb::getEncodedData");
+        //console.log("Breadcrumb::getEncodedData");
 
         let returnObject = {};
 

package/src/dbm-graph-api/range/encode/Menu.js

@@ -0,0 +1,27 @@
+import Dbm from "dbm";
+import EncodeBaseObject from "./EncodeBaseObject.js";
+
+export default class Menu extends EncodeBaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async getEncodedData(aId, aEncodingSession) {
+
+        let returnObject = {};
+
+        let object = Dbm.getInstance().repository.getItem("graphDatabase").controller.getObject(aId);
+
+        await aEncodingSession.encodeSingle(aId, "language");
+
+        {
+            let relatedItems = await object.objectRelationQuery("in:in:menuItem");
+            returnObject["menuItems"] = await aEncodingSession.encodeObjects(relatedItems, "menuItem");
+        }
+
+        let fields = await object.getFields();
+        returnObject["order"] = fields["order"] ? fields["order"] : null;
+
+        return returnObject;
+    }
+}

package/src/dbm-graph-api/range/encode/MenuItem.js

@@ -0,0 +1,21 @@
+import Dbm from "dbm";
+import EncodeBaseObject from "./EncodeBaseObject.js";
+
+export default class MenuItem extends EncodeBaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async getEncodedData(aId, aEncodingSession) {
+
+        let returnObject = {};
+
+        let object = Dbm.getInstance().repository.getItem("graphDatabase").controller.getObject(aId);
+
+        let fields = await object.getFields();
+        returnObject["label"] = fields["label"] ? fields["label"] : null;
+        returnObject["link"] = fields["link"] ? fields["link"] : null;
+
+        return returnObject;
+    }
+}

package/src/dbm-graph-api/range/encode/MenuLocation.js

@@ -0,0 +1,23 @@
+import Dbm from "dbm";
+import EncodeBaseObject from "./EncodeBaseObject.js";
+
+export default class MenuLocation extends EncodeBaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async getEncodedData(aId, aEncodingSession) {
+
+        let returnObject = {};
+
+        let object = Dbm.getInstance().repository.getItem("graphDatabase").controller.getObject(aId);
+
+        await aEncodingSession.encodeSingle(aId, "identifier");
+
+        let relatedItem = await object.singleObjectRelationQuery("in:at:menu");
+
+        returnObject["menu"] = await aEncodingSession.encodeObjectOrNull(relatedItem, "menu");
+
+        return returnObject;
+    }
+}

package/src/dbm-graph-api/range/encode/index.js

@@ -26,5 +26,9 @@ export {default as SingleRelation} from "./SingleRelation.js";
 export {default as TranslatedTitle} from "./TranslatedTitle.js";
 export {default as TranslatedName} from "./TranslatedName.js";
 export {default as TranslationGroup} from "./TranslationGroup.js";
+export {default as MenuLocation} from "./MenuLocation.js";
+export {default as Menu} from "./Menu.js";
+export {default as MenuItem} from "./MenuItem.js";
+export {default as Action} from "./Action.js";
 
 export * as admin from "./admin/index.js";

package/src/dbm-graph-api/range/select/WithIdentifier.js

@@ -0,0 +1,17 @@
+import Dbm from "dbm";
+
+import SelectBaseObject from "./SelectBaseObject.js";
+
+export default class WithIdentifier extends SelectBaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async select(aQuery, aData, aRequest) {
+        aQuery.withIdentifier(aData["identifier"]);
+    }
+
+    async filter(aIds, aData, aRequest) {
+        return aIds;
+    }
+}

package/src/dbm-graph-api/range/select/index.js

@@ -4,4 +4,5 @@ export {default as ByObjectType} from "./ByObjectType.js";
 export {default as IncludePrivate} from "./IncludePrivate.js";
 export {default as IncludeDraft} from "./IncludeDraft.js";
 export {default as ObjectRelationQuery} from "./ObjectRelationQuery.js";
-export {default as GlobalObjectRelationQuery} from "./GlobalObjectRelationQuery.js";
+export {default as GlobalObjectRelationQuery} from "./GlobalObjectRelationQuery.js";
+export {default as WithIdentifier} from "./WithIdentifier.js";