@tiledesk/tiledesk-server 2.3.27 → 2.3.29

package/CHANGELOG.md

@@ -1,4 +1,21 @@
 
+# Untagged
+- UIDGenerator class replacement for request route
+- Added hasRole cache for project_user
+- Added index { id_project: 1, role: 1, status: 1, createdAt: 1  } for  Project_user schema
+- Enabled project_user for cacheEnabler class
+- Created cache test for project_user and project
+- Enabled project_user cache for hasRole method
+- Log fix
+- add fields reply and enabled to faq model 
+- field answer in faq model is no longer required
+- add field public to faq_kb model (IGNORA PER IL MOMENTO)
+- when template is undefined the empty template is now created
+- add test
+
+# 2.3.28
+- UIDGenerator renamed fix
+
 # 2.3.27
 - CacheUtil fix with new values
 - UIDGenerator class replacement

package/app.js

@@ -97,6 +97,7 @@ var faq = require('./routes/faq');
 var faq_kb = require('./routes/faq_kb');
 var project = require('./routes/project');
 var project_user = require('./routes/project_user');
+var project_users_test = require('./routes/project_user_test');
 var request = require('./routes/request');
 // var setting = require('./routes/setting');
 var users = require('./routes/users');
@@ -142,7 +143,9 @@ botSubscriptionNotifier.start();
 
 
 var geoService = require('./services/geoService');
- geoService.listen();
+geoService.listen();
+
+
 
 
 
@@ -322,8 +325,8 @@ var projectSetter = function (req, res, next) {
   if (projectid) {
     
     let q =  Project.findOne({_id: projectid, status: 100});
-    if (cacheEnabler.project) {
-      q.cache(cacheUtil.defaultTTL, "projects:id:"+projectid)  //project_cache
+    if (cacheEnabler.project) { 
+      q.cache(cacheUtil.longTTL, "projects:id:"+projectid)  //project_cache
       winston.debug('project cache enabled');
     }
     q.exec(function(err, project){
@@ -400,6 +403,8 @@ app.use('/:projectid/', [projectIdSetter, projectSetter, IPFilter.projectIpFilte
 
 app.use('/:projectid/authtestWithRoleCheck', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken], authtestWithRoleCheck);
 
+app.use('/:projectid/project_users_test', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])], project_users_test);
+
 app.use('/:projectid/leads', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])], lead);
 app.use('/:projectid/requests/:request_id/messages', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes(null, ['bot','subscription'])] , message);
 
@@ -442,6 +447,8 @@ app.use('/:projectid/project_users', project_user);
 
 // app.use('/:projectid/project_users', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('agent')], project_user);
 
+
+//passport double check this and the next
 app.use('/:projectid/requests', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('guest', ['bot','subscription'])], userRequest);
 
 app.use('/:projectid/requests', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])], request);

package/event/messageEvent.js

