@tiledesk/tiledesk-server 2.1.4-0.3 → 2.1.4-0.31

package/routes/campaigns.js

@@ -1,9 +1,8 @@
 var express = require('express');
 var router = express.Router();
-var Lead = require("../models/lead");
-var LeadConstants = require("../models/leadConstants");
+var Group = require("../models/group");
+var User = require("../models/user");
 var winston = require('../config/winston');
-var leadService = require("../services/leadService");
 var requestService = require("../services/requestService");
 var messageService = require("../services/messageService");
 var MessageConstants = require("../models/messageConstants");
@@ -12,13 +11,6 @@ const uuidv4 = require('uuid/v4');
 
 
 
-// curl -v -X POST -H 'Content-Type:application/json' -u andrea.leo@f21.it:123456 -d '{"text":"ciao"}' http://localhost:3000/5f897142c9e7ad9602a744c9/campaigns/
-// curl -v -X POST -H 'Content-Type:application/json' -u andrea.leo@f21.it:123456 -d '{"text":"ciao", "leadid":"213213221"}' http://localhost:3000/5f897142c9e7ad9602a744c9/campaigns/
-
-
-// curl -v -X POST -H 'Content-Type:application/json' -u andrea.leo@frontiere21.it:258456 -d '{"text":"ciao", "leadid":"5f8972c82db41c003473cb03"}' https://tiledesk-server-pre.herokuapp.com/5f86c201189063003453a045/campaigns/
-// curl -v -X POST -H 'Content-Type:application/json' -u andrea.leo@frontiere21.it:258456 -d '{"text":"ciao", "leadid":"5f8972c82db41c003473cb03", "request_id":"group-123456789112233"}' https://tiledesk-server-pre.herokuapp.com/5f86c201189063003453a045/campaigns/
-
 
 // this endpoint supports support-group- or groups. this create a conversation for the sender (agent console)
 router.post('/', function (req, res) {
@@ -27,43 +19,143 @@ router.post('/', function (req, res) {
 
   winston.debug(req.body);
   winston.debug("req.user", req.user);
-  var request_id = req.body.request_id || 'support-group-'+uuidv4();
-  
+  var request_id = req.body.request_id || 'support-group-' + req.projectid + "-" + uuidv4();
+
+  // TODO cicla su segment
+
+
   // createWithIdAndRequester(request_id, project_user_id, lead_id, id_project, first_text, departmentid, sourcePage, language, userAgent, status, createdBy, attributes, subject, preflight, channel) {
-  return requestService.createWithIdAndRequester(request_id, req.projectuser._id, req.body.leadid, req.projectid, 
-    req.body.text, req.body.departmentid, req.body.sourcePage, 
+
+  //TODO USE NEW requestService.create()
+  return requestService.createWithIdAndRequester(request_id, req.projectuser._id, req.body.leadid, req.projectid,
+    req.body.text, req.body.departmentid, req.body.sourcePage,
     req.body.language, req.body.userAgent, null, req.user._id, req.body.attributes, req.body.subject, true, req.body.channel).then(function (savedRequest) {
 
       winston.info("savedRequest", savedRequest);
 
       // create(sender, senderFullname, recipient, text, id_project, createdBy, status, attributes, type, metadata, language, channel_type) {
       return messageService.create(req.body.sender || req.user._id, req.body.senderFullname || req.user.fullName, savedRequest.request_id, req.body.text,
-        req.projectid, req.user._id, messageStatus, req.body.attributes, req.body.type, req.body.metadata,  req.body.language, MessageConstants.CHANNEL_TYPE.DIRECT, req.body.channel).then(function(savedMessage){                    
+        req.projectid, req.user._id, messageStatus, req.body.attributes, req.body.type, req.body.metadata, req.body.language, MessageConstants.CHANNEL_TYPE.DIRECT, req.body.channel).then(function (savedMessage) {
           res.json(savedMessage);
-       });
+        });
 
-  });
+    });
 });
 
