Correct Discovery Implementation of passages

Author: chughts

README.md

@@ -7,6 +7,11 @@ Node-RED Watson Nodes for IBM Cloud
 
 <a href="https://cla-assistant.io/watson-developer-cloud/node-red-node-watson"><img src="https://cla-assistant.io/readme/badge/watson-developer-cloud/node-red-node-watson" alt="CLA assistant" /></a>
 
+### New in version 0.6.8
+- Move all Discovery calls to latest API version - 2017-11-07
+- Updated calls to deprecated discovery methods addJsonDocument and getCollections 
+- Correct implemetation of passages related options
+
 ### New in version 0.6.7
 - Enable Opt-out option for Conversation Node.
 - Implement time out option for response from Conversation Node.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-node-watson",
-  "version": "0.6.7",
+  "version": "0.6.8",
   "description": "A collection of Node-RED nodes for IBM Watson services",
   "dependencies": {
     "async": "^1.5.2",
@@ -10,7 +10,7 @@
     "temp": "^0.8.3",
     "qs": "6.x",
 	  "image-type": "^2.0.2",
-    "watson-developer-cloud": "^3.2.1",
+    "watson-developer-cloud": "^3.3.0",
     "kuromoji": "^0.1.1",
     "word-count": "^0.2.2",
     "is-docx": "^0.0.3",

services/discovery/discovery-utils.js

@@ -71,6 +71,35 @@ DiscoveryUtils.prototype = {
     return params;
   },
 
+  buildParamsForPassages: function (me, msg, config, params) {
+    let passagesFound = false;
+
+    // Allow the passages parameters to be passed in two ways
+    // 1. As the API is expecting
+    ['passages.fields', 'passages.count', 'passages.characters'
+    ].forEach(function(f) {
+      params = me.buildParamsFor(msg, config, params, f);
+      passagesFound = true;
+    });
+
+    // 2. As anyone misreading the documentation might do it.
+    if (msg.discoveryparams && msg.discoveryparams.passages) {
+      passagesFound = true;
+      ['fields', 'count', 'characters'
+      ].forEach(function(f) {
+        if (msg.discoveryparams.passages[f]) {
+          params['passages.' + f] = msg.discoveryparams.passages[f];
+        }
+      });
+    }
+
+    if (passagesFound) {
+      params.passages = true;
+    }
+
+    return params;
+  },
+
   buildParamsFromConfig: function(config, params, field) {
     if (config[field]) {
       params[field] = config[field];
@@ -101,6 +130,8 @@ DiscoveryUtils.prototype = {
       params = me.buildParamsFor(msg, config, params, f);
     });
 
+    params = me.buildParamsForPassages(me, msg, config, params);
+
     ['count', 'filter', 'aggregation', 'return'].forEach(function(f) {
       params = me.buildParamsFromConfig(config, params, f);
     });

services/discovery/v1-document-loader.js

@@ -130,7 +130,7 @@ module.exports = function (RED) {
         serviceSettings = {
           username: username,
           password: password,
-          version_date: '2017-09-01',
+          version_date: '2017-11-07',
           headers: {
             'User-Agent': pkg.name + '-' + pkg.version
           }
@@ -141,12 +141,13 @@ module.exports = function (RED) {
       }
 
       discovery = new DiscoveryV1(serviceSettings);
-
-      if ('.json' === suffix) {
-        method = 'addJsonDocument';
-      } else {
-        method = 'addDocument';
-      }
+      // addJsonDocument is deprecated
+      //if ('.json' === suffix) {
+      //  method = 'addJsonDocument';
+      //} else {
+      //  method = 'addDocument';
+      //}
+      method = 'addDocument';
 
       discovery[method](params, function (err, response) {
         if (err) {

services/discovery/v1-query-builder.js

@@ -70,7 +70,7 @@ module.exports = function(RED) {
       }
     });
 
-    discovery.getCollections({
+    discovery.listCollections({
       environment_id: req.query.environment_id
     },
       function(err, response) {

services/discovery/v1.js

@@ -251,7 +251,7 @@ module.exports = function (RED) {
       serviceSettings = {
         username: username,
         password: password,
-        version_date: '2017-09-01',
+        version_date: '2017-11-07',
         headers: {
           'User-Agent': pkg.name + '-' + pkg.version
         }