@tiledesk/tiledesk-server 2.10.11 → 2.10.13

package/CHANGELOG.md

@@ -5,6 +5,15 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.10.13
+- Updated tybot-connector to 0.2.127
+- Added event on request fully abandoned
+
+# 2.10.12
+- Updated tiledesk-chatbot-template to 0.1.3
+- Added check on valid mongo id
+- Removed logs
+
 # 2.10.11
 - Updated tybot-connector to 0.2.118
 - Removed logs

package/app.js

@@ -449,6 +449,11 @@ var projectSetter = function (req, res, next) {
 
   if (projectid) {
     
+    if (!mongoose.Types.ObjectId.isValid(projectid)) {
+      winston.warn(`Invalid ObjectId: ${projectid}`);
+      return res.status(400).send({ error: "Invalid project id: " + projectid });
+    }
+    
     let q =  Project.findOne({_id: projectid, status: 100});
     if (cacheEnabler.project) { 
       q.cache(cacheUtil.longTTL, "projects:id:"+projectid)  //project_cache

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.10.11",
+  "version": "2.10.13",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -38,7 +38,7 @@
   "dependencies": {
     "@tiledesk/tiledesk-apps": "^1.0.26",
     "@tiledesk/tiledesk-chat21-app": "^1.1.8",
-    "@tiledesk/tiledesk-chatbot-templates": "^0.1.2",
+    "@tiledesk/tiledesk-chatbot-templates": "^0.1.3",
     "@tiledesk/tiledesk-chatbot-util": "^0.8.33",
     "@tiledesk/tiledesk-client": "^0.10.10",
     "@tiledesk/tiledesk-dialogflow-connector": "^1.8.4",
@@ -48,7 +48,7 @@
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
     "@tiledesk/tiledesk-telegram-connector": "^0.1.14",
     "@tiledesk/tiledesk-train-jobworker": "^0.0.11",
-    "@tiledesk/tiledesk-tybot-connector": "^0.2.118",
+    "@tiledesk/tiledesk-tybot-connector": "^0.2.127",
     "@tiledesk/tiledesk-whatsapp-connector": "^0.1.73",
     "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.8",
     "@tiledesk/tiledesk-sms-connector": "^0.1.10",

package/routes/request.js

@@ -30,6 +30,7 @@ csv.separator = ';';
 
 const { check, validationResult } = require('express-validator');
 const RoleConstants = require('../models/roleConstants');
+const eventService = require('../pubmodules/events/eventService');
 
 // var messageService = require('../services/messageService');
 
@@ -182,7 +183,7 @@ router.post('/',
 
           winston.debug('res.json(savedRequest)');
           var endTimestamp = new Date();
-          winston.verbose("request create end: " + (endTimestamp - startTimestamp));
+          winston.verbose("(Request Route) request create end: " + (endTimestamp - startTimestamp));
           return res.json(savedRequest);
           // });
           // });
@@ -273,7 +274,7 @@ router.patch('/:requestid', function (req, res) {
 
 
 
-  winston.verbose("Request patch update", update);
+  winston.verbose("(Request Route) Request patch update", update);
 
   //cacheinvalidation
   return Request.findOneAndUpdate({ "request_id": req.params.requestid, "id_project": req.projectid }, { $set: update }, { new: true, upsert: false })
@@ -326,18 +327,18 @@ router.put('/:requestid/close', async function (req, res) {
     })
   
     if (!request) {
-      winston.verbose("Request with request_id " + request_id)
+      winston.verbose("(Request Route) Request with request_id " + request_id)
       return res.status(404).send({ success: false, error: "Request not found"})
     }
   
     if (!request.participantsAgents.includes(req.user.id)) {
-      winston.verbose("Request can't be closed by a non participant. Attempt made by " + req.user.id);
+      winston.verbose("(Request Route) Request can't be closed by a non participant. Attempt made by " + req.user.id);
       return res.status(403).send({ success: false, error: "You must be among the participants to close a conversation."})
     }
   }
 
   return requestService.closeRequestByRequestId(req.params.requestid, req.projectid, false, true, closed_by, req.body.force).then(function (closedRequest) {
-    winston.verbose("request closed", closedRequest);
+    winston.verbose("(Request Route) request closed", closedRequest);
     return res.json(closedRequest);
   });
 
@@ -349,7 +350,7 @@ router.put('/:requestid/reopen', function (req, res) {
   // reopenRequestByRequestId(request_id, id_project) {
   return requestService.reopenRequestByRequestId(req.params.requestid, req.projectid).then(function (reopenRequest) {
 
-    winston.verbose("request reopen", reopenRequest);
+    winston.verbose("(Request Route) request reopen", reopenRequest);
 
     return res.json(reopenRequest);
   });
@@ -380,7 +381,7 @@ router.post('/:requestid/participants',
     //addParticipantByRequestId(request_id, id_project, member)
     return requestService.addParticipantByRequestId(req.params.requestid, req.projectid, req.body.member).then(function (updatedRequest) {
 
-      winston.verbose("participant added", updatedRequest);
+      winston.verbose("(Request Route) participant added", updatedRequest);
 
       return res.json(updatedRequest);
     });
@@ -420,7 +421,7 @@ router.delete('/:requestid/participants/:participantid', function (req, res) {
   //removeParticipantByRequestId(request_id, id_project, member)
   return requestService.removeParticipantByRequestId(req.params.requestid, req.projectid, req.params.participantid).then(function (updatedRequest) {
 
-    winston.verbose("participant removed", updatedRequest);
+    winston.verbose("(Request Route) participant removed", updatedRequest);
 
     return res.json(updatedRequest);
   });
@@ -451,10 +452,16 @@ router.delete('/:requestid/participants/:participantid', function (req, res) {
 router.put('/:requestid/assign', function (req, res) {
   winston.debug(req.body);
 
-  // leggi la request se già assegnata o già chiusa (1000) esci 
+  let id_project = req.projectid;
+  let user = req.user;
+  let pu;
+  if (req.projectuser) {
+    pu = req.projectuser.id;
+  }
 
-  //cacheinvalidation
-  return Request.findOne({ "request_id": req.params.requestid, "id_project": req.projectid })
+  // leggi la request se già assegnata o già chiusa (1000) esci 
+  // cacheinvalidation
+  return Request.findOne({ "request_id": req.params.requestid, "id_project": id_project })
     .exec(function (err, request) {
 
       if (err) {
@@ -467,13 +474,17 @@ router.put('/:requestid/assign', function (req, res) {
       }
 
       if (request.status === RequestConstants.ASSIGNED || request.status === RequestConstants.SERVED || request.status === RequestConstants.CLOSED) {
-        winston.info('Request already assigned');
+        winston.verbose('(Request Route) Request already assigned');
         return res.json(request);
       }
       //route(request_id, departmentid, id_project) {      
-      requestService.route(req.params.requestid, req.body.departmentid, req.projectid, req.body.nobot, req.body.no_populate).then(function (updatedRequest) {
+      requestService.route(req.params.requestid, req.body.departmentid, id_project, req.body.nobot, req.body.no_populate).then(function (updatedRequest) {
 
-        winston.debug("department changed", updatedRequest);
+        winston.debug("request routed ", updatedRequest);
+        
+        if (updatedRequest.status === RequestConstants.ABANDONED) {
+          eventService.emit('request.fully_abandoned', updatedRequest, id_project, pu, user._id, undefined, user);
+        }
 
         return res.json(updatedRequest);
       }).catch(function (error) {
@@ -624,7 +635,7 @@ router.patch('/:requestid/attributes', function (req, res) {
           winston.error("error saving request attributes", err)
           return res.status(500).send({ success: false, msg: 'Error getting object.' });
         }
-        winston.verbose(" saved request attributes", savedRequest.toObject())
+        winston.verbose("(Request Route) saved request attributes", savedRequest.toObject())
         requestEvent.emit("request.update", savedRequest);
         requestEvent.emit("request.update.comment", { comment: "ATTRIBUTES_PATCH", request: savedRequest });//Deprecated
         requestEvent.emit("request.updated", { comment: "ATTRIBUTES_PATCH", request: savedRequest, patch: { attributes: data } });
@@ -657,7 +668,7 @@ router.post('/:requestid/notes', async function (req, res) {
 
     // Check if the user is a participant
     if (!request.participantsAgents.includes(req.user.id)) {
-      winston.verbose("Trying to add a note from a non participating agent");
+      winston.verbose("(Request Route) Trying to add a note from a non participating agent");
       return res.status(403).send({ success: false, error: "You are not participating in the conversation"})
     }
   }
@@ -703,7 +714,7 @@ router.delete('/:requestid/notes/:noteid', async function (req, res) {
   
     // Check if the user is a participant
     if (!request.participantsAgents.includes(req.user.id)) {
-      winston.verbose("Trying to delete a note from a non participating agent");
+      winston.verbose("(Request Route) Trying to delete a note from a non participating agent");
       return res.status(403).send({ success: false, error: "You are not participating in the conversation"})
     }
   }
@@ -766,14 +777,14 @@ router.post('/:requestid/email/send',
 
 
 
-      winston.info("Sending an email with text : " + text + " to request_id " + request_id);
+      winston.debug("Sending an email with text : " + text + " to request_id " + request_id);
 
       if (!request.lead.email) {
         res.json({ "no queued": true });
       }
 
       let newto = request.lead.email
-      winston.info("Sending an email newto " + newto);
+      winston.verbose("(Request Route) Sending an email newto " + newto);
 
       //sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage, payload)
       emailService.sendEmailDirect(newto, text, req.project, request_id, subject, undefined, undefined, undefined, replyto);
@@ -796,7 +807,7 @@ router.post('/:requestid/followers',
     check('member').notEmpty(),
   ],
   function (req, res) {
-    winston.info("followers add", req.body);
+    winston.verbose("(Request Route) followers add", req.body);
 
     const errors = validationResult(req);
     if (!errors.isEmpty()) {
@@ -806,7 +817,7 @@ router.post('/:requestid/followers',
     //addParticipantByRequestId(request_id, id_project, member)
     return requestService.addFollowerByRequestId(req.params.requestid, req.projectid, req.body.member).then(function (updatedRequest) {
 
-      winston.verbose("participant added", updatedRequest);
+      winston.verbose("(Request Route) participant added", updatedRequest);
 
       return res.json(updatedRequest);
     });
@@ -839,7 +850,7 @@ router.delete('/:requestid/followers/:followerid', function (req, res) {
   //removeFollowerByRequestId(request_id, id_project, member)
   return requestService.removeFollowerByRequestId(req.params.requestid, req.projectid, req.params.followerid).then(function (updatedRequest) {
 
-    winston.verbose("follower removed", updatedRequest);
+    winston.verbose("(Request Route) follower removed", updatedRequest);
 
     return res.json(updatedRequest);
   });
@@ -866,7 +877,7 @@ router.delete('/:requestid', function (req, res) {
     if (err) {
       return res.status(500).send({ success: false, msg: 'Error deleting messages.' });
     }
-    winston.verbose('Messages deleted for the recipient: ' + req.params.requestid);
+    winston.verbose('(Request Route) Messages deleted for the recipient: ' + req.params.requestid);
   });
 
 
@@ -880,7 +891,7 @@ router.delete('/:requestid', function (req, res) {
       return res.status(404).send({ success: false, msg: 'Object not found.' });
     }
 
-    winston.verbose('Request deleted with request_id: ' + req.params.requestid);
+    winston.verbose('(Request Route) Request deleted with request_id: ' + req.params.requestid);
 
     requestEvent.emit('request.delete', request);
 
@@ -928,7 +939,7 @@ router.delete('/id/:id', function (req, res) {
       return res.status(404).send({ success: false, msg: 'Object not found.' });
     }
 
-    winston.verbose('Request deleted with id: ' + req.params.id);
+    winston.verbose('(Request Route) Request deleted with id: ' + req.params.id);
 
     requestEvent.emit('request.delete', request);
 
@@ -1201,7 +1212,7 @@ router.get('/', function (req, res, next) {
     } else if (req.query.duration_op === 'lt') {
       query.duration = { $lte: duration }
     } else {
-      winston.verbose("Duration operator can be 'gt' or 'lt'. Skip duration_op " + req.query.duration_op)
+      winston.verbose("(Request Route) Duration operator can be 'gt' or 'lt'. Skip duration_op " + req.query.duration_op)
     }
   }
 
@@ -1217,12 +1228,12 @@ router.get('/', function (req, res, next) {
 
   if (req.query.full_text) {
     if (req.query.no_textscore != "true" && req.query.no_textscore != true) {
-      winston.verbose('fulltext projection on');
+      winston.verbose('(Request Route) fulltext projection on');
       projection = { score: { $meta: "textScore" } };
     }
   }
 
-  winston.verbose('REQUEST ROUTE - REQUEST FIND QUERY ', query);
+  winston.verbose('(Request Route) Find request with query ', query);
   
   var q1 = Request.find(query, projection).
     skip(skip).limit(limit);
@@ -1251,7 +1262,7 @@ router.get('/', function (req, res, next) {
   var q2 = Request.countDocuments(query).exec();
 
   if (req.query.no_count && req.query.no_count == "true") {
-    winston.info('REQUEST ROUTE - no_count ');
+    winston.verbose('(Request Route) - no_count');
     q2 = 0;
   }
 
@@ -1263,16 +1274,16 @@ router.get('/', function (req, res, next) {
       count: results[1],
       requests: results[0]
     };
-    winston.debug('REQUEST ROUTE - objectToReturn ');
-    winston.debug('REQUEST ROUTE - objectToReturn ', objectToReturn);
+    winston.debug('(Request Route) - objectToReturn ');
+    winston.debug('(Request Route) - objectToReturn ', objectToReturn);
 
     const endExecTime = new Date();
-    winston.verbose('REQUEST ROUTE - exec time:  ' + (endExecTime - startExecTime));
+    winston.verbose('(Request Route) - exec time:  ' + (endExecTime - startExecTime));
 
     return res.json(objectToReturn);
 
   }).catch(function (err) {
-    winston.error('REQUEST ROUTE - REQUEST FIND ERR ', err);
+    winston.error('(Request Route) find request error ', err);
     return res.status(500).send({ success: false, msg: 'Error getting requests.', err: err });
   });
 
@@ -1824,7 +1835,7 @@ router.get('/csv', function (req, res, next) {
     } else if (req.query.duration_op === 'lt') {
       query.duration = { $lte: duration }
     } else {
-      winston.verbose("Duration operator can be 'gt' or 'lt'. Skip duration_op " + req.query.duration_op)
+      winston.verbose("(Request Route) Duration operator can be 'gt' or 'lt'. Skip duration_op " + req.query.duration_op)
     }
   }