-// curl -v -X POST -H 'Content-Type:application/json' -u andrea.leo@frontiere21.it:258456 -d '{"text":"ciao", "recipient":"5f8972c82db41c003473cb03"}' https://tiledesk-server-pre.herokuapp.com/5f86c201189063003453a045/campaigns/direct
-router.post('/direct', function (req, res) {
+router.post('/direct', async function (req, res) {
 
   let messageStatus = req.body.status || MessageConstants.CHAT_MESSAGE_STATUS.SENDING;
 
   winston.debug(req.body);
   winston.debug("req.user", req.user);
+
+  var recipients = [];
+
+  var recipient = req.body.recipient;
+  if (recipient) {
+    recipients.push(recipient);
+  }
+
+  // TODO cicla su segment
+  var segment_id = req.body.segment_id;
+  if (segment_id) {
+
+  }
+
+  var group_id = req.body.group_id;
+  if (group_id) {
+    var group = await Group.findOne({ _id: group_id, id_project: req.projectid }).exec();
+    winston.info("group", group);
+
+    var recipients = group.members;
+    // winston.info("members", members);
+
+
+  }
+
+  winston.info("recipients", recipients);
+  winston.info("recipients.length: " + recipients.length);
+
+  let message = {
+    sender: req.body.sender || req.user._id, 
+    senderFullname: req.body.senderFullname || req.user.fullName, 
+    recipient: req.body.recipient, 
+    recipientFullname: req.body.recipientFullname,
+    text: req.body.text, 
+    id_project: req.projectid, // rendilo opzionale?
+    createdBy: req.user._id, 
+    status:  messageStatus,
+    attributes: req.body.attributes, 
+    type: req.body.type, 
+    metadata: req.body.metadata, 
+    language: req.body.language, 
+    channel_type: MessageConstants.CHANNEL_TYPE.DIRECT, 
+    channel: req.body.channel
+};
   
 
-  // create(sender, senderFullname, recipient, text, id_project, createdBy, status, attributes, type, metadata, language, channel_type) {
-  return messageService.create(req.body.sender || req.user._id, req.body.senderFullname || req.user.fullName, req.body.recipient, req.body.text,
-    req.projectid, req.user._id, messageStatus, req.body.attributes, req.body.type, req.body.metadata,  req.body.language, MessageConstants.CHANNEL_TYPE.DIRECT, req.body.channel).then(function(savedMessage){                    
-      res.json(savedMessage);
-    });
+  if (recipients.length == 0) {
+    // return res  XXX
+  }
+
+  if (recipients.length == 1) {
+    return messageService.save(message).then(function(savedMessage){                        
+        if (req.body.returnobject) {
+          return res.json(savedMessage);
+        } else {
+          return res.json({ success: true });
+        }
+
+      });
+  }
+
+
+  var promises = [];
+  for (const recipient of recipients) {
+  // recipients.forEach( async (recipient) => {
+
+    // create(sender, senderFullname, recipient, text, id_project, createdBy, status, attributes, type, metadata, language, channel_type) {
+    // var promise = messageService.create(req.body.sender || req.user._id, req.body.senderFullname || req.user.fullName, recipient, req.body.text,
+    //   req.projectid, req.user._id, messageStatus, req.body.attributes, req.body.type, req.body.metadata, req.body.language, MessageConstants.CHANNEL_TYPE.DIRECT, req.body.channel);
+
+    winston.info("recipient: " + recipient);
+
+    message.recipient = recipient;
+
+    var user = await User.findOne({_id:recipient}).exec();
+    winston.info("user", user);
+    
+    message.recipientFullname = user.fullName;
+
+    var promise = messageService.save(message);
+    promises.push(promise);
+    // .then(function(savedMessage){                    
+    // result.push(savedMessage);
+    // res.json(savedMessage);
+  }
+  //);
+
+  Promise.all(promises).then(function (data) {
+    if (req.body.returnobject) {
+      return res.json(data);
+    }
+  });
+
+  if (!req.body.returnobject) {
+    return res.json({ success: true });
+  }
+
+
+
 
-  
 });
 
 
 
 
+
+
+
+
+
 module.exports = router;

package/routes/faq_kb.js

@@ -58,8 +58,15 @@ router.post('/askbot', function (req, res) {
          }else {
           query = { "id_project": req.projectid, "id_faq_kb": req.body.id_faq_kb};
 
-          query.$text = {"$search": req.body.question};
-       
+          var search_obj = {"$search": req.body.question};
+
+          if (faq_kb.language) {
+              search_obj["$language"] = faq_kb.language;
+          }
+          query.$text = search_obj;
+          winston.info("fulltext search query", query);  
+
+
           winston.debug('internal ft query: '+ query);
     
            Faq.find(query,  {score: { $meta: "textScore" } })  

package/routes/messagesRoot.js

@@ -1,41 +1,98 @@
 var express = require('express');
 
 // https://stackoverflow.com/questions/28977253/express-router-undefined-params-with-router-use-when-split-across-files
-var router = express.Router();
+var router = express.Router({mergeParams: true});
 
 var MessageConstants = require("../models/messageConstants");
+var Message = require("../models/message");
 var messageService = require("../services/messageService");
 var winston = require('../config/winston');
+var fastCsv = require("fast-csv");
+var roleChecker = require('../middleware/has-role');
+const { check, validationResult } = require('express-validator');
 
-// curl -v -X POST -H 'Content-Type:application/json' -u andrea.leo@frontiere21.it:258456td -d '{"senderFullname":"Bot","recipient":"USERID", "text":"ciao"}' https://tiledesk-server-pre.herokuapp.com/5f86c201189063003453a045/messages/
-// curl -v -X POST -H 'Content-Type:application/json' -u andrea.leo@f21.it:123456 -d '{"senderFullname":"Bot","recipient":"USERID", "text":"ciao"}' http://localhost:3000/609e3fd8e049553972114b88/messages/
 
 router.post('/', 
+[
+  check('recipient').notEmpty(),  
+  check('recipientFullname').notEmpty(),
+  check('text').custom((value, { req }) => {
+    winston.debug('validation: '+ value + ' req.body.type ' + req.body.type);
+    if (!value && (!req.body.type || req.body.type === "text") ) {
+      winston.debug('validation1 ');
+      return Promise.reject('Text field is required for messages with type "text"');
+    }   
+    winston.debug('validation2 ');
+    return Promise.resolve('validation ok');
+  })
+],
   async (req, res)  => {
 
   winston.debug('req.body post message', req.body);
   winston.debug('req.params: ', req.params);
   winston.debug('req.params.request_id: ' + req.params.request_id);
 
-  let messageStatus = req.body.status || MessageConstants.CHAT_MESSAGE_STATUS.SENDING;
 
-  return messageService.create(req.body.sender || req.user._id, req.body.senderFullname || req.user.fullName, req.body.recipient, req.body.text,
-    req.projectid, req.user._id, messageStatus, req.body.attributes, req.body.type, req.body.metadata,  req.body.language, MessageConstants.CHANNEL_TYPE.DIRECT, req.body.channel).then(function(savedMessage){                    
+   const errors = validationResult(req);
+  if (!errors.isEmpty()) {
+    winston.error("Signup validation error", errors);
+    return res.status(422).json({ errors: errors.array() });
+  }
+  let message = {
+    sender: req.body.sender || req.user._id, 
+    senderFullname: req.body.senderFullname || req.user.fullName, 
+    recipient: req.body.recipient, 
+    recipientFullname: req.body.recipientFullname,
+    text: req.body.text, 
+    id_project: req.projectid, // rendilo opzionale?
+    createdBy: req.user._id, 
+    status:  MessageConstants.CHAT_MESSAGE_STATUS.SENDING, 
+    attributes: req.body.attributes, 
+    type: req.body.type, 
+    metadata: req.body.metadata, 
+    language: req.body.language, 
+    channel_type: req.body.channel_type || MessageConstants.CHANNEL_TYPE.DIRECT, 
+    channel: req.body.channel
+};
+  return messageService.save(message).then(function(savedMessage){                    
       res.json(savedMessage);
-    });
+    }).catch(function(err){                    
+      winston.error('Error saving message.', err);
+      return res.status(500).send({ success: false, msg: 'Error saving message.', err: err });
+    })
 
 });
 
 
-//TODO reenable it with role owner
-/*
-router.get('/csv', function(req, res) {
 
-  return Message.find({id_project: req.projectid}).sort({createdAt: 'asc'}).exec(function(err, messages) { 
-      if (err) return next(err);
-      res.csv(messages, true);
-    });
+router.get('/csv', roleChecker.hasRoleOrTypes('owner'), function(req, res) {
+
+
+  const cursor = Message.find({id_project: req.projectid}).select("-channel -attributes -metadata");
+
+  const transformer = (doc)=> {
+    return {
+        Id: doc._id,
+        Name: doc.fullname,
+        Email: doc.email,
+        Type: doc.registration_type,
+        RegisterOn: doc.registered_on
+    };
+  }
+
+  const filename = 'export.csv';
+
+  res.setHeader('Content-disposition', `attachment; filename=${filename}`);
+  res.writeHead(200, { 'Content-Type': 'text/csv' });
+
+  res.flushHeaders();
+
+  console.log("fastCsv",fastCsv)
+  var csvStream = fastCsv.format({headers: true})//.transform(transformer)
+  // var csvStream = fastCsv.createWriteStream({headers: true}).transform(transformer)
+  cursor.stream().pipe(csvStream).pipe(res);
+
 });
-*/
 
-module.exports = router;
+
+module.exports = router;

package/routes/project_user.js

@@ -112,7 +112,7 @@ router.post('/invite', [passport.authenticate(['basic', 'jwt'], { session: false
                   // if ('5ae6c62c61c7d54bf119ac73' == '5ae6c62c61c7d54bf119ac73') {
 
                     winston.debug('»»»» THE PRJCT-USER ID ', p_user.id_user, ' MATCHES THE FOUND USER-ID', user._id)
-                    winston.debug('»»»» USER IS ALREADY A MEMBER OF THE PROJECT ')
+                    winston.warn("User " + projectUserId+ " is already a member of the project: " + req.projectid)
 
                   // cannot use continue or break inside a JavaScript Array.prototype.forEach loop. However, there are other options:
                   throw new Error('User is already a member'); // break
@@ -359,6 +359,37 @@ router.get('/:project_userid', [passport.authenticate(['basic', 'jwt'], { sessio
 });
 
 
+router.get('/users/search', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['subscription'])], async (req, res, next) => {
+  winston.info("--> users search  ");
+
+  if (!req.project) {
+    return res.status(404).send({ success: false, msg: 'Project not found.' });
+  }
+
+
+  let query =  {email: req.query.email};
+  
+  winston.info('query: ', query);
+  
+  let user = await User.findOne(query).exec();
+  winston.info('user: ', user);
+  
+  if (!user) {
+    return res.status(404).send({ success: false, msg: 'Object not found.' });
+  }
+ 
+
+  let project_user = await Project_user.findOne({id_user: user._id, id_project: req.projectid}).exec();
+  winston.info('project_user: ', project_user);
+  
+  if (!project_user) {
+    return res.status(403).json({msg: "Unauthorized. This is not a your teammate." });
+  }
+  
+
+  return res.json({_id: user._id});
+
+});
 
 /**
  * GET PROJECT-USER BY PROJECT ID AND CURRENT USER ID 
@@ -368,6 +399,10 @@ router.get('/:project_userid', [passport.authenticate(['basic', 'jwt'], { sessio
 router.get('/users/:user_id', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['subscription'])], function (req, res, next) {
   winston.debug("--> users USER ID ", req.params.user_id);
 
+  if (!req.project) {
+    return res.status(404).send({ success: false, msg: 'Project not found.' });
+  }
+
   var isObjectId = mongoose.Types.ObjectId.isValid(req.params.user_id);
   winston.debug("isObjectId:"+ isObjectId);
 

package/routes/request.js

@@ -541,6 +541,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);
@@ -957,51 +988,68 @@ router.get('/csv', function (req, res, next) {
         }
         
 
-         requests.forEach(function(element) {
-
-            var channel_name = "";
-            if (element.channel && element.channel.name) {
-              channel_name = element.channel.name;
-            }
-            delete element.channel;
-            element.channel_name = channel_name;
-
-            var department_name = "";
-            if (element.department && element.department.name) {
-              department_name = element.department.name;
-            }
-            delete element.department;
-            element.department_name = department_name;
-
-            var lead_fullname = "";
-            if (element.lead && element.lead.fullname) {
-              lead_fullname = element.lead.fullname
-            }
-            element.lead_fullname = lead_fullname;
-
-
-            var lead_email = "";
-            if (element.lead && element.lead.email) {
-              lead_email = element.lead.email
-            }
-            
-            element.lead_email = lead_email;
+        requests.forEach(function(element) {
 
-            delete element.lead;
+          var channel_name = "";
+          if (element.channel && element.channel.name) {
+            channel_name = element.channel.name;
+          }
+          delete element.channel;
+          element.channel_name = channel_name;
 
-            delete element.attributes;
+          var department_name = "";
+          if (element.department && element.department.name) {
+            department_name = element.department.name;
+          }
+          delete element.department;
+          element.department_name = department_name;
 
-            delete element.notes;
+          var lead_fullname = "";
+          if (element.lead && element.lead.fullname) {
+            lead_fullname = element.lead.fullname
+          }
+          element.lead_fullname = lead_fullname;
 
-            delete element.tags;
 
-            delete element.channelOutbound;
+          var lead_email = "";
+          if (element.lead && element.lead.email) {
+            lead_email = element.lead.email
+          }
+          
+          element.lead_email = lead_email;
 
-            delete element.location;
+          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(", ")
 
-            // TODO print also lead. use a library to flattize
-          });
+          winston.debug('tagsString ' +tagsString)
+          
+          element.tags = tagsString;
+
+          delete element.lead;
+
+          delete element.attributes;
+
+          delete element.notes;
+
+          // delete element.tags;
+
+          delete element.channelOutbound;
+
+          delete element.location;
+
+          delete element.snapshot;
+          
+
+          // TODO print also lead. use a library to flattize
+        });
 
           winston.debug('REQUEST ROUTE - REQUEST AS CSV', requests);
 

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.info("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.info("request",request);
+      res.json({id_project: request.id_project});
+    });
+
+});
+
+
+module.exports = router;
+
+
+
+

package/services/departmentService.js

@@ -77,11 +77,11 @@ 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      
+      // https://stackoverflow.com/questions/14789684/find-mongodb-records-where-array-field-is-not-empty
       let query = {id_project: operatorSelectedEvent.id_project, 
         hasBot:false, preflight:false, status: { $gt: 100 }, 
         participants: { $exists: true, $ne: [] }};
-
+      
       winston.debug('query', query);            
 
       // let lastRequests = await 
@@ -96,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;
@@ -123,7 +124,7 @@ roundRobin(operatorSelectedEvent) {
           if (operatorSelectedEvent.available_agents && operatorSelectedEvent.available_agents.length==0) {
             winston.debug('operatorSelectedEvent.available_agents empty ', operatorSelectedEvent.available_agents);
             return resolve(operatorSelectedEvent);
-          }
+          }          
 
           // 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);
@@ -135,6 +136,9 @@ roundRobin(operatorSelectedEvent) {
 
           winston.debug('lastOperatorIndex: ' + lastOperatorIndex);
 
+          winston.debug('operatorSelectedEvent.available_agents: ', operatorSelectedEvent.available_agents);
+
+          
           let nextOperator = that.nextOperator(operatorSelectedEvent.available_agents, lastOperatorIndex);
 
           
@@ -210,8 +214,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)