@tiledesk/tiledesk-server 2.3.55 → 2.3.57

package/CHANGELOG.md

@@ -1,11 +1,14 @@
 
 
-💥 TILEDESK SERVER v2.3.55 💥
+💥 TILEDESK SERVER v2.3.56 💥
 🚀        TAGGED AND PUBLISHED ON NPM           🚀
 🚀        IN PRODUCTION                        🚀
-(https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.55) 
+(https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.56) 
 
-# 2.3.55 -> PROD 
+# 2.3.56
+- Tybot updated to 0.1.30
+
+# 2.3.55 
 - Tybot updated to 0.1.28
 
 # 2.3.54

package/app.js

@@ -139,6 +139,9 @@ subscriptionNotifier.start();
 
 var botSubscriptionNotifier = require('./services/BotSubscriptionNotifier');
 botSubscriptionNotifier.start();
+
+var trainingService = require('./services/trainingService');
+trainingService.start();
  
 // job_here
 
@@ -172,8 +175,8 @@ var IPFilter = require('./middleware/ipFilter');
 
 // job_here
 var BanUserNotifier = require('./services/banUserNotifier');
-const { ChatbotService } = require('./services/chatbotService');
 BanUserNotifier.listen();
+const { ChatbotService } = require('./services/chatbotService');
 
 var modulesManager = undefined;
 try {

package/models/faq.js

@@ -9,23 +9,23 @@ var defaultFullTextLanguage = process.env.DEFAULT_FULLTEXT_INDEX_LANGUAGE || "no
 var FaqSchema = new Schema({
   id_faq_kb: {
     type: String,
-    index: true    
+    index: true
   },
-  intent_id: { 
+  intent_id: {
     type: String,
     required: false,
-    index:true,
-    default: function() {
+    index: true,
+    default: function () {
       return uuidv4();
-    } 
+    }
   },
   intent_display_name: { //documentare
     type: String,
-    required: false,  
-    index:true,
-    default: function() {
+    required: false,
+    index: true,
+    default: function () {
       return nanoid(6);
-    } 
+    }
   },
   question: {
     type: String,
@@ -74,11 +74,11 @@ var FaqSchema = new Schema({
     index: true
   },
 
-//   "stats":{  
-//     "conversation_count":2,
-//     "all_done_count":0,
-//     "wait_for_team_count":2
-//  }
+  //   "stats":{  
+  //     "conversation_count":2,
+  //     "all_done_count":0,
+  //     "wait_for_team_count":2
+  //  }
 
   createdBy: {
     type: String,
@@ -88,7 +88,7 @@ var FaqSchema = new Schema({
     type: Object,
     required: false
   }
-},{
+}, {
   timestamps: true,
   toJSON: { virtuals: true } //used to polulate messages in toJSON// https://mongoosejs.com/docs/populate.html
 }
@@ -102,26 +102,60 @@ FaqSchema.virtual('faq_kb', {
   //options: { sort: { name: -1 }, limit: 5 } // Query options, see http://bit.ly/mongoose-query-options
 });
 
-FaqSchema.index({ id_project: 1, id_faq_kb: 1, question: 1 }); 
+FaqSchema.index({ id_project: 1, id_faq_kb: 1, question: 1 });
 
 // https://docs.mongodb.com/manual/core/index-text/
 // https://docs.mongodb.com/manual/tutorial/specify-language-for-text-index/
 // https://docs.mongodb.com/manual/reference/text-search-languages/#text-search-languages
 
-
-FaqSchema.index({question: 'text'},
- {"name":"faq_fulltext","default_language": defaultFullTextLanguage,"language_override": "language"}); // schema level
+// In testing...
+// FaqSchema.index({ question: "text", answer: "text" }, { weights: { question: 5, answer: 3 } })
+
+// FaqSchema.statics = {
+//   searchPartial: function (q, callback) {
+//     return this.find({
+//       $or: [
+//         { "question": new RegExp(q, "gi") },
+//         { "answer": new RegExp(q, "gi") },
+//       ]
+//     }, callback)
+//   },
+
+//   searchFull: function (q, callback) {
+//     return this.find({
+//       $text: { $search: q, $caseSensitive: false }
+//     }, callback)
+//   },
+
+//   searchFull: function (q, callback) {
+//     return this.find({
+//       $text: { $search: q, $caseSensitive: false }
+//     }, callback)
+//   },
+
+//   search: function (q, callback) {
+//     this.searchFull(q, (err, data) => {
+//       if (err) return callback(err, data);
+//       if (!err && data.length) return callback(err, data);
+//       if (!err && data.length === 0) return this.searchPartial(q, callback);
+//     });
+//   },
+
+// }
+
+FaqSchema.index({ question: 'text' },
+  { "name": "faq_fulltext", "default_language": defaultFullTextLanguage, "language_override": "language" }); // schema level
 
 //  FaqSchema.index({question: 'text', answer: 'text'},
-//  {"name":"faq_fulltext","default_language": defaultFullTextLanguage,"language_override": "language", weights: {question: 10,answer: 1}}); // schema level
+//  {"name":"faq_fulltext","default_language": defaultFqullTextLanguage,"language_override": "language", weights: {question: 10,answer: 1}}); // schema level
 
 
-FaqSchema.index({ id_project: 1, id_faq_kb: 1, intent_display_name: 1  }, { unique: true }); 
+FaqSchema.index({ id_project: 1, id_faq_kb: 1, intent_display_name: 1 }, { unique: true });
 
 
- var faq = mongoose.model('faq', FaqSchema);
+var faq = mongoose.model('faq', FaqSchema);
 
- faq.on('index', function(error) {
+faq.on('index', function (error) {
   // "_id index cannot be sparse"
   winston.debug('index', error);
 });

package/models/faq_kb.js

@@ -70,6 +70,20 @@ var Faq_kbSchema = new Schema({
     type: Boolean,
     required: false,
     default: false
+  },
+  certified: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  mainCategory: {
+    type: String,
+    required: false
+  },
+  intentsEngine: {
+    type: String,
+    required: false,
+    default: 'none'
   }
 },{
   timestamps: true

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.3.55",
+  "version": "2.3.57",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -42,7 +42,7 @@
     "@tiledesk/tiledesk-chatbot-util": "^0.8.33",
     "@tiledesk/tiledesk-json-rules-engine": "^4.0.3",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
-    "@tiledesk/tiledesk-tybot-connector": "^0.1.28",
+    "@tiledesk/tiledesk-tybot-connector": "^0.1.30",
     "@tiledesk/tiledesk-dialogflow-connector": "^1.7.4",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",

package/routes/faq.js

@@ -194,8 +194,6 @@ router.put('/:faqid', function (req, res) {
   if (req.body.form!=undefined) {
     update.form = req.body.form;
   }
-  
-
 
   Faq.findByIdAndUpdate(req.params.faqid, update, { new: true, upsert: true }, function (err, updatedFaq) {
     if (err) {
@@ -329,7 +327,11 @@ router.get('/', function (req, res, next) {
   // 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
 
-
+  // in testing...
+  // 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] } }}).

package/routes/faq_kb.js

@@ -15,11 +15,10 @@ var configGlobal = require('../config/global');
 
 var chatbot_templates_api_url = "https://chatbot-templates.herokuapp.com/chatbots/public/templates"
 
-
 router.post('/', function (req, res) {
   winston.info('create BOT ', req.body);
   //create(name, url, projectid, user_id, type, description, webhook_url, webhook_enabled, language, template)
-  faqService.create(req.body.name, req.body.url, req.projectid, req.user.id, req.body.type, req.body.description, undefined, undefined, req.body.language, req.body.template).then(function (savedFaq_kb) {
+  faqService.create(req.body.name, req.body.url, req.projectid, req.user.id, req.body.type, req.body.description, undefined, undefined, req.body.language, req.body.template, req.body.mainCategory, req.body.intentsEngine).then(function (savedFaq_kb) {
     res.json(savedFaq_kb);
   });
 
@@ -232,13 +231,24 @@ router.put('/:faq_kbid', function (req, res) {
   if (req.body.webhook_enabled != undefined) {
     update.webhook_enabled = req.body.webhook_enabled;
   }
-
   if (req.body.type != undefined) {
     update.type = req.body.type;
   }
   if (req.body.trashed != undefined) {
     update.trashed = req.body.trashed;
   }
+  if (req.body.public != undefined) {
+    update.public = req.body.public;
+  }
+  if (req.body.certified != undefined) {
+    update.certified = req.body.certified;
+  }
+  if (req.body.mainCategory != undefined) {
+    update.mainCategory = req.body.mainCategory;
+  }
+  if (req.body.intentsEngine != undefined) {
+    update.intentsEngine = req.body.intentsEngine;
+  }
 
   Faq_kb.findByIdAndUpdate(req.params.faq_kbid, update, { new: true, upsert: true }, function (err, updatedFaq_kb) {
     if (err) {
@@ -356,9 +366,6 @@ router.post('/fork/:id_faq_kb', async (req, res) => {
   let landing_project_id = req.query.projectid;
   winston.info("landing project id " + landing_project_id)
 
-  let new_bot_name = req.query.name;
-  winston.info("new bot name: " + new_bot_name);
-
   let public = req.query.public;
   winston.info("public " + public);
 
@@ -373,8 +380,6 @@ router.post('/fork/:id_faq_kb', async (req, res) => {
     return res.status(500).send({ success: false, message: "Unable to get chatbot" });
   }
 
-  //chatbot.name = new_bot_name;
-
   let savedChatbot = await cs.createBot(api_url, token, chatbot, landing_project_id);
   winston.info("savedChatbot: ", savedChatbot)
 

package/services/chatbotService.js

@@ -42,7 +42,7 @@ class ChatbotService {
         },
         method: 'GET'
       }).then((resbody) => {
-        winston.info("(CHATBOT SERVICE) forking public chatbot " + resbody.data);
+        winston.info("(CHATBOT SERVICE) forking public chatbot " + resbody.data.name);
         let chatbot = resbody.data;
         return chatbot
       }).catch((err) => {

package/services/faqService.js

@@ -8,7 +8,7 @@ const ActionsConstants = require('../models/actionsConstants');
 class FaqService {
 
 
-  create(name, url, projectid, user_id, type, description, webhook_url, webhook_enabled, language, template) {
+  create(name, url, projectid, user_id, type, description, webhook_url, webhook_enabled, language, template, mainCategory, intentsEngine) {
     var that = this;
     return new Promise(function (resolve, reject) {
 
@@ -23,6 +23,9 @@ class FaqService {
           type: type,
           language: language,
           public: false,
+          certified: false,
+          mainCategory: mainCategory,
+          intentsEngine: intentsEngine,
           trashed: false,
           createdBy: user_id,
           updatedBy: user_id

package/services/trainingService.js

@@ -0,0 +1,106 @@
+const faqBotEvent = require('../event/faqBotEvent');
+const Faq_kb = require('../models/faq_kb');
+const Faq = require('../models/faq');
+var winston = require('../config/winston');
+const axios = require("axios").default;
+
+
+let chatbot_training_api_url = "http://34.65.210.38/model/train"
+
+class TrainingService {
+
+
+
+    train(eventName, faq) {
+
+        Faq_kb.findById(faq.id_faq_kb, (err, faq_kb) => {
+            winston.debug("faq_kb: ", faq_kb)
+
+            if (!faq_kb.intentsEngine) {
+                winston.info("intentsEngine: off")
+                return null;
+            }
+
+            winston.info("intentsEngine: on")
+            Faq.find({ id_faq_kb: faq.id_faq_kb }, (err, faqs) => {
+
+                if (err) {
+                    winston.error("[Training] find all error: ", err);
+                } else {
+
+                    let json = {
+                        "configuration": {
+                            "language": faq_kb.language,
+                            "pipeline": [""]
+                        },
+                        "model": faq_kb._id,
+                        "nlu": []
+                    }
+
+                    faqs.forEach((f) => {
+                        if (f.enabled == true) {
+                            let intent = {
+                                "intent": f.intent_display_name,
+                                "examples": []
+                            }
+                            let questions = f.question.split("\n");
+                            intent.examples = questions;
+                            json.nlu.push(intent);
+                        }
+                    })
+
+                    winston.debug("training json: \n" + JSON.stringify(json, null, 2));
+
+                    axios({
+                        url: chatbot_training_api_url,
+                        headers: {
+                            'Content-Type': 'application/json'
+                        },
+                        data: json,
+                        method: 'POST'
+                    }).then((resbody) => {
+                        winston.info("[Training] resbody: ", resbody.data);
+                        return true;
+                    }).catch((err) => {
+                        winston.error("[Training] error: ", err.response.data);
+                    })
+                }
+            })
+
+        })
+
+
+
+    }
+
+    start() {
+        winston.info('TrainingService start');
+
+        faqBotEvent.on('faq.create', (faq) => {
+            setImmediate(() => {
+                trainingService.train('faq.create', faq);
+            })
+        })
+
+        faqBotEvent.on('faq.update', (faq) => {
+            winston.debug("--> event faq: ", faq);
+            setImmediate(() => {
+                trainingService.train('faq.update', faq);
+            })
+        })
+
+        faqBotEvent.on('faq.delete', (faq) => {
+            console.log("--> event faq: ", faq);
+            setImmediate(() => {
+                trainingService.train('faq.delete', faq);
+            })
+        })
+
+
+    }
+
+}
+
+var trainingService = new TrainingService();
+
+module.exports = trainingService;

package/test/faqRoute.js

@@ -19,28 +19,30 @@ const path = require('path');
 var expect = chai.expect;
 var assert = chai.assert;
 
+let log = true;
+
 chai.use(chaiHttp);
 
 describe('FaqKBRoute', () => {
 
-  describe('/create', () => {
- 
-    it('create', (done) => {
-       
-        //   this.timeout();
+    describe('/create', () => {
+
+        it('create', (done) => {
+
+            //   this.timeout();
 
-        var email = "test-signup-" + Date.now() + "@email.com";
-        var pwd = "pwd";
+            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) {                                              
+            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')
+                        .post('/' + savedProject._id + '/faq_kb')
                         .auth(email, pwd)
-                        .send({"name":"testbot", type: "internal"})
+                        .send({ "name": "testbot", type: "internal" })
                         .end((err, res) => {
                             //console.log("res",  res);
-                            console.log("res.body",  res.body);
+                            console.log("res.body", res.body);
                             res.should.have.status(200);
                             res.body.should.be.a('object');
                             expect(res.body.name).to.equal("testbot");
@@ -48,380 +50,418 @@ describe('FaqKBRoute', () => {
                             expect(res.body.public).to.equal(false);
                             var id_faq_kb = res.body._id;
 
-                             chai.request(server)
-                                .post('/'+ savedProject._id + '/faq')
+                            chai.request(server)
+                                .post('/' + savedProject._id + '/faq')
                                 .auth(email, pwd)
-                                .send({id_faq_kb: id_faq_kb, question: "question1", answer: "answer1"})
+                                .send({ id_faq_kb: id_faq_kb, question: "question1", answer: "answer1" })
                                 .end((err, res) => {
                                     //console.log("res",  res);
-                                    console.log("res.body",  res.body);
+                                    console.log("res.body", res.body);
                                     res.should.have.status(200);
                                     res.body.should.be.a('object');
-                                    expect(res.body.id_faq_kb).to.equal(id_faq_kb);                                                                              
-                                    expect(res.body.question).to.equal("question1");                                                                              
-                                    expect(res.body.answer).to.equal("answer1");                                                                              
-                                    expect(res.body.intent_display_name).to.not.equal(undefined);                                                                              
-                                    expect(res.body.webhook_enabled).to.equal(false);                                                                              
-                                    
+                                    expect(res.body.id_faq_kb).to.equal(id_faq_kb);
+                                    expect(res.body.question).to.equal("question1");
+                                    expect(res.body.answer).to.equal("answer1");
+                                    expect(res.body.intent_display_name).to.not.equal(undefined);
+                                    expect(res.body.webhook_enabled).to.equal(false);
+
                                     done();
                                 });
 
                         });
 
-                        
+
                 });
             });
-                
-    });
 
-    it('create with form (createFaqKb function)', (done) => {
-
-
-        //   this.timeout();
-
-        var email = "test-signup-" + Date.now() + "@email.com";
-        var pwd = "pwd";
-        let example_form = {
-            fields: [
-                {
-                    name: "userFullname",
-                    type: "text",
-                    label: "What is your name?"
-                },
-                {
-                    name: "userEmail",
-                    type: "text",
-                    regex: "/^(?=.{1,254}$)(?=.{1,64}@)[-!#$%&'+/0-9=?A-Z^_`a-z{|}~]+(.[-!#$%&'+/0-9=?A-Z^_`a-z{|}~]+)*@[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?(.[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?)+$/",
-                    label: "Your email?",
-                    errorLabel: "This email address is invalid\n\nCan you insert a correct email address?"
-                }
-            ]
-        }
-
-        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) => {
-                        //console.log("res",  res);
-                        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");
-                        var id_faq_kb = res.body._id;
-
-                        chai.request(server)
-                            .post('/'+ savedProject._id + '/faq')
-                            .auth(email, pwd)
-                            .send({id_faq_kb: id_faq_kb, form: example_form})
-                            .end((err, res) => {
-                                //console.log("res",  res);
-                                console.log("res.body",  res.body);
-                                res.should.have.status(200);
-                                res.body.should.be.a('object');
-                                expect(res.body.id_faq_kb).to.equal(id_faq_kb);                                                                              
-                                expect(res.body.form).to.exist;
-                                res.body.form.should.be.a('object');                                                                           
-                                expect(res.body.intent_display_name).to.not.equal(undefined);                                                                              
-                                expect(res.body.webhook_enabled).to.equal(false);                                                                              
-                                
-                                done();
-                            });
-                    });
+        });
 
+        it('create with form (createFaqKb function)', (done) => {
 
+
+            //   this.timeout();
+
+            var email = "test-signup-" + Date.now() + "@email.com";
+            var pwd = "pwd";
+            let example_form = {
+                fields: [
+                    {
+                        name: "userFullname",
+                        type: "text",
+                        label: "What is your name?"
+                    },
+                    {
+                        name: "userEmail",
+                        type: "text",
+                        regex: "/^(?=.{1,254}$)(?=.{1,64}@)[-!#$%&'+/0-9=?A-Z^_`a-z{|}~]+(.[-!#$%&'+/0-9=?A-Z^_`a-z{|}~]+)*@[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?(.[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?)+$/",
+                        label: "Your email?",
+                        errorLabel: "This email address is invalid\n\nCan you insert a correct email address?"
+                    }
+                ]
+            }
+
+            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) => {
+                            //console.log("res",  res);
+                            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");
+                            var id_faq_kb = res.body._id;
+
+                            chai.request(server)
+                                .post('/' + savedProject._id + '/faq')
+                                .auth(email, pwd)
+                                .send({ id_faq_kb: id_faq_kb, form: example_form })
+                                .end((err, res) => {
+                                    //console.log("res",  res);
+                                    console.log("res.body", res.body);
+                                    res.should.have.status(200);
+                                    res.body.should.be.a('object');
+                                    expect(res.body.id_faq_kb).to.equal(id_faq_kb);
+                                    expect(res.body.form).to.exist;
+                                    res.body.form.should.be.a('object');
+                                    expect(res.body.intent_display_name).to.not.equal(undefined);
+                                    expect(res.body.webhook_enabled).to.equal(false);
+
+                                    done();
+                                });
+                        });
+
+
+                });
+            });
+
+        }).timeout(20000);
+
+
+
+        it('createWithLanguage', (done) => {
+
+
+            //   this.timeout();
+
+            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: "internal", template: "example", language: "it" })
+                        .end((err, res) => {
+                            //console.log("res",  res);
+                            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("it");
+                            var id_faq_kb = res.body._id;
+
+                            chai.request(server)
+                                .post('/' + savedProject._id + '/faq')
+                                .auth(email, pwd)
+                                .send({ id_faq_kb: id_faq_kb, question: "question1", answer: "answer1" })
+                                .end((err, res) => {
+                                    //console.log("res",  res);
+                                    console.log("res.body", res.body);
+                                    res.should.have.status(200);
+                                    res.body.should.be.a('object');
+                                    expect(res.body.id_faq_kb).to.equal(id_faq_kb);
+                                    expect(res.body.question).to.equal("question1");
+                                    expect(res.body.answer).to.equal("answer1");
+                                    expect(res.body.intent_display_name).to.not.equal(undefined);
+                                    expect(res.body.webhook_enabled).to.equal(false);
+                                    expect(res.body.language).to.equal("it");
+                                    done();
+                                });
+
+                        });
+
+
+                });
             });
-        });
 
-    }).timeout(20000);
-
-
-
-    it('createWithLanguage', (done) => {
-
-        
-        //   this.timeout();
-    
-           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: "internal", template: "example", language: "it"})
-                            .end((err, res) => {
-                                //console.log("res",  res);
-                                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("it");                                                                              
-                                var id_faq_kb = res.body._id;
-    
-                                 chai.request(server)
-                                    .post('/'+ savedProject._id + '/faq')
-                                    .auth(email, pwd)
-                                    .send({id_faq_kb: id_faq_kb, question: "question1", answer: "answer1"})
-                                    .end((err, res) => {
-                                        //console.log("res",  res);
-                                        console.log("res.body",  res.body);
-                                        res.should.have.status(200);
-                                        res.body.should.be.a('object');
-                                        expect(res.body.id_faq_kb).to.equal(id_faq_kb);                                                                              
-                                        expect(res.body.question).to.equal("question1");                                                                              
-                                        expect(res.body.answer).to.equal("answer1");                                                                              
-                                        expect(res.body.intent_display_name).to.not.equal(undefined);                                                                              
-                                        expect(res.body.webhook_enabled).to.equal(false);                                                                              
-                                        expect(res.body.language).to.equal("it");                                                                              
-                                        done();
-                                    });
-    
-                            });
-    
-                            
-                    });
-                    });
-                    
         });
-    
-    
 
 
 
 
-    it('createWithIntentDisplayNameAndWebhookEnalbed', (done) => {
 
-        
-        //   this.timeout();
-    
-           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) {                                              
-                      
+
+        it('createWithIntentDisplayNameAndWebhookEnalbed', (done) => {
+
+
+            //   this.timeout();
+
+            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')
+                        .post('/' + savedProject._id + '/faq_kb')
                         .auth(email, pwd)
-                        .send({"name":"testbot", type: "internal", template: "example",})
+                        .send({ "name": "testbot", type: "internal", template: "example", })
                         .end((err, res) => {
                             //console.log("res",  res);
-                            console.log("res.body",  res.body);
+                            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.name).to.equal("testbot");
                             var id_faq_kb = res.body._id;
 
-                             chai.request(server)
-                                .post('/'+ savedProject._id + '/faq')
+                            chai.request(server)
+                                .post('/' + savedProject._id + '/faq')
                                 .auth(email, pwd)
-                                .send({id_faq_kb: id_faq_kb, question: "question1", answer: "answer1", webhook_enabled:true, intent_display_name: "intent_display_name1"})
+                                .send({ id_faq_kb: id_faq_kb, question: "question1", answer: "answer1", webhook_enabled: true, intent_display_name: "intent_display_name1" })
                                 .end((err, res) => {
                                     //console.log("res",  res);
-                                    console.log("res.body",  res.body);
+                                    console.log("res.body", res.body);
                                     res.should.have.status(200);
                                     res.body.should.be.a('object');
-                                    expect(res.body.id_faq_kb).to.equal(id_faq_kb);                                                                              
-                                    expect(res.body.question).to.equal("question1");                                                                              
-                                    expect(res.body.answer).to.equal("answer1");                                                                              
-                                    expect(res.body.intent_display_name).to.equal("intent_display_name1");                                                                              
-                                    expect(res.body.webhook_enabled).to.equal(true);                                                                              
+                                    expect(res.body.id_faq_kb).to.equal(id_faq_kb);
+                                    expect(res.body.question).to.equal("question1");
+                                    expect(res.body.answer).to.equal("answer1");
+                                    expect(res.body.intent_display_name).to.equal("intent_display_name1");
+                                    expect(res.body.webhook_enabled).to.equal(true);
 
                                     done();
                                 });
 
                         });
-    
-                            
-                    });
-                    });
-                    
+
+
+                });
+            });
+
         });
-    
-        
+
+
 
 
 
         it('update', (done) => {
 
-        
+
             //   this.timeout();
-        
-               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) {                                              
+
+            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: "internal" })
+                        .end((err, res) => {
+                            //console.log("res",  res);
+                            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)
-                                .post('/'+ savedProject._id + '/faq_kb')
+                                .post('/' + savedProject._id + '/faq')
                                 .auth(email, pwd)
-                                .send({"name":"testbot", type: "internal"})
+                                .send({ id_faq_kb: id_faq_kb, question: "question1", answer: "answer1" })
                                 .end((err, res) => {
                                     //console.log("res",  res);
-                                    console.log("res.body",  res.body);
+                                    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)
-                                        .post('/'+ savedProject._id + '/faq')
+                                    expect(res.body.id_faq_kb).to.equal(id_faq_kb);
+                                    expect(res.body.question).to.equal("question1");
+                                    expect(res.body.answer).to.equal("answer1");
+                                    expect(res.body.intent_display_name).to.not.equal(undefined);
+                                    expect(res.body.webhook_enabled).to.equal(false);
+
+                                    chai.request(server)
+                                        .put('/' + savedProject._id + '/faq/' + res.body._id)
                                         .auth(email, pwd)
-                                        .send({id_faq_kb: id_faq_kb, question: "question1", answer: "answer1"})
+                                        .send({ id_faq_kb: id_faq_kb, question: "question2", answer: "answer2", webhook_enabled: true })
                                         .end((err, res) => {
                                             //console.log("res",  res);
-                                            console.log("res.body",  res.body);
+                                            console.log("res.body", res.body);
                                             res.should.have.status(200);
                                             res.body.should.be.a('object');
-                                            expect(res.body.id_faq_kb).to.equal(id_faq_kb);                                                                              
-                                            expect(res.body.question).to.equal("question1");                                                                              
-                                            expect(res.body.answer).to.equal("answer1");                                                                              
-                                            expect(res.body.intent_display_name).to.not.equal(undefined);                                                                              
-                                            expect(res.body.webhook_enabled).to.equal(false);                                                                              
-                                            
-                                            chai.request(server)
-                                            .put('/'+ savedProject._id + '/faq/'+res.body._id)
-                                            .auth(email, pwd)
-                                            .send({id_faq_kb: id_faq_kb, question: "question2", answer: "answer2", webhook_enabled:true})
-                                            .end((err, res) => {
-                                                //console.log("res",  res);
-                                                console.log("res.body",  res.body);
-                                                res.should.have.status(200);
-                                                res.body.should.be.a('object');
-                                                expect(res.body.id_faq_kb).to.equal(id_faq_kb);                                                                              
-                                                expect(res.body.question).to.equal("question2");                                                                              
-                                                expect(res.body.answer).to.equal("answer2");                                                                              
-                                                expect(res.body.intent_display_name).to.not.equal(undefined);                                                                              
-                                                expect(res.body.webhook_enabled).to.equal(true);                                                                              
-                                                
-                                                done();
-                                            });
+                                            expect(res.body.id_faq_kb).to.equal(id_faq_kb);
+                                            expect(res.body.question).to.equal("question2");
+                                            expect(res.body.answer).to.equal("answer2");
+                                            expect(res.body.intent_display_name).to.not.equal(undefined);
+                                            expect(res.body.webhook_enabled).to.equal(true);
 
+                                            done();
                                         });
-        
+
                                 });
-        
-                                
-                        });
+
                         });
-                        
+
+
+                });
             });
 
-    
+        });
+
+
         it('uploadcsv', (done) => {
 
-        
+
             //   this.timeout();
-        
-               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-uploadcsv", savedUser._id).then(function(savedProject) {            
-                        
-                        chai.request(server)
-                        .post('/'+ savedProject._id + '/faq_kb')
+
+            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-uploadcsv", savedUser._id).then(function (savedProject) {
+
+                    chai.request(server)
+                        .post('/' + savedProject._id + '/faq_kb')
                         .auth(email, pwd)
-                        .send({"name":"testbot", type: "internal"})
+                        .send({ "name": "testbot", type: "internal" })
                         .end((err, res) => {
                             //console.log("res",  res);
-                            console.log("res.body",  res.body);
+                            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.name).to.equal("testbot");
                             var id_faq_kb = res.body._id;
 
                             chai.request(server)
-                                .post('/'+ savedProject._id + '/faq/uploadcsv')
+                                .post('/' + savedProject._id + '/faq/uploadcsv')
                                 .auth(email, pwd)
                                 .set('Content-Type', 'text/csv')
-                                .attach('uploadFile',  fs.readFileSync(path.resolve(__dirname, './example-faqs.csv')), 'example-faqs.csv') 
+                                .attach('uploadFile', fs.readFileSync(path.resolve(__dirname, './example-faqs.csv')), 'example-faqs.csv')
                                 .field('id_faq_kb', id_faq_kb)
                                 .field('delimiter', ';')
                                 // .send({id_faq_kb: id_faq_kb})       
                                 .end((err, res) => {
-                                    console.log("err",  err);
-                                    console.log("res.body",  res.body);
+                                    console.log("err", err);
+                                    console.log("res.body", res.body);
                                     res.should.have.status(200);
                                     res.body.should.be.a('object');
-                                    
+
                                     done();
                                 });
-                                        
-                        });
-                                
-                        });
+
                         });
