Merge pull request #419 from chughts/disfix

Discovery Query Builder Fix

Author: chughts

README.md

@@ -7,6 +7,9 @@ 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.7.3
+- Modify Discovery Query Builder Node to use `listCollectionFields` to determine query list.
+
 ### New in version 0.7.2
 - Allow version date for Assistant to be specified in `msg.params.version`
 to allow optional usage of beta version.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-node-watson",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "A collection of Node-RED nodes for IBM Watson services",
   "dependencies": {
     "async": "^1.5.2",

services/discovery/discovery-utils.js

@@ -308,18 +308,23 @@ DiscoveryUtils.prototype = {
   // Looking for Text, Type and label
   buildFieldList: function(schemaData) {
     var fields = [];
-    if ('object' === typeof schemaData) {
-      for (var k in schemaData) {
-        if ('results' === k &&
-          'object' === typeof schemaData[k] &&
-          'object' === typeof schemaData[k][0]) {
-          fields = this.buildFieldByStep(schemaData[k][0], fields, '');
+
+    if (schemaData &&
+           'object' === typeof schemaData &&
+           schemaData['fields'] &&
+            Array.isArray(schemaData['fields'])) {
+      schemaData['fields'].forEach((f) => {
+        if (f['field'] && f['type'] && 'nested' !== f['type']) {
+          fields.push(f['field']);
         }
-      }
-      if (fields.length) {
-        fields = fields.filter(this.uniqueFilter);
-      }
+      });
+
+    }
+
+    if (fields.length) {
+      fields = fields.filter(this.uniqueFilter);
     }
+
     return fields;
   },
 

services/discovery/v1-query-builder.js

@@ -82,13 +82,9 @@ module.exports = function(RED) {
                                          sApikey ? sApikey : req.query.key,
                                          req.query.endpoint ? req.query.endpoint : sEndpoint);
 
-    discovery.query({
+    discovery.listCollectionFields({
       environment_id: req.query.environment_id,
-      collection_id: req.query.collection_id,
-      //query: 'text:a,text:ibm',
-      // Need a Query that will return some data!
-      query: 'text:"Trump",text:"IBM",text:"Watson"',
-      count: 1
+      collection_id: req.query.collection_id
     },
       function(err, response) {
         if (err) {