@tiledesk/tiledesk-server 2.9.29 → 2.9.31

package/CHANGELOG.md

@@ -5,6 +5,13 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.9.31
+- Improved conversations queues management
+- Added conversation status 150 (ABANDONED)
+
+# 2.9.30
+- Restore Voice and SMS modules
+
 # 2.9.29
 - Fixed bug: try to update non existant project user (bot)
 

package/models/requestConstants.js

@@ -1,6 +1,7 @@
 module.exports = {
         TEMP : 50,
         UNASSIGNED : 100,
+        ABANDONED: 150,
         ASSIGNED : 200,
         SERVED : 300,
         CLOSED: 1000

package/package.json

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

package/pubmodules/pubModulesManager.js

@@ -33,11 +33,11 @@ class PubModulesManager {
         this.telegram = undefined;
         this.telegramRoute = undefined;
 
-        // this.sms = undefined;
-        // this.smsRoute = undefined;
+        this.sms = undefined;
+        this.smsRoute = undefined;
         
-        // this.voice = undefined;
-        // this.voiceRoute = undefined;
+        this.voice = undefined;
+        this.voiceRoute = undefined;
 
         this.mqttTest = undefined;
         this.mqttTestRoute = undefined;
@@ -97,14 +97,14 @@ class PubModulesManager {
             app.use('/modules/telegram', this.telegramRoute);
             winston.info("PubModulesManager telegramRoute controller loaded");
         }
-        // if (this.smsRoute) {
-        //     app.use('/modules/sms', this.smsRoute);
-        //     winston.info("PubModulesManager smsRoute controller loaded");
-        // }
-        // if (this.voiceRoute) {
-        //     app.use('/modules/voice', this.voiceRoute);
-        //     winston.info("PubModulesManager voiceRoute controller loaded");
-        // }
+        if (this.smsRoute) {
+            app.use('/modules/sms', this.smsRoute);
+            winston.info("PubModulesManager smsRoute controller loaded");
+        }
+        if (this.voiceRoute) {
+            app.use('/modules/voice', this.voiceRoute);
+            winston.info("PubModulesManager voiceRoute controller loaded");
+        }
         if (this.mqttTestRoute) {
             app.use('/modules/mqttTest', this.mqttTestRoute);
             winston.info("PubModulesManager mqttTestRoute controller loaded");
@@ -345,40 +345,40 @@ class PubModulesManager {
             }
         }
 
-        // if (process.env.VOICE_TOKEN === process.env.VOICE_SECRET) {
-        //     try {
-        //         this.voice = require('./voice');
-        //         winston.info("this.voice: " + this.voice);
-        //         this.voice.listener.listen(config);
+        if (process.env.VOICE_TOKEN === process.env.VOICE_SECRET) {
+            try {
+                this.voice = require('./voice');
+                winston.info("this.voice: " + this.voice);
+                this.voice.listener.listen(config);
     
-        //         this.voiceRoute = this.voice.voiceRoute;
+                this.voiceRoute = this.voice.voiceRoute;
     
-        //         winston.info("PubModulesManager initialized apps (voice).")
-        //     } catch(err) {
-        //         console.log("\n Unable to start voice connector: ", err);
-        //         if (err.code == 'MODULE_NOT_FOUND') {
-        //             winston.info("PubModulesManager init apps module not found ");
-        //         } else {
-        //             winston.info("PubModulesManager error initializing init apps module", err);
-        //         }
-        //     }
-        // }
+                winston.info("PubModulesManager initialized apps (voice).")
+            } catch(err) {
+                console.log("\n Unable to start voice connector: ", err);
+                if (err.code == 'MODULE_NOT_FOUND') {
+                    winston.info("PubModulesManager init apps module not found ");
+                } else {
+                    winston.info("PubModulesManager error initializing init apps module", err);
+                }
+            }
+        }
 
-        // try {
-        //     this.sms = require('./sms');
-        //     winston.info("this.sms: " + this.sms);
-        //     this.sms.listener.listen(config);
+        try {
+            this.sms = require('./sms');
+            winston.info("this.sms: " + this.sms);
+            this.sms.listener.listen(config);
 
-        //     this.smsRoute = this.sms.smsRoute;
+            this.smsRoute = this.sms.smsRoute;
 
-        //     winston.info("PubModulesManager initialized apps (sms).")
-        // } catch(err) {
-        //     if (err.code == 'MODULE_NOT_FOUND') {
-        //         winston.info("PubModulesManager init apps module not found ");
-        //     } else {
-        //         winston.info("PubModulesManager error initializing init apps module", err);
-        //     }
-        // }
+            winston.info("PubModulesManager initialized apps (sms).")
+        } catch(err) {
+            if (err.code == 'MODULE_NOT_FOUND') {
+                winston.info("PubModulesManager init apps module not found ");
+            } else {
+                winston.info("PubModulesManager error initializing init apps module", err);
+            }
+        }
 
         try {
             this.mqttTest = require('./mqttTest');

package/pubmodules/routing-queue/listener.js

@@ -177,7 +177,11 @@ class Listener {
                     winston.debug("abandoned_by_project_usersAsArray", abandoned_by_project_usersAsArray);
 
                     var available_agents_not_busy = available_agents_not_busy.filter(projectUser=> !abandoned_by_project_usersAsArray.includes(projectUser._id.toString()))
-                  
+                    
+                    if (available_agents_not_busy.length == 0) {
+                      res.context.request.attributes.fully_abandoned = true;
+                    }
+
                     winston.debug("available_agents_not_busy after: ", available_agents_not_busy );                           
                   }
               }

package/pubmodules/routing-queue/listenerQueued.js

@@ -50,7 +50,7 @@ class Listener {
       return winston.warn("Chatbot is not a project_user. Skip update.")
     }
 
-    return Request.countDocuments({ id_project: id_project, participantsAgents: id_user, status: { $lt: 1000 } }, (err, requestsCount) => {
+    return Request.countDocuments({ id_project: id_project, participantsAgents: id_user, status: { $lt: 1000 }, draft: { $in: [null, false] } }, (err, requestsCount) => {
       winston.verbose("requestsCount for id_user: ", id_user, "and project: ", id_project, "-->", requestsCount);
       if (err) {
         return winston.error(err);

package/routes/request.js

@@ -881,8 +881,10 @@ router.get('/', function (req, res, next) {
   winston.debug('REQUEST ROUTE - QUERY ', req.query)
 
   const DEFAULT_LIMIT = 40;
-
+  
+  var page = 0;
   var limit = DEFAULT_LIMIT; // Number of request per page
+  let statusArray = [];
 
   if (req.query.limit) {
     limit = parseInt(req.query.limit);
@@ -891,9 +893,6 @@ router.get('/', function (req, res, next) {
     limit = DEFAULT_LIMIT;
   }
 
-
-  var page = 0;
-
   if (req.query.page) {
     page = req.query.page;
   }
@@ -901,14 +900,11 @@ router.get('/', function (req, res, next) {
   var skip = page * limit;
   winston.debug('REQUEST ROUTE - SKIP PAGE ', skip);
 
-  let statusArray = [];
-
-  var query = { "id_project": req.projectid, "status": { $lt: 1000 }, preflight: false };
-
+  // Default Query
+  var query = { "id_project": req.projectid, "status": { $lt: 1000, $ne: 150 }, preflight: false };
 
   var projectuser = req.projectuser;
 
-
   if (req.user instanceof Subscription) {
     //all request 
   } else if (projectuser && (projectuser.role == "owner" || projectuser.role == "admin")) {
@@ -921,7 +917,6 @@ router.get('/', function (req, res, next) {
     query["$or"] = [{ "snapshot.agents.id_user": req.user.id }, { "participants": req.user.id }];
   }
 
-
   if (req.query.dept_id) {
     query.department = req.query.dept_id;
     winston.debug('REQUEST ROUTE - QUERY DEPT ID', query.department);
@@ -1170,6 +1165,10 @@ router.get('/', function (req, res, next) {
   sortQuery[sortField] = direction;
   winston.debug("sort query", sortQuery);
 
+  if (req.query.abandonded && (req.query.abandoned === true || req.query.abandoned === 'true')) {
+    query["attributes.fully_abandoned"] = true
+  }
+
   if (req.query.draft && (req.query.draft === 'false' || req.query.draft === false)) {
     query.draft = { $in: [false, null] }
   }
@@ -1190,10 +1189,6 @@ router.get('/', function (req, res, next) {
   var q1 = Request.find(query, projection).
     skip(skip).limit(limit);
 
-
-
-
-
   winston.debug('REQUEST ROUTE no_populate:' + req.query.no_populate);
 
   if (req.query.no_populate != "true" && req.query.no_populate != true) {

package/services/requestService.js

@@ -310,6 +310,20 @@ class RequestService {
 
             winston.verbose("Request " + request.request_id + " contains already the same participants at the same request status. Routed to the same participants");
 
+            if (routedRequest.attributes.fully_abandoned && routedRequest.attributes.fully_abandoned === true) {
+              request.status = RequestConstants.ABANDONED;
+              request.attributes.fully_abandoned = true;
+              request.markModified('status');
+              request.markModified('attributes');
+              request.save((err, savedRequest) => {
+                if (err) {
+                  winston.error("Error updating request with status ABANDONED ", err);
+                } else {
+                  winston.verbose("Status modified in ABANDONED for request: " + savedRequest._id);
+                }
+              })
+            }
+
             if (no_populate === "true" || no_populate === true) {
               winston.debug("no_populate is true");
               return resolve(request);

package/websocket/webSocketServer.js

@@ -310,7 +310,7 @@ class WebSocketServer {
 
                 // db.getCollection('requests').find({"id_project":"5e15bef09877c800176d217f","status":{"$lt":1000},"$or":[{"agents":{"id_user":"5ddd30bff0195f0017f72c6d"}},{"participants":"5ddd30bff0195f0017f72c6d"}]})
                 // pubblica dopo toni
-                var query = { "id_project": projectId, "status": { $lt: 1000, $gt: 50 }, preflight: false, "draft": { $in: [false, null] } };
+                var query = { "id_project": projectId, "status": { $lt: 1000, $gt: 50, $ne: 150 }, preflight: false, "draft": { $in: [false, null] } };
                 // add hasBot:false
 
                 // var query = {"id_project":projectId, "status": { $lt: 1000, $gt: 50 }, $or:[ {preflight:false}, { preflight : { $exists: false } } ] };