-                        
+
+                });
             });
-        
+
+        });
+
+
 
 
 
 
 
-    
         it('uploadcsvWithLanguage', (done) => {
 
-        
+
             //   this.timeout();
-        
-               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-uploadcsv", savedUser._id).then(function(savedProject) {            
-                        
-                        chai.request(server)
-                        .post('/'+ savedProject._id + '/faq_kb')
+
+            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-uploadcsv", savedUser._id).then(function (savedProject) {
+
+                    chai.request(server)
+                        .post('/' + savedProject._id + '/faq_kb')
                         .auth(email, pwd)
-                        .send({"name":"testbot", type: "internal", language: "it"})
+                        .send({ "name": "testbot", type: "internal", language: "it" })
                         .end((err, res) => {
                             //console.log("res",  res);
-                            console.log("res.body",  res.body);
+                            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("it");                                                                      
+                            expect(res.body.name).to.equal("testbot");
+                            expect(res.body.language).to.equal("it");
                             var id_faq_kb = res.body._id;
 
                             chai.request(server)
-                                .post('/'+ savedProject._id + '/faq/uploadcsv')
+                                .post('/' + savedProject._id + '/faq/uploadcsv')
                                 .auth(email, pwd)
                                 .set('Content-Type', 'text/csv')
-                                .attach('uploadFile',  fs.readFileSync(path.resolve(__dirname, './example-faqs.csv')), 'example-faqs.csv') 
+                                .attach('uploadFile', fs.readFileSync(path.resolve(__dirname, './example-faqs.csv')), 'example-faqs.csv')
                                 .field('id_faq_kb', id_faq_kb)
                                 .field('delimiter', ';')
                                 // .send({id_faq_kb: id_faq_kb})       
                                 .end((err, res) => {
-                                    console.log("err",  err);
-                                    console.log("res.body",  res.body);
+                                    console.log("err", err);
+                                    console.log("res.body", res.body);
                                     res.should.have.status(200);
                                     res.body.should.be.a('object');
-                                    
+
                                     done();
                                 });
-                                        
-                        });
-                                
-                        });
+
                         });
