@tiledesk/tiledesk-server 2.1.41 → 2.2.4

package/routes/request.js

@@ -27,9 +27,9 @@ const { check, validationResult } = require('express-validator');
 
 
 
-// undocumented
+// undocumented, used by test
 
-// TODO make a synchronous chat21 version (with query parameter?) with request.support_group.created
+// TODO make a synchronous chat21 version (with query parameter?) with request.support_group.create
 router.post('/', 
 [
   check('text').notEmpty(),  
@@ -58,7 +58,7 @@ function (req, res) {
     let messageStatus = req.body.status || MessageConstants.CHAT_MESSAGE_STATUS.SENDING;
     winston.debug('messageStatus: ' + messageStatus);
 
-    var request_id = req.params.request_id || 'support-group-'+uuidv4();
+    var request_id = req.params.request_id || 'support-group-' + req.projectid + "-" + uuidv4();
 
     // createIfNotExistsWithLeadId(lead_id, fullname, email, id_project, createdBy, attributes) {
     return leadService.createIfNotExistsWithLeadId(req.body.sender || req.user._id, req.body.senderFullname || req.user.fullName , req.body.email || req.user.email, req.projectid, null, req.body.attributes || req.user.attributes)
@@ -107,7 +107,6 @@ function (req, res) {
 
 
 
-
 // TODO make a synchronous chat21 version (with query parameter?) with request.support_group.created
 router.patch('/:requestid', function (req, res) {
   winston.debug(req.body);
@@ -159,7 +158,9 @@ router.patch('/:requestid', function (req, res) {
   if (req.body.location) {
     update.location = req.body.location;
   }
-
+  if (req.body.priority) {
+    update.priority = req.body.priority;
+  }
 
   
   winston.verbose("Request patch update",update);
@@ -189,6 +190,7 @@ router.patch('/:requestid', function (req, res) {
 
 });
 
+
 // TODO make a synchronous chat21 version (with query parameter?) with request.support_group.created
 router.put('/:requestid/close', function (req, res) {
   winston.debug(req.body);
@@ -198,7 +200,8 @@ router.put('/:requestid/close', function (req, res) {
 
       winston.verbose("request closed", closedRequest);
 
-      return res.json(closedRequest);
+        return res.json(closedRequest);
+      
   });
 
 
@@ -336,7 +339,10 @@ router.put('/:requestid/assign', function (req, res) {
         winston.debug("department changed", updatedRequest);
 
         return res.json(updatedRequest);
-      });
+      }).catch(function(error)  {
+        winston.error('Error changing the department.', error)
+        return res.status(500).send({ success: false, msg: 'Error changing the department.' });
+      })
   });
 });
 
@@ -349,7 +355,10 @@ router.put('/:requestid/departments', function (req, res) {
       winston.debug("department changed", updatedRequest);
 
       return res.json(updatedRequest);
-  });
+  }).catch(function(error)  {
+    winston.error('Error changing the department.', error)
+    return res.status(500).send({ success: false, msg: 'Error changing the department.' });
+  })
 });
 
 
