notherbase-fs 3.4.1 → 3.4.3

package/controllers/spirit-world.js

@@ -20,6 +20,7 @@ export default class SpiritWorld {
         this.user = new User();
 
         this.router.post("/loadAll", this.loadAll);
+        this.router.post("/load", this.load);
         this.router.post("/serve", this.serve);
         this.router.use("/user", this.user.router);
 
@@ -99,7 +100,7 @@ export default class SpiritWorld {
             // if the scope is local, the parent is the user's id
             if (req.body.scope === "local") {
                 let user = await req.db.Spirit.recallOne("user",  null, { email: req.session.currentUser });
-                if (user?.id) parent = user.id;
+                if (user?.memory?._id) parent = user.memory._id;
                 else {
                     fail(res, "User had no id on load()");
                     return;
@@ -116,6 +117,38 @@ export default class SpiritWorld {
         }
     }
 
+    /**
+     * This API route requests a spirit of a kind from the database.
+     * @param {Object} req
+     * @param {Object} res
+     * @returns {Object} The requested spirit.
+     */
+    load = async (req, res) => {
+        try {
+            let parent = null;
+            let data = req.body.data ? req.body.data : {};
+            let id = req.body.id ? req.body.id : null;
+
+            // if the scope is local, the parent is the user's id
+            if (req.body.scope === "local") {
+                let user = await req.db.Spirit.recallOne("user",  null, { email: req.session.currentUser });
+                if (user?.memory?._id) parent = user.memory._id;
+                else {
+                    fail(res, "User had no id on load()");
+                    return;
+                }
+            } 
+
+            // recall all spirits with the given service name and parent
+            let spirit = await req.db.Spirit.recallOne(req.body.service, parent, data, id);
+
+            res.send(spirit);
+        } catch (error) {
+            console.log(error);
+            fail(res, "Server error");
+        }
+    }
+
     /**
      * This API route runs a script on the server. Responds with the result.
      * @param {Object} req 

package/models/spirit.js

@@ -14,10 +14,7 @@ export default class Spirit {
             required: false
         },
         data: {},
-        backups: [{
-            _lastUpdate: Number,
-            data: {}
-        }]
+        backups: []
     }));
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "notherbase-fs",
-  "version": "3.4.1",
+  "version": "3.4.3",
   "description": "Functions to help make developing for NotherBase easier.",
   "exports": "./notherbase-fs.js",
   "scripts": {

package/public/js/base.js

@@ -114,6 +114,8 @@ class Base {
      * Loads all spirits of a certain service.
      * @param {String} service The name of the spirits to load.
      * @param {String} scope Defaults to local, else global.
+     * @param {Object} data Data to filter the spirits by.
+     * @param {ObjectID} id The id of the spirit to load.
      * @returns Spirit world response.
      */
     loadAll = async (service, scope = "local", data = {}, id = null) => {
@@ -122,6 +124,20 @@ class Base {
         return response;
     }
 
+    /**
+     * Loads a single spirit of a certain service.
+     * @param {String} service The name of the spirit to load.
+     * @param {String} scope Defaults to local, else global.
+     * @param {Object} data Data to filter the spirits by.
+     * @param {ObjectID} id The id of the spirit to load.
+     * @returns Spirit world response.
+     */ 
+    load = async (service, scope = "local", data = {}, id = null) => {
+        let response = await $.post("/s/load", JSON.stringify({ service, scope, data, id }));
+
+        return response;
+    }
+
     /**
      * Creates the toggle view button.
      */

package/test/the-front/add-gold.js

@@ -2,7 +2,13 @@ export default async (req, user, io) => {
     // let deleted = await req.db.Spirit.delete("gold");
     let spirit = await req.db.Spirit.recallOrCreateOne("gold");
     spirit.addBackup({
-        amount: spirit.memory?.data?.amount != null ? spirit.memory.data.amount + 1 : 0
+        amount: spirit.memory?.data?.amount != null ? spirit.memory.data.amount + 1 : 1
+    });
+    await spirit.commit();
+
+    spirit = await req.db.Spirit.recallOrCreateOne("gold", user.memory._id);
+    spirit.addBackup({
+        amount: spirit.memory?.data?.amount != null ? spirit.memory.data.amount + 1 : 1
     });
     await spirit.commit();
 }

package/test/the-front/index.ejs

@@ -57,9 +57,11 @@
             this.$info.append(this.newEmail + "<br>");
             this.$info.append(this.newPassword + "<br>");
 
-            let loaded = await base.loadAll("gold", "global");
+            let loaded = await base.load("gold", "global");
+            console.log(loaded);
+            this.$gold.text(`?/${loaded?.memory?.data?.amount !== null ? loaded.memory.data.amount : 0} Gold Added`);
+            loaded = await base.loadAll("gold");
             console.log(loaded);
-            this.$gold.text(`?/${loaded[0]?.memory?.data?.amount !== null ? loaded[0].memory.data.amount : 0} Gold Added`);
         }
 
         runTest = async () => {