@@ -74,7 +74,7 @@ function populateMessageWithRequest(message, eventPrefix) {
   // request.department._id DA CORREGGERE ANCHE PER REQUEST.CREATE
   // request.department.hasBot 
   // request.isOpen
-  winston.info('message Event populate');
+  winston.debug('message Event populate');
   if (cacheEnabler.request) {
     q.cache(cacheUtil.defaultTTL, message.id_project+":requests:request_id:"+message.recipient) //request_cache ma con lean????attento metti a parte
     winston.debug('request cache enabled');

package/middleware/has-role.js

@@ -4,6 +4,7 @@ var Subscription = require("../models/subscription");
 var winston = require('../config/winston');
 
 var cacheUtil = require('../utils/cacheUtil');
+var cacheEnabler = require("../services/cacheEnabler");
 
 class RoleChecker {
     
@@ -131,15 +132,21 @@ class RoleChecker {
 
           // JWT_HERE
           var query = { id_project: req.params.projectid, id_user: req.user._id, status: "active"};
+          let cache_key = req.params.projectid+":project_users:iduser:"+req.user._id
 
           if (req.user.sub && (req.user.sub=="userexternal" || req.user.sub=="guest")) {
             query = { id_project: req.params.projectid, uuid_user: req.user._id, status: "active"};
+            cache_key = req.params.projectid+":project_users:uuid_user:"+req.user._id
           }
           winston.debug("hasRoleOrType query " + JSON.stringify(query));
 
-          Project_user.findOne(query)
-            //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, req.params.projectid+":project_users:id:"+req.user.id) 
-            .exec(function (err, project_user) {
+          let q = Project_user.findOne(query);
+          if (cacheEnabler.project_user) { 
+            q.cache(cacheUtil.defaultTTL, cache_key);
+            winston.debug("cacheEnabler.project_user enabled");
+
+          }
+            q.exec(function (err, project_user) {
               if (err) {
                 winston.error("Error getting project_user for hasrole",err);
                 return next(err);

package/models/faq.js

@@ -39,7 +39,17 @@ var FaqSchema = new Schema({
   },
   answer: {
     type: String,
-    required: true
+    //required: true
+    required: false
+  },
+  reply: {
+    type: Object,
+    required: false,
+  },
+  enabled: {
+    type: Boolean,
+    required: false,
+    default: true,
   },
   id_project: {
     type: String,

package/models/faq_kb.js

@@ -65,6 +65,11 @@ var Faq_kbSchema = new Schema({
   createdBy: {
     type: String,
     required: true
+  },
+  public: {
+    type: Boolean,
+    required: false,
+    default: false
   }
 },{
   timestamps: true

package/models/message.js

@@ -20,7 +20,7 @@ var MessageSchema = new Schema({
   senderFullname: {
     type: String,
     required: false,
-    default: "Guest"
+    default: "Guest" // guest_here
   },
   recipient: {
     type: String,

package/models/project_user.js

@@ -111,6 +111,12 @@ Project_userSchema.virtual('isAuthenticated').get(function () {
   // Project_user.find({ id_project: projectid, id_user: { $in : group[0].members}, role: { $in : [RoleConstants.OWNER, RoleConstants.ADMIN, RoleConstants.AGENT]} })
   Project_userSchema.index({ id_project: 1, id_user:1, role: 1 }); 
 
- 
+  // suggested by atlas
+  Project_userSchema.index({ id_project: 1, role: 1, status: 1, createdAt: 1  }); 
+
+
+
+
+
   module.exports = mongoose.model('project_user', Project_userSchema);;
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.3.27",
+  "version": "2.3.29",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",

package/pubmodules/cache/mongoose-cachegoose-fn.js

@@ -112,6 +112,26 @@
                 winston.verbose("Updated cache for project_user.update",{err:err});
             });
 
+            if (project_user.id_user) {
+                var key = project_user.id_project+":project_users:iduser:"+project_user.id_user;
+                winston.verbose("Updating cache for project_user.update with key: " + key);
+                client.set(key, project_user, cacheUtil.defaultTTL, (err, reply) => {
+                    winston.debug("Updated cache for project_user.update",reply);
+                    winston.verbose("Updated cache for project_user.update",{err:err});
+                });
+            }
+
+            if (project_user.uuid_user) {
+                var key = project_user.id_project+":project_users:uuid_user:"+project_user.uuid_user;
+                winston.verbose("Updating cache for project_user.update with key: " + key);
+                client.set(key, project_user, cacheUtil.defaultTTL, (err, reply) => {
+                    winston.debug("Updated cache for project_user.update",reply);
+                    winston.verbose("Updated cache for project_user.update",{err:err});
+                });
+            }
+            
+
+
             var role = project_user.role;
 
             var TEAMMATE_ROLES =  {       
@@ -563,7 +583,7 @@
 
 module.exports = function (mongoose, option) {
 
-    if (process.env.CACHE_ENABLED == "true") {
+    if (process.env.CACHE_ENABLED == true || process.env.CACHE_ENABLED == "true") {
         var engine = process.env.CACHE_ENGINE;
         winston.debug("Redis engine: "+ engine);
 

package/routes/department.js

@@ -176,6 +176,7 @@ router.get('/allstatus', [passport.authenticate(['basic', 'jwt'], { session: fal
   winston.debug("## GET ALL DEPTS req.project ", req.project)
 
   var query = { "id_project": req.projectid };
+                                            //secondo me qui manca un parentesi tonda per gli or
   if (req.project && req.project.profile && (req.project.profile.type === 'free' && req.project.trialExpired === true) || (req.project.profile.type === 'payment' && req.project.isActiveSubscription === false)) {
 
     query.default = true;
@@ -270,7 +271,7 @@ router.get('/', function (req, res) {
   winston.debug('GET DEPTS FILTERED FOR STATUS === 1 req.project.profile.type ',  req.project.trialExpired);
   winston.debug('GET DEPTS FILTERED FOR STATUS === 1 req.project.isActiveSubscription ',  req.project.isActiveSubscription);
   
-
+                                            //secondo me qui manca un parentesi tonda per gli or
   if (req.project && req.project.profile && (req.project.profile.type === 'free' && req.project.trialExpired === true) || (req.project.profile.type === 'payment' && req.project.isActiveSubscription === false)) {
 
     query.default = true;

package/routes/faq.js

@@ -61,6 +61,7 @@ router.post('/uploadcsv', upload.single('uploadFile'), function (req, res, next)
         // var row = {question: element.question, answer: element.answer, 
         //   intent_id: element.intent_id, intent_display_name: element.intent_display_name,
         //   webhook_enabled: element.webhook_enabled || false }
+
         var newFaq = new Faq({
           id_faq_kb: id_faq_kb,
           question: question,
@@ -114,6 +115,8 @@ router.post('/', function (req, res) {
       id_faq_kb: req.body.id_faq_kb,
       question: req.body.question,
       answer: req.body.answer,
+      reply: req.body.reply,
+      enabled: true,
       id_project: req.projectid,
       topic: req.body.topic,
       language: faq_kb.language,
@@ -123,6 +126,10 @@ router.post('/', function (req, res) {
       updatedBy: req.user.id
     });
 
+    if (req.body.enabled != undefined) {
+      newFaq.enabled = req.body.enabled;
+    }
+
     newFaq.save(function (err, savedFaq) {
       if (err) {
         if (err.code == 11000) {
@@ -177,6 +184,12 @@ router.put('/:faqid', function (req, res) {
   if (req.body.webhook_enabled!=undefined) {
     update.webhook_enabled = req.body.webhook_enabled;
   }
+  if (req.body.enabled!=undefined) {
+    update.enabled = req.body.enabled;
+  }
+  if (req.body.reply!=undefined) {
+    updated.reply = req.body.enabled;
+  }
   
 
 
@@ -308,6 +321,9 @@ router.get('/', function (req, res, next) {
 
   // query.$text = {"$search": "question"};
 
+// TODO ORDER BY SCORE
+  // return Faq.find(query,  {score: { $meta: "textScore" } }) 
+  // .sort( { score: { $meta: "textScore" } } ) //https://docs.mongodb.com/manual/reference/operator/query/text/#sort-by-text-search-score
 
 
   return Faq.find(query).

package/routes/faqpub.js

@@ -27,6 +27,11 @@ router.get('/', function (req, res, next) {
 
   // query.$text = {"$search": "question"};
 
+  // TODO ORDER BY SCORE
+  // return Faq.find(query,  {score: { $meta: "textScore" } }) 
+  // .sort( { score: { $meta: "textScore" } } ) //https://docs.mongodb.com/manual/reference/operator/query/text/#sort-by-text-search-score
+
+  
   return Faq.find(query).
     populate({path:'faq_kb'}).//, match: { trashed: { $in: [null, false] } }}).
     exec(function (err, faq) {

package/routes/lead.js

@@ -93,6 +93,58 @@ router.put('/:leadid', function (req, res) {
   });
 });
 
+
+
+router.patch('/:leadid/attributes',  function (req, res) {
+  var data = req.body;
+
+  // TODO use service method
+
+  Lead.findById(req.params.leadid, function (err, lead) {
+    if (err) {
+      winston.error('--- > ERROR ', err);
+      return res.status(500).send({ success: false, msg: 'Error updating object.' });
+    }
+
+     if (!lead) {
+        return res.status(404).send({ success: false, msg: 'Object not found.' });
+      }
+      
+      if (!lead.attributes) {
+        winston.debug("empty attributes")
+        lead.attributes = {};
+      }
+
+      winston.debug(" lead attributes", lead.attributes)
+        
+        Object.keys(data).forEach(function(key) {
+          var val = data[key];
+          winston.debug("data attributes "+key+" " +val)
+          lead.attributes[key] = val;
+        });     
+        
+        winston.debug(" lead attributes", lead.attributes)
+
+        // https://stackoverflow.com/questions/24054552/mongoose-not-saving-nested-object
+        lead.markModified('attributes');
+
+          //cacheinvalidation
+          lead.save(function (err, savedLead) {
+          if (err) {
+            winston.error("error saving lead attributes",err)
+            return res.status(500).send({ success: false, msg: 'Error getting object.' });
+          }
+          winston.verbose(" saved lead attributes",savedLead.toObject())
+          leadEvent.emit('lead.update', savedLead);
+
+            res.json(savedLead);
+        });
+  });
+  
+});
+
+
+
 // router.put('/:leadid', function (req, res) {
 //   winston.debug(req.body);
 //   var update = {};

package/routes/message.js

@@ -48,12 +48,16 @@ async (req, res)  => {
   winston.debug('req.params: ', req.params);
   winston.debug('req.params.request_id: ' + req.params.request_id);
 
+  if (!req.body.text &&  (!req.body.type || req.body.type=="text") ) {
+    return res.status(422).json({ errors: ["text field is required"] });
+  } 
   const errors = validationResult(req);
   if (!errors.isEmpty()) {
     return res.status(422).json({ errors: errors.array() });
   }
   
-
+  // TODO se sei agent non puoi cambiare sender
+  // verificare validazione invio immagine senza caption 
   var project_user = req.projectuser;
   var sender = req.body.sender;
   var fullname = req.body.senderFullname || req.user.fullName;
@@ -298,6 +302,157 @@ async (req, res)  => {
 
 
 
+
+// router.post('/multi2', async (req, res, next)  => {
+
+//       if ( !req.body instanceof Array ) {
+//               return res.status(422).json({ errors: ["request body is not array"] });
+//       }
+//           req.url =  '/';
+//           winston.info('--- > req.url'+req.url);
+
+//           req.method = 'POST';  
+
+//           let promises = [];
+
+//           req.body.forEach(function(message,index) {
+//             promises.push(router.handle(req, res, next));
+//           });
+//           winston.info('--- >promises', promises);
+
+//           Promise.all(promises).then((values) => {
+//             console.log("finito",values);
+//             return res.status(200).json({ "success": true });
+//           }).catch((err) => {
+//             console.log("errore",err);
+//           });
+// });
+
+
+
+
+router.post('/multi', 
+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);
+
+  const errors = validationResult(req);
+  if (!errors.isEmpty()) {
+    return res.status(422).json({ errors: errors.array() });
+  }
+  
+  var project_user = req.projectuser;
+
+  let q = Request.findOne({request_id: req.params.request_id, id_project: req.projectid}); 
+  // if (cacheEnabler.request) {
+  //   q.cache(cacheUtil.defaultTTL, req.projectid+":requests:request_id:"+req.params.request_id+":simple") //request_cache
+  //   winston.debug('request cache enabled');
+  // }
+  return q.exec(async(err, request) => {
+    
+
+    if (err) {
+      winston.log({
+          level: 'error',
+          message: 'Error getting the request: '+ JSON.stringify(err) + " " + JSON.stringify(req.body) ,
+          label: req.projectid
+        });
+      // winston.error('Error getting the request.', err);
+      return res.status(500).send({success: false, msg: 'Error getting the request.', err:err});
+    }
+
+    if (!request) { //the request doen't exists create it
+      return res.status(404).send({success: false, msg: 'Request doesn\'t exist.', err:err});
+    } else {
+
+  
+
+      winston.debug("request  exists", request.toObject());
+  
+      
+      let promises = [];
+
+      let sender;
+      let fullname;
+      let email;
+      let text;
+      let attributes;
+      let type;
+      let metadata;
+      let language;
+      let channel;
+      let messageStatus;
+      
+      req.body.forEach(function(message,index) {
+
+        sender = message.sender;
+        fullname = message.senderFullname || req.user.fullName;
+        email = message.email || req.user.email;
+
+        text = message.text;
+        attributes = message.attributes;
+        type = message.type;
+        metadata = message.metadata;
+        language = message.language;
+        channel = message.channel;
+        messageStatus = message.status || MessageConstants.CHAT_MESSAGE_STATUS.SENDING;
+            // create(sender, senderFullname, recipient, text, id_project, createdBy, status, attributes, type, metadata, language, channel_type, channel) {                 
+        let promise =  messageService.create(sender || req.user._id, fullname, req.params.request_id, text,
+                request.id_project, null, messageStatus, attributes, type, metadata, language, undefined, channel);
+
+          promises.push(promise);
+      });
+      winston.debug('--- >promises', promises);
+
+      Promise.all(promises).then((values) => {
+        winston.info('Inserted multiple messages with values: ', values);
+        return res.status(200).json(values);
+      }).catch((err) => {
+        winston.error('Error inserting multiple messages.', err);
+        return res.status(500).send({success: false, msg: 'Error inserting multiple messages.', err:err});
+
+      });
+
+      
+
+
+
+
+    }
+  
+
+
+  });
+
+
+
+
+});
+
+
+
+
+
+
+
+
+
+
+// router.patch('/:messageid', function(req, res) {
+  
+//   winston.info(req.body);
+  
+//   Message.findByIdAndUpdate(req.params.messageid, req.body, {new: true, upsert:true}, function(err, updatedMessage) {
+//     if (err) {
+//       return res.status(500).send({success: false, msg: 'Error updating object.'});
+//     }
+//     res.json(updatedMessage);
+//   });
+// });
+
+
 // router.put('/:messageid', function(req, res) {
   
 //     console.log(req.body);

package/routes/project.js

@@ -451,8 +451,8 @@ Project.findByIdAndUpdate(req.params.projectid, { $pull: { bannedUsers: { "_id":
 router.get('/:projectid', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['subscription'])], function (req, res) {
   winston.debug(req.body);
   let q = Project.findOne({_id: req.params.projectid, status:100});
-  if (cacheEnabler.project) {
-    q.cache(cacheUtil.defaultTTL, "projects:id:"+req.params.projectid)  //project_cache
+  if (cacheEnabler.project) { 
+    q.cache(cacheUtil.longTTL, "projects:id:"+req.params.projectid)  //project_cache
     winston.debug('project cache enabled');
   }
   q.exec(function (err, project) {

package/routes/project_user_test.js

@@ -0,0 +1,19 @@
+var express = require('express');
+var router = express.Router({mergeParams: true});
+
+var passport = require('passport');
+require('../middleware/passport')(passport);
+var validtoken = require('../middleware/valid-token')
+var roleChecker = require('../middleware/has-role');
+
+
+
+router.get('/test', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['subscription'])], function (req, res) {
+      // console.log("req.projectuser",req.projectuser);      
+      res.json(req.projectuser);
+
+});
+
+
+
+module.exports = router;