@@ -541,6 +550,37 @@ router.delete('/:requestid',  function (req, res) {
 
 
 
+router.delete('/id/:id',  function (req, res) {
+  
+  var projectuser = req.projectuser;
+
+
+  if (projectuser.role != "owner" ) {
+    return res.status(403).send({ success: false, msg: 'Unauthorized.' });
+  }
+
+  Request.remove({ _id: req.params.id }, 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 id: '+ req.params.id );
+
+    requestEvent.emit('request.delete', request);
+
+    res.json(request);
+
+  });
+});
+
+
+
+
 router.get('/', function (req, res, next) {
 
   winston.debug("req projectid", req.projectid);
@@ -632,6 +672,11 @@ router.get('/', function (req, res, next) {
     query.hasBot = req.query.hasbot;
   }
 
+  // if (req.query.waiting_time_exists) { //non basta aggiungi anche che nn è null
+  //   query.waiting_time = {"$exists": req.query.waiting_time_exists} //{$ne:null}
+  //   winston.debug('REQUEST ROUTE - QUERY waiting_time_exists', query.waiting_time_exists);
+  // }
+
 
   if (req.query.tags) {
     winston.debug('req.query.tags', req.query.tags);
@@ -826,7 +871,7 @@ router.get('/', function (req, res, next) {
 });
 
 
-
+// TODO converti con fast-csv e stream
 // DOWNLOAD HISTORY REQUESTS AS CSV
 router.get('/csv', function (req, res, next) {
 
@@ -918,7 +963,7 @@ router.get('/csv', function (req, res, next) {
     query.createdAt = { $gte: new Date(Date.parse(startDate)).toISOString() };
     winston.debug('REQUEST ROUTE - QUERY CREATED AT (only for start date)', query.createdAt);
   }
-
+  winston.debug("csv query", query);
 
   var direction = 1; //-1 descending , 1 ascending
   if (req.query.direction) {
@@ -938,11 +983,13 @@ router.get('/csv', function (req, res, next) {
   winston.debug("sort query", sortQuery);
 
   winston.debug('REQUEST ROUTE - REQUEST FIND ', query)
-    return Request.find(query, '-transcript  -agents -status -__v').
+    return Request.find(query, '-transcript -status -__v').
     skip(skip).limit(limit).
         //populate('department', {'_id':-1, 'name':1}).     
         populate('department').
         populate('lead').
+        // populate('participatingBots').
+        // populate('participatingAgents'). 
         lean().
       // populate({
       //   path: 'department', 
@@ -987,17 +1034,46 @@ router.get('/csv', function (req, res, next) {
             
             element.lead_email = lead_email;
 
+            var tags = [];
+            var tagsString = "";
+            if (element.tags && element.tags.length>0) {
+              
+              element.tags.forEach(function(tag) {
+                // tags = tags  + tag.tag + ", ";
+                tags.push(tag.tag);
+              });              
+            }
+            tagsString = tags.join(", ")
+
+            winston.debug('tagsString ' +tagsString)
+            
+            element.tags = tagsString;
+
+
+            // var participatingAgents = "";
+            // if (element.participatingAgents && element.participatingAgents.length>0) {
+            //   element.participatingAgents.forEach(function(agent) {                
+            //     participatingAgents = participatingAgents + ", " + agent;
+            //   });          
+            // }
+            // // da terminare e testare. potrebbe essere troppo lenta la query per tanti record
+            // element.participatingAgents = participatingAgents;
+            
+
+
             delete element.lead;
 
             delete element.attributes;
 
             delete element.notes;
 
-            delete element.tags;
+            // delete element.tags;
 
             delete element.channelOutbound;
 
             delete element.location;
+
+            delete element.snapshot;
             
 
             // TODO print also lead. use a library to flattize

package/routes/requestUtilRoot.js

@@ -0,0 +1,30 @@
+var express = require('express');
+
+var router = express.Router();
+
+var Request = require("../models/request");
+var winston = require('../config/winston');
+
+// https://tiledesk-server-pre.herokuapp.com/requests_util/lookup/id_project/support-group-60ffe291f725db00347661ef-b4cb6875785c4a23b27244fe498eecf4
+router.get('/lookup/id_project/:request_id',  function(req, res) {
+  winston.debug("lookup: "+req.params.request_id);
+  
+  return Request.findOne({request_id: req.params.request_id}).select("id_project").exec(function(err, request) { 
+      if (err) {
+        return res.status(500).send({success: false, msg: 'Error creating message', err:err });
+      } 
+      if (!request) {
+        return res.status(404).send({success: false, msg: "Request with  " + req.params.request_id + " not found" });
+      }
+      winston.debug("request",request);
+      res.json({id_project: request.id_project});
+    });
+
+});
+
+
+module.exports = router;
+
+
+
+

package/routes/urls.js

@@ -0,0 +1,12 @@
+var express = require('express');
+var router = express.Router();
+var winston = require('../config/winston');
+
+
+router.get('/redirect', function (req, res) {
+  winston.debug("redirect: "+ req.query.path);
+  res.redirect(req.query.path);
+});
+
+
+module.exports = router;

package/routes/users.js

@@ -154,11 +154,15 @@ router.get('/resendverifyemail', function (req, res) {
 
 router.get('/', function (req, res) {
   winston.debug("users");
-  User.findById(req.user.id, 'firstname lastname _id', function (err, user) {
+  var userid = req.user.id;
+
+  User.findById(userid, 'email firstname lastname _id emailverified', function (err, user) {
     if (err) {
+      winston.error('Error getting object.',err);
       return res.status(500).send({ success: false, msg: 'Error getting object.' });
     }
     if (!user) {
+      winston.warn("Object not found with id " +req.user.id);
       return res.status(404).send({ success: false, msg: 'Object not found.' });
     }
     winston.debug("GET USER BY ID RES JSON", user);

package/services/BotSubscriptionNotifier.js

@@ -55,6 +55,7 @@ class BotSubscriptionNotifier {
             winston.verbose("SENT notify for bot with url " + url +  " with err " + err);
             if (err) {
               winston.error("Error sending notify for bot with url " + url + " with err " + err);
+              //TODO Reply with error
               // next(err, json);
             }
           });

package/services/departmentService.js

@@ -78,7 +78,9 @@ roundRobin(operatorSelectedEvent) {
     // db.getCollection('requests').find({id_project: "5c12662488379d0015753c49", participants: { $exists: true, $ne: [] }}).sort({_id:-1}).limit(1)
     
       // https://stackoverflow.com/questions/14789684/find-mongodb-records-where-array-field-is-not-empty
-      let query = {id_project: operatorSelectedEvent.id_project, participants: { $exists: true, $ne: [] }};
+      let query = {id_project: operatorSelectedEvent.id_project, 
+        hasBot:false, preflight:false, status: { $gt: 100 }, 
+        participants: { $exists: true, $ne: [] }};
       
       winston.debug('query', query);            
 
@@ -94,6 +96,7 @@ roundRobin(operatorSelectedEvent) {
           winston.debug('lastRequests',lastRequests); 
 
           if (lastRequests.length==0) {
+              winston.debug('roundRobin lastRequest not found. fall back to random info',operatorSelectedEvent); 
               winston.verbose('roundRobin lastRequest not found. fall back to random'); 
               //first request use default random algoritm
               // return 0;
@@ -121,11 +124,29 @@ roundRobin(operatorSelectedEvent) {
           if (operatorSelectedEvent.available_agents && operatorSelectedEvent.available_agents.length==0) {
             winston.debug('operatorSelectedEvent.available_agents empty ', operatorSelectedEvent.available_agents);
             return resolve(operatorSelectedEvent);
-          }
+          }          
+
+
+            //when the agent has a custom auth jwt. so he has uuid_user and not id_user
+          // error: uncaughtException: Cannot read property 'toString' of undefined
+          // 2021-10-14T08:54:00.099370+00:00 app[web.1]: TypeError: Cannot read property 'toString' of undefined
+          // 2021-10-14T08:54:00.099371+00:00 app[web.1]:     at /app/services/departmentService.js:130:119
+          // 2021-10-14T08:54:00.099372+00:00 app[web.1]:     at Array.findIndex (<anonymous>)
+          // 2021-10-14T08:54:00.099372+00:00 app[web.1]:     at /app/services/departmentService.js:130:74
+          // 2021-10-14T08:54:00.099372+00:00 app[web.1]:     at /app/node_modules/mongoose/lib/model.js:5074:18
+          // 2021-10-14T08:54:00.099381+00:00 app[web.1]:     at processTicksAndRejections (internal/process/task_q
 
           // https://stackoverflow.com/questions/15997879/get-the-index-of-the-object-inside-an-array-matching-a-condition
-          let lastOperatorIndex = operatorSelectedEvent.available_agents.findIndex(projectUser => projectUser.id_user.toString() === lastOperatorId);
+          let lastOperatorIndex = operatorSelectedEvent.available_agents.findIndex(projectUser =>  {
+                if (projectUser.id_user) {
+                  return projectUser.id_user.toString() === lastOperatorId;
+                } else { //when the agent has a custom auth jwt. so he has uuid_user and not id_user
+                  return projectUser.uuid_user === lastOperatorId;
+                }
+              }
+            );
 
+          
           // if lastOperatorIndex is -1(last operator is not available)->  that.nextOperator increment index +1 so it's work
 
 
@@ -133,6 +154,9 @@ roundRobin(operatorSelectedEvent) {
 
           winston.debug('lastOperatorIndex: ' + lastOperatorIndex);
 
+          winston.debug('operatorSelectedEvent.available_agents: ', operatorSelectedEvent.available_agents);
+
+          
           let nextOperator = that.nextOperator(operatorSelectedEvent.available_agents, lastOperatorIndex);
 
           
@@ -208,8 +232,8 @@ getOperators(departmentid, projectid, nobot, disableWebHookCall, context) {
         }
         // console.log("department", department);
         if (!department) {
-          winston.error("Department not found for query ", query);
-          return reject({ success: false, msg: 'Department not found.' });
+          winston.error("Department not found for projectid: "+ projectid +" for query: ", query, context);
+          return reject({ success: false, msg: 'Department not found for projectid: '+ projectid +' for query: ' + JSON.stringify(query) });
         }
         // console.log('OPERATORS - »»» DETECTED ROUTING ', department.routing)
         // console.log('OPERATORS - »»» DEPARTMENT - ID BOT ', department.id_bot)