@tiledesk/tiledesk-server 2.4.46 → 2.4.48

package/app.js

@@ -112,6 +112,7 @@ var jwtroute = require('./routes/jwt');
 var key = require('./routes/key');
 var widgets = require('./routes/widget');
 var widgetsLoader = require('./routes/widgetLoader');
+var openai_kbs = require('./routes/openai_kbs');
 
 // var admin = require('./routes/admin');
 var faqpub = require('./routes/faqpub');
@@ -549,6 +550,8 @@ app.use('/:projectid/emails',[passport.authenticate(['basic', 'jwt'], { session:
 
 app.use('/:projectid/properties',[passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])], property);
 
+app.use('/:projectid/openai_kbs', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent')], openai_kbs);
+
 
 
 if (pubModulesManager) {

package/jobs.js

@@ -93,9 +93,9 @@ 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 routingQueueQueued = require('./pubmodules/routing-queue').listenerQueued;
+    winston.debug("routingQueueQueued"); 
+    jobsManager.listenRoutingQueue(routingQueueQueued);
 
 
 

package/jobsManager.js

@@ -45,14 +45,14 @@ 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();
-    // }
+    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");  

package/models/openai_kbs.js

@@ -0,0 +1,23 @@
+var mongoose = require('mongoose');
+var Schema = mongoose.Schema;
+var winston = require('../config/winston');
+
+var OpenaiKbsSchema = new Schema({
+  name: {
+    type: String,
+    required: true
+  },
+  url: {
+    type: String,
+    required: true
+  },
+  id_project: {
+    type: String,
+    required: true,
+    index: true
+  },
+
+});
+
+
+module.exports = mongoose.model('OpenaiKbs', OpenaiKbsSchema);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.4.46",
+  "version": "2.4.48",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",

package/pubmodules/pubModulesManager.js

@@ -51,6 +51,7 @@ class PubModulesManager {
         this.jobsManager = undefined;
 
         this.routingQueue = undefined;
+        this.routingQueueQueued = undefined;
 
         this.cache = undefined;
 
@@ -407,8 +408,11 @@ class PubModulesManager {
 
         try {
             this.routingQueue = require('./routing-queue').listener;
+            this.routingQueueQueued = require('./routing-queue').listenerQueued;
+
             // this.routingQueue.listen();
             winston.debug("this.routingQueue:"+ this.routingQueue);           
+            winston.debug("this.routingQueueQueued:"+ this.routingQueueQueued);           
 
             winston.info("PubModulesManager routing queue initialized");
         } catch(err) {
@@ -515,13 +519,21 @@ class PubModulesManager {
 
         if (this.routingQueue) {
             try {
-                this.routingQueue.listen();
-                // this.jobsManager.listenRoutingQueue(this.routingQueue);
+                this.routingQueue.listen();  
                 winston.info("PubModulesManager routingQueue started");
             } catch(err) {        
                 winston.info("PubModulesManager error starting routingQueue module", err);            
             }
         }
+        if (this.routingQueueQueued) {
+            try {
+                // this.routingQueueQueued.listen();  
+                this.jobsManager.listenRoutingQueue(this.routingQueueQueued);
+                winston.info("PubModulesManager routingQueue queued started");
+            } catch(err) {        
+                winston.info("PubModulesManager error starting routingQueue queued module", err);            
+            }
+        }
 
         // if (this.dialogFlow) {
         //     try {

package/pubmodules/routing-queue/index.js

@@ -1,3 +1,5 @@
 const listener = require("./listener");
+const listenerQueued = require("./listenerQueued");
 
-module.exports = {listener:listener };
+
+module.exports = {listener:listener, listenerQueued: listenerQueued };

package/pubmodules/routing-queue/listener.js

@@ -1,13 +1,7 @@
-const projectEvent = require('../../event/projectEvent');
 const departmentEvent = require('../../event/departmentEvent');
-const authEvent = require('../../event/authEvent');
-const requestEvent = require('../../event/requestEvent');
 var Request = require('../../models/request');
-var Project = require('../../models/project');
-var Project_user = require('../../models/project_user');
 var winston = require('../../config/winston');
 
-var ProjectUserUtil = require("../../utils/project_userUtil");
 
 // var request = require('retry-request', {
 //     request: require('request')
@@ -55,42 +49,6 @@ class Listener {
         // };
       }
 
-      // db.getCollection('project_users').find({"number_assigned_requests" : {"$lt":0}}).count()
-
-
-    updateProjectUser(id_user, id_project, operation) {
-      winston.debug("updateProjectUser start");
-      return Project_user       
-                    .findOneAndUpdate({id_user: id_user, id_project: id_project}, {$inc : {'number_assigned_requests' : operation}}, {new: true, upsert:false}, function(err, updatedPU) {
-                    if (err) {
-                     return winston.error(err);
-                    }
-                    winston.debug("number_assigned_requests +1 :" + updatedPU.id);
-
-                    updatedPU.populate({path:'id_user', select:{'firstname':1, 'lastname':1}},function (err, updatedProject_userPopulated){    
-
-                      var pu = updatedProject_userPopulated.toJSON();
-
-                      return Project.findById(id_project).exec(function(err, project) {
-                        pu.isBusy = ProjectUserUtil.isBusy(updatedProject_userPopulated, project.settings && project.settings.max_agent_assigned_chat);                  
-                        winston.debug("pu.isBusy: "+ pu.isBusy);
-                        authEvent.emit('project_user.update', {updatedProject_userPopulated:pu, req: undefined, skipArchive: true});
-                      })
-                      
-                    });
-
-                });
-    }
-
-    updateParticipatingProjectUsers(request, operation) {
-        winston.debug("request.participatingAgents", request.participatingAgents);
-        if (request.participatingAgents.length>0) {
-            request.participatingAgents.forEach(user => {
-              winston.debug("request.participatingAgents user",user); //it is a user and not a project_user
-                this.updateProjectUser(user.id, request.id_project, operation);                
-            });
-        } 
-      }  
 
     listen() {
 
@@ -101,57 +59,6 @@ class Listener {
       }
 
         var that = this;
- 
-        // TODO fai versione che passa anche project
-        requestEvent.on('request.create', async (request) => {
-            setImmediate(() => {
-              this.updateParticipatingProjectUsers(request, +1);  
-            });
-        });
-
-          // TODO usa versione complete con project per evitare query??
-        requestEvent.on('request.close', async (request) => {
-          setImmediate(() => {
-            this.updateParticipatingProjectUsers(request, -1);          
-          });
-        });
-
-
-        requestEvent.on('request.participants.join', async (data) => {
-          var request = data.request;
-          var member = data.member;
-          setImmediate(() => {
-            this.updateProjectUser(member, request.id_project, 1);          
-          });
-        });
-
-        requestEvent.on('request.participants.leave', async (data) => {
-          var request = data.request;
-          var member = data.member;
-          setImmediate(() => {
-            this.updateProjectUser(member, request.id_project, -1);          
-          });
-        });
-
-        requestEvent.on('request.participants.update', async (data) => {
-          var request = data.request;
-          var removedParticipants = data.removedParticipants;
-          var addedParticipants = data.addedParticipants;
-
-          setImmediate(() => {
-
-            addedParticipants.forEach(participant => {
-              winston.debug('addedParticipants participant', participant);
-              this.updateProjectUser(participant, request.id_project, 1);          
-            });
-
-            removedParticipants.forEach(participant => {
-              winston.debug('removedParticipants participant', participant);
-              this.updateProjectUser(participant, request.id_project, -1);          
-            });
-
-          });
-        });
 
         departmentEvent.on('operator.select.base2', async (res) => {
             // departmentEvent.prependListener('operator.select', async (data) => {
@@ -170,9 +77,7 @@ class Listener {
           
             }
           
-          
-          
-          
+        
           
           
           

package/pubmodules/routing-queue/listenerQueued.js

@@ -0,0 +1,194 @@
+const authEvent = require('../../event/authEvent');
+const requestEvent = require('../../event/requestEvent');
+var Project = require('../../models/project');
+var Project_user = require('../../models/project_user');
+var winston = require('../../config/winston');
+
+var ProjectUserUtil = require("../../utils/project_userUtil");
+
+// var request = require('retry-request', {
+//     request: require('request')
+//   });
+
+// TODO riabilitare questo
+
+// const ROUTE_QUEUE_ENDPOINT = process.env.ROUTE_QUEUE_ENDPOINT;
+// winston.debug("ROUTE_QUEUE_ENDPOINT: " + ROUTE_QUEUE_ENDPOINT);
+
+// if (ROUTE_QUEUE_ENDPOINT) {
+//   winston.info("Route queue endpoint: " + ROUTE_QUEUE_ENDPOINT);
+// } else {
+//    winston.info("Route queue endpoint not configured");
+// }
+
+
+
+
+// TODO web socket is not supported with queue
+class Listener {
+
+ 
+  constructor() {
+    this.enabled = true;
+    if (process.env.ROUTE_QUEUE_ENABLED=="false" || process.env.ROUTE_QUEUE_ENABLED==false) {
+        this.enabled = false;
+    }
+    winston.debug("Listener this.enabled: "+ this.enabled);
+}
+
+ 
+      // db.getCollection('project_users').find({"number_assigned_requests" : {"$lt":0}}).count()
+
+
+    updateProjectUser(id_user, id_project, operation) {
+      winston.debug("Route queue updateProjectUser start");
+      return Project_user       
+                    .findOneAndUpdate({id_user: id_user, id_project: id_project}, {$inc : {'number_assigned_requests' : operation}}, {new: true, upsert:false}, function(err, updatedPU) {
+                    if (err) {
+                     return winston.error(err);
+                    }
+                    winston.debug("Route queue number_assigned_requests +1 :" + updatedPU.id);
+
+                    updatedPU.populate({path:'id_user', select:{'firstname':1, 'lastname':1}},function (err, updatedProject_userPopulated){    
+
+                      var pu = updatedProject_userPopulated.toJSON();
+
+                      return Project.findById(id_project).exec(function(err, project) {
+                        pu.isBusy = ProjectUserUtil.isBusy(updatedProject_userPopulated, project.settings && project.settings.max_agent_assigned_chat);                  
+                        winston.debug("Route queue pu.isBusy: "+ pu.isBusy);
+                                               
+                        authEvent.emit('project_user.update', {updatedProject_userPopulated:pu, req: undefined, skipArchive: true}); //if queued with jobs -> websocket notification on project_user.update doesn't work??? forse si in quanto viene convertito in .pub.queue e poi rifunziiona
+
+
+                        // project_user.update triggers activityArchiver(tested), cache invalidation(tested), subscriptionNotifierQueued and websocket(tested works from queue i trigger ws)
+                        if (requestEvent.queueEnabled) {  //force to .queue to be catched into the queue (activity archiver, subscriptionNotifierQueued )
+                          authEvent.emit('project_user.update.queue', {updatedProject_userPopulated:pu, req: undefined, skipArchive: true});
+                        }
+
+                      })
+                      
+                    });
+
+                });
+    }
+
+    updateParticipatingProjectUsers(request, operation) {
+        winston.debug("Route queue request.participatingAgents", request.participatingAgents);
+        if (request.participatingAgents.length>0) {
+            request.participatingAgents.forEach(user => {
+              winston.debug("request.participatingAgents user",user); //it is a user and not a project_user
+                this.updateProjectUser(user.id, request.id_project, operation);                
+            });
+        } 
+      }  
+
+    listen() {
+
+      if (this.enabled==true) {
+        winston.info("Route queue with queue Listener listen");
+      } else {
+          return winston.info("Route queue with queue Listener disabled");
+      }
+
+        var that = this;
+ 
+        // TODO fai versione che passa anche project
+        var requestCreateKey = 'request.create';
+        if (requestEvent.queueEnabled) {
+          requestCreateKey = 'request.create.queue';
+        }
+        winston.debug('Route queue requestCreateKey: ' + requestCreateKey);
+   
+        requestEvent.on(requestCreateKey, async (request) => {
+            setImmediate(() => {
+              winston.debug('Route queue requestCreate');
+              this.updateParticipatingProjectUsers(request, +1);  
+            });
+        });
+
+          // TODO usa versione complete con project per evitare query??
+        var requestCloseKey = 'request.close';   //request.close event here queued under job
+        if (requestEvent.queueEnabled) {
+          requestCloseKey = 'request.close.queue';
+        }
+        winston.debug('Route queue requestCloseKey: ' + requestCloseKey);
+
+        requestEvent.on(requestCloseKey, async (request) => {    //request.close event here noqueued
+          winston.debug("request.close event here 4")
+          setImmediate(() => {
+            winston.debug('Route queue requestClose');
+            this.updateParticipatingProjectUsers(request, -1);          
+          });
+        });
+
+
+        var requestParticipantsJoinKey = 'request.participants.join';
+        if (requestEvent.queueEnabled) {
+          requestParticipantsJoinKey = 'request.participants.join.queue';
+        }
+        winston.debug('Route queue  requestParticipantsJoinKey: ' + requestParticipantsJoinKey);
+   
+        requestEvent.on(requestParticipantsJoinKey, async (data) => {
+          winston.debug('Route queue ParticipantsJoin');
+
+          var request = data.request;
+          var member = data.member;
+          setImmediate(() => {
+            this.updateProjectUser(member, request.id_project, 1);          
+          });
+        });
+
+        var requestParticipantsLeaveKey = 'request.participants.leave';
+        if (requestEvent.queueEnabled) {
+          requestParticipantsLeaveKey = 'request.participants.leave.queue';
+        }
+        winston.debug('Route queue  requestParticipantsLeaveKey: ' + requestParticipantsLeaveKey);
+   
+        requestEvent.on(requestParticipantsLeaveKey, async (data) => {
+          winston.debug('Route queue ParticipantsLeave');
+
+          var request = data.request;
+          var member = data.member;
+          setImmediate(() => {
+            this.updateProjectUser(member, request.id_project, -1);          
+          });
+        });
+
+        var requestParticipantsUpdateKey = 'request.participants.update';
+        if (requestEvent.queueEnabled) {
+         requestParticipantsUpdateKey = 'request.participants.update.queue';
+        }
+        winston.debug('Route queue  requestParticipantsUpdateKey: ' + requestParticipantsUpdateKey);
+   
+        requestEvent.on(requestParticipantsUpdateKey, async (data) => {
+          winston.debug('Route queue Participants Update');
+
+          var request = data.request;
+          var removedParticipants = data.removedParticipants;
+          var addedParticipants = data.addedParticipants;
+
+          setImmediate(() => {
+
+            addedParticipants.forEach(participant => {
+              winston.debug('addedParticipants participant', participant);
+              this.updateProjectUser(participant, request.id_project, 1);          
+            });
+
+            removedParticipants.forEach(participant => {
+              winston.debug('removedParticipants participant', participant);
+              this.updateProjectUser(participant, request.id_project, -1);          
+            });
+
+          });
+        });
+
+     
+       
+    }
+
+}
+
+var listener = new Listener();
+
+
+module.exports = listener;

package/routes/email.js

@@ -303,33 +303,35 @@ if (process.env.ENABLE_TEST_EMAIL_ENDPOINT==true || process.env.ENABLE_TEST_EMAI
 
 
 //TODO add cc
-router.post('/send', 
- async (req, res) => {
-  let to = req.body.to;
-  winston.debug("to: " + to);
+// router.post('/send', 
+//  async (req, res) => {
+//   let to = req.body.to;
+//   winston.debug("to: " + to);
 
-  let text = req.body.text;
-  winston.debug("text: " + text);
+//   let text = req.body.text;
+//   winston.debug("text: " + text);
 
-  let request_id = req.body.request_id;
-  winston.debug("request_id: " + request_id);
+//   let request_id = req.body.request_id;
+//   winston.debug("request_id: " + request_id);
 
-  let subject = req.body.subject;
-  winston.debug("subject: " + subject);
+//   let subject = req.body.subject;
+//   winston.debug("subject: " + subject);
 
-  winston.debug("req.project", req.project);
+//   winston.debug("req.project", req.project);
 
-  let newto = await recipientEmailUtil.process(to, req.projectid);
-  winston.debug("newto: " + newto);
+//   let newto = await recipientEmailUtil.process(to, req.projectid);
+//   winston.debug("newto: " + newto);
 
-  let replyto = req.body.replyto;
-  winston.debug("replyto: " + replyto);
+//   let replyto = req.body.replyto;
+//   winston.debug("replyto: " + replyto);
 
-             //sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage, payload)
-  emailService.sendEmailDirect(newto, text, req.project, request_id, subject, undefined, undefined, undefined, replyto);
+//   winston.info("Sending an email with text : " + text + " to " + to);
+
+//              //sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage, payload)
+//   emailService.sendEmailDirect(newto, text, req.project, request_id, subject, undefined, undefined, undefined, replyto);
   
-  res.json({"queued": true});
+//   res.json({"queued": true});
     
-});
+// });
 
 module.exports = router;

package/routes/faq.js

@@ -168,10 +168,12 @@ router.post('/', function (req, res) {
     if (req.body.actions) {
       newFaq.actions = req.body.actions
     }
-
     if (req.body.attributes) {
       newFaq.attributes = req.body.attributes
     }
+    if (req.body.intent_id) {
+      newFaq.intent_id = req.body.intent_id;
+    }
 
     newFaq.save(function (err, savedFaq) {
       if (err) {

package/routes/openai_kbs.js

@@ -0,0 +1,57 @@
+var express = require('express');
+var OpenaiKbs = require('../models/openai_kbs');
+var router = express.Router();
+
+
+router.get('/', async (req, res) => {
+
+    let project_id = req.projectid;
+
+    OpenaiKbs.find({ id_project: project_id }, (err, kbs) => {
+        if (err) {
+            console.error("find all kbs error: ", err);
+            return res.status(500).send({ success: false, error: err });
+        } else {
+            return res.status(200).send(kbs);
+        }
+    })
+})
+
+router.post('/', async (req, res) => {
+
+    let body = req.body;
+
+    let new_kbs = new OpenaiKbs({
+        name: body.name,
+        url: body.url,
+        id_project: req.projectid
+    })
+
+    new_kbs.save(function (err, savedKbs) {
+        if (err) {
+            console.error("save new kbs error: ", err);
+            return res.status(500).send({ success: false, error: err});
+        } else {
+            return res.status(200).send(savedKbs);
+        }
+    })
+})
+
+router.put('/', async (req, res) => {
+
+})
+
+router.delete('/:kbs_id', async (req, res) => {
+    let kbs_id = req.params.kbs_id;
+
+    OpenaiKbs.findOneAndDelete( { _id: kbs_id }, (err, kbDeleted) => {
+        if (err) {
+            console.error("find one and delete kbs error: ", err);
+            return res.status(500).send({ success: false, error: err});
+        } else {
+            return res.status(200).send({ success: true, message: 'Knowledge Base deleted successfully', openai_kb: kbDeleted });
+        }
+    })
+})
+
+module.exports = router;

package/services/faqService.js

@@ -12,53 +12,53 @@ class FaqService {
     var that = this;
     return new Promise(function (resolve, reject) {
 
-        //winston.debug('FAQ-KB POST REQUEST BODY ', req.body);
-        var newFaq_kb = new Faq_kb({
-          name: name,
-          description: description,
-          url: url,
-          id_project: projectid,
-          webhook_url: webhook_url,
-          webhook_enabled: webhook_enabled,
-          type: type,
-          language: language,
-          public: false,
-          certified: false,
-          mainCategory: mainCategory,
-          intentsEngine: intentsEngine,
-          trashed: false,
-          createdBy: user_id,
-          updatedBy: user_id,
-          attributes: attributes
-        });
-             
+      //winston.debug('FAQ-KB POST REQUEST BODY ', req.body);
+      var newFaq_kb = new Faq_kb({
+        name: name,
+        description: description,
+        url: url,
+        id_project: projectid,
+        webhook_url: webhook_url,
+        webhook_enabled: webhook_enabled,
+        type: type,
+        language: language,
+        public: false,
+        certified: false,
+        mainCategory: mainCategory,
+        intentsEngine: intentsEngine,
+        trashed: false,
+        createdBy: user_id,
+        updatedBy: user_id,
+        attributes: attributes
+      });
 
-        newFaq_kb.save(function (err, savedFaq_kb) {
-          if (err) {
-            winston.error('--- > ERROR ', err)
-            return reject('Error saving object.' );
+
+      newFaq_kb.save(function (err, savedFaq_kb) {
+        if (err) {
+          winston.error('--- > ERROR ', err)
+          return reject('Error saving object.');
+        }
+        winston.debug('-> -> SAVED FAQFAQ KB ', savedFaq_kb.toObject())
+
+        botEvent.emit('faqbot.create', savedFaq_kb);
+
+        winston.debug('type ' + type)
+
+        if (type === "internal" || type === "tilebot") {
+
+          if (!template) {
+            template = "empty";
           }
-          winston.debug('-> -> SAVED FAQFAQ KB ', savedFaq_kb.toObject())              
-      
-          botEvent.emit('faqbot.create', savedFaq_kb);
-          
-          winston.debug('type '+ type)      
-
-          if (type==="internal" || type==="tilebot") {      
-            
-            if (!template) {
-              template = "empty";
-            }
-            winston.debug('template '+ template);
-            that.createGreetingsAndOperationalsFaqs(savedFaq_kb._id, savedFaq_kb.createdBy, savedFaq_kb.id_project, template);
-          } else {
-            winston.debug('external bot: ', savedFaq_kb);
-          } 
+          winston.debug('template ' + template);
+          that.createGreetingsAndOperationalsFaqs(savedFaq_kb._id, savedFaq_kb.createdBy, savedFaq_kb.id_project, template);
+        } else {
+          winston.debug('external bot: ', savedFaq_kb);
+        }
 
-          
 
-          return resolve(savedFaq_kb);
-        });  
+
+        return resolve(savedFaq_kb);
+      });
     });
   }
 
@@ -69,98 +69,119 @@ class FaqService {
       // aggiungi esempio tdAction con intent_id
 
       // TODO non scatta i trigger sui rest hook. fare?
-      winston.debug('template: '+ template);
+      winston.debug('template: ' + template);
 
       var faqsArray;
 
-      if (template==="example") {
+      if (template === "example") {
 
         faqsArray = [
           { 'question': 'Hi', 'answer': 'Hi', 'topic': 'greetings' },
           { 'question': 'Hello', 'answer': 'Hello', 'topic': 'greetings' },
-          { 'question': 'Who are you?', 'answer': 'Hi, I\'m a bot 🤖. You can find more about me [here](https://tiledesk.com/chatbot-for-customer-service).\ntdImage:https://console.tiledesk.com/assets/images/tily-welcomebot.gif\n* See the website https://tiledesk.com/\n* Back to start tdAction:start', 'topic': 'greetings' },   
-          { 'question': '👨🏻‍🦰 I want an agent', 'answer': 'We are looking for an operator.. '+ActionsConstants.CHAT_ACTION_MESSAGE.AGENT, 'intent_display_name': 'agent_handoff', 'topic': 'internal' },
-          { 'question': 'Close\nResolved', 'answer': ActionsConstants.CHAT_ACTION_MESSAGE.CLOSE, 'topic': 'internal' }, 
-          { 'question': '\\start', 'answer': 'Hello 👋. I\'m a bot 🤖.\n\nChoose one of the options below or write a message to reach our staff.\n* Who are you?\n* Where are you?\n* What can you do?\n* 👨🏻‍🦰 I want an agent', 'intent_display_name': 'start', 'topic': 'internal' },            
+          { 'question': 'Who are you?', 'answer': 'Hi, I\'m a bot 🤖. You can find more about me [here](https://tiledesk.com/chatbot-for-customer-service).\ntdImage:https://console.tiledesk.com/assets/images/tily-welcomebot.gif\n* See the website https://tiledesk.com/\n* Back to start tdAction:start', 'topic': 'greetings' },
+          { 'question': '👨🏻‍🦰 I want an agent', 'answer': 'We are looking for an operator.. ' + ActionsConstants.CHAT_ACTION_MESSAGE.AGENT, 'intent_display_name': 'agent_handoff', 'topic': 'internal' },
+          { 'question': 'Close\nResolved', 'answer': ActionsConstants.CHAT_ACTION_MESSAGE.CLOSE, 'topic': 'internal' },
+          { 'question': '\\start', 'answer': 'Hello 👋. I\'m a bot 🤖.\n\nChoose one of the options below or write a message to reach our staff.\n* Who are you?\n* Where are you?\n* What can you do?\n* 👨🏻‍🦰 I want an agent', 'intent_display_name': 'start', 'topic': 'internal' },
           { 'question': 'defaultFallback', 'answer': 'I can not provide an adequate answer. Write a new question or talk to a human agent.\n* Back to start tdAction:start\n* See the docs https://docs.tiledesk.com/\n* 👨🏻‍🦰 I want an agent', 'intent_display_name': 'defaultFallback', 'topic': 'internal' }, //TODO se metto spazio n * nn va      
-          { 'question': 'What can you do?', 'answer': 'Using natural language processing, I\'m able to find the best answer for your users. I also support images, videos etc.. Let\'s try:\n* Sample Image\n* Sample Video\n* Sample Action tdAction:action1\n* Sample Frame\n* Back to start tdAction:start', 'topic': 'sample' },    
-          { 'question': 'Sample Image', 'answer': 'tdImage:https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v2.png\n* What can you do?\n* Back to start tdAction:start', 'topic': 'sample' },    
-          { 'question': 'Sample Frame', 'answer': 'tdFrame:https://www.emanueleferonato.com/wp-content/uploads/2019/02/runner/\n* What can you do?\n* Back to start tdAction:start', 'topic': 'sample' },    
-          { 'question': 'Sample Video', 'answer': 'tdVideo:https://www.youtube.com/embed/EngW7tLk6R8\n* What can you do?\n* Back to start tdAction:start', 'topic': 'sample' },    
-          { 'question': 'Where are you?', 'answer': 'We are here ❤️\ntdFrame:https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d6087916.923447935!2d8.234804542117423!3d41.836572992140624!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x12d4fe82448dd203%3A0xe22cf55c24635e6f!2sItaly!5e0!3m2!1sen!2sit!4v1613657475377!5m2!1sen!2sit\n* Back to start tdAction:start', 'topic': 'sample' },    
-  
+          { 'question': 'What can you do?', 'answer': 'Using natural language processing, I\'m able to find the best answer for your users. I also support images, videos etc.. Let\'s try:\n* Sample Image\n* Sample Video\n* Sample Action tdAction:action1\n* Sample Frame\n* Back to start tdAction:start', 'topic': 'sample' },
+          { 'question': 'Sample Image', 'answer': 'tdImage:https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v2.png\n* What can you do?\n* Back to start tdAction:start', 'topic': 'sample' },
+          { 'question': 'Sample Frame', 'answer': 'tdFrame:https://www.emanueleferonato.com/wp-content/uploads/2019/02/runner/\n* What can you do?\n* Back to start tdAction:start', 'topic': 'sample' },
+          { 'question': 'Sample Video', 'answer': 'tdVideo:https://www.youtube.com/embed/EngW7tLk6R8\n* What can you do?\n* Back to start tdAction:start', 'topic': 'sample' },
+          { 'question': 'Where are you?', 'answer': 'We are here ❤️\ntdFrame:https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d6087916.923447935!2d8.234804542117423!3d41.836572992140624!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x12d4fe82448dd203%3A0xe22cf55c24635e6f!2sItaly!5e0!3m2!1sen!2sit!4v1613657475377!5m2!1sen!2sit\n* Back to start tdAction:start', 'topic': 'sample' },
+
           // { 'question': 'Sample Webhook', 'answer': 'tdWebhook:https://tiledesk-bot-webhook.tiledesk.repl.co', 'topic': 'sample' },    
-          { 'question': 'Sample Action', 'answer': 'Hello 👋 Would you like to take a closer look at our offer?\n* Yes, please tdAction:yes_action\n* No tdAction:no_action','intent_display_name': 'action1', 'topic': 'sample' },    
-          { 'question': 'Yes Action', 'answer': 'Great! Take a look here:\n* Tiledesk Pricing https://tiledesk.com/pricing-cloud/',  'intent_display_name': 'yes_action','topic': 'sample' },    
-          { 'question': 'No Action', 'answer': 'All right! If you need anything, let us know.',  'intent_display_name': 'no_action','topic': 'sample' },    
-  
-         
+          { 'question': 'Sample Action', 'answer': 'Hello 👋 Would you like to take a closer look at our offer?\n* Yes, please tdAction:yes_action\n* No tdAction:no_action', 'intent_display_name': 'action1', 'topic': 'sample' },
+          { 'question': 'Yes Action', 'answer': 'Great! Take a look here:\n* Tiledesk Pricing https://tiledesk.com/pricing-cloud/', 'intent_display_name': 'yes_action', 'topic': 'sample' },
+          { 'question': 'No Action', 'answer': 'All right! If you need anything, let us know.', 'intent_display_name': 'no_action', 'topic': 'sample' },
+
+
           // action button nn si può fare perche gli id cambiano 
         ]
 
       }
 
-      if (template==="blank") {
+      if (template === "blank") {
 
         // faqsArray = [         
         //   { 'question': '\\start', 'answer': 'Hello', 'intent_display_name': 'start', 'topic': 'internal' },            
         //   { 'question': 'defaultFallback', 'answer': 'I can not provide an adequate answer. Write a new question or talk to a human agent.\n* Back to start tdAction:start\n* See the docs https://docs.tiledesk.com/\n* 👨🏻‍🦰 I want an agent', 'intent_display_name': 'defaultFallback', 'topic': 'internal' }, //TODO se metto spazio n * nn va              
         // ]
-        faqsArray = [         
-          {
-            'question': '\\start',
-            "actions" : [ 
-              {
-                  "_tdActionType" : "reply",
-                  "text" : "Hi, how can I help you?",
-                  "attributes" : {
-                      "commands" : [ 
-                          {
-                              "type" : "message",
-                              "message" : {
-                                  "type" : "text",
-                                  "text" : "Hi, how can I help you?"
-                              }
-                          }
-                      ]
-                  }
-              }
-            ],
-            'intent_display_name': 'start',
-            'topic': 'internal'
-          },            
-          {
-            'question': 'defaultFallback',
-            "actions" : [ 
-              {
-                  "_tdActionType" : "reply",
-                  "text" : "I didn't understand. Can you rephrase your question?",
-                  "attributes" : {
-                      "commands" : [ 
-                          {
-                              "type" : "message",
-                              "message" : {
-                                  "type" : "text",
-                                  "text" : "I didn't understand. Can you rephrase your question?"
-                              }
-                          }
-                      ]
-                  }
-              }
-            ],
-            'intent_display_name': 'defaultFallback',
-            'topic': 'internal'
-          }, //TODO se metto spazio n * nn va              
-        ]
+        faqsArray = [{
+          "webhook_enabled": false,
+          "enabled": true,
+          "actions": [{
+            "_tdActionType": "reply",
+            "text": "I didn't understand. Can you rephrase your question?",
+            "attributes": {
+              "commands": [{
+                "type": "message",
+                "message": {
+                  "type": "text",
+                  "text": "I didn't understand. Can you rephrase your question?"
+                }
+              }]
+            }
+          }],
+          "intent_display_name": "defaultFallback",
+          "attributes": {
+            "position": {
+              "x": 714,
+              "y": 528
+            }
+          }
+        }, {
+          "webhook_enabled": false,
+          "enabled": true,
+          "actions": [{
+            "_tdActionType": "intent",
+            "intentName": "#9d0b96b9-e036-4c2d-8504-1181b5c4be75"
+          }],
+          "question": "\\start",
+          "intent_display_name": "start",
+          "attributes": {
+            "position": {
+              "x": 172,
+              "y": 384
+            }
+          }
+        }, {
+          "webhook_enabled": false,
+          "enabled": true,
+          "actions": [{
+            "_tdActionType": "reply",
+            "attributes": {
+              "disableInputMessage": false,
+              "commands": [{
+                "type": "wait",
+                "time": 500
+              }, {
+                "type": "message",
+                "message": {
+                  "type": "text",
+                  "text": "Hi, how can I help you?"
+                }
+              }]
+            },
+            "text": "Hi, how can I help you?\r\n"
+          }],
+          "intent_display_name": "welcome",
+          "intent_id": "9d0b96b9-e036-4c2d-8504-1181b5c4be75",
+          "attributes": {
+            "position": {
+              "x": 714,
+              "y": 113
+            }
+          }
+        }]
 
       }
 
 
-      if (template==="handoff") {
+      if (template === "handoff") {
 
-        faqsArray = [         
-          { 'question': '\\start', 'answer': 'Hello', 'intent_display_name': 'start', 'topic': 'internal' },            
-          { 'question': '👨🏻‍🦰 I want an agent', 'answer': 'We are looking for an operator.. '+ActionsConstants.CHAT_ACTION_MESSAGE.AGENT, 'intent_display_name': 'agent_handoff', 'topic': 'internal' },
+        faqsArray = [
+          { 'question': '\\start', 'answer': 'Hello', 'intent_display_name': 'start', 'topic': 'internal' },
+          { 'question': '👨🏻‍🦰 I want an agent', 'answer': 'We are looking for an operator.. ' + ActionsConstants.CHAT_ACTION_MESSAGE.AGENT, 'intent_display_name': 'agent_handoff', 'topic': 'internal' },
           { 'question': 'defaultFallback', 'answer': 'I can not provide an adequate answer. Write a new question or talk to a human agent.\n* Back to start tdAction:start\n* See the docs https://docs.tiledesk.com/\n* 👨🏻‍🦰 I want an agent', 'intent_display_name': 'defaultFallback', 'topic': 'internal' }, //TODO se metto spazio n * nn va              
         ]
 
@@ -169,18 +190,20 @@ class FaqService {
       if (template === "empty") {
         faqsArray = [];
       }
-      
-      
+
+
       faqsArray.forEach(faq => {
 
         var newFaq = new Faq({
           id_faq_kb: faq_kb_id,
+          intent_id: faq.intent_id,
           question: faq.question,
           answer: faq.answer,
           actions: faq.actions,
           reply: faq.reply,
           intent_display_name: faq.intent_display_name,
           language: "en",
+          attributes: faq.attributes,
           id_project: projectid,
           topic: faq.topic,
           createdBy: created_by,
@@ -207,8 +230,8 @@ class FaqService {
     winston.debug("(Service) GET ALL FAQ OF THE BOT ID (req.query): ", faq_kb_id);
 
     return new Promise((resolve, reject) => {
-      
-      Faq.find({ id_faq_kb: faq_kb_id}, (err, faqs) => {
+
+      Faq.find({ id_faq_kb: faq_kb_id }, (err, faqs) => {
         if (err) {
           reject(err);
         }

package/test/faqRoute.js

@@ -53,7 +53,7 @@ describe('FaqKBRoute', () => {
                             chai.request(server)
                                 .post('/' + savedProject._id + '/faq')
                                 .auth(email, pwd)
-                                .send({ id_faq_kb: id_faq_kb, question: "question1", answer: "answer1", attributes: { attr1: { one: "one", two: "two"}, attr2: {three: "three"}} })
+                                .send({ id_faq_kb: id_faq_kb, question: "question1", answer: "answer1", attributes: { attr1: { one: "one", two: "two"}, attr2: {three: "three"}}, intent_id: 'custom-intent-id' }) // if intent_id is null the value will be the default one
                                 .end((err, res) => {
                                     //console.log("res",  res);
                                     console.log("res.body", res.body);

package/test/faqkbRoute.js

@@ -111,6 +111,48 @@ describe('FaqKBRoute', () => {
 
 
 
+                        });
+                })
+            })
+        })
+
+        it('create with template blank', (done) => {
+
+            var email = "test-signup-" + Date.now() + "@email.com";
+            var pwd = "pwd";
+
+            userService.signup(email, pwd, "Test Firstname", "Test Lastname").then((savedUser) => {
+                projectService.create("test-faqkb-create", savedUser._id).then((savedProject) => {
+
+                    chai.request(server)
+                        .post('/' + savedProject._id + '/faq_kb')
+                        .auth(email, pwd)
+                        .send({ "name": "testbot", type: "internal", template: "blank" })
+                        .end((err, res) => {
+                            if (log) {
+                            }
+                            console.log("res.body", res.body);
+                            res.should.have.status(200);
+                            res.body.should.be.a('object');
+                            expect(res.body.name).to.equal("testbot");
+                            var id_faq_kb = res.body._id;
+
+                            chai.request(server)
+                                .get('/' + savedProject._id + '/faq?id_faq_kb=' + id_faq_kb)
+                                .auth(email, pwd)
+                                .end((err, res) => {
+                                    if (log) {
+                                    }
+                                    console.log("faq_list: ", JSON.stringify(res.body, null, 2));
+                                    res.should.have.status(200);
+                                    res.body.should.be.an('array').that.is.not.empty;
+
+                                    done();
+
+                                })
+
+
+
                         });
                 })
             })

package/test/openaiKbsRoute.js

@@ -0,0 +1,75 @@
+//During the test the env variable is set to test
+process.env.NODE_ENV = 'test';
+
+let log = false;
+
+//Require the dev-dependencies
+let chai = require('chai');
+let chaiHttp = require('chai-http');
+let server = require('../app');
+let should = chai.should();
+var fs = require('fs');
+const path = require('path');
+
+// chai.config.includeStack = true;
+
+var expect = chai.expect;
+var assert = chai.assert;
+
+chai.use(chaiHttp);
+
+describe('FaqKBRoute', () => {
+
+    describe('/create', () => {
+
+        it('home', (done) => {
+            
+        })
+
+        it('create', (done) => {
+
+            var email = "test-signup-" + Date.now() + "@email.com";
+            var pwd = "pwd";
+
+            userService.signup(email, pwd, "Test Firstname", "Test lastname").then(function (savedUser) {
+                projectService.create("test-faqkb-create", savedUser._id).then(function (savedProject) {
+                    chai.request(server)
+                        .post('/' + savedProject._id + '/faq_kb')
+                        .auth(email, pwd)
+                        .send({ "name": "testbot", type: "external", language: 'fr' })
+                        .end((err, res) => {
+                            if (log) {
+                                console.log("res.body", res.body);
+                            }
+                            res.should.have.status(200);
+                            res.body.should.be.a('object');
+                            expect(res.body.name).to.equal("testbot");
+                            expect(res.body.language).to.equal("fr");
+
+                            chai.request(server)
+                                .get('/' + savedProject._id + '/faq_kb/' + res.body._id)
+                                .auth(email, pwd)
+                                .end((err, res) => {
+                                    if (log) {
+                                        console.log("res.body", res.body);
+                                    }
+                                    res.should.have.status(200);
+
+                                    done();
+                                });
+                        });
+
+
+                });
+            });
+
+        }).timeout(20000);
+
+
+
+
+    });
+
+});
+
+