-                        
+
+                });
             });
-        
-        
-        
-    
+
+        });
 
 
+        it('searchFaqs', (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-search-faqs", savedUser._id).then((savedProject) => {
+                    
+                    chai.request(server)
+                        .post('/' + savedProject._id + '/faq_kb')
+                        .auth(email, pwd)
+                        .send({ "name": "testbot", type: "internal", template: "example" })
+                        .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)
+                                .get('/' + savedProject._id + '/faq?id_faq_kb=' + id_faq_kb + "&page=0&limit=25&text=looking")
+                                .auth(email, pwd)
+                                .end((err, res) => {
+                                    if (log) {
+                                        console.log("found these faqs: \n", res.body);
+                                    }
+                                    res.should.have.status(200);
+                                    res.body.should.be.an('array');
+
+
+                                    done();
+
+                                })
+                        })
+                })
+            })
+        });
+
+
+    });
 
 });
 

package/test/faqkbRoute.js

@@ -147,7 +147,7 @@ describe('FaqKBRoute', () => {
                                 let id_faq_kb = res.body._id;
 
                                 chai.request(server)
-                                    .post('/' + currentProject._id + '/faq_kb/fork/' + id_faq_kb + "?public=false&name=privateBotForked&projectid=" + landingProject._id)
+                                    .post('/' + currentProject._id + '/faq_kb/fork/' + id_faq_kb + "?public=false&projectid=" + landingProject._id)
                                     .auth(email, pwd)
                                     .set('Content-Type', 'application/json')
                                     .end((err, res) => {
@@ -180,6 +180,9 @@ describe('FaqKBRoute', () => {
                     projectService.create("current-project", user1._id).then(function (currentProject) {
                         projectService.create("landing-project", user2._id).then(function (landingProject) {
 
+                            console.log("\n[TEST]")
+                            console.log("mock: ", chatbot_mock.existing_chatbot_mock);
+
                             class chatbot_service {
                                 async getBotById(id, published, api_url, chatbot_templates_api_url, token, project_id) {
                                     return chatbot_mock.existing_chatbot_mock;