@tiledesk/tiledesk-server 2.9.31 → 2.9.32

package/CHANGELOG.md

@@ -5,6 +5,11 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.9.32
+- Added voice filters in get requests
+- Added endpoint to get all projects
+- Updated vxml-connector to 0.1.49
+
 # 2.9.31
 - Improved conversations queues management
 - Added conversation status 150 (ABANDONED)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.9.31",
+  "version": "2.9.32",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -52,7 +52,7 @@
     "@tiledesk/tiledesk-whatsapp-connector": "^0.1.73",
     "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.8",
     "@tiledesk/tiledesk-sms-connector": "^0.1.10",
-    "@tiledesk/tiledesk-vxml-connector": "^0.1.44",
+    "@tiledesk/tiledesk-vxml-connector": "^0.1.49",
     "amqplib": "^0.5.5",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",

package/routes/project.js

@@ -13,7 +13,7 @@ var Group = require('../models/group');
 
 var winston = require('../config/winston');
 var roleChecker = require('../middleware/has-role');
-
+var config = require('../config/database');
 
 // THE THREE FOLLOWS IMPORTS  ARE USED FOR AUTHENTICATION IN THE ROUTE
 var passport = require('passport');
@@ -25,6 +25,24 @@ var orgUtil = require("../utils/orgUtil");
 var cacheEnabler = require("../services/cacheEnabler");
 var mongoose = require('mongoose');
 
