dbm-graph-api 1.1.39 → 1.1.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dbm-graph-api",
-  "version": "1.1.39",
+  "version": "1.1.41",
   "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.8",
+    "dbm": "^1.3.0",
     "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

@@ -236,6 +236,8 @@ let fullEncodeSetup = function() {
     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};
@@ -313,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; 
     
 }
 
@@ -346,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/index.js

@@ -29,5 +29,6 @@ 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";