@tiledesk/tiledesk-server 2.5.1 → 2.5.3

package/CHANGELOG.md

@@ -5,6 +5,14 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.5.3
+- Updated whatsapp-connector to 0.1.64
+
+# 2.5.2
+- Updated messenger-connector to 0.1.18
+- Bug fix: kbs createdAt wrongly generated
+- Added advanced search for kbs
+
 # 2.5.1
 - Bug fix: reset busy status for agents when smart assignment is enabled
 - Added possibility to delete chat21 conversation 

package/models/kb_setting.js

@@ -31,19 +31,12 @@ var KBSchema = new Schema({
     type: String,
     required: false
   },
-  createdAt: {
-    type: Date,
-    default: Date.now,
-  },
-  updatedAt: {
-    type: Date,
-    default: Date.now
-  },
   status: {
     type: Number,
-    required: false,
-    default: -1
+    required: false
   }
+}, {
+  timestamps: true
 })
 
 var KBSettingSchema = new Schema({
@@ -64,9 +57,11 @@ var KBSettingSchema = new Schema({
     type: Number,
     default: 1000
   },
-  kbs: [ KBSchema ]
+  kbs: [KBSchema]
 });
 
+KBSchema.index({ createdAt: -1, updatedAt: -1 })
+
 
 //module.exports = mongoose.model('KBSettings', KBSettingSchema);
 const KBSettings = mongoose.model('KBSettings', KBSettingSchema);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.5.1",
+  "version": "2.5.3",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -42,11 +42,11 @@
     "@tiledesk/tiledesk-dialogflow-connector": "^1.8.4",
     "@tiledesk/tiledesk-json-rules-engine": "^4.0.3",
     "@tiledesk/tiledesk-kaleyra-proxy": "^0.1.7",
-    "@tiledesk/tiledesk-messenger-connector": "^0.1.17",
+    "@tiledesk/tiledesk-messenger-connector": "^0.1.18",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
     "@tiledesk/tiledesk-telegram-connector": "^0.1.10",
     "@tiledesk/tiledesk-tybot-connector": "^0.2.56",
-    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.63",
+    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.64",
     "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.7",
     "@tiledesk/tiledesk-chatbot-templates": "^0.1.2",
     "@tiledesk/tiledesk-client": "^0.10.10",

package/routes/kb.js

@@ -8,16 +8,103 @@ const openaiService = require('../services/openaiService');
 router.get('/', async (req, res) => {
 
     let project_id = req.projectid;
+    let status;
+    let limit = 200;
+    let page = 0;
+    let direction = -1;
+    let sortField = "updatedAt";
+    let text;
+
+    let query = {};
+    query["id_project"] = project_id;
+
+    if (req.query.status) {
+        status = parseInt(req.query.status);
+        query["status"] = status;
+        winston.debug("Get kb status: " + status)
+    }
+    if (req.query.limit) {
+        limit = parseInt(req.query.limit);
+        winston.debug("Get kb limit: " + limit)
+    }
+    
+    if (req.query.page) {
+        page = parseInt(req.query.page);
+        winston.debug("Get kb page: " + page)
+    }
+
+    let skip = page * limit;
+    winston.debug("Get kb skip page: " + skip);
+
+    if (req.query.direction) {
+        direction = parseInt(req.query.direction)
+        winston.debug("Get kb direction: " + direction)
+    }
+
+    if (req.query.sortField) {
+        sortField = req.query.sortField;
+        winston.debug("Get kb sortField: " + sortField)
+    }
+
+    if (req.query.search) {
+        text = req.query.search;
+        query['source'] = new RegExp(text);
+        winston.debug("Get kb text: " + text);
+    }
+
+    let sortQuery = {};
+    sortQuery[sortField] = direction;
+    winston.debug("Get kb sortQuery: " + sortQuery);
+     
+    KB.countDocuments(query, (err, kbs_count) => {
+            if (err) {
+                winston.error("Find all kbs error: ", err);
+            }
+            winston.debug("KBs count: ", kbs_count);
+            
+            KB.find(query)
+                .skip(skip)
+                .limit(limit)
+                .sort(sortQuery)
+                .exec((err, kbs) => {
+                    if (err) {
+                        winston.error("Find all kbs error: ", err);
+                        return res.status(500).send({ success: false, error: err });
+                    }
+
+                    winston.debug("KBs found: ", kbs);
+
+                    let response = {
+                        count: kbs_count,
+                        query: {},
+                        kbs: kbs
+                    }
+                    if (status) {
+                        response.query.status = status;
+                    }
+                    if (limit) {
+                        response.query.limit = limit;
+                    }
+                    if (status) {
+                        response.query.page = page;
+                    }
+                    if (sortField) {
+                        response.query.sortField = sortField;
+                    }
+                    if (direction) {
+                        response.query.direction = direction;
+                    }
+                    if (text) {
+                        response.query.search = text;
+                    }
+
+
+                    return res.status(200).send(response);
+                })
+
+        })
 
-    KB.find({ id_project: project_id }, (err, kbs) => {
-        if (err) {
-            winston.error("Find all kbs error: ", err);
-            return res.status(500).send({ success: false, error: err });
-        }
 
-        winston.debug("KBs found: ", kbs);
-        return res.status(200).send(kbs);
-    })
 })
 
 router.get('/:kb_id', async (req, res) => {
@@ -46,7 +133,8 @@ router.post('/', async (req, res) => {
         type: body.type,
         source: body.source,
         content: body.content,
-        namespace: body.namespace
+        namespace: body.namespace,
+        status: -1
     }
     if (!new_kb.namespace) {
         new_kb.namespace = project_id;
@@ -101,7 +189,6 @@ router.put('/:kb_id', async (req, res) => {
         update.status = req.body.status;
     }
 
-    update.updatedAt = new Date();
     winston.debug("kb update: ", update);
 
     KB.findByIdAndUpdate(kb_id, update, { new: true }, (err, savedKb) => {

package/routes/project_user.js

@@ -195,7 +195,7 @@ router.post('/', [passport.authenticate(['basic', 'jwt'], { session: false }), v
     uuid_user: uuidv4(),
     // role: RoleConstants.USER,   
     // - Create project_user endpoint by agent (Ticketing) now is with Guest Role      
-    role: RoleConstants.GUEST,         
+    role: RoleConstants.GUEST,
     user_available: false,
     tags: req.body.tags, 
     createdBy: req.user.id,
@@ -228,6 +228,11 @@ router.put('/', [passport.authenticate(['basic', 'jwt'], { session: false }), va
   if (req.body.max_assigned_chat!=undefined) {
     update.max_assigned_chat = req.body.max_assigned_chat;
   }
+
+  if (req.body.number_assigned_requests!=undefined) {
+    update.number_assigned_requests = req.body.number_assigned_requests;
+  }
+
   if (req.body.attributes!=undefined) {
     update.attributes = req.body.attributes;
   }
@@ -287,6 +292,10 @@ router.put('/:project_userid', [passport.authenticate(['basic', 'jwt'], { sessio
     update.max_assigned_chat = req.body.max_assigned_chat;
   }
 
+  if (req.body.number_assigned_requests!=undefined) {
+    update.number_assigned_requests = req.body.number_assigned_requests;
+  }
+  
   if (req.body.attributes!=undefined) {
     update.attributes = req.body.attributes;
   }

package/test/kbRoute.js

@@ -73,6 +73,98 @@ describe('KbRoute', () => {
 
         });
 
+        it('getWithQueries', (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) {
+
+                    let kb1 = {
+                        name: "example_name1",
+                        type: "url",
+                        source: "https://www.exampleurl1.com",
+                        content: ""
+                    }
+
+                    let kb2 = {
+                        name: "example_name2",
+                        type: "text",
+                        source: "example_name2",
+                        content: "example content"
+                    }
+
+                    let kb3 = {
+                        name: "example_name3",
+                        type: "url",
+                        source: "https://www.exampleurl3.com",
+                        content: ""
+                    }
+
+                    chai.request(server)
+                        .post('/' + savedProject._id + "/kb")
+                        .auth(email, pwd)
+                        .send(kb1)
+                        .end((err, res) => {
+                            if (log) { console.log("create kb res.body: ", res.body); }
+                            res.should.have.status(200);
+
+                            setTimeout(() => {
+                                chai.request(server)
+                                    .post('/' + savedProject._id + "/kb")
+                                    .auth(email, pwd)
+                                    .send(kb2)
+                                    .end((err, res) => {
+                                        if (log) { console.log("create kb res.body: ", res.body); }
+                                        res.should.have.status(200);
+
+                                        setTimeout(() => {
+                                            chai.request(server)
+                                                .post('/' + savedProject._id + "/kb")
+                                                .auth(email, pwd)
+                                                .send(kb3)
+                                                .end((err, res) => {
+                                                    if (log) { console.log("create kb res.body: ", res.body); }
+                                                    res.should.have.status(200);
+
+                                                    let query = "?status=-1&limit=5&page=0&direction=-1&sortField=updatedAt&search=example";
+                                                    //let query = "";
+                                                    console.log("query: ", query);
+
+                                                    chai.request(server)
+                                                        .get('/' + savedProject._id + "/kb" + query)
+                                                        .auth(email, pwd)
+                                                        .end((err, res) => {
+                                                            console.log("getall res.body: ", res.body);
+                                                            res.should.have.status(200);
+                                                            res.body.should.be.a('object');
+                                                            res.body.kbs.should.be.a('array');
+                                                            expect(res.body.kbs.length).to.equal(3);
+                                                            expect(res.body.count).to.equal(3);
+                                                            res.body.query.should.be.a('object');
+                                                            expect(res.body.query.status).to.equal(-1);
+                                                            expect(res.body.query.limit).to.equal(5);
+                                                            expect(res.body.query.page).to.equal(0);
+                                                            expect(res.body.query.direction).to.equal(-1);
+                                                            expect(res.body.query.sortField).to.equal("updatedAt");
+                                                            expect(res.body.query.search).to.equal("example");
+
+                                                            done();
+
+                                                        })
+            
+                                                })
+                                        }, 1000)
+                                    })
+                            }, 1000)
+
+
+                        })
+                })
+            })
+        }).timeout(20000)
+
         it('scrapeSingle', (done) => {
 
             var email = "test-signup-" + Date.now() + "@email.com";