@tiledesk/tiledesk-server 2.3.26 → 2.3.28

package/CHANGELOG.md

@@ -1,4 +1,12 @@
 
+# 2.3.28
+- UIDGenerator renamed fix
+
+# 2.3.27
+- CacheUtil fix with new values
+- UIDGenerator class replacement
+- Disabled cache for requestService route. Bug:  No matching document found for id "XYZ" 
+
 # 2.3.26
 - DialogFlow connector fix /tdbot
 
@@ -47,7 +55,10 @@
 - Moved route-queue to public module
 - Disable queue module if JOB_WORKER_ENABLED is true
 
-# 2.3.18.6 -> PROD
+# 2.3.18.7 -> PROD
+- filter request by smartAssignment
+
+# 2.3.18.6
 - logfix
 
 # 2.3.18.1 

package/package.json

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

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

@@ -13,7 +13,8 @@
 
  var cachegoose = require('cachegoose');
 
- var defaultTTL = process.env.CACHE_DEFAULT_TTL || 300;
+ var cacheUtil = require('../../utils/cacheUtil');
+
  
 
  function listen(client) {
@@ -22,7 +23,7 @@
         setImmediate(() => {
             var key = "projects:id:"+project.id;
             winston.verbose("Creating cache for project.create with key: " + key);
-            client.set(key, project, defaultTTL, (err, reply) => {
+            client.set(key, project, cacheUtil.longTTL, (err, reply) => {
                 winston.verbose("Created cache for project.create",{err:err});
                 winston.debug("Created cache for project.create reply",reply);
             });
@@ -41,7 +42,7 @@
         setImmediate(() => {
             var key = "projects:id:"+project.id;
             winston.verbose("Updating cache for project.update with key: " + key);
-            client.set(key, project, defaultTTL, (err, reply) => {
+            client.set(key, project, cacheUtil.longTTL, (err, reply) => {
                 winston.verbose("Updated cache for project.update",{err:err});
                 winston.debug("Updated cache for project.update",reply);
 
@@ -80,7 +81,7 @@
             var key = "projects:id:"+project.id;
             winston.verbose("Updating cache for project.downgrade with key: " + key);
 
-            client.set(key, project, defaultTTL, (err, reply) => {
+            client.set(key, project, cacheUtil.longTTL, (err, reply) => {
                 winston.debug("Updated cache for project.downgrade",reply);
                 winston.verbose("Updated cache for project.downgrade",{err:err});
             });
@@ -106,7 +107,7 @@
 
             var key = project_user.id_project+":project_users:id:"+project_user.id;
             winston.verbose("Updating cache for project_user.update with key: " + key);
-            client.set(key, project_user, defaultTTL, (err, reply) => {
+            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});
             });
@@ -127,7 +128,7 @@
 
                 var key = project_user.id_project+":project_users:role:teammate:"+project_user.id;
                 winston.verbose("Updating cache for project_user.update with key: " + key);
-                client.set(key, project_user, defaultTTL, (err, reply) => {
+                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});
                 });
@@ -145,14 +146,14 @@
 
             var key = "users:id:"+user.id;
             winston.verbose("Creating cache for user.signup with key: " + key);
-            client.set(key, user, defaultTTL, (err, reply) => {
+            client.set(key, user, cacheUtil.defaultTTL, (err, reply) => {
                 winston.debug("Created cache for user.signup",reply);
                 winston.verbose("Created cache for user.signup",{err:err});
             });
 
             var key = "users:email:"+user.email;
             winston.verbose("Creating cache for user.signup with key: " + key);
-            client.set(key, user, defaultTTL, (err, reply) => {
+            client.set(key, user, cacheUtil.defaultTTL, (err, reply) => {
                 winston.debug("Created cache for user.signup",reply);
                 winston.verbose("Created cache for user.signup",{err:err});
             });
@@ -166,14 +167,14 @@
 
             var key = "users:id:"+user.id;
             winston.verbose("Updating cache for user.update with key: " + key);
-            client.set(key, user, defaultTTL, (err, reply) => {
+            client.set(key, user, cacheUtil.defaultTTL, (err, reply) => {
                 winston.debug("Updated cache for user.update",reply);
                 winston.verbose("Updated cache for user.update",{err:err});
             });
 
             var key = "users:email:"+user.email;
             winston.verbose("Updating cache for user.update with key: " + key);
-            client.set(key, user, defaultTTL, (err, reply) => {
+            client.set(key, user, cacheUtil.defaultTTL, (err, reply) => {
                 winston.debug("Updated cache for user.update",reply);
                 winston.verbose("Updated cache for user.update",{err:err});
             });
@@ -208,7 +209,7 @@
             var key = request.id_project+":requests:id:"+request.id+":simple";
             winston.verbose("Creating cache for request.create.simple with key: " + key);
 
-            client.set(key, request, defaultTTL, (err, reply) => {
+            client.set(key, request, cacheUtil.defaultTTL, (err, reply) => {
                 winston.debug("Created cache for request.create.simple",reply);
                 winston.verbose("Created cache for request.create.simple",{err:err});
             });
@@ -217,14 +218,14 @@
             var key = "requests:id:"+request.request_id+":simple";  //without project for chat21 webhook
             winston.verbose("Creating cache for request.create.simple with key: " + key);
 
-            client.set(key, request, defaultTTL, (err, reply) => {
+            client.set(key, request, cacheUtil.defaultTTL, (err, reply) => {
                 winston.debug("Created cache for request.create.simple",reply);
                 winston.verbose("Created cache for request.create.simple",{err:err});
             });
 
             var key = request.id_project+":requests:request_id:"+request.request_id+":simple";
             winston.verbose("Creating cache for request.create.simple with key: " + key);
-            client.set(key, request, defaultTTL, (err, reply) => {
+            client.set(key, request, cacheUtil.defaultTTL, (err, reply) => {
                 winston.debug("Created cache for request.create.simple",reply);
                 winston.verbose("Created cache for request.create.simple",{err:err});
             });
@@ -237,14 +238,14 @@
             var key = request.id_project+":requests:id:"+request.id;
             winston.verbose("Creating cache for request.create with key: " + key);
 
-            client.set(key, request, defaultTTL, (err, reply) => {
+            client.set(key, request, cacheUtil.defaultTTL, (err, reply) => {
                 winston.debug("Created cache for request.create",reply);
                 winston.verbose("Created cache for request.create",{err:err});
             });
 
             var key = request.id_project+":requests:request_id:"+request.request_id;
             winston.verbose("Creating cache for request.create with key: " + key);
-            client.set(key, request, defaultTTL, (err, reply) => {
+            client.set(key, request, cacheUtil.defaultTTL, (err, reply) => {
                 winston.debug("Created cache for request.create",reply);
                 winston.verbose("Created cache for request.create",{err:err});
             });
@@ -264,14 +265,14 @@
         setImmediate(() => {
             var key = request.id_project+":requests:id:"+request.id;
             winston.verbose("Creating cache for request.update with key: " + key);
-            client.set(key, request, defaultTTL, (err, reply) => {
+            client.set(key, request, cacheUtil.defaultTTL, (err, reply) => {
                 winston.debug("Created cache for request.update",reply);
                 winston.verbose("Created cache for request.update",{err:err});
             });
 
             var key = request.id_project+":requests:request_id:"+request.request_id;
             winston.verbose("Creating cache for request.update with key: " + key);
-            client.set(key, request, defaultTTL, (err, reply) => {
+            client.set(key, request, cacheUtil.defaultTTL, (err, reply) => {
                 winston.debug("Created cache for request.update",reply);
                 winston.verbose("Created cache for request.update",{err:err});
             });
@@ -290,14 +291,14 @@
         setImmediate(() => {
             var key = request.id_project+":requests:id:"+request.id;
             winston.verbose("Creating cache for request.close with key: " + key);
-            client.set(key, request, defaultTTL, (err, reply) => {
+            client.set(key, request, cacheUtil.defaultTTL, (err, reply) => {
                 winston.debug("Created cache for request.close",reply);
                 winston.verbose("Created cache for request.close",{err:err});
             });
 
             var key = request.id_project+":requests:request_id:"+request.request_id;
             winston.verbose("Creating cache for request.close with key: " + key);
-            client.set(key, request, defaultTTL, (err, reply) => {
+            client.set(key, request, cacheUtil.defaultTTL, (err, reply) => {
                 winston.debug("Created cache for request.close",reply);
                 winston.verbose("Created cache for request.close",{err:err});
             });
@@ -319,13 +320,13 @@
     //     setImmediate(() => {
     //         var key = message.id_project+":requests:id:"+message.request._id + ":messages:id:" + message._id;
     //         winston.verbose("Creating cache for message.create with key: " + key);
-    //         client.set(key, message, defaultTTL, (err, reply) => {
+    //         client.set(key, message, cacheUtil.defaultTTL, (err, reply) => {
     //             winston.verbose("Created cache for message.create",{err:err, reply:reply});
     //         });
 
     //         var key = message.id_project+":requests:request_id:"+message.request.request_id + ":messages:id:" + message._id;        
     //         winston.verbose("Creating cache for message.create with key: " + key);
-    //         client.set(key, message, defaultTTL, (err, reply) => {
+    //         client.set(key, message, cacheUtil.defaultTTL, (err, reply) => {
     //             winston.verbose("Created cache for message.create",{err:err, reply:reply});
     //         });
     //     });
@@ -337,7 +338,7 @@
         setImmediate(() => {
             var key = faq_kb.id_project+":faq_kbs:id:"+faq_kb._id;
             winston.verbose("Creating cache for faq_kb.create with key: " + key);
-            client.set(key, faq_kb, defaultTTL, (err, reply) => {
+            client.set(key, faq_kb, cacheUtil.defaultTTL, (err, reply) => {
                 winston.debug("Created cache for faq_kb.create",reply);
                 winston.verbose("Created cache for faq_kb.create",{err:err});
             });
@@ -350,7 +351,7 @@
         setImmediate(() => {
             var key = faq_kb.id_project+":faq_kbs:id:"+faq_kb._id;
             winston.verbose("Creating cache for faq_kb.update with key: " + key);
-            client.set(key, faq_kb, defaultTTL, (err, reply) => {
+            client.set(key, faq_kb, cacheUtil.defaultTTL, (err, reply) => {
                 winston.debug("Created cache for faq_kb.create",reply);
                 winston.verbose("Created cache for faq_kb.update",{err:err});
             });       
@@ -362,7 +363,7 @@
         setImmediate(() => {
             var key = faq_kb.id_project+":faq_kbs:id:"+faq_kb._id;
             winston.verbose("Creating cache for faqbot.delete with key: " + key);
-            client.set(key, faq_kb, defaultTTL, (err, reply) => {
+            client.set(key, faq_kb, cacheUtil.defaultTTL, (err, reply) => {
                 winston.debug("Created cache for faqbot.delete",reply);
                 winston.verbose("Created cache for faqbot.delete",{err:err});
             });
@@ -374,7 +375,7 @@
         setImmediate(() => {
             var key = department.id_project+":departments:id:"+department._id;
             winston.verbose("Creating cache for department.create with key: " + key);
-            client.set(key, department, defaultTTL, (err, reply) => {
+            client.set(key, department, cacheUtil.defaultTTL, (err, reply) => {
                 winston.debug("Created cache for department.create",reply);
                 winston.verbose("Created cache for department.create",{err:err});
             });
@@ -394,7 +395,7 @@
         setImmediate(() => {
             var key = department.id_project+":departments:id:"+department._id;
             winston.verbose("Creating cache for department.update with key: " + key);
-            client.set(key, department, defaultTTL, (err, reply) => {
+            client.set(key, department, cacheUtil.defaultTTL, (err, reply) => {
                 winston.debug("Created cache for department.update",reply);
                 winston.verbose("Created cache for department.update",{err:err});
             });    
@@ -413,7 +414,7 @@
         setImmediate(() => {
             var key = department.id_project+":departments:id:"+department._id;
             winston.verbose("Creating cache for department.delete with key: " + key);
-            client.set(key, department, defaultTTL, (err, reply) => {
+            client.set(key, department, cacheUtil.defaultTTL, (err, reply) => {
                 winston.debug("Created cache for department.delete",reply);
                 winston.verbose("Created cache for department.delete",{err:err});
             });
@@ -578,7 +579,7 @@ module.exports = function (mongoose, option) {
         var password = process.env.CACHE_REDIS_PASSWORD;
         winston.debug("Redis password: "+ password);
         
-        winston.info("Mongoose Cachegoose fn initialized, engine: " + engine + ", port: "+ port + ", host: "+ host  + " defaultTTL: " +defaultTTL + ", password: "+ password);
+        winston.info("Mongoose Cachegoose fn initialized, engine: " + engine + ", port: "+ port + ", host: "+ host  + " defaultTTL: " +cacheUtil.defaultTTL + ", password: "+ password);
         // winston.info("Mongoose Cachegoose fn initialized, engine: " + engine + ", endpoint: "+endPoint +", port: "+ port + ", host: "+ host + ", password: "+ password);
 
 

package/pubmodules/trigger/rulesTrigger.js

@@ -20,10 +20,7 @@ var operatingHoursService = require("../../services/operatingHoursService");
 var sendMessageUtil = require("../../utils/sendMessageUtil");
 var cacheUtil = require("../../utils/cacheUtil");
 var cacheEnabler = require("../../services/cacheEnabler");
-
-
-
-const uuidv4 = require('uuid/v4');
+var UIDGenerator = require("../../utils/UIDGenerator");
 
 
 class RulesTrigger {
@@ -683,7 +680,7 @@ class RulesTrigger {
 
           
 
-          var request_id = 'support-group-'+id_project+"-"+uuidv4();
+          var request_id = 'support-group-'+id_project+"-"+UIDGenerator.generate();
           var id_user;
           var fullname;
           var email;

package/routes/campaigns.js

@@ -6,8 +6,7 @@ var winston = require('../config/winston');
 var requestService = require("../services/requestService");
 var messageService = require("../services/messageService");
 var MessageConstants = require("../models/messageConstants");
-const uuidv4 = require('uuid/v4');
-
+var UIDGenerator = require("../utils/UIDGenerator");
 
 
 
@@ -19,7 +18,7 @@ router.post('/', function (req, res) {
 
   winston.debug(req.body);
   winston.debug("req.user", req.user);
-  var request_id = req.body.request_id || 'support-group-' + req.projectid + "-" + uuidv4();
+  var request_id = req.body.request_id || 'support-group-' + req.projectid + "-" + UIDGenerator.generate();
 
   // TODO cicla su segment
 
@@ -73,6 +72,7 @@ router.post('/direct', async function (req, res) {
 
   }
 
+  
   winston.info("recipients", recipients);
   winston.info("recipients.length: " + recipients.length);
 

package/services/requestService.js

@@ -7,12 +7,12 @@ var messageService = require('../services/messageService');
 const requestEvent = require('../event/requestEvent');
 const leadEvent = require('../event/leadEvent');
 var winston = require('../config/winston');
-const uuidv4 = require('uuid/v4');
 var RequestConstants = require("../models/requestConstants");
 var requestUtil = require("../utils/requestUtil");
 var cacheUtil = require("../utils/cacheUtil");
 var arrayUtil = require("../utils/arrayUtil");
 var cacheEnabler = require("../services/cacheEnabler");
+var UIDGenerator = require("../utils/UIDGenerator");
 
 class RequestService {
 
@@ -230,10 +230,10 @@ class RequestService {
         let q= Request       
         .findOne({request_id: request_id, id_project: id_project});
 
-        if (cacheEnabler.request) {
-          q.cache(cacheUtil.defaultTTL, id_project+":requests:request_id:"+request_id+":simple")      //request_cache
-          winston.debug('request cache enabled');
-        }
+        // if (cacheEnabler.request) {  //(node:60837) UnhandledPromiseRejectionWarning: VersionError: No matching document found for id "633efe246a6cc0eda5732684" version 0 modifiedPaths "status, participants, participantsAgents, department, assigned_at, snapshot, snapshot.department, snapshot.department.updatedAt, snapshot.agents"
+        //   q.cache(cacheUtil.defaultTTL, id_project+":requests:request_id:"+request_id+":simple")      //request_cache
+        //   winston.debug('request cache enabled');
+        // }
         return q.exec( function(err, request) {
 
           if (err) {
@@ -241,6 +241,7 @@ class RequestService {
             return reject(err);
           }
                    
+          winston.debug('request return',request);
 
           // cambia var in let
 
@@ -417,7 +418,7 @@ class RequestService {
 
   createWithRequester(project_user_id, lead_id, id_project, first_text, departmentid, sourcePage, language, userAgent, status, createdBy, attributes, subject, preflight) {
 
-    var request_id = 'support-group-'+ id_project + "-" + uuidv4();
+    var request_id = 'support-group-'+ id_project + "-" + UIDGenerator.generate();  
     winston.debug("request_id: "+request_id);
     
     return this.createWithIdAndRequester(request_id, project_user_id, lead_id, id_project, first_text, departmentid, sourcePage, language, userAgent, status, createdBy, attributes, subject, preflight);

package/utils/UIDGenerator.js

@@ -0,0 +1,20 @@
+let stringUtil = require("../utils/stringUtil");
+const uuidv4 = require('uuid/v4');
+
+class UIDGenerator {
+
+    generate() {        
+        let uid = uuidv4();
+        // console.log("uid",uid);
+        let uidWithoutChar = stringUtil.replaceAll(uid, "-", "");
+        // console.log("uidWithoutChar",uidWithoutChar);
+        return uidWithoutChar;
+    }
+}
+
+ var uidGenerator = new UIDGenerator();
+
+ module.exports = uidGenerator;
+ 
+
+ 

package/utils/cacheUtil.js

@@ -1,6 +1,6 @@
 module.exports = {
-    defaultTTL: Number(process.env.CACHE_DEFAULT_TTL) || 120,    
+    defaultTTL: Number(process.env.CACHE_DEFAULT_TTL) || 300, //5 minutes   
     queryTTL: Number(process.env.CACHE_QUERY_TTL) || 30,    
-    longTTL: Number(process.env.CACHE_LONG_TTL) || 1200,    
+    longTTL: Number(process.env.CACHE_LONG_TTL) || 3600,  //1 hour    
   };
   

package/utils/stringUtil.js

@@ -0,0 +1,12 @@
+
+class StringUtil {
+
+    replaceAll(string, characterToReplace, replacement) {
+        return string.split(characterToReplace).join(replacement);
+    }
+}
+
+ var stringUtil = new StringUtil();
+
+ module.exports = stringUtil;
+