+var jwt = require('jsonwebtoken');
+// CHECK IT ASAP!!!!
+let configSecret = process.env.GLOBAL_SECRET || config.secret;
+var pKey = process.env.GLOBAL_SECRET_OR_PRIVATE_KEY;
+// console.log("pKey",pKey);
+
+if (pKey) {
+  configSecret = pKey.replace(/\\n/g, '\n');
+}
+
+let pubConfigSecret = process.env.GLOBAL_SECRET || config.secret;
+var pubKey = process.env.GLOBAL_SECRET_OR_PUB_KEY;
+if (pubKey) {
+  pubConfigSecret = pubKey.replace(/\\n/g, '\n');
+}
+// CHECK IT ASAP!!!!
+
+
 router.post('/', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken], async (req, res) => {
   
   // create(name, createdBy, settings) 
@@ -735,6 +753,95 @@ Project.findByIdAndUpdate(req.params.projectid, { $pull: { bannedUsers: { "_id":
 
 });
 
+router.get('/all', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken], function (req, res) {
+
+  if (req.headers.authorization) {
+
+    let token = req.headers.authorization.split(" ")[1];
+    let decode = jwt.verify(token, pubConfigSecret)
+    if (decode && (decode.email === process.env.ADMIN_EMAIL)) {
+
+      Project.aggregate([
+        // {
+        //   $match: {
+        //     status: 100,
+        //     //createdAt: { $gte: startDate}
+        //   },
+        // },
+        {
+          $sort: {
+            createdAt: -1
+          },
+        },
+        {
+          $lookup: {
+            from: 'project_users',          
+            localField: '_id',              
+            foreignField: 'id_project',     
+            as: 'project_user',            
+            pipeline: [                     
+              { $match: { role: 'owner' } } 
+            ]
+          }
+        },
+        {
+          $addFields: {
+            project_user: { $arrayElemAt: ['$project_user', 0] }
+          }
+        },
+        {
+          $lookup: {
+            from: 'users',
+            localField: 'project_user.id_user',              
+            foreignField: '_id',     
+            as: 'user'            
+          },
+        },
+        {
+          $addFields: {
+            user: { $arrayElemAt: ['$user', 0] } 
+          }
+        }
+      ])
+        .then((projects) => {
+          winston.verbose("Projects found " + projects.length)
+          // const fieldsToKeep = ['_id', 'name', 'createdBy', 'createdAt', 'user.email' ];
+
+          const filteredProjects = projects.map(project => {
+            const filteredProject = {};
+            filteredProject._id = project._id;
+            filteredProject.name = project.name;
+            filteredProject.owner = project.user?.email;
+            filteredProject.createdAt = project.createdAt;
+            filteredProject.profile_name = project.profile?.name;
+            // ... add other fields here
+
+            // fieldsToKeep.forEach(field => {
+            //   if (project[field] !== undefined) {
+            //     filteredProject[field] = project[field];
+            //   }
+            // });
+            return filteredProject;
+          });
+
+          return res.status(200).send(filteredProjects);
+        })
+        .catch((err) => {
+          console.error(err);
+          return res.status(500).send({ success: false,  error: err});
+        });
+      
+      // let updatedUser = await User.findByIdAndUpdate(savedUser._id, { emailverified: true }, { new: true }).exec();
+      // winston.debug("updatedUser: ", updatedUser);
+      // skipVerificationEmail = true;
+      // winston.verbose("skip sending verification email")
+    } else {
+      return res.status(403).send({ success: false,  error: "You don't have the permission required to perform the operation"});
+    }
+
+  }
+
+});
 
 
 //roleChecker.hasRole('agent') works because req.params.projectid is valid using :projectid of this method

package/routes/request.js

@@ -884,7 +884,10 @@ router.get('/', function (req, res, next) {
   
   var page = 0;
   var limit = DEFAULT_LIMIT; // Number of request per page
+  var page = 0;
+  var skip = 0;
   let statusArray = [];
+  var projectuser = req.projectuser;
 
   if (req.query.limit) {
     limit = parseInt(req.query.limit);
@@ -897,19 +900,16 @@ router.get('/', function (req, res, next) {
     page = req.query.page;
   }
 
-  var skip = page * limit;
-  winston.debug('REQUEST ROUTE - SKIP PAGE ', skip);
+  skip = page * limit;
 
-  // Default Query
+  // 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 
+    // All request 
   } else if (projectuser && (projectuser.role == "owner" || projectuser.role == "admin")) {
-    // all request 
-    // per uni mostrare solo quelle proprie quindi solo participants
+    // All request 
+    // Per uni mostrare solo quelle proprie quindi solo participants
     if (req.query.mine) {
       query["$or"] = [{ "snapshot.agents.id_user": req.user.id }, { "participants": req.user.id }];
     }
@@ -919,7 +919,6 @@ router.get('/', function (req, res, next) {
 
   if (req.query.dept_id) {
     query.department = req.query.dept_id;
-    winston.debug('REQUEST ROUTE - QUERY DEPT ID', query.department);
   }
 
   if (req.query.requester_email) {
@@ -927,27 +926,13 @@ router.get('/', function (req, res, next) {
   }
 
   if (req.query.full_text) {
-    winston.debug('req.query.fulltext', req.query.full_text);
     query.$text = { "$search": req.query.full_text };
   }
 
-  var history_search = false; // ? serve ancora?
-
-  // if (req.query.status) {
-  //   winston.debug('req.query.status', req.query.status);
-  //   query.status = req.query.status;
-
-  //   if (req.query.status == 1000 || req.query.status == "1000") {
-  //     history_search = true;
-  //   }
-  //   if (req.query.status === "all") {
-  //     history_search = true;
-  //     delete query.status;
-  //   }
-  // }
+  var history_search = false;
 
+  // Multiple status management
   if (req.query.status) {
-
     if (req.query.status === 'all') {
       delete query.status;
     } else {
@@ -961,40 +946,27 @@ router.get('/', function (req, res, next) {
         delete query.status;
       }
     }
-
     if (statusArray.length > 0) {
       query.status = {
         $in: statusArray
       }
     }
-
   }
 
   if (req.query.lead) {
-    winston.debug('req.query.lead', req.query.lead);
     query.lead = req.query.lead;
   }
 
   // USERS & BOTS
   if (req.query.participant) {
-    winston.debug('req.query.participant', req.query.participant);
     query.participants = req.query.participant;
   }
 
-  winston.debug('req.query.hasbot', req.query.hasbot);
   if (req.query.hasbot != undefined) {
-    winston.debug('req.query.hasbot', req.query.hasbot);
     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);
     query["tags.tag"] = req.query.tags;
   }
 
@@ -1026,9 +998,7 @@ router.get('/', function (req, res, next) {
   //fixato. secondo me qui manca un parentesi tonda per gli or
   if (history_search === true && req.project && req.project.profile && ((req.project.profile.type === 'free' && req.project.trialExpired === true) || (req.project.profile.type === 'payment' && req.project.isActiveSubscription === false))) {
 
-
     var startdate = moment().subtract(14, "days").format("YYYY-MM-DD");
-
     var enddate = moment().format("YYYY-MM-DD");
 
     winston.debug('»»» REQUEST ROUTE - startdate ', startdate);
@@ -1037,11 +1007,8 @@ router.get('/', function (req, res, next) {
     var enddatePlusOneDay = moment(new Date()).add(1, 'days').toDate()
     winston.debug('»»» REQUEST ROUTE - enddate + 1 days: ', enddatePlusOneDay);
 
-    // var enddatePlusOneDay = "2019-09-17T00:00:00.000Z"
-
     query.createdAt = { $gte: new Date(Date.parse(startdate)).toISOString(), $lte: new Date(enddatePlusOneDay).toISOString() }
     winston.debug('REQUEST ROUTE - QUERY CREATED AT ', query.createdAt);
-
   }
 
   /**
@@ -1072,9 +1039,6 @@ router.get('/', function (req, res, next) {
     var newdate = new Date(date);
     var endDate_plusOneDay = newdate.setDate(newdate.getDate() + 1);
     winston.debug('REQUEST ROUTE - REQ QUERY FORMATTED END DATE + 1 DAY ', endDate_plusOneDay);
-    // var endDate_plusOneDay =   moment('2018-09-03').add(1, 'd')
-    // var endDate_plusOneDay =   endDate.add(1).day();
-    // var toDate = new Date(Date.parse(endDate_plusOneDay)).toISOString()
 
     query.createdAt = { $gte: new Date(Date.parse(startDate)).toISOString(), $lte: new Date(endDate_plusOneDay).toISOString() }
     winston.debug('REQUEST ROUTE - QUERY CREATED AT ', query.createdAt);
@@ -1092,44 +1056,34 @@ router.get('/', function (req, res, next) {
 
     winston.debug('REQUEST ROUTE - QUERY CREATED AT (only for start date)', query.createdAt);
   }
-  // }
-
-
 
   if (req.query.snap_department_routing) {
     query["snapshot.department.routing"] = req.query.snap_department_routing;
-    winston.debug('REQUEST ROUTE - QUERY snap_department_routing', query.snap_department_routing);
   }
 
   if (req.query.snap_department_default) {
     query["snapshot.department.default"] = req.query.snap_department_default;
-    winston.debug('REQUEST ROUTE - QUERY snap_department_default', query.snap_department_default);
   }
 
 
   if (req.query.snap_department_id_bot) {
     query["snapshot.department.id_bot"] = req.query.snap_department_id_bot;
-    winston.debug('REQUEST ROUTE - QUERY snap_department_id_bot', query.snap_department_id_bot);
   }
 
   if (req.query.snap_department_id_bot_exists) {
     query["snapshot.department.id_bot"] = { "$exists": req.query.snap_department_id_bot_exists }
-    winston.debug('REQUEST ROUTE - QUERY snap_department_id_bot_exists', query.snap_department_id_bot_exists);
   }
 
   if (req.query.snap_lead_lead_id) {
     query["snapshot.lead.lead_id"] = req.query.snap_lead_lead_id;
-    winston.debug('REQUEST ROUTE - QUERY snap_lead_lead_id', query.snap_lead_lead_id);
   }
 
   if (req.query.snap_lead_email) {
     query["snapshot.lead.email"] = req.query.snap_lead_email;
-    winston.debug('REQUEST ROUTE - QUERY snap_lead_email', query.snap_lead_email);
   }
 
   if (req.query.smartAssignment) {
     query.smartAssignment = req.query.smartAssignment;
-    winston.debug('REQUEST ROUTE - QUERY smartAssignment', query.smartAssignment);
   }
 
   if (req.query.channel) {
@@ -1140,8 +1094,6 @@ router.get('/', function (req, res, next) {
     } else {
       query["channel.name"] = req.query.channel
     }
-
-    winston.debug('REQUEST ROUTE - QUERY channel', query.channel);
   }
 
   if (req.query.priority) {
@@ -1153,17 +1105,37 @@ router.get('/', function (req, res, next) {
   if (req.query.direction) {
     direction = req.query.direction;
   }
-  winston.debug("direction", direction);
 
   var sortField = "createdAt";
   if (req.query.sort) {
     sortField = req.query.sort;
   }
-  winston.debug("sortField", sortField);
 
   var sortQuery = {};
   sortQuery[sortField] = direction;
-  winston.debug("sort query", sortQuery);
+
+  // VOICE FILTERS - Start
+  if (req.query.caller) {
+    query["attributes.caller_phone"] = req.query.caller;
+  }
+  if (req.query.called) {
+    query["attributes.called_phone"] = req.query.called;
+  }
+  if (req.query.call_id) {
+    query["attributes.call_id"] = req.query.call_id;
+  }
+  // VOICE FILTERS - End
+
+  if (req.query.duration && req.query.duration_op) {
+    let duration = Number(req.query.duration) * 60 * 1000;
+    if (req.query.duration_op === 'gt') {
+      query.duration = { $gte: duration }
+    } 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)
+    }
+  }
 
   if (req.query.abandonded && (req.query.abandoned === true || req.query.abandoned === 'true')) {
     query["attributes.fully_abandoned"] = true
@@ -1173,26 +1145,21 @@ router.get('/', function (req, res, next) {
     query.draft = { $in: [false, null] }
   }
 
-  winston.debug('REQUEST ROUTE - REQUEST FIND ', query);
-
   var projection = undefined;
 
   if (req.query.full_text) {
-
     if (req.query.no_textscore != "true" && req.query.no_textscore != true) {
-      winston.info('fulltext projection on');
+      winston.verbose('fulltext projection on');
       projection = { score: { $meta: "textScore" } };
     }
-
   }
-  // requestcachefarequi populaterequired
+
+  winston.verbose('REQUEST ROUTE - REQUEST FIND QUERY ', query);
+  
   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) {
-    winston.verbose('REQUEST ROUTE - no_polutate false ', req.headers);
     q1.populate('department').
       populate('participatingBots').            //nico già nn gli usa
       populate('participatingAgents').          //nico già nn gli usa
@@ -1200,17 +1167,7 @@ router.get('/', function (req, res, next) {
       populate({ path: 'requester', populate: { path: 'id_user' } });        //toglilo perche nico lo prende già da snapshot
   }
 
-  // cache(cacheUtil.defaultTTL, "requests-"+projectId).    
-
-
-  // if (req.query.select_snapshot) {
-  //   winston.info('select_snapshot');
-  //   q1.select("+snapshot");
-  //   // q1.select({ "snapshot": 1});
-  // }
-
   if (req.query.full_text) {
-    winston.debug('fulltext sort');
     if (req.query.no_textscore != "true" && req.query.no_textscore != true) {
       q1.sort({ score: { $meta: "textScore" } }) //https://docs.mongodb.com/manual/reference/operator/query/text/#sort-by-text-search-score
     }
@@ -1218,10 +1175,6 @@ router.get('/', function (req, res, next) {
     q1.sort(sortQuery);
   }
 
-
-  // winston.info('q1',q1);
-
-
   q1.exec();
 
   // TODO if ?onlycount=true do not perform find query but only 
@@ -1234,10 +1187,7 @@ router.get('/', function (req, res, next) {
     q2 = 0;
   }
 
-  var promises = [
-    q1,
-    q2
-  ];
+  var promises = [ q1, q2 ];
 
   Promise.all(promises).then(function (results) {
     var objectToReturn = {
@@ -1664,11 +1614,6 @@ router.get('/csv', function (req, res, next) {
     query.$text = { "$search": req.query.full_text };
   }
 
-  // if (req.query.status) {
-  //   winston.debug('req.query.status', req.query.status);
-  //   query.status = req.query.status;
-  // }
-
   if (req.query.status) {
 
     if (req.query.status === 'all') {
@@ -1776,6 +1721,27 @@ router.get('/csv', function (req, res, next) {
 
   winston.debug("sort query", sortQuery);
 
+  if (req.query.channel) {
+    if (req.query.channel === "offline") {
+      query["channel.name"] = { "$in": ["email", "form"] }
+    } else if (req.query.channel === "online") {
+      query["channel.name"] = { "$nin": ["email", "form"] }
+    } else {
+      query["channel.name"] = req.query.channel
+    }
+  }
+
+  // VOICE FILTERS - Start
+  if (req.query.caller) {
+    query["attributes.caller_phone"] = req.query.caller;
+  }
+  if (req.query.called) {
+    query["attributes.called_phone"] = req.query.called;
+  }
+  if (req.query.call_id) {
+    query["attributes.call_id"] = req.query.call_id;
+  }
+  // VOICE FILTERS - End
 
   // TODO ORDER BY SCORE
   // return Faq.find(query,  {score: { $meta: "textScore" } }) 
@@ -1783,6 +1749,21 @@ router.get('/csv', function (req, res, next) {
 
   // aggiungi filtro per data marco
 
+  if (req.query.duration && req.query.duration_op) {
+    let duration = Number(req.query.duration) * 60 * 1000;
+    if (req.query.duration_op === 'gt') {
+      query.duration = { $gte: duration }
+    } 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)
+    }
+  }
+
+  if (req.query.draft && (req.query.draft === 'false' || req.query.draft === false)) {
+    query.draft = { $in: [false, null] }
+  }
+
   winston.debug('REQUEST ROUTE - REQUEST FIND ', query)
   return Request.find(query, '-transcript -status -__v').
     skip(skip).limit(limit).
@@ -1860,7 +1841,17 @@ router.get('/csv', function (req, res, next) {
         // // da terminare e testare. potrebbe essere troppo lenta la query per tanti record
         // element.participatingAgents = participatingAgents;
 
-
+        if (element.attributes) {
+          if (element.attributes.caller_phone) {
+            element.caller_phone = element.attributes.caller_phone;
+          }
+          if (element.attributes.called_phone) {
+            element.called_phone = element.attributes.called_phone;
+          }
+          if (element.attributes.caller_phone) {
+            element.call_id = element.attributes.call_id;
+          }
+        }
 
         delete element.lead;
 

package/test/projectRoute.js

@@ -50,6 +50,47 @@ describe('ProjectRoute', () => {
 
     describe('/create', () => {
 
+        it('getAllProjectsWithSuperAdminCredential', (done) => {
+
+            var email = "test-signup-" + Date.now() + "@email.com";
+            var pwd = "pwd";
+
+            userService.signup(email, pwd, "Test Firstname", "Test Lastname").then((savedUser) => {
+                projectService.create("test-project-create-1", savedUser._id).then(() => {
+                    projectService.create("test-project-create-2", savedUser._id).then((savedProject2) => {
+
+                        chai.request(server)
+                        .post('/auth/signin')
+                        .send({ email: "admin@tiledesk.com", password: "adminadmin" })
+                        // .send({ email: email, password: pwd }) // con queste credenziali non si può fare la richiesta /projects/all
+                        .end((err, res) => {
+
+                            if (log) { console.log("login with superadmin res.body: ", res.body) };
+                            res.should.have.status(200);
+                            res.body.should.be.a('object');
+                            expect(res.body.success).to.equal(true);
+                            expect(res.body.token).not.equal(null);
+
+                            let superadmin_token = res.body.token;
+
+                            chai.request(server)
+                            .get('/projects/all')
+                            .set('Authorization', superadmin_token)
+                            .end((err, res) => {
+    
+                                console.log("res.body: ", res.body.length);
+                                console.log("example: ", res.body[0]);
+                                res.should.have.status(200);
+                                res.body.should.be.a('array');
+
+                                done()
+                            })
+                        })
+                    })
+                })
+            })
+        }).timeout(10000)
+        
         it('updateProjectProfileWithSuperAdminCredential', (done) => {
 
             var email = "test-signup-" + Date.now() + "@email.com";