@tiledesk/tiledesk-server 2.9.27 → 2.9.28

package/CHANGELOG.md

@@ -5,6 +5,9 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.9.28
+- Updated number_assigned_request count logic (removed incr/decr)
+
 # 2.9.27
 - Updated tybot-connector to 0.2.107
 - Improved quotas slots

package/package.json

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

package/pubmodules/routing-queue/listenerQueued.js

@@ -2,6 +2,7 @@ const authEvent = require('../../event/authEvent');
 const requestEvent = require('../../event/requestEvent');
 var Project = require('../../models/project');
 var Project_user = require('../../models/project_user');
+var Request = require('../../models/request')
 var winston = require('../../config/winston');
 
 var ProjectUserUtil = require("../../utils/project_userUtil");
@@ -34,44 +35,88 @@ class Listener {
         this.enabled = false;
     }
     winston.debug("Listener this.enabled: "+ this.enabled);
-}
+  }
 
  
-      // db.getCollection('project_users').find({"number_assigned_requests" : {"$lt":0}}).count()
+  // db.getCollection('project_users').find({"number_assigned_requests" : {"$lt":0}}).count()
+
+  // New version of updateProjectUser() method.
+  // This will not increment or decrement the number_assigned_requests field but search the exact number of assigned conversation to the project user
+  updateProjectUser(id_user, id_project, operation) {
+    winston.debug("Route queue updateProjectUser start operation: " + operation + "id_user " + id_user + " id_project " + id_project);
+    
+    return Request.countDocuments({ id_project: id_project, participantsAgents: id_user, status: { $lt: 1000 } }, (err, requestsCount) => {
+      console.log("requestsCount for id_user: ", id_user, "and project: ", id_project, "-->", requestsCount);
+      if (err) {
+        return winston.error(err);
+      }
+
+      return Project_user
+        .findOneAndUpdate({ id_user: id_user, id_project: id_project }, { number_assigned_requests: requestsCount }, { 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);
+          winston.debug("Route queue number_assigned_requests updated to " + requestsCount + "for project user " + 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 });
+              }
+  
+            })
+  
+          });
+  
+        });
+    })
 
+  }
 
-    updateProjectUser(id_user, id_project, operation) {
-      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);
+  _updateProjectUser(id_user, id_project, operation) {
+    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){    
+        updatedPU.populate({ path: 'id_user', select: { 'firstname': 1, 'lastname': 1 } }, function (err, updatedProject_userPopulated) {
 
-                      var pu = updatedProject_userPopulated.toJSON();
+          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
+          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});
-                        }
 
-                      })
-                      
-                    });
+            // 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);

package/websocket/webSocketServer.js

@@ -198,27 +198,6 @@ class WebSocketServer {
         var projectId = urlSub[1];
         winston.debug('projectId: ' + projectId);
         
-        // sponz support 65203e12f8c0cf002cf4110b
-        // johnny support 62c3f10152dc7400352bab0d
-        // sponz collaudo 66acec0cf7ebf80013d67974
-        // johnny collaudo 6613ff078890fc0013ad3c3a
-        // sponz prod 6565047fdd64fd001323f37c
-        // mweb prod 656054000410fa00132e5dcc
-
-        if (projectId === "65203e12f8c0cf002cf4110b"
-            || projectId === "62c3f10152dc7400352bab0d"
-            || projectId === "66acec0cf7ebf80013d67974"
-            || projectId === "6613ff078890fc0013ad3c3a"
-            || projectId === "6565047fdd64fd001323f37c"
-            || projectId === "656054000410fa00132e5dcc") {
-
-              console.log('WSS onSubscribeCallback - ProjectID ' + projectId);
-              console.log("x-forwarded-for: ", req.headers['x-forwarded-for'], "remote port: ", req.socket.remotePort);
-              console.log("remoteAddress: ",  req.socket.remoteAddress)
-            }
-
-
-
         let q = Project.findOne({ _id: projectId, status: 100 })
 
         if (cacheEnabler.project) {