Merge pull request #147 from kuzzleio/develop-110-align-notification-responses-format

Align notification responses format

Author: scottinet

CHANGELOG.md

@@ -1,3 +1,9 @@
+# next
+
+## Breaking changes
+
+* Align notification response formats #146
+
 *__note:__ the # at the end of lines are the pull request numbers on GitHub*
 
 # 2.2.0

package.json

@@ -35,17 +35,18 @@
     "ws": "^1.1.1"
   },
   "devDependencies": {
-    "ora": "^0.4.0",
-    "webpack": "^1.13.1",
+    "codecov": "^1.0.1",
     "eslint": "^3.7.1",
     "eslint-friendly-formatter": "^2.0.6",
-    "codecov": "^1.0.1",
     "istanbul": "0.4.5",
     "istanbul-middleware": "0.2.2",
     "mocha": "3.2.0",
+    "ora": "^0.4.0",
     "proxyquire": "^1.7.10",
     "rewire": "^2.5.2",
     "should": "11.1.2",
-    "sinon": "^1.17.5"
+    "should-sinon": "0.0.5",
+    "sinon": "^1.17.5",
+    "webpack": "^1.13.1"
   }
 }

src/Document.js

@@ -29,11 +29,11 @@ function Document(kuzzleDataCollection, documentId, content) {
     },
     dataCollection: {
       value: kuzzleDataCollection,
-      enumerable: true
+      enumerable: false
     },
     kuzzle: {
       value: kuzzleDataCollection.kuzzle,
-      enumerable: true
+      enumerable: false
     },
     // writable properties
     id: {

src/Room.js

@@ -1,5 +1,6 @@
 var
-  uuid = require('uuid');
+  uuid = require('uuid'),
+  Document = require('./Document');
 
 /**
  * This is a global callback pattern, called by all asynchronous functions of the Kuzzle object.
@@ -319,6 +320,18 @@ function notificationCallback (data) {
     return this.kuzzle.emitEvent('jwtTokenExpired');
   }
 
+  if (data.controller === 'document') {
+    data.type = 'document';
+    data.document = new Document(this.collection, data.result._id, data.result._source);
+    delete data.result;
+  }
+
+  if (data.controller === 'realtime') {
+    data.type = 'user';
+    data.user = {count: data.result.count};
+    delete data.result;
+  }
+
   if (this.kuzzle.requestHistory[data.requestId]) {
     if (this.subscribeToSelf) {
       this.callback(null, data);