@tiledesk/tiledesk-server 2.5.0 → 2.5.1

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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -37,7 +37,7 @@
   },
   "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",
@@ -45,7 +45,7 @@
     "@tiledesk/tiledesk-messenger-connector": "^0.1.17",
     "@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/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);
+
+  // });
 });