Merge branch 'develop' of https://github.com/agco/harvesterjs into fe…

…ature/AGCMD-1989
agco · Mar 11, 2016 · 42b0847 · 42b0847
2 parents d3521d9 + 92e61b5
commit 42b0847
Show file tree

Hide file tree

Showing 3 changed files with 76 additions and 24 deletions.
diff --git a/lib/sse.js b/lib/sse.js
@@ -311,7 +311,10 @@ SSE.prototype.getData = function(routeName, chunk) {
 
     switch (chunk.op) {
         case 'i' : data = this.harvesterApp.adapter._deserialize(model, chunk.o); break;
-        case 'u' : data = chunk.o.$set; break;
+        case 'u' :
+            data = chunk.o.$set || chunk.o;
+            data._id = chunk.o2._id;
+            break;
         default : data = {}
     }
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "harvesterjs",
   "description": "a library which makes it easy to construct a JSON-API compliant REST API (http://jsonapi.org/) with Nodejs and Mongodb",
-  "version": "2.3.7",
+  "version": "2.3.8",
   "license": "MIT",
   "author": {
     "name": "Kristof Sajdak",

diff --git a/test/singleRouteSSE.spec.js b/test/singleRouteSSE.spec.js
@@ -150,9 +150,7 @@ describe('EventSource implementation for resource changes', function () {
         describe('Given a resource x with property y ' +
                  '\nWhen the value of y changes', function () {
             it('Then an SSE is broadcast with event set to x_update, ID set to the oplog timestamp' +
-                 'and data set to an instance of x that only contains the new value for property y', function (done) {
-                var that = this;
-                var counter = 0;
+                 'and data set to an instance of x that contains document id and new value for property y', function (done) {
 
                 var payloads = [
                     {
@@ -167,29 +165,80 @@ describe('EventSource implementation for resource changes', function () {
                         }]
                     }
                 ];
+                $http.post(baseUrl + '/books', {json: payloads[0]}).spread(function(res)
+                {
+                    var counter = 0;
+                    var documentId = res.body.books[0].id;
+                    var expected = {
+                        _id: documentId,
+                        title: payloads[1].books[0].title
+                    };
+
+                    var eventSource = ess(baseUrl + '/books/changes/stream', {retry: false})
+                        .on('data', function (data)
+                        {
+                            var data = JSON.parse(data.data);
+                            if (counter === 0) {
+                                $http.put(baseUrl + '/books/' + documentId, {json: payloads[1]});
+                            }
+                            if (counter === 1) {
+                                expect(data).to.deep.equal(expected);
+                            }
+                            if (counter === 2) {
+                                done();
+                                eventSource.destroy();
+                            }
+                            counter++;
+                        });
+                });
+            });
+        });
 
-                var eventSource = ess(baseUrl + '/books/changes/stream', {retry : false})
-                .on('data', function(data) {
 
-                    lastEventId = data.id;
-                    var data = JSON.parse(data.data);
-
-                    //ignore ticker data
-                    if(_.isNumber(data)) {
-                        //post data after we've hooked into change events and receive a ticker
-                        return $http.post(baseUrl + '/books', {json : payloads[0]})
-                        .spread(function(res) {
-                            return $http.put(baseUrl + '/books/' + res.body.books[0].id, {json : payloads[1]});
-                        });
-                    }
+        describe('When I update collection document directly through mongodb adapter', function()
+        {
+            var documentId = '', model;
 
-                    expect(_.omit(data, 'id')).to.deep.equal(payloads[counter].books[0]);
-                    counter ++;
-                    if (counter === 1) {
-                        done();
-                        eventSource.destroy();
-                    }
+            before(function(done)
+            {
+                seeder(harvesterApp, baseUrl).seedCustomFixture({
+                    books: [
+                        {
+                            title: 'The Bourne Identity',
+                            author: 'Robert Ludlum'
+                        }
+                    ]
+                }).then(function (result)
+                {
+                    documentId = result[0].books[0];
+                    done();
                 });
+                model = harvesterApp.adapter.model('book');
+            });
+
+            it('Then SSE should broadcast event with data containing properties that has been changed', function(done)
+            {
+                var expected = {
+                    _id: documentId,
+                    title: 'The Bourne Supremacy'
+                };
+                var counter = 0;
+                var eventSource = ess(baseUrl + '/books/changes/stream', {retry: false})
+                    .on('data', function (data)
+                    {
+                        var data = JSON.parse(data.data);
+                        if (0 === counter) {
+                            harvesterApp.adapter.db.collections.books.findOneAndUpdate({'_id': documentId}, {'title': 'The Bourne Supremacy'});
+                        }
+                        if (1 === counter) {
+                            expect(data).to.deep.equal(expected);
+                        }
+                        if (2 === counter) {
+                            done();
+                            eventSource.destroy();
+                        }
+                        counter++;
+                    });
             });
         });
     });