@tiledesk/tiledesk-server 2.3.76 → 2.3.77

package/models/faq_kb.js

@@ -3,6 +3,9 @@ var Schema = mongoose.Schema;
 const uuidv4 = require('uuid/v4');
 var winston = require('../config/winston');
 
+var defaultFullTextLanguage = process.env.DEFAULT_FULLTEXT_INDEX_LANGUAGE || "none";
+
+
 var Faq_kbSchema = new Schema({
   name: {
     type: String,
@@ -101,6 +104,8 @@ Faq_kbSchema.virtual('fullName').get(function () {
 Faq_kbSchema.index({certified: 1, public: 1}); //suggested by atlas
 
 
+Faq_kbSchema.index({name: 'text', description: 'text', subject: 'text', "tags": 'text'},  
+ {"name":"faqkb_fulltext","default_language": defaultFullTextLanguage,"language_override": "language"}); // schema level
 
 
 var faq_kb = mongoose.model('faq_kb', Faq_kbSchema);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.3.76",
+  "version": "2.3.77",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -43,8 +43,8 @@
     "@tiledesk/tiledesk-json-rules-engine": "^4.0.3",
     "@tiledesk/tiledesk-kaleyra-proxy": "^0.1.6",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
-    "@tiledesk/tiledesk-tybot-connector": "^0.1.53",
-    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.19",
+    "@tiledesk/tiledesk-tybot-connector": "^0.1.55",
+    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.24",
     "amqplib": "^0.5.5",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",

package/pubmodules/cache/mongoose-cachegoose-fn.js

@@ -423,7 +423,15 @@
                 winston.debug("Deleted cache for faq_kb.update secret",reply);
                 winston.verbose("Deleted cache for faq_kb.update secret",{err:err});
             });   
-            
+
+            // without project for tilebot
+            key = "faq_kbs:id:"+faq_kb._id;
+            winston.verbose("Deleting cache for faq_kb.update without project for tilebot with key: " + key);
+            client.del(key, function (err, reply) {  
+                winston.debug("Deleted cache for faq_kb.update  without project for tilebot ",reply);
+                winston.verbose("Deleted cache for faq_kb.update  without project for tilebot ",{err:err});
+            });   
+
             // TODO invalidate widgets here
             winston.verbose("Deleting widgets cache for faqbot.update");
             invalidateWidgets(client, faq_kb.id_project); //TESTED
@@ -446,6 +454,15 @@
             client.del(key, function (err, reply) {
                 winston.debug("Deleted cache for faq_kb.delete secret",reply);
                 winston.verbose("Deleted cache for faq_kb.delete secret",{err:err});
+            });  
+            
+
+            // without project for tilebot
+            key = "faq_kbs:id:"+faq_kb._id;
+            winston.verbose("Deleting cache for faq_kb.update without project for tilebot with key: " + key);
+            client.del(key, function (err, reply) {  
+                winston.debug("Deleted cache for faq_kb.update  without project for tilebot ",reply);
+                winston.verbose("Deleted cache for faq_kb.update  without project for tilebot ",{err:err});
             });   
 
             // TODO invalidate widgets here

package/pubmodules/kaleyra/listener.js

@@ -13,17 +13,21 @@ class Listener {
             winston.debug("kaleyra config databaseUri: " + config.databaseUri);
         }
 
-        kaleyra.startApp({
-            MONGODB_URL: config.databaseUri,
-            API_URL: apiUrl,
-            BASE_URL: apiUrl + "/modules/kaleyra",
-            APPS_API_URL: apiUrl + "/modules/apps",
-            KALEYRA_API_URL: process.env.KALEYRA_API_URL,
-            API_KEY: process.env.API_KEY,
-            log: process.env.KALEYRA_LOG
-        }, () => {
-            winston.info("Tiledesk Kaleyra proxy server succesfully started.");
-        })
+        if (!process.env.KALEYRA_API_URL || !process.env.API_KEY) {
+            winston.info("Skip Kaleyra startApp")
+        } else {
+            kaleyra.startApp({
+                MONGODB_URL: config.databaseUri,
+                API_URL: apiUrl,
+                BASE_URL: apiUrl + "/modules/kaleyra",
+                APPS_API_URL: apiUrl + "/modules/apps",
+                KALEYRA_API_URL: process.env.KALEYRA_API_URL,
+                API_KEY: process.env.API_KEY,
+                log: process.env.KALEYRA_LOG
+            }, () => {
+                winston.info("Tiledesk Kaleyra proxy server succesfully started.");
+            })
+        }
     }
 }
 

package/pubmodules/whatsapp/listener.js

@@ -13,16 +13,20 @@ class Listener {
             winston.debug("whatsapp config databaseUri: " + config.databaseUri);
         }
 
-        whatsapp.startApp({
-            MONGODB_URL: config.databaseUri,          
-            API_URL: apiUrl,
-            GRAPH_URL: process.env.META_GRAPH_URL || config.graphUrl,
-            BASE_URL: apiUrl + "/modules/whatsapp",                     
-            APPS_API_URL: apiUrl + "/modules/apps",                 
-            log: process.env.WHATSAPP_LOG
-        }, () => {
-            winston.info("Tiledesk WhatsApp Connector proxy server succesfully started.");
-        })
+        if (!process.env.GRAPH_URL || !config.graphUrl) {
+            winston.info("Skip WhatsApp startApp")
+        } else {
+            whatsapp.startApp({
+                MONGODB_URL: config.databaseUri,          
+                API_URL: apiUrl,
+                GRAPH_URL: process.env.META_GRAPH_URL || config.graphUrl,
+                BASE_URL: apiUrl + "/modules/whatsapp",                     
+                APPS_API_URL: apiUrl + "/modules/apps",                 
+                log: process.env.WHATSAPP_LOG
+            }, () => {
+                winston.info("Tiledesk WhatsApp Connector proxy server succesfully started.");
+            })
+        }
 
     }
 }

package/routes/faq_kb.js

@@ -319,7 +319,6 @@ router.delete('/:faq_kbid', function (req, res) {
 
   winston.debug(req.body);
 
- 
   Faq_kb.remove({ _id: req.params.faq_kbid }, function (err, faq_kb) {
     if (err) {
       return res.status(500).send({ success: false, msg: 'Error deleting object.' });
@@ -393,12 +392,23 @@ router.get('/', function (req, res) {
     query.type = { $ne: "identity" }
   }
 
-  winston.debug("query", query);
+  var search_obj = {"$search": req.query.text};
+
+  if (req.query.text) {    
+    if (req.query.language) {
+      search_obj["$language"] = req.query.language;
+    }
+    query.$text = search_obj;    
+  }
+
+                    
+
+  winston.info("query", query);
 
   Faq_kb.find(query, function (err, faq_kb) {
     if (err) {
       winston.error('GET FAQ-KB ERROR ', err)
-      return (err);
+      return res.status(500).send({ success: false, message: "Unable to get chatbots" });
     }
 
     res.json(faq_kb);

package/services/faqService.js

@@ -177,6 +177,7 @@ class FaqService {
           id_faq_kb: faq_kb_id,
           question: faq.question,
           answer: faq.answer,
+          actions: faq.actions,
           reply: faq.reply,
           intent_display_name: faq.intent_display_name,
           language: "en",