@tiledesk/tiledesk-server 2.2.24 → 2.2.29

package/models/project.js

@@ -101,6 +101,16 @@ var ProjectSchema = new Schema({
       return [new Channel({ name: 'chat21' })];
     }
   },
+  organization: {
+    type: String,
+  },
+  ipFilterEnabled:{
+    type: Boolean,
+    default: false
+  },
+  ipFilter: [{
+    type: String
+  }],
   // defaultLanguage: {
   //   type: String,
   //   required: true,

package/models/project_user.js

@@ -5,6 +5,7 @@ var Schema = mongoose.Schema;
 var winston = require('../config/winston');
 var RoleConstants = require('./roleConstants');
 var PresenceSchema = require('./presence');
+var TagSchema = require("../models/tag");
 
 
 
@@ -58,6 +59,7 @@ var PresenceSchema = require('./presence');
     settings: {
       type: Object,
     },
+    tags: [TagSchema],
     createdBy: {
       type: String,
       required: true

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.2.24",
+  "version": "2.2.29",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -38,7 +38,7 @@
     "@tiledesk-ent/tiledesk-server-groups": "^1.1.2",
     "@tiledesk-ent/tiledesk-server-jwthistory": "^1.1.9",
     "@tiledesk-ent/tiledesk-server-mt": "^1.1.7",
-    "@tiledesk-ent/tiledesk-server-payments": "^1.1.5",
+    "@tiledesk-ent/tiledesk-server-payments": "^1.1.6",
     "@tiledesk-ent/tiledesk-server-queue": "^1.1.11",
     "@tiledesk-ent/tiledesk-server-request-history": "^1.1.5",
     "@tiledesk-ent/tiledesk-server-resthook": "^1.1.53",
@@ -61,6 +61,7 @@
     "email-templates": "^8.0.8",
     "eventemitter2": "^6.4.4",
     "express": "~4.17.1",
+    "express-ipfilter": "^1.2.0",
     "express-session": "^1.17.2",
     "express-validator": "^6.12.1",
     "fast-csv": "^4.3.6",
@@ -109,7 +110,7 @@
     "chai-string": "^1.5.0",
     "loadtest": "^5.1.2",
     "mocha": "^8.4.0",
-    "mongodb-runner": "4.8.1",
+    "mongodb-runner": "4.8.3",
     "nodemon": "^2.0.12",
     "sinon": "^9.2.4",
     "sinon-mongoose": "^2.3.0"

package/pubmodules/rules/conciergeBot.js

@@ -70,8 +70,11 @@ devi mandare un messaggio welcome tu altrimenti il bot inserito successivamente
                         //TESTA QUESTO
 
                                 winston.debug("message.request.status: "+message.request.status);
-                                winston.debug("message.request.department.id_bot: "+message.request.department.id_bot);
-                                if (message.request.status === 50 &&  message.request.department.id_bot == undefined) { 
+                                
+                                winston.debug("message.request.hasBot: "+message.request.hasBot);
+                                // winston.info("message.request.department.id_bot: "+message.request.department.id_bot);
+                                if (message.request.status === 50 &&  message.request.hasBot === false) { 
+                                    // if (message.request.status === 50 &&  message.request.department.id_bot == undefined) { 
                                     //apply only if the status is temp and no bot is available. with agent you must reroute to assign temp request to an agent 
                                     winston.debug("rerouting");
                                     // reroute(request_id, id_project, nobot)

package/pubmodules/scheduler/tasks/closeBotUnresponsiveRequestTask.js

@@ -48,9 +48,15 @@ scheduleUnresponsiveRequests() {
   // }
 
  //https://crontab.guru/examples.html
- var s= schedule.scheduleJob(this.cronExp, function(fireDate){
-    winston.debug('CloseBotUnresponsiveRequestTask scheduleUnresponsiveRequests job was supposed to run at ' + fireDate + ', but actually ran at ' + new Date());
-    that.findUnresponsiveRequests(); 
+ var s= schedule.scheduleJob(this.cronExp, function(fireDate){   //TODO aggiungi un bias random
+
+    let timeInMs = Math.random() * (1000);  // avoid cluster concurrent jobs in multiple nodes between 0 and 1sec
+    winston.info('timeInMs => '+ timeInMs);
+
+    setTimeout(function () {
+      winston.debug('CloseBotUnresponsiveRequestTask scheduleUnresponsiveRequests job was supposed to run at ' + fireDate + ', but actually ran at ' + new Date());
+      that.findUnresponsiveRequests(); 
+    },timeInMs );
   });
 }
 
@@ -65,6 +71,8 @@ findUnresponsiveRequests() {
       query.id_project = JSON.parse(this.queryProject);
     }
 
+
+
     winston.debug("CloseBotUnresponsiveRequestTask query",query);
 
     Request.find(query)
@@ -84,6 +92,7 @@ findUnresponsiveRequests() {
       winston.debug("CloseBotUnresponsiveRequestTask: found unresponsive requests ", requests);
       
       requests.forEach(request => {
+
         winston.debug("********unresponsive request ", request);
 
         return requestService.closeRequestByRequestId(request.request_id, request.id_project, false, false).then(function(updatedStatusRequest) {

package/routes/faq_kb.js

@@ -10,9 +10,8 @@ var httpUtil = require("../utils/httpUtil");
 
 router.post('/', function (req, res) {
   winston.info('create BOT ', req.body);
-  // create(name, url, projectid, user_id, type, description) {
-  faqService.create(req.body.name, req.body.url, req.projectid, req.user.id, req.body.type, req.body.description, undefined, undefined,
-    req.body.language).then(function(savedFaq_kb) {
+              // create(name, url, projectid, user_id, type, description, webhook_url, webhook_enabled, language, template)
+    faqService.create(req.body.name, req.body.url, req.projectid, req.user.id, req.body.type, req.body.description, undefined, undefined, req.body.language, req.body.template).then(function(savedFaq_kb) {
     res.json(savedFaq_kb);
   });
 

package/routes/labels.js

@@ -27,6 +27,8 @@ router.get('/default', function (req, res) {
 });
 // curl -v -X POST -H 'Content-Type:application/json'  -d '{"lang":"IT"}' http://localhost:3000/123/labels/default/clone
 
+// curl -v -X POST -H 'Content-Type:application/json' -u andrea.leo@f21.it:123456 -d '{"lang":"IT"}' http://localhost:3001/624c78e27b91d2a2ab49543a/labels/default/clone
+
 router.post('/default/clone', 
   [
     passport.authenticate(['basic', 'jwt'], { session: false }), 

package/routes/project.js

@@ -15,6 +15,7 @@ require('../middleware/passport')(passport);
 var validtoken = require('../middleware/valid-token')
 var RoleConstants = require("../models/roleConstants");
 var cacheUtil = require('../utils/cacheUtil');
+var orgUtil = require("../utils/orgUtil");
 
 router.put('/:projectid', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('admin')], function (req, res) {
   winston.debug('UPDATE PROJECT REQ BODY ', req.body);
@@ -151,6 +152,15 @@ router.put('/:projectid', [passport.authenticate(['basic', 'jwt'], { session: fa
   if (req.body.channels!=undefined) {
     update.channels = req.body.channels; 
   }
+
+  if (req.body.ipFilterEnabled!=undefined) {
+    update.ipFilterEnabled = req.body.ipFilterEnabled;
+  }
+
+  if (req.body.ipFilter!=undefined) {
+    update.ipFilter = req.body.ipFilter;
+  }
+
   
   // if (req.body.defaultLanguage!=undefined) {
   //   update.defaultLanguage = req.body.defaultLanguage; 
@@ -291,6 +301,13 @@ router.patch('/:projectid', [passport.authenticate(['basic', 'jwt'], { session:
     update.channels = req.body.channels; 
   }
   
+  if (req.body.ipFilterEnabled!=undefined) {
+    update.ipFilterEnabled = req.body.ipFilterEnabled;
+  }
+
+  if (req.body.ipFilter!=undefined) {
+    update.ipFilter = req.body.ipFilter;
+  }
     
   // if (req.body.defaultLanguage!=undefined) {
   //   update.defaultLanguage = req.body.defaultLanguage; 
@@ -362,6 +379,61 @@ router.get('/', [passport.authenticate(['basic', 'jwt'], { session: false }), va
         return res.status(500).send({ success: false, msg: 'Error getting object.' });
       }       
 
+
+
+      //organization: if third sub domain iterate and put only project with organization==subdomain otherwise remove projects with org
+      winston.info("orgUtil.ORGANIZATION_ENABLED: " + orgUtil.ORGANIZATION_ENABLED);
+      if (orgUtil.ORGANIZATION_ENABLED == true ) {
+
+              // winston.info("project_users", project_users);
+        winston.info("project_users.length:"+ project_users.length);
+
+        let org = orgUtil.getOrg(req);
+        winston.info("org:"+ org);
+        
+        if (org!=undefined) {
+          winston.info("org!=undefined");
+
+          var project_users = project_users.filter(function (projectUser) {
+            if (projectUser.id_project.organization && projectUser.id_project.organization === org ) {
+              winston.info("keep");
+              return true;
+            }
+          });
+
+        /* for (var i = 0; i < project_users.length; i++) { 
+            winston.info("project_users[i].id_project.organization: " + project_users[i].id_project.organization);
+            if (project_users[i].id_project.organization && project_users[i].id_project.organization === org ) {
+              //keep
+              winston.info("keep");
+            } else {
+              // project_users.splice(i, 1); // 2nd parameter means remove one item only
+              winston.info("splice");
+            }
+          }*/
+        } else {
+
+            var project_users = project_users.filter(function (projectUser) {
+              if (projectUser.id_project.organization == undefined ) {
+                // winston.info("keep");
+                return true;
+              }
+            });        
+          
+
+          /*
+          for (var i = 0; i < project_users.length; i++) { 
+            winston.info("project_users[i].id_project.organization: " + project_users[i].id_project.organization);
+            if (project_users[i].id_project.organization) {
+              project_users.splice(i, 1); // 2nd parameter means remove one item only
+            }
+          }*/
+        }
+      } else {
+        winston.info("no")
+      }
+
+
       project_users.sort((a, b) => (a.id_project && b.id_project && a.id_project.updatedAt > b.id_project.updatedAt) ? 1 : -1)
       project_users.reverse(); 
       res.json(project_users);

package/routes/project_user.js

@@ -196,7 +196,8 @@ router.post('/', [passport.authenticate(['basic', 'jwt'], { session: false }), v
     // role: RoleConstants.USER,   
     // - Create project_user endpoint by agent (Ticketing) now is with Guest Role      
     role: RoleConstants.GUEST,         
-    user_available: false, 
+    user_available: false,
+    tags: req.body.tags, 
     createdBy: req.user.id,
     updatedBy: req.user.id
   });
@@ -234,6 +235,10 @@ router.put('/', [passport.authenticate(['basic', 'jwt'], { session: false }), va
   if (req.body["settings.email.notification.conversation.pooled"]!=undefined) {
     update["settings.email.notification.conversation.pooled"] = req.body["settings.email.notification.conversation.pooled"];
   }
+  if (req.body.tags!=undefined) {
+    update.tags = req.body.tags;
+  }
+
 
 
   Project_user.findByIdAndUpdate(req.projectuser.id, update,  { new: true, upsert: true }, function (err, updatedProject_user) {
@@ -289,7 +294,9 @@ router.put('/:project_userid', [passport.authenticate(['basic', 'jwt'], { sessio
     update["settings.email.notification.conversation.pooled"] = req.body["settings.email.notification.conversation.pooled"];
   }
   
-
+  if (req.body.tags!=undefined) {
+    update.tags = req.body.tags;
+  }
 
   winston.debug("project_userid update", update);
 

package/routes/request.js

@@ -693,6 +693,10 @@ router.get('/', function (req, res, next) {
     query.location = req.query.location;
   }
 
+  if (req.query.ticket_id) {
+    query.ticket_id = req.query.ticket_id;
+  }
+
   // if (req.query.request_id) {
   //   console.log('req.query.request_id', req.query.request_id);
   //   query.request_id = req.query.request_id;
@@ -798,6 +802,17 @@ router.get('/', function (req, res, next) {
     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.channel) {
+    query["channel.name"] =  req.query.channel
+    winston.debug('REQUEST ROUTE - QUERY channel', query.channel);
+  }
+
+
   var direction = -1; //-1 descending , 1 ascending
   if (req.query.direction) {
     direction = req.query.direction;

package/routes/user-request.js

@@ -4,6 +4,8 @@ var Request = require("../models/request");
 var winston = require('../config/winston');
 const requestEvent = require('../event/requestEvent');
 const { check, validationResult } = require('express-validator');
+var requestService = require('../services/requestService');
+var mongoose = require('mongoose');
 
 
 router.patch('/:requestid/rating', function (req, res) {
@@ -54,5 +56,329 @@ router.patch('/:requestid/rating', function (req, res) {
 });
 
 
+router.put('/:requestid/closeg', function (req, res) {
+  winston.debug(req.body);
+  
+  // closeRequestByRequestId(request_id, id_project)
+  return requestService.closeRequestByRequestId(req.params.requestid, req.projectid).then(function(closedRequest) {
+
+      winston.verbose("request closed", closedRequest);
+
+        return res.json(closedRequest);
+      
+  });
+
+
+});
+
+
+
+
+router.get('/me', function (req, res, next) {
+
+  winston.debug("req projectid", req.projectid);
+  winston.debug("req.query.sort", req.query.sort);
+  winston.debug('REQUEST ROUTE - QUERY ', req.query)
+
+  const DEFAULT_LIMIT = 40;
+
+  var limit = DEFAULT_LIMIT; // Number of request per page
+
+  if (req.query.limit) {
+    limit = parseInt(req.query.limit);
+  }
+  if (limit > 100) {
+    limit = DEFAULT_LIMIT;
+  }
+
+
+  var page = 0;
+
+  if (req.query.page) {
+    page = req.query.page;
+  }
+
+  var skip = page * limit;
+  winston.debug('REQUEST ROUTE - SKIP PAGE ', skip);
+
+
+  var user_id = req.user._id;
+  winston.debug('REQUEST ROUTE - user_id:  '+user_id);
+
+  var isObjectId = mongoose.Types.ObjectId.isValid(user_id);
+  winston.debug("isObjectId:"+ isObjectId);
+
+
+  var query = { "id_project": req.projectid, "status": {$lt:1000}, preflight:false};
+
+    
+  if (isObjectId) {
+    query["snapshot.requester.id_user"] = user_id;
+    // query.id_user = mongoose.Types.ObjectId(contact_id);
+  } else {
+    query["snapshot.requester.uuid_user"] = user_id;
+  }
+
+
+  // $or:[{"snapshot.requester.id_user": user_id}, {"snapshot.requester.uuid_user": user_id}]};  
+
+  winston.debug('REQUEST ROUTE - query ', query);
+
+
+  if (req.query.dept_id) {
+    query.department = req.query.dept_id;
+    winston.debug('REQUEST ROUTE - QUERY DEPT ID', query.department);
+  }
+
+  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;
+
+  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;
+    }
+  }
+
+  // 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;
+  }
+
+  if (req.query.location) {
+    query.location = req.query.location;
+  }
+
+  if (req.query.ticket_id) {
+    query.ticket_id = req.query.ticket_id;
+  }
+
+  // if (req.query.request_id) {
+  //   console.log('req.query.request_id', req.query.request_id);
+  //   query.request_id = req.query.request_id;
+  // }
+
+  /**
+   **! *** DATE RANGE  USECASE 1 ***
+   *  in the tiledesk dashboard's HISTORY PAGE
+   *  WHEN THE TRIAL IS EXIPIRED OR THE SUBSCIPTION IS NOT ACTIVE
+   *  THE SEARCH FOR DATE INTERVAL OF THE HISTORY OF REQUESTS ARE DISABLED AND 
+   *  ARE DISPLAYED ONLY THE REQUESTS OF THE LAST 14 DAYS
+   */
+  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);
+    winston.debug('»»» REQUEST ROUTE - enddate ', enddate);
+
+    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);
+
+  }
+ 
+ /**
+   **! *** DATE RANGE  USECASE 2 ***
+   *  in the tiledesk dashboard's HISTORY PAGE 
+   *  WHEN THE USER SEARCH FOR DATE INTERVAL OF THE HISTORY OF REQUESTS
+   */
+  if (req.query.start_date && req.query.end_date) {
+    winston.debug('REQUEST ROUTE - REQ QUERY start_date ', req.query.start_date);
+    winston.debug('REQUEST ROUTE - REQ QUERY end_date ', req.query.end_date);
+
+    /**
+     * USING TIMESTAMP  in MS    */
+    // var formattedStartDate = new Date(+req.query.start_date);
+    // var formattedEndDate = new Date(+req.query.end_date);
+    // query.createdAt = { $gte: formattedStartDate, $lte: formattedEndDate }
+
+    /**
+     * USING MOMENT      */
+    var startDate = moment(req.query.start_date, 'DD/MM/YYYY').format('YYYY-MM-DD');
+    var endDate = moment(req.query.end_date, 'DD/MM/YYYY').format('YYYY-MM-DD');
+
+    winston.debug('REQUEST ROUTE - REQ QUERY FORMATTED START DATE ', startDate);
+    winston.debug('REQUEST ROUTE - REQ QUERY FORMATTED END DATE ', endDate);
+
+    // ADD ONE DAY TO THE END DAY
+    var date = new Date(endDate);
+    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);
+
+  } else if (req.query.start_date && !req.query.end_date) {
+    winston.debug('REQUEST ROUTE - REQ QUERY END DATE IS EMPTY (so search only for start date)');
+    var startDate = moment(req.query.start_date, 'DD/MM/YYYY').format('YYYY-MM-DD');
+
+    var range = { $gte: new Date(Date.parse(startDate)).toISOString() };
+    if (req.query.filterRangeField) {
+      query[req.query.filterRangeField] = range;
+    }else {
+      query.createdAt = range;
+    }
+    
+    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.channel) {
+    query["channel.name"] =  req.query.channel
+    winston.debug('REQUEST ROUTE - QUERY channel', query.channel);
+  }
+
+
+  var direction = -1; //-1 descending , 1 ascending
+  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);
+
+  winston.verbose('REQUEST ROUTE - REQUEST FIND ', query);
+
+  // requestcachefarequi populaterequired
+  var q1 = Request.find(query).
+    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
+      populate('lead').
+      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});
+    // }
+
+    q1.sort(sortQuery);
+
+    // winston.info('q1',q1);
+
+
+    q1.exec();
+
+    // TODO if ?onlycount=true do not perform find query but only 
+    // set q1 to undefined; to skip query
+
+  var q2 =  Request.countDocuments(query).exec();
+
+  var promises = [
+    q1,
+    q2
+  ];
+
+  Promise.all(promises).then(function(results) {
+    var objectToReturn = {
+      perPage: limit,
+      count: results[1],
+      requests: results[0]
+    };
+    winston.debug('REQUEST ROUTE - objectToReturn ', objectToReturn);
+    return res.json(objectToReturn);
+
+  }).catch(function(err){
+    winston.error('REQUEST ROUTE - REQUEST FIND ERR ', err);
+    return res.status(500).send({ success: false, msg: 'Error getting requests.', err: err });
+  });
+  
+
+});
+
 
 module.exports = router;

package/routes/widget.js

@@ -116,7 +116,7 @@ router.get('/', function(req, res, next) {
 
 // TOOD add labels
     Promise.all([
-        Project.findOne({_id: req.projectid, status: 100}).select('-settings')     //--profile todo trialExpired attento user_available cambia spesso quindi magari leggerlo dal db ogni volta
+        Project.findOne({_id: req.projectid, status: 100}).select('-settings')
         //@DISABLED_CACHE .cache(cacheUtil.queryTTL, "projects:query:id:status:100:"+req.projectid+":select:-settings")        
       ,
         availableUsers()