@tiledesk/tiledesk-server 2.5.0 → 2.5.2

package/channels/chat21/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-chat21-app",
   "description": "The Tiledesk Chat21 module",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "private": false,
   "author": "Andrea Leo - Frontiere21 SRL",
   "license": "AGPL-3.0",
@@ -11,7 +11,7 @@
     "url": "https://github.com/Tiledesk/tiledesk-server"
   },
   "dependencies": {
-    "@chat21/chat21-node-sdk": "^1.1.7",
+    "@chat21/chat21-node-sdk": "^1.1.8",
     "winston": "^3.3.3",
     "firebase-admin": "^9.5.0"
   },

package/deploy.sh

@@ -1,5 +1,5 @@
 git pull
-npm version minor
+npm version patch
 version=`node -e 'console.log(require("./package.json").version)'`
 echo "version $version"
 

package/middleware/passport.js

@@ -464,12 +464,12 @@ if (enableGoogleSignin==true) {
   },
   function(issuer, profile, cb) {
 
-    winston.info("issuer: "+issuer)
-    winston.info("profile", profile)
+    winston.debug("issuer: "+issuer)
+    winston.debug("profile", profile)
     // winston.info("cb", cb)
 
     var email = profile.emails[0].value;
-    winston.info("email: "+email)   
+    winston.debug("email: "+email)   
 
     var query = {providerId : issuer, subject: profile.id};
     winston.debug("query", query)

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.0",
+  "version": "2.5.2",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -37,15 +37,15 @@
   },
   "dependencies": {
     "@tiledesk/tiledesk-apps": "^1.0.17",
-    "@tiledesk/tiledesk-chat21-app": "^1.1.7",
+    "@tiledesk/tiledesk-chat21-app": "^1.1.8",
     "@tiledesk/tiledesk-chatbot-util": "^0.8.33",
     "@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.54",
+    "@tiledesk/tiledesk-tybot-connector": "^0.2.56",
     "@tiledesk/tiledesk-whatsapp-connector": "^0.1.63",
     "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.7",
     "@tiledesk/tiledesk-chatbot-templates": "^0.1.2",

package/pubmodules/queue/reconnect.js

@@ -150,6 +150,16 @@ function startWorker() {
           winston.info("Data queue", oka)
         });
 
+        ch.bindQueue(_ok.queue, exchange, "request_participants_join", {}, function(err3, oka) {
+          winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: request_participants_join");
+          winston.info("Data queue", oka)
+        });
+
+        ch.bindQueue(_ok.queue, exchange, "request_participants_leave", {}, function(err3, oka) {
+          winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: request_participants_leave");
+          winston.info("Data queue", oka)
+        });
+
         ch.bindQueue(_ok.queue, exchange, "request_update", {}, function(err3, oka) {
           winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: request_update");
           winston.info("Data queue", oka)
@@ -230,6 +240,19 @@ function work(msg, cb) {
     // requestEvent.emit('request.update.queue',  msg.content);
     requestEvent.emit('request.update.preflight.queue',  JSON.parse(message_string));
   }    
+
+  if (topic === 'request_participants_join') {
+    winston.debug("reconnect here topic:" + topic); 
+    // requestEvent.emit('request.update.queue',  msg.content);
+    requestEvent.emit('request.participants.join.queue',  JSON.parse(message_string));
+  }   
+
+
+  if (topic === 'request_participants_leave') {
+    winston.debug("reconnect here topic:" + topic); 
+    // requestEvent.emit('request.update.queue',  msg.content);
+    requestEvent.emit('request.participants.leave.queue',  JSON.parse(message_string));
+  }   
   
   if (topic === 'request_participants_update') {
     winston.debug("reconnect here topic:" + topic); 
@@ -312,8 +335,19 @@ function listen() {
       });
     });
 
+    requestEvent.on('request.participants.join', function(request) {
+      setImmediate(() => {
+        publish(exchange, "request_participants_join", Buffer.from(JSON.stringify(request)));
+        winston.debug("reconnect participants.join published")
+      });
+    });
 
-    
+    requestEvent.on('request.participants.leave', function(request) {
+      setImmediate(() => {
+        publish(exchange, "request_participants_leave", Buffer.from(JSON.stringify(request)));
+        winston.debug("reconnect participants.leave published")
+      });
+    });
 
     requestEvent.on('request.participants.update', function(request) {
       setImmediate(() => {

package/pubmodules/routing-queue/listenerQueued.js

@@ -41,13 +41,14 @@ class Listener {
 
 
     updateProjectUser(id_user, id_project, operation) {
-      winston.debug("Route queue updateProjectUser start");
+      winston.debug("Route queue updateProjectUser start operation: " +operation+ "id_user "+ id_user + " id_project " + id_project );
       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);
+                     winston.debug("Route queue number_assigned_requests +1 :" + updatedPU.id);
 
                     updatedPU.populate({path:'id_user', select:{'firstname':1, 'lastname':1}},function (err, updatedProject_userPopulated){    
 
@@ -77,7 +78,10 @@ class Listener {
         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);                
+                var userid = user.id || user._id;
+                winston.debug("updateParticipatingProjectUsers userid: "+userid); 
+
+                this.updateProjectUser(userid, request.id_project, operation);                
             });
         } 
       }  

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/request.js

@@ -802,7 +802,7 @@ router.delete('/:requestid', function (req, res) {
   });
 
 
-  Request.remove({ request_id: req.params.requestid }, function (err, request) {
+  Request.findOneAndDelete({ request_id: req.params.requestid }, function (err, request) {
     if (err) {
       winston.error('--- > ERROR ', err);
       return res.status(500).send({ success: false, msg: 'Error deleting object.' });
@@ -819,6 +819,24 @@ router.delete('/:requestid', function (req, res) {
     res.json(request);
 
   });
+
+  // Request.remove({ request_id: req.params.requestid }, function (err, request) {
+  //   if (err) {
+  //     winston.error('--- > ERROR ', err);
+  //     return res.status(500).send({ success: false, msg: 'Error deleting object.' });
+  //   }
+
+  //   if (!request) {
+  //     return res.status(404).send({ success: false, msg: 'Object not found.' });
+  //   }
+
+  //   winston.verbose('Request deleted with request_id: ' + req.params.requestid);
+
+  //   requestEvent.emit('request.delete', request);
+
+  //   res.json(request);
+
+  // });
 });
 
 

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";