added a damas-core 2.5 retro compatibility switch

remyla · Sep 25, 2024 · cb34911 · cb34911
1 parent b903ebe
commit cb34911
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/docker/compose.yml b/docker/compose.yml
@@ -1,16 +1,14 @@
 services:
     damas:
         container_name: damas-core
-        image: primcode/damas-core:experimental
+        image: primcode/damas-core:latest
         volumes:
             - ./damas.json:/damas-core/server-nodejs/conf.json
             - ./www:/app/www
             - ./extensions:/app/extensions
         environment:
             DEBUG: "damas:*"
             HTTP_PORT: 8090
-#        ports:
-#            - 80:80
         depends_on:
             - mongo
         restart: always
@@ -23,7 +21,7 @@ services:
         container_name: damas-mongo
         image: mongo:latest
         volumes:
-            - ./db:/damas-core/db
+            - ./db:/data/db
         restart: always
         stdin_open: true
         tty: true

diff --git a/server-nodejs/conf.json b/server-nodejs/conf.json
@@ -11,7 +11,8 @@
         "db": "node",
         "collection": "node",
         "port": 27017,
-        "options": { }
+        "options": { },
+        "create_returns_obj": true
     },
     "mongodb": {
         "host": "mongo",

diff --git a/server-nodejs/db/mongodb6.js b/server-nodejs/db/mongodb6.js
@@ -5,6 +5,7 @@
 
 // SPECIFICATION BREAKING CHANGES (to add in documentation) :
 // - create() method now returns identifier(s) and not entire object(s)
+//     - added a damas-core 2.5 retro compatibility switch `conf.create_returns_obj`
 
 var async = require('async');
 
@@ -85,8 +86,24 @@ module.exports = function (conf) {
                 );
             }
             async.mapLimit(nodes, 100, createNode, function (err, array) {
-                fireEvent('create', array);
-                callback(false, array);
+                // damas-core 2.5 retro compatibility switch
+                if (self.conf.create_returns_obj === true) {
+                    console.log("### damas-core retro compatibility switch ###");
+                    console.log(array);
+                    if (array.includes(null)) {
+                        fireEvent('create', [null]);
+                        callback(false, [null]);
+                        return;
+		    }
+                    self.read(array, (err, res) => {
+                        fireEvent('create', res);
+                        callback(false, res);
+		    });
+                }
+                else {
+                    fireEvent('create', array);
+                    callback(false, array);
+                }
             });
         });
     }; // create()