@tiledesk/tiledesk-server 2.4.39 → 2.4.41

package/app.js

@@ -147,9 +147,9 @@ var subscriptionNotifierQueued = require('./services/subscriptionNotifierQueued'
 
 
 var botSubscriptionNotifier = require('./services/BotSubscriptionNotifier');
-// botSubscriptionNotifier.start(); //queued
+botSubscriptionNotifier.start(); //queued but disabled
 
-// botEvent.listen(); queued
+botEvent.listen(); //queued but disabled
 
 var trainingService = require('./services/trainingService');
 trainingService.start();

package/channels/chat21/chat21Handler.js

@@ -85,6 +85,8 @@ class Chat21Handler {
 
         
       
+        // chat21Handler on worker is loaded with stadard events like request.create and NOT request.create.queue because it is used internally by the worker when the request is closed by ChatUnhandledRequestScheduler
+
         // su projectUser create e update
         authEvent.on('user.signup', function(userData) {
             var firstName = userData.savedUser.firstname;
@@ -258,7 +260,7 @@ class Chat21Handler {
                         });
         });
        
-
+        // chat21Handler on worker is loaded with stadard events like request.create and NOT request.create.queue because it is used internally by the worker when the request is closed by ChatUnhandledRequestScheduler
         messageEvent.on('message.sending', function(message) {
 
             // setImmediate(() => {
@@ -358,7 +360,7 @@ class Chat21Handler {
                            return  chat21.messages.sendToGroup(message.senderFullname,     message.recipient, 
                                 recipient_fullname, message.text, message.sender, attributes, message.type, message.metadata, timestamp)
                                         .then(function(data){
-                                            winston.verbose("Chat21Sender sendToGroup sent: "+ JSON.stringify(data));
+                                            winston.verbose("Chat21Sender sendToGroup sent: "+ JSON.stringify(data) + " for text message " + message.text);
                                     
 
                                             // chat21.conversations.stopTyping(message.recipient,message.sender);
@@ -520,6 +522,8 @@ class Chat21Handler {
             //     });
             // });
 
+
+            // chat21Handler on worker is loaded with stadard events like request.create and NOT request.create.queue because it is used internally by the worker when the request is closed by ChatUnhandledRequestScheduler
             requestEvent.on('request.create',  function(request) {          
 
                 winston.debug("chat21Handler requestEvent request.create called" , request);
@@ -632,9 +636,10 @@ class Chat21Handler {
             });
     
 
-            
-            requestEvent.on('request.close',  function(request) {          
+            // chat21Handler on worker is loaded with stadard events like request.create and NOT request.create.queue because it is used internally by the worker when the request is closed by ChatUnhandledRequestScheduler
 
+            requestEvent.on('request.close',  function(request) {          //request.close event here noqueued
+                winston.debug("request.close event here 8")
                 winston.debug("chat21Handler requestEvent request.close called" , request);
 
                 setImmediate(() => {

package/event/botEvent.js

@@ -26,7 +26,7 @@ class BotEvent extends EventEmitter {
             messageCreateKey = 'message.create.queue';
         }
 
-        winston.info("Listening messageCreateKey" + messageCreateKey + " for Chatbot messages");
+        winston.info("Listening " + messageCreateKey + " event for Chatbot messages");
 
         messageEvent.on(messageCreateKey, function(message) {
 

package/jobs.js

@@ -26,6 +26,7 @@ var subscriptionNotifierQueued = require('./services/subscriptionNotifierQueued'
 var botSubscriptionNotifier = require('./services/BotSubscriptionNotifier');
 
 const botEvent = require('./event/botEvent');
+var channelManager = require('./channels/channelManager');
 
 require('./services/mongoose-cache-fn')(mongoose);
 
@@ -58,11 +59,27 @@ winston.info("Mongoose connection done on host: "+mongoose.connection.host + " o
 async function main()
 {
 
-   //************* LOAD QUEUE ************ //
-    require('./pubmodules/queue');   
-    
+  ////************* LOAD QUEUE ************ //
+  require('./pubmodules/cache').cachegoose(mongoose);            
+      
+
+  ////************* LOAD CONCIERGE BOT ************ //
+  require('./pubmodules/rules/appRules').start();
+
+
+  // require('./pubmodules/trigger/rulesTrigger').listen(); request.close trigger event is not triggered by anyone now?
+   
+
+  //************* LOAD QUEUE ************ //
+  require('./pubmodules/queue');   
     // require('@tiledesk-ent/tiledesk-server-queue');     
 
+   //************* LOAD CHAT21 ************ //
+   channelManager.listen(); // chat21Handler is loaded with stadard events like request.create and NOT request.create.queue because it is used internally by the worker when the request is closed by ChatUnhandledRequestScheduler
+
+    
+
+
     let jobsManager = new JobsManager(undefined, geoService, botEvent, subscriptionNotifierQueued, botSubscriptionNotifier);
 
     jobsManager.listen();
@@ -76,6 +93,15 @@ async function main()
     jobsManager.listenActivityArchiver(activityArchiver);
 
 
+    // let routingQueue = require('./pubmodules/routing-queue').listener;    //ci sono altri eventi che nn gestisco in queue request.participants.join etc
+    // winston.info("routingQueue1"); 
+    // jobsManager.listenRoutingQueue(routingQueue);
+
+
+
+    let scheduler = require('./pubmodules/scheduler');    
+    jobsManager.listenScheduler(scheduler);
+
 
     winston.info("Jobs started"); 
 

package/jobsManager.js

@@ -27,12 +27,13 @@ class JobsManager {
            return winston.info("JobsManager jobWorkerEnabled is enabled. Skipping listeners");  
         }
         this.geoService.listen();
-        this.botEvent.listen();
+        
+        // this.botEvent.listen(); // disabled
 
         // this.subscriptionNotifier.start();
         this.subscriptionNotifierQueued.start();
 
-        this.botSubscriptionNotifier.start();
+        // this.botSubscriptionNotifier.start(); // disabled
     }
 
     listenEmailNotification(emailNotification) {      
@@ -44,7 +45,23 @@ class JobsManager {
         this.emailNotification.requestNotification.listen();
     }
 
-   
+    // listenRoutingQueue(routingQueue) {
+    //     winston.info("JobsManager routingQueue started");  
+    //     if ( this.jobWorkerEnabled == true) {
+    //         return winston.info("JobsManager jobWorkerEnabled is enabled. Skipping listener for routingQueue");  
+    //     }
+    //     this.routingQueue = routingQueue;
+    //     this.routingQueue.listen();
+    // }
+
+    listenScheduler(scheduler) {
+        winston.info("JobsManager scheduler started");  
+        if ( this.jobWorkerEnabled == true) {
+            return winston.info("JobsManager jobWorkerEnabled is enabled. Skipping listener for scheduler");  
+        }
+        this.scheduler = scheduler;
+        this.scheduler.taskRunner.start();    
+    }
 
     listenActivityArchiver(activityArchiver) {
         winston.info("JobsManager listenActivityArchiver started"); 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.4.39",
+  "version": "2.4.41",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -45,7 +45,7 @@
     "@tiledesk/tiledesk-messenger-connector": "0.1.9",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
     "@tiledesk/tiledesk-tybot-connector": "^0.1.89",
-    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.50",
+    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.51",
     "amqplib": "^0.5.5",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",

package/pubmodules/activities/activityArchiver.js

@@ -42,6 +42,7 @@ class ActivityArchiver {
         activityEvent.on('lead.download.csv', this.save);
 */
       
+//  works only if worker is disabled
       var authProjectUserInvitePendingKey = 'project_user.invite.pending';  //Don't work if job_worker enabled because queue.worker is disabled
       // if (authEvent.queueEnabled) { //queue not supported.
       //   authProjectUserInvitePendingKey = 'project_user.invite.pending.queue';
@@ -63,6 +64,10 @@ class ActivityArchiver {
        
         });
       
+
+
+
+//  works only if worker is disabled
         var authProjectUserInviteKey = 'project_user.invite';   //Don't work if job_worker enabled because queue.worker is disabled
         // if (authEvent.queueEnabled) { //queue not supported
         //   authProjectUserInviteKey = 'project_user.invite.queue';
@@ -84,6 +89,9 @@ class ActivityArchiver {
             
           });
         });
+
+
+
       
       // verified with queue
         var authProjectUserUpdateKey = 'project_user.update';
@@ -125,7 +133,7 @@ class ActivityArchiver {
         
        });
       
-
+//  works only if worker is disabled
        var authProjectUserDeleteKey = 'project_user.delete';     //Don't work if job_worker enabled because queue.worker is disabled
       //  if (authEvent.queueEnabled) { //queue not supported
       //   authProjectUserDeleteKey = 'project_user.delete.queue';
@@ -147,8 +155,10 @@ class ActivityArchiver {
           
         });
       });
-      
 
+
+      
+// disabled why? performance?
       // var authUserSignineKey = 'user.signin';
       // // if (authEvent.queueEnabled) { //queue not supported
       // //   authUserSignineKey = 'user.signin.queue';

package/pubmodules/emailNotification/requestNotification.js

@@ -83,14 +83,14 @@ listen() {
 
           //messages sent from admins or agents to requester
           if (message.sender != message.request.lead.lead_id) {
-            winston.verbose("sending sendToUserEmailChannelEmail for EMAIL or FORM channel");
+            winston.debug("sending sendToUserEmailChannelEmail for EMAIL or FORM channel");
              
             //send email notification to requester (send also to followers)
             return that.sendToUserEmailChannelEmail(message.id_project, message);        
           } else { //messages sent from requester to agents or admins
 
             if (message.text != message.request.first_text) {              
-              winston.verbose("sending sendToAgentEmailChannelEmail for EMAIL or FORM channel");
+              winston.debug("sending sendToAgentEmailChannelEmail for EMAIL or FORM channel");
 
               //send email notification to admins and agents(send also to followers)
               return that.sendToAgentEmailChannelEmail(message.id_project, message);           
@@ -140,7 +140,7 @@ listen() {
    
         /*
         if (request && (request.channel.name===ChannelConstants.EMAIL || request.channel.name===ChannelConstants.FORM )) {
-          winston.verbose("sending sendEmailChannelTakingNotification for EMAIL or FORM channel");
+          winston.debug("sending sendEmailChannelTakingNotification for EMAIL or FORM channel");
          that.sendEmailChannelTakingNotification(request.id_project, request)
         } 
         */
@@ -190,7 +190,7 @@ listen() {
     if (requestEvent.queueEnabled) {
       requestCloseExtendedKey = 'request.close.extended.queue';
     }
-    winston.debug('RequestNotification requestCloseExtendedKey: ' + requestCloseExtendedKey);
+    winston.debug('RequestNotification requestCloseExtendedKey: ' + requestCloseExtendedKey);    //request.close event here queued under job
     requestEvent.on(requestCloseExtendedKey, function(data) {
       winston.debug('requestEvent.on(requestCloseExtendedKey ' + requestCloseExtendedKey);
       setImmediate(() => {
@@ -563,7 +563,7 @@ sendToAgentEmailChannelEmail(projectid, message) {
                          if (!user) {
                           winston.warn("User not found", userid);
                          } else {
-                           winston.verbose("Sending sendNewPooledMessageNotification to user with email: "+ user.email);
+                           winston.debug("Sending sendNewPooledMessageNotification to user with email: "+ user.email);
                            if (user.emailverified) {
                              emailService.sendNewPooledMessageEmailNotification(user.email, savedRequest, project, message);
                            }else {
@@ -997,7 +997,7 @@ sendAgentEmail(projectid, savedRequest) {
                           if (!user) {
                             winston.warn("User not found",  savedRequest.participants[0]);
                           } else {
-                            winston.verbose("Sending sendNewAssignedRequestNotification to user with email", user.email);
+                            winston.debug("Sending sendNewAssignedRequestNotification to user with email", user.email);
                             //  if (user.emailverified) {    enable it?     send anyway to improve engagment for new account    
                             
                             

package/pubmodules/pubModulesManager.js

@@ -493,7 +493,8 @@ class PubModulesManager {
         
         if (this.scheduler) {
             try {
-                this.scheduler.taskRunner.start();     
+                // this.scheduler.taskRunner.start();     
+                this.jobsManager.listenScheduler(this.scheduler);
                 winston.info("PubModulesManager scheduler started.");   
             } catch(err) {        
                 winston.info("PubModulesManager error starting scheduler module", err);            
@@ -515,6 +516,7 @@ class PubModulesManager {
         if (this.routingQueue) {
             try {
                 this.routingQueue.listen();
+                // this.jobsManager.listenRoutingQueue(this.routingQueue);
                 winston.info("PubModulesManager routingQueue started");
             } catch(err) {        
                 winston.info("PubModulesManager error starting routingQueue module", err);            

package/pubmodules/queue/reconnect.js

@@ -17,7 +17,9 @@ var url = process.env.CLOUDAMQP_URL + "?heartbeat=60" || "amqp://localhost";
 // attento devi aggiornare configMap di PRE E PROD
 // var url = process.env.AMQP_URL + "?heartbeat=60" || "amqp://localhost?heartbeat=60";
 
+// var durable = true;
 var durable = false;
+
 // if (process.env.ENABLE_DURABLE_QUEUE == false || process.env.ENABLE_DURABLE_QUEUE == "false") {
 //   durable = false;
 // }
@@ -67,10 +69,10 @@ function whenConnected() {
   winston.info("JobsManager jobWorkerEnabled: "+ jobWorkerEnabled);  
 
   if (jobWorkerEnabled == false) {
-    winston.info("Queue Reconnect start worker");
+    winston.info("Queue Reconnect starts queue worker (queue observer)");
     startWorker();
   } else {
-    winston.info("Queue Reconnect without worker because external worker is enabled");
+    winston.info("Queue Reconnect without queue worker (queue observer) because external worker is enabled");
   }
   
 }
@@ -328,9 +330,10 @@ function listen() {
       });
     });
 
-
+    // winston.debug("sub to reconnect request.close");
     requestEvent.on('request.close', function(request) {
       setImmediate(() => {
+        winston.debug("reconnect request.close");
         publish(exchange, "request_close", Buffer.from(JSON.stringify(request)));
       });
     });
@@ -395,6 +398,6 @@ if (process.env.QUEUE_ENABLED === "true") {
     leadEvent.queueEnabled = true;
     listen();
     start();
-    winston.info("Queue enabled. endpint: " + url );
+    winston.info("Queue enabled. endpoint: " + url );
 } 
 

package/routes/faq.js

@@ -10,6 +10,7 @@ const faqEvent = require('../event/faqBotEvent')
 
 var parsecsv = require("fast-csv");
 const botEvent = require('../event/botEvent');
+const uuidv4 = require('uuid/v4');
 csv = require('csv-express');
 csv.separator = ';';
 
@@ -21,10 +22,10 @@ router.post('/uploadcsv', upload.single('uploadFile'), function (req, res, next)
   winston.debug(' -> FILE ', req.file);
 
   var id_faq_kb = req.body.id_faq_kb;
-  winston.debug('id_faq_kb: '+id_faq_kb);
+  winston.debug('id_faq_kb: ' + id_faq_kb);
 
   var delimiter = req.body.delimiter || ";";
-  winston.debug('delimiter: '+delimiter);
+  winston.debug('delimiter: ' + delimiter);
 
   var csv = req.file.buffer.toString('utf8');
   // winston.debug(' -> CSV STRING ', csv);
@@ -32,10 +33,10 @@ router.post('/uploadcsv', upload.single('uploadFile'), function (req, res, next)
   // res.json({ success: true, msg: 'Importing CSV...' });
 
   // PARSE CSV
- 
 
 
-  Faq_kb.findById(id_faq_kb).exec(function(err, faq_kb) {
+
+  Faq_kb.findById(id_faq_kb).exec(function (err, faq_kb) {
     if (err) {
       return res.status(500).send({ success: false, msg: 'Error getting object.' });
     }
@@ -44,18 +45,43 @@ router.post('/uploadcsv', upload.single('uploadFile'), function (req, res, next)
     }
     winston.debug('faq_kb ', faq_kb.toJSON());
 
-  // getFaqKbKeyById(req.body.id_faq_kb, function (remote_faqkb_key) {
+    // getFaqKbKeyById(req.body.id_faq_kb, function (remote_faqkb_key) {
 
     parsecsv.parseString(csv, { headers: false, delimiter: delimiter })
       .on("data", function (data) {
         winston.debug('PARSED CSV ', data);
 
         var question = data[0]
-        var answer = data[1]
+        //var answer = data[1]
         var intent_id = data[2];
         var intent_display_name = data[3];
         var webhook_enabled = data[4];
 
+
+        var actions = [
+          {
+            _tdActionType: "reply",
+            _tdActionId: uuidv4(),
+            text: data[1],
+            attributes: {
+              commands: [
+                {
+                  type: "wait",
+                  time: 500
+                },
+                {
+                  type: "message",
+                  message: {
+                    type: "text",
+                    text: data[1]
+                  }
+                }
+              ]
+            }
+
+          }
+        ]
+
         var webhook_enabled_boolean = false;
         if (webhook_enabled) {
           webhook_enabled_boolean = (webhook_enabled == 'true');
@@ -67,8 +93,9 @@ router.post('/uploadcsv', upload.single('uploadFile'), function (req, res, next)
         var newFaq = new Faq({
           id_faq_kb: id_faq_kb,
           question: question,
-          answer: answer,
-          intent_id:intent_id,
+          //answer: answer,
+          actions: actions,
+          intent_id: intent_id,
           intent_display_name: intent_display_name,
           webhook_enabled: webhook_enabled_boolean,
           language: faq_kb.language,
@@ -85,7 +112,7 @@ router.post('/uploadcsv', upload.single('uploadFile'), function (req, res, next)
           } else {
             faqBotEvent.emit('faq.create', savedFaq);
           }
-          
+
         });
       })
       .on("end", function () {
@@ -105,7 +132,7 @@ router.post('/', function (req, res) {
 
   winston.debug(req.body);
 
-  Faq_kb.findById(req.body.id_faq_kb).exec(function(err, faq_kb) {
+  Faq_kb.findById(req.body.id_faq_kb).exec(function (err, faq_kb) {
     if (err) {
       return res.status(500).send({ success: false, msg: 'Error getting object.' });
     }
@@ -148,7 +175,7 @@ router.post('/', function (req, res) {
         } else {
           winston.debug('--- > ERROR ', err)
           return res.status(500).send({ success: false, msg: 'Error saving object.' });
-        }     
+        }
       }
       winston.debug('1. ID OF THE NEW FAQ CREATED ', savedFaq._id)
       winston.debug('1. QUESTION OF THE NEW FAQ CREATED ', savedFaq.question)
@@ -160,14 +187,13 @@ router.post('/', function (req, res) {
 
       res.json(savedFaq);
 
-    
+
     });
   });
 });
 
 router.patch('/:faqid/attributes', function (req, res) {
   let data = req.body;
-  console.log("data: ", data);
 
   Faq.findById(req.params.faqid, function (err, updatedFaq) {
     if (err) {
@@ -180,22 +206,18 @@ router.patch('/:faqid/attributes', function (req, res) {
     }
 
     if (!updatedFaq.attributes) {
-      console.log("empty attributes");
       winston.debug("empty attributes");
       updatedFaq.attributes = {};
     }
 
     winston.debug("updatedFaq attributes", updatedFaq.attributes);
 
-    Object.keys(data).forEach(function(key) {
+    Object.keys(data).forEach(function (key) {
       var val = data[key];
       winston.debug("data attributes" + key + " " + val);
       updatedFaq.attributes[key] = val;
     })
 
-    console.log("updatedFaq: ", updatedFaq);
-    console.log("updatedFaq attributes: ", updatedFaq.attributes);
-
     winston.debug("updatedBot attributes", updatedFaq.attributes)
 
     updatedFaq.markModified('attributes');
@@ -207,8 +229,6 @@ router.patch('/:faqid/attributes', function (req, res) {
         return res.status(500).send({ success: false, msg: 'Error saving object.' });
       }
 
-      console.log("saved faq attributes", savedFaq.toObject());
-
       winston.verbose("saved faq attributes", savedFaq.toObject());
       faqBotEvent.emit('faq.update', savedFaq);
       res.json(savedFaq);
@@ -221,38 +241,38 @@ router.put('/:faqid', function (req, res) {
   winston.debug('UPDATE FAQ ', req.body);
 
   var update = {};
-  
-  if (req.body.intent!=undefined) {
+
+  if (req.body.intent != undefined) {
     update.intent = req.body.intent;
   }
-  if (req.body.question!=undefined) {
+  if (req.body.question != undefined) {
     update.question = req.body.question;
   }
-  if (req.body.answer!=undefined) {
+  if (req.body.answer != undefined) {
     update.answer = req.body.answer;
   }
-  if (req.body.topic!=undefined) {
+  if (req.body.topic != undefined) {
     update.topic = req.body.topic;
   }
-  if (req.body.status!=undefined) {
+  if (req.body.status != undefined) {
     update.status = req.body.status;
   }
-  if (req.body.language!=undefined) {
+  if (req.body.language != undefined) {
     update.language = req.body.language;
   }
-  if (req.body.intent_display_name!=undefined) {
+  if (req.body.intent_display_name != undefined) {
     update.intent_display_name = req.body.intent_display_name;
   }
-  if (req.body.webhook_enabled!=undefined) {
+  if (req.body.webhook_enabled != undefined) {
     update.webhook_enabled = req.body.webhook_enabled;
   }
-  if (req.body.enabled!=undefined) {
+  if (req.body.enabled != undefined) {
     update.enabled = req.body.enabled;
   }
-  if (req.body.reply!=undefined) {
+  if (req.body.reply != undefined) {
     update.reply = req.body.reply;
   }
-  if (req.body.form!=undefined) {
+  if (req.body.form != undefined) {
     update.form = req.body.form;
   }
   if (req.body.actions != undefined) {
@@ -266,7 +286,7 @@ router.put('/:faqid', function (req, res) {
     if (err) {
       if (err.code == 11000) {
         return res.status(409).send({ success: false, msg: 'Duplicate  intent_display_name.' });
-      }else {
+      } else {
         return res.status(500).send({ success: false, msg: 'Error updating object.' });
       }
     }
@@ -315,16 +335,18 @@ router.get('/csv', function (req, res) {
 
   winston.debug('EXPORT FAQS TO CSV QUERY', query);
 
-   Faq.find(query, 'question answer intent_id intent_display_name webhook_enabled -_id').lean().exec(function (err, faqs) {
+  Faq.find(query, 'question answer intent_id intent_display_name webhook_enabled -_id').lean().exec(function (err, faqs) {
     if (err) {
       winston.debug('EXPORT FAQS TO CSV ERR', err)
       return (err)
     };
     var csv = [];
-    faqs.forEach(function(element) {
-      var row = {question: element.question, answer: element.answer, 
+    faqs.forEach(function (element) {
+      var row = {
+        question: element.question, answer: element.answer,
         intent_id: element.intent_id, intent_display_name: element.intent_display_name,
-        webhook_enabled: element.webhook_enabled || false }
+        webhook_enabled: element.webhook_enabled || false
+      }
       csv.push(row);
     });
     winston.debug('EXPORT FAQ TO CSV FAQS', csv)
@@ -363,9 +385,9 @@ router.get('/', function (req, res, next) {
 
   var limit = 3000; // Number of request per page
 
-  if (req.query.limit) {    
+  if (req.query.limit) {
     limit = parseInt(req.query.limit);
-    winston.debug('faq ROUTE - limit: '+limit);
+    winston.debug('faq ROUTE - limit: ' + limit);
   }
 
   var page = 0;
@@ -388,15 +410,15 @@ router.get('/', function (req, res, next) {
   }
 
   if (req.query.intent_display_name) {
-    query.intent_display_name=req.query.intent_display_name
+    query.intent_display_name = req.query.intent_display_name
   }
-  
+
 
   winston.debug("GET FAQ query", query);
 
   // query.$text = {"$search": "question"};
 
-// TODO ORDER BY SCORE
+  // TODO ORDER BY SCORE
   // return Faq.find(query,  {score: { $meta: "textScore" } }) 
   // .sort( { score: { $meta: "textScore" } } ) //https://docs.mongodb.com/manual/reference/operator/query/text/#sort-by-text-search-score
 
@@ -404,11 +426,11 @@ router.get('/', function (req, res, next) {
   // return Faq.search('a closer', (err, result) => {
   //   console.log("result: ", result);
   // })
-  
+
   return Faq.find(query).
-  skip(skip).limit(limit).
-  populate({path:'faq_kb'})//, match: { trashed: { $in: [null, false] } }}).
-  .exec(function (err, faq) {
+    skip(skip).limit(limit).
+    populate({ path: 'faq_kb' })//, match: { trashed: { $in: [null, false] } }}).
+    .exec(function (err, faq) {
       winston.debug("GET FAQ ", faq);
 
       if (err) {
@@ -420,7 +442,7 @@ router.get('/', function (req, res, next) {
 
     });
 
-  
+
 });
 
 

package/routes/faq_kb.js

@@ -363,7 +363,6 @@ router.put('/:faq_kbid/language/:language', (req, res) => {
         botEvent.emit('faqbot.update', updatedFaq_kb);
         return res.status(500).send({ success: false, msg: 'Error updating multiple object.' });
       }
-      console.log("updateMany intents result: ", result)
       return res.status(200).send(updatedFaq_kb)
     })
 

package/routes/users-util.js

@@ -21,7 +21,7 @@ router.get('/:userid', function (req, res) {
     return res.status(404).send({ success: false, msg: 'User id not found' });
   }
 
-  User.findById(userid, 'firstname lastname _id', function (err, user) {
+  User.findById(userid, 'firstname lastname _id public_website public_email description', function (err, user) {
     if (err) {
       winston.error('Error getting object.',err);
       return res.status(500).send({ success: false, msg: 'Error getting object.' });

package/services/BotSubscriptionNotifier.js

@@ -19,7 +19,7 @@ class BotSubscriptionNotifier {
   
   notify(bot,botWithSecret, payload) {
   
-      winston.verbose("BotSubscriptionNotifier bot", bot.toObject());
+      winston.debug("BotSubscriptionNotifier bot", bot.toObject());
       winston.debug("BotSubscriptionNotifier payload", payload );
 
       var url = bot.url;