have nedb passing back meta

happner · Jun 3, 2016 · a52f12d · a52f12d
1 parent 36b3f90
commit a52f12d
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 16 deletions.
diff --git a/lib/services/data_embedded/service.js b/lib/services/data_embedded/service.js
@@ -543,35 +543,35 @@ DataEmbeddedService.prototype.upsert = function(path, data, options, callback){
 
 }
 
-DataEmbeddedService.prototype.transform = function(dataObj, additionalMeta){
+DataEmbeddedService.prototype.transform = function(dataObj, meta){
     var transformed = {};
 
     transformed.data = dataObj.data;
 
-    transformed._meta = {
-        path:dataObj._id,
-        tag:dataObj._tag
-    }
-
-    if (dataObj.created)
-        transformed._meta.created = dataObj.created;
+    if (!meta){
+      meta = {};
 
-    if (dataObj.modified)
-        transformed._meta.modified = dataObj.modified;
+      if (dataObj.created)
+        meta.created = dataObj.created;
 
-    if (additionalMeta){
-        for (var additionalProperty in additionalMeta)
-           transformed._meta[additionalProperty] = additionalMeta[additionalProperty];
+      if (dataObj.modified)
+        meta.modified = dataObj.modified;
     }
 
+    transformed._meta = meta;
+    transformed._meta.path = dataObj._id;
+
+    if (dataObj._tag)
+        transformed._meta.tag = dataObj._tag;
+
     return transformed;
 }
 
 DataEmbeddedService.prototype.__upsertInternal = function(path, setData, options, dataWasMerged, callback){
     var _this = this;
     var setParameters = {$set: {"data":setData.data, "_id":setData._meta.path}};
 
-    _this.db(path).update({"_id":path}, setParameters, {upsert:true, returnUpdatedDocs:true}, function(err, response, created) {
+    _this.db(path).update({"_id":path}, setParameters, {upsert:true}, function(err, response, created, upsert, meta) {
 
         if (err){
 
@@ -585,7 +585,7 @@ DataEmbeddedService.prototype.__upsertInternal = function(path, setData, options
 
         if (dataWasMerged && !options.tag) {
             if (created) return callback(null, _this.transform(created));
-            return callback(null, _this.transform(setData));
+            return callback(null, _this.transform(setData, meta));
         }
 
         if (dataWasMerged && options.tag){ // we have a prefetched object, and we want to tag it
@@ -605,7 +605,7 @@ DataEmbeddedService.prototype.__upsertInternal = function(path, setData, options
 
             setData._id = path;
             setData.modified = Date.now();
-            callback(null, _this.transform(setData));
+            callback(null, _this.transform(setData, meta));
 
         }
 

diff --git a/lib/services/pubsub/service.js b/lib/services/pubsub/service.js
@@ -691,6 +691,7 @@ PubSubService.prototype.emitToAudience = function(publication, channel) {
 				decoupledPublication = JSON.parse(serialized);
 			}
 
+      //TODO are these necessary?
 			decoupledPublication._meta.channel = channel.toString();
 			decoupledPublication._meta.sessionId = _this.__sessions[sessionIndex].session.id;
 

diff --git a/test/9_eventemitter_meta.js b/test/9_eventemitter_meta.js
@@ -300,6 +300,9 @@ describe('9_eventemitter_meta.js', function () {
       expect(result._meta.modified).to.not.be(null);
       expect(result._meta.modified).to.not.be(undefined);
 
+      expect(result._meta.path).to.not.be(null);
+      expect(result._meta.path).to.not.be(undefined);
+
       expect(result._meta.modified.toString()).to.be(result._meta.created.toString());
 
       var firstCreated = result._meta.created;
@@ -320,6 +323,9 @@ describe('9_eventemitter_meta.js', function () {
           expect(result._meta.modified).to.not.be(null);
           expect(result._meta.modified).to.not.be(undefined);
 
+          expect(result._meta.path).to.not.be(null);
+          expect(result._meta.path).to.not.be(undefined);
+
           publisherclient.get(test_path_created_modified_update, function(e, result){
 
             expect(result._meta.created).to.not.be(null);
@@ -328,6 +334,9 @@ describe('9_eventemitter_meta.js', function () {
             expect(result._meta.modified).to.not.be(null);
             expect(result._meta.modified).to.not.be(undefined);
 
+            expect(result._meta.path).to.not.be(null);
+            expect(result._meta.path).to.not.be(undefined);
+
             expect(result._meta.modified > result._meta.created).to.be(true);
             callback();
 
@@ -356,6 +365,9 @@ describe('9_eventemitter_meta.js', function () {
       expect(result._meta.modified).to.not.be(null);
       expect(result._meta.modified).to.not.be(undefined);
 
+      expect(result._meta.path).to.not.be(null);
+      expect(result._meta.path).to.not.be(undefined);
+
       var firstCreated = result._meta.created;
 
       expect(result._meta.modified.toString()).to.be(result._meta.created.toString());
@@ -374,6 +386,9 @@ describe('9_eventemitter_meta.js', function () {
           expect(result._meta.modified).to.not.be(null);
           expect(result._meta.modified).to.not.be(undefined);
 
+          expect(result._meta.path).to.not.be(null);
+          expect(result._meta.path).to.not.be(undefined);
+
           expect(result._meta.created.toString()).to.be(firstCreated.toString());
 
           publisherclient.get(test_path_created_modified_update_notmerge, function(e, result){
@@ -384,6 +399,9 @@ describe('9_eventemitter_meta.js', function () {
             expect(result._meta.modified).to.not.be(null);
             expect(result._meta.modified).to.not.be(undefined);
 
+            expect(result._meta.path).to.not.be(null);
+            expect(result._meta.path).to.not.be(undefined);
+
             expect(result._meta.modified > result._meta.created).to.be(true);
             callback();