@tiledesk/tiledesk-server 2.3.6 → 2.3.7-1.2

package/services/departmentService.js

@@ -8,6 +8,8 @@ var winston = require('../config/winston');
 const departmentEvent = require('../event/departmentEvent');
 const Request = require('../models/request');
 const RoleConstants = require ('../models/roleConstants')
+var cacheEnabler = require("../services/cacheEnabler");
+var cacheUtil = require("../utils/cacheUtil");
 
 class DepartmentService {
 
@@ -86,7 +88,7 @@ roundRobin(operatorSelectedEvent) {
 
       // let lastRequests = await 
       // requestcachefarequi nocachepopulatereqired
-      Request.find(query).sort({_id:-1}).limit(1).exec(function (err, lastRequests) {
+      Request.find(query).sort({_id:-1}).limit(1).exec(function (err, lastRequests) {  // cache_attention  use_lean use_select
           if (err) {
               winston.error('Error getting request for RoundRobinOperator', err); 
               return reject(err);
@@ -190,7 +192,12 @@ getOperators(departmentid, projectid, nobot, disableWebHookCall, context) {
        // console.log("»»» »»» --> DEPT ID ", departmentid);
 
 
-    return Project.findOne({_id: projectid, status: 100}, function(err, project) {
+    let q = Project.findOne({_id: projectid, status: 100})
+    if (cacheEnabler.project) { 
+      q.cache(cacheUtil.longTTL, "projects:id:"+projectid)  //project_cache
+      winston.debug('project cache enabled');
+    }
+    return q.exec(function(err, project){
       if (err) {
         winston.error('Project findById ', err);
         return reject(err);
@@ -205,6 +212,7 @@ getOperators(departmentid, projectid, nobot, disableWebHookCall, context) {
       // TODO questo lo abiliterei solo esplicitamete se si flagga opzione su progetto per performance
       if (disableWebHookCall==undefined) {
               //if pro enabled disableWebHookCall = false
+                              //secondo me qui manca un parentesi tonda per gli or
         if (project.profile && (project.profile.type === 'free' && project.trialExpired === false) || (project.profile.type === 'payment' && project.isActiveSubscription === true)) {
           // winston.info('disableWebHookCall pro');
           disableWebHookCall = false;
@@ -389,6 +397,7 @@ getOperators(departmentid, projectid, nobot, disableWebHookCall, context) {
 
               let objectToReturn = { available_agents: _available_agents, agents: project_users, operators: selectedoperator, department: department, group: group, id_project: projectid, project: project,  context: context };
 
+              // var objectToReturnRoundRobin = objectToReturn;
               that.roundRobin(objectToReturn).then(function(objectToReturnRoundRobin){
 
                 winston.debug("context2",context);
@@ -450,6 +459,8 @@ getOperators(departmentid, projectid, nobot, disableWebHookCall, context) {
 
           let objectToReturn = { available_agents: _available_agents, agents: project_users, operators: selectedoperator, department: department, id_project: projectid, project: project, context: context };
 
+          // var objectToReturnRoundRobin = objectToReturn;
+
           that.roundRobin(objectToReturn).then(function(objectToReturnRoundRobin) {
             winston.debug("context2",context);
             departmentEvent.emit('operator.select.base1', {result:objectToReturnRoundRobin,  disableWebHookCall: disableWebHookCall, resolve: resolve, reject: reject, context: context});
@@ -543,8 +554,19 @@ getOperators(departmentid, projectid, nobot, disableWebHookCall, context) {
 
   // console.log('-- > OPERATORS [ getRandomAvailableOperator ] - PROJECT USER AVAILABLE LENGHT ', project_users_available.length);
   if (project_users_available.length > 0) {
+
+
+    // new
+                                  // num between 0 and 1 * es 3 -> 
+    // let randomIndex =  Math.round(Math.random() * project_users_available.length);
+    // // let randomIndex =  Math.floor(Math.random() * project_users_available.length);
+    
+    // console.log("randomIndex",randomIndex);
+    // var operator = project_users_available[randomIndex];
+    // // console.log('OPERATORS - SELECTED MEMBER ID', operator.id_user);
+
     var operator = project_users_available[Math.floor(Math.random() * project_users_available.length)];
-    // console.log('OPERATORS - SELECTED MEMBER ID', operator.id_user);
+
 
     return [{ id_user: operator.id_user }];
     // return [operator];

package/services/emailService.js

@@ -12,6 +12,9 @@ handlebars.registerHelper('ifEquals', function(arg1, arg2, options) {
   return (arg1 == arg2) ? options.fn(this) : options.inverse(this);
 });
 
+handlebars.registerHelper('dateFormat', require('handlebars-dateformat'));
+
+
 // var options = {};
 // handlebars.registerHelper('markdown', markdown(options));
 
@@ -45,6 +48,8 @@ const maskOptions = {
 
 const MESSAGE_ID_DOMAIN = "tiledesk.com";
 
+// const hcustomization = require('../utils/hcustomization');
+
 class EmailService {
 
   constructor() {
@@ -98,7 +103,11 @@ class EmailService {
     this.host = process.env.EMAIL_HOST || config.host;
     winston.info('EmailService host: ' + this.host);
 
-    this.secure  = process.env.EMAIL_SECURE || false;     
+    this.secure  = false;     
+    if (process.env.EMAIL_SECURE == "true" || process.env.EMAIL_SECURE ==true) {
+      this.secure  = true;     
+    }
+    // this.secure  = process.env.EMAIL_SECURE || false;     
     winston.info('EmailService secure: ' + this.secure);
 
     this.user  = process.env.EMAIL_USERNAME || config.username;
@@ -108,7 +117,11 @@ class EmailService {
     winston.info('EmailService port: ' + this.port);
 
 
-    this.markdown = process.env.EMAIL_MARKDOWN || true;
+    this.markdown = true;
+    if (process.env.EMAIL_MARKDOWN =="false" || process.env.EMAIL_MARKDOWN ==false) {
+      this.markdown = false;
+    }
+    // this.markdown = process.env.EMAIL_MARKDOWN || true;
     winston.info('EmailService markdown: '+ this.markdown);
 
     this.headers = {
@@ -116,6 +129,13 @@ class EmailService {
     }
     winston.info('EmailService headers: ' + JSON.stringify(this.headers));
 
+    this.ccEnabled = false //cc creates loop when you send an email with cc: support@tiledesk.com -> Tiledesk generates an email with ticket id with in cc support@tiledesk.com that loop 
+
+    if (process.env.EMAIL_CC_ENABLED ==="true" || process.env.EMAIL_CC_ENABLED === true ) {
+      this.ccEnabled = true;
+    }
+    winston.info('EmailService ccEnabled: ' + this.ccEnabled);
+
   }
 
   readTemplate(templateName, settings) {
@@ -252,6 +272,8 @@ class EmailService {
     };
 
     winston.debug('mailOptions', mailOptions);
+    winston.debug(' mail.config',  mail.config);
+   
     if (!mail.to) {
       return winston.warn("EmailService send method. to field is not defined", mailOptions);
     }
@@ -262,7 +284,7 @@ class EmailService {
         if (mail.callback){
           mail.callback(error, {info:info});
         }
-        return winston.error("Error sending email ", {error:error,  mailOptions:mailOptions});
+        return winston.error("Error sending email ", {error:error,  mailConfig: mail.config, mailOptions:mailOptions});
       }
       winston.verbose('Email sent:', {info: info});
       winston.debug('Email sent:', {info: info, mailOptions: mailOptions});
@@ -1020,7 +1042,7 @@ class EmailService {
 
   }
 
-
+  
   
   async sendEmailChannelNotification(to, message, project, tokenQueryString, sourcePage) {
 
@@ -1114,14 +1136,17 @@ class EmailService {
         references = message.request.attributes.email_references;
       }        
 
-      if (message.request.attributes.email_cc) {
-        cc = message.request.attributes.email_cc;       
-      }
-      winston.debug("email message.request.attributes.email_ccStr: "+ message.request.attributes.email_ccStr);
-      if (message.request.attributes.email_ccStr!=undefined) {
-        ccString = message.request.attributes.email_ccStr;
-        winston.debug("email set ccString");
+      if (that.ccEnabled==true) {
+        if (message.request.attributes.email_cc) {
+          cc = message.request.attributes.email_cc;       
+        }
+        winston.debug("email message.request.attributes.email_ccStr: "+ message.request.attributes.email_ccStr);
+        if (message.request.attributes.email_ccStr!=undefined) {
+          ccString = message.request.attributes.email_ccStr;
+          winston.debug("email set ccString");
+        }
       }
+      
     }
     winston.verbose("email inReplyTo: "+ inReplyTo);
     winston.verbose("email references: "+ references);
@@ -1283,13 +1308,15 @@ class EmailService {
         references = message.request.attributes.email_references;
       }        
 
-      if (message.request.attributes.email_cc) {
-        cc = message.request.attributes.email_cc;       
-      }
-      winston.debug("email message.request.attributes.email_ccStr: "+ message.request.attributes.email_ccStr);
-      if (message.request.attributes.email_ccStr!=undefined) {
-        ccString = message.request.attributes.email_ccStr;
-        winston.debug("email set ccString");
+      if (that.ccEnabled==true) {
+        if (message.request.attributes.email_cc) {
+          cc = message.request.attributes.email_cc;       
+        }
+        winston.debug("email message.request.attributes.email_ccStr: "+ message.request.attributes.email_ccStr);
+        if (message.request.attributes.email_ccStr!=undefined) {
+          ccString = message.request.attributes.email_ccStr;
+          winston.debug("email set ccString");
+        }
       }
     }
     winston.verbose("email inReplyTo: "+ inReplyTo);
@@ -1350,10 +1377,6 @@ class EmailService {
   }
 
 
-
-
-
-
 /*
   sendEmailChannelTakingNotification(to, request, project, tokenQueryString) {
 
@@ -1401,6 +1424,103 @@ class EmailService {
   }
 */
 
+
+
+
+
+
+  
+async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage) {
+
+  var that = this;
+
+
+  if (project.toJSON) {
+    project = project.toJSON();
+  }
+
+  var html = await this.readTemplate('emailDirect.html', project.settings);
+
+  var envTemplate = process.env.EMAIL_DIRECT_HTML_TEMPLATE;
+    winston.debug("envTemplate: " + envTemplate);
+
+  if (envTemplate) {
+      html = envTemplate;
+  }
+
+  winston.debug("html: " + html);
+
+  var template = handlebars.compile(html);
+
+  var baseScope = JSON.parse(JSON.stringify(that));
+  delete baseScope.pass;
+
+
+  let msgText = text;
+  msgText = encode(msgText);
+  if (this.markdown) {
+    msgText = marked(msgText);
+  }
+  
+  winston.debug("msgText: " + msgText);
+  winston.debug("baseScope: " + JSON.stringify(baseScope));
+  
+
+  var replacements = {        
+    project: project,
+    request_id: request_id,
+    seamlessPage: sourcePage,
+    msgText: msgText,
+    tokenQueryString: tokenQueryString,
+    baseScope: baseScope    
+  };
+
+  var html = template(replacements);
+  winston.debug("html: " + html);
+
+  
+  let replyTo;
+  if (this.replyEnabled && request_id) {
+    replyTo = request_id + this.inboundDomainDomainWithAt;
+  }
+
+  let from;
+  let configEmail;
+  if (project && project.settings && project.settings.email) {
+    if (project.settings.email.config) {
+      configEmail = project.settings.email.config;
+      winston.verbose("custom email configEmail setting found: ", configEmail);
+    }
+    if (project.settings.email.from) {
+      from = project.settings.email.from;
+      winston.verbose("custom from email setting found: "+ from);
+    }
+  }
+
+
+  // if (message.request && message.request.lead && message.request.lead.email) {
+  //   winston.info("message.request.lead.email: " + message.request.lead.email);
+  //   replyTo = replyTo + ", "+ message.request.lead.email;
+  // }
+
+  // if (!subject) {
+  //   subject = "Tiledesk"
+  // }
+  
+  that.send({
+    from:from, 
+    to:to, 
+    replyTo: replyTo, 
+    subject:subject,
+    text:html, 
+    html:html,
+    config:configEmail, 
+  }); 
+  
+}
+
+
+
   // ok
   async sendPasswordResetRequestEmail(to, resetPswRequestId, userFirstname, userLastname) {
 
@@ -1616,7 +1736,7 @@ class EmailService {
 // ok
 
 async sendRequestTranscript(to, messages, request, project) {
-
+  winston.debug("sendRequestTranscript: "+to); 
 
      //if the request came from rabbit mq?
      if (request.toJSON) {
@@ -1664,13 +1784,33 @@ async sendRequestTranscript(to, messages, request, project) {
 
     var html = template(replacements);
 
+  
+
+    let from;
     let configEmail;
-    if (project && project.settings && project.settings.email && project.settings.email.config) {
-      configEmail = project.settings.email.config;
-      winston.verbose("custom email setting found: ", configEmail);
+    if (project && project.settings && project.settings.email) {
+      if (project.settings.email.config) {
+        configEmail = project.settings.email.config;
+        winston.verbose("custom email configEmail setting found: ", configEmail);
+      }
+      if (project.settings.email.from) {
+        from = project.settings.email.from;
+        winston.verbose("custom from email setting found: "+ from);
+      }
+    }
+
+
+
+    //custom ocf here
+    // console.log("ocf",project._id);
+    let subject = '[Tiledesk] Transcript';
+    if (project._id =="636a63070d942d001950c023") {
+      subject = "Chiusura richiesta di supporto #" + request.ticket_id;
+      console.log("subject",subject);
     }
+    // hcustomization.emailTranscript(to, subject, html, configEmail)
 
-    that.send({to:to, subject: '[Tiledesk] Transcript', html:html, config: configEmail});
+    that.send({from:from, to:to, subject: subject, html:html, config: configEmail});
     that.send({to: that.bcc, subject: '[Tiledesk] Transcript - notification', html:html });
 
 }
@@ -1683,6 +1823,8 @@ async sendRequestTranscript(to, messages, request, project) {
 
 var emailService = new EmailService();
 
-//  emailService.sendTest("asd.");
+// var subject = "abc";
+// hcustomization.emailTranscript({subject: subject});
+// console.log("subject", subject);
 
 module.exports = emailService;

package/services/faqBotHandler.js

@@ -185,7 +185,7 @@ class FaqBotHandler {
                             if (clonedfaqs && clonedfaqs.length>0) {
                                 clonedfaqs = clonedfaqs.shift()
                             }
-                            winston.verbose("clonedfaqs", clonedfaqs);
+                            winston.debug("clonedfaqs", clonedfaqs);
 
                             const intent_info = {
                                 intent_name: answerObj.intent_display_name,
@@ -389,7 +389,7 @@ class FaqBotHandler {
                             if (clonedfaqs && clonedfaqs.length>0) {
                                 clonedfaqs = clonedfaqs.shift()
                             }
-                            winston.verbose("clonedfaqs", clonedfaqs);
+                            winston.debug("clonedfaqs", clonedfaqs);
 
                             const intent_info = {
                                 intent_name: answerObj.intent_display_name,
@@ -468,7 +468,6 @@ class FaqBotHandler {
                                         message.id_project, project_user,  "system", undefined);
                             }
                            
-                            // not sending with ws event with project_user undefined {"_id":"601be8bf5e24bf0012d653be","name":"faqbot.answer_not_found","attributes":{"bot":{"type":"internal","_id":"601baf4d9974d20019469ea8","name":"Bot2","description":"HI,IM","id_project":"60113c4f9974d200191d90d3","trashed":false,"createdBy":"60113ba19974d200191d868a","createdAt":"2021-02-04T08:24:45.137Z","updatedAt":"2021-02-04T08:24:45.137Z","__v":0},"message":{"senderFullname":"IndelishFinal ","type":"text","channel_type":"group","status":0,"_id":"601be8be5e24bf0012d653b7","sender":"acbc3f18-fc6b-41fc-a257-ce68f51f2551","recipient":"support-group-acbc3f18-fc6b-41fc-a257-ce68f51f2551","text":"Chineese","id_project":"60113c4f9974d200191d90d3","createdBy":"acbc3f18-fc6b-41fc-a257-ce68f51f2551","channel":{"name":"chat21"},"createdAt":"2021-02-04T12:29:50.753Z","updatedAt":"2021-02-04T12:29:50.753Z","__v":0,"request":{"_id":"601be8be5e24bf0012d653b4","status":200,"preflight":false,"hasBot":true,"participants":["bot_601baf4d9974d20019469ea8"],"participantsAgents":[],"participantsBots":["601baf4d9974d20019469ea8"],"request_id":"support-group-acbc3f18-fc6b-41fc-a257-ce68f51f2551","requester":{"_id":"601be8945e24bf0012d65311","user_available":true,"number_assigned_requests":0,"last_login_at":"2021-02-04T11:47:39.753Z","status":"active","id_project":"60113c4f9974d200191d90d3","uuid_user":"acbc3f18-fc6b-41fc-a257-ce68f51f2551","role":"guest","createdBy":"acbc3f18-fc6b-41fc-a257-ce68f51f2551","createdAt":"2021-02-04T12:29:08.397Z","updatedAt":"2021-02-04T12:29:08.397Z","__v":0},"lead":{"_id":"601be8be5e24bf0012d653b3","status":100,"lead_id":"acbc3f18-fc6b-41fc-a257-ce68f51f2551","fullname":"IndelishFinal ","id_project":"60113c4f9974d200191d90d3","createdBy":"system","tags":[],"createdAt":"2021-02-04T12:29:50.696Z","updatedAt":"2021-02-04T12:29:50.696Z","__v":0},"first_text":"Chineese","department":{"_id":"60113c4f9974d200191d90d5","routing":"assigned","default":true,"status":1,"name":"Default Department","id_project":"60113c4f9974d200191d90d3","createdBy":"60113ba19974d200191d868a","createdAt":"2021-01-27T10:11:27.117Z","updatedAt":"2021-02-04T08:27:04.354Z","__v":0,"id_bot":"601baf4d9974d20019469ea8","id_group":null,"bot":{"type":"internal","_id":"601baf4d9974d20019469ea8","name":"Bot2","description":"HI,IM","id_project":"60113c4f9974d200191d90d3","trashed":false,"createdBy":"60113ba19974d200191d868a","createdAt":"2021-02-04T08:24:45.137Z","updatedAt":"2021-02-04T08:24:45.137Z","__v":0}},"agents":[{"user_available":false,"number_assigned_requests":4,"last_login_at":"2021-01-21T20:57:22.057Z","status":"active","_id":"601308d89974d2001925e57e","id_project":"60113c4f9974d200191d90d3","id_user":"6012f23e9974d200192594cc","role":"agent","createdBy":"60113ba19974d200191d868a","createdAt":"2021-01-28T18:56:24.213Z","updatedAt":"2021-01-28T18:56:24.213Z","__v":0,"max_assigned_chat":-1},{"user_available":false,"number_assigned_requests":12,"last_login_at":"2021-01-21T20:57:22.057Z","status":"active","_id":"60113c4f9974d200191d90d4","id_project":"60113c4f9974d200191d90d3","id_user":"60113ba19974d200191d868a","role":"owner","createdBy":"60113ba19974d200191d868a","createdAt":"2021-01-27T10:11:27.110Z","updatedAt":"2021-01-27T10:11:27.110Z","__v":0,"presence":{"status":"online","changedAt":"2021-02-04T12:21:50.878Z"},"max_assigned_chat":-1}],"assigned_at":"2021-02-04T12:29:50.732Z","id_project":"60113c4f9974d200191d90d3","createdBy":"acbc3f18-fc6b-41fc-a257-ce68f51f2551","channel":{"name":"chat21"},"tags":[],"notes":[],"channelOutbound":{"name":"chat21"},"createdAt":"2021-02-04T12:29:50.739Z","updatedAt":"2021-02-04T12:29:50.739Z","__v":0,"participatingAgents":[],"participatingBots":[{"_id":"601baf4d9974d20019469ea8","type":"internal","name":"Bot2","description":"HI,IM","id_project":"60113c4f9974d200191d90d3","trashed":false,"createdBy":"60113ba19974d200191d868a","createdAt":"2021-02-04T08:24:45.137Z","updatedAt":"2021-02-04T08:24:45.137Z","__v":0}]}}},"id_project":"60113c4f9974d200191d90d3","createdBy":"system","createdAt":"2021-02-04T12:29:51.074Z","updatedAt":"2021-02-04T12:29:51.074Z","__v":0,"id":"601be8bf5e24bf0012d653be"}
 
                             var attr = botAns.attributes;                            
                             if (!attr) {

package/services/faqService.js

@@ -8,7 +8,7 @@ const ActionsConstants = require('../models/actionsConstants');
 class FaqService {
 
 
-  create(name, url, projectid, user_id, type, description, webhook_url, webhook_enabled, language, template) {
+  create(name, url, projectid, user_id, type, description, webhook_url, webhook_enabled, language, template, mainCategory, intentsEngine) {
     var that = this;
     return new Promise(function (resolve, reject) {
 
@@ -22,6 +22,10 @@ class FaqService {
           webhook_enabled: webhook_enabled,
           type: type,
           language: language,
+          public: false,
+          certified: false,
+          mainCategory: mainCategory,
+          intentsEngine: intentsEngine,
           trashed: false,
           createdBy: user_id,
           updatedBy: user_id
@@ -39,10 +43,10 @@ class FaqService {
           
           winston.debug('type '+ type)      
 
-          if (type==="internal") {      
+          if (type==="internal" || type==="tilebot") {      
             
             if (!template) {
-              template = "example";
+              template = "empty";
             }
             winston.debug('template '+ template);
             that.createGreetingsAndOperationalsFaqs(savedFaq_kb._id, savedFaq_kb.createdBy, savedFaq_kb.id_project, template);
@@ -63,6 +67,7 @@ class FaqService {
 
       // aggiungi esempio tdAction con intent_id
 
+      // TODO non scatta i trigger sui rest hook. fare?
       winston.debug('template: '+ template);
 
       var faqsArray;
@@ -113,6 +118,10 @@ class FaqService {
         ]
 
       }
+
+      if (template === "empty") {
+        faqsArray = [];
+      }
       
       
       faqsArray.forEach(faq => {
@@ -121,6 +130,7 @@ class FaqService {
           id_faq_kb: faq_kb_id,
           question: faq.question,
           answer: faq.answer,
+          reply: faq.reply,
           intent_display_name: faq.intent_display_name,
           language: "en",
           id_project: projectid,
@@ -144,6 +154,21 @@ class FaqService {
     });
   }
 
+  getAll(faq_kb_id) {
+
+    winston.debug("(Service) GET ALL FAQ OF THE BOT ID (req.query): ", faq_kb_id);
+
+    return new Promise((resolve, reject) => {
+      
+      Faq.find({ id_faq_kb: faq_kb_id}, (err, faqs) => {
+        if (err) {
+          reject(err);
+        }
+        resolve(faqs);
+      }).lean().exec()
+    })
+  }
+
 
 }
 

package/services/geoService.js

@@ -8,6 +8,13 @@ var geoip = require('geoip-lite');
 
 class GeoService {
 
+    constructor() {
+        this.enabled = true;
+        if (process.env.GEO_SERVICE_ENABLED=="false" || process.env.GEO_SERVICE_ENABLED==false) {
+            this.enabled = false;
+        }
+        winston.debug("GeoService this.enabled: "+ this.enabled);
+    }
 
 
   // https://medium.com/@rossbulat/node-js-client-ip-location-with-geoip-lite-fallback-c25833c94a76
@@ -16,7 +23,12 @@ class GeoService {
 
   listen() {
     
-    winston.info("GeoService listener started");
+    if (this.enabled==true) {
+        winston.info("GeoService listener started");
+    } else {
+        return winston.info("GeoService listener disabled");
+    }
+    
 
 
  
@@ -36,15 +48,25 @@ class GeoService {
   //     area: 200 }
 
 
-  requestEvent.on('request.create', function(request) {
 
-    winston.debug("request", request.toObject());
+  var requestCreateKey = 'request.create';
+  if (requestEvent.queueEnabled) {
+    requestCreateKey = 'request.create.queue';
+  }
+  winston.debug('GeoService requestCreateKey: ' + requestCreateKey);
+
+
+  requestEvent.on(requestCreateKey, function(request) {
+
+    setImmediate(() => { 
+
+    winston.debug("request", request);
 
     var ip = (request.location && request.location.ipAddress) || (request.attributes && request.attributes.ipAddress);
     winston.debug("ip" + ip);
     if (ip) {
         var geo = geoip.lookup(ip);  
-        winston.verbose("Geo result", geo);
+        winston.debug("Geo result", geo);
 
         // var update = {};
         if (geo) {
@@ -106,7 +128,11 @@ class GeoService {
 
             winston.debug("geo request saving", request);
 
-            request.markModified('location');
+
+            if (request.markModified) {
+                request.markModified('location');
+            }
+            
             request.save(function(err, reqL) {            
             // return Request.findByIdAndUpdate("5fb297bd1d838b14607b3b62", update, { new: true, upsert: false }).exec( function(err, reqL) {                
                 if (err) {
@@ -114,11 +140,15 @@ class GeoService {
                 }
                 return winston.verbose("Saved location metadata for request with id " + request._id);
             }); 
+
+            //TODO AGGIORNA ANCHE LEAD e req.snapshot.lead?
+            // leggi ip da request e nn da attributes
                
         }
     }
     });
-  }
+    });
+}
 
 
 }

package/services/labelService.js

@@ -74,7 +74,7 @@ getAll(id_project) {
 
 
                 return Label.findOne(query).lean()
-                //@DISABLED_CACHE .cache(cacheUtil.longTTL, id_project+":labels:query:all")
+                //@DISABLED_CACHE .cache(cacheUtil.longTTL, id_project+":labels:query:all")  //label_cache
                 .exec(function (err, labels) {
                     if (err) {
                         winston.error('Label ROUTE - REQUEST FIND ERR ', err)

package/services/leadService.js

@@ -14,7 +14,7 @@ class LeadService {
     var that = this;
     return new Promise(function (resolve, reject) {
       return Lead.findOne({email: email, id_project: id_project})
-      //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, id_project+":leads:email:"+email)
+      //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, id_project+":leads:email:"+email)  //lead_cache
       .exec(function(err, lead)  {
           if (err) {
             return reject(err);
@@ -58,7 +58,7 @@ class LeadService {
     var that = this;
     return new Promise(function (resolve, reject) {
       return Lead.findOne({lead_id: lead_id, id_project: id_project})
-        //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, id_project+":leads:lead_id:"+lead_id)
+        //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, id_project+":leads:lead_id:"+lead_id) //lead_cache
         .exec(function(err, lead)  {
           if (err) {
             winston.error("Error createIfNotExistsWithLeadId", err);
@@ -130,6 +130,7 @@ class LeadService {
         leadEvent.emit('lead.update', updatedLead);
         leadEvent.emit('lead.email.update', updatedLead);
         leadEvent.emit('lead.fullname.update', updatedLead);
+        leadEvent.emit('lead.fullname.email.update', updatedLead);
         return resolve(updatedLead);
       });
     });

package/services/messageService.js

@@ -17,7 +17,7 @@ class MessageService {
        if (!id) {
            return this.create(sender, senderFullname, recipient, text, id_project, createdBy, status, attributes, type, metadata, language);
        } else {
-            winston.debug("Message changeStatus", status);
+            winston.debug("Message upsert changeStatus:"+ status);
             return this.changeStatus(id, status);
        }
    }
@@ -173,7 +173,10 @@ class MessageService {
   }
 
 //   TODO must update also message.attributes from chat21
+// attento già scatta su chat21handler
+
   changeStatus(message_id, newstatus) {
+    winston.debug("changeStatus. "+message_id + " "+ newstatus);
     var that = this;
     return new Promise(function (resolve, reject) {
      // winston.debug("request_id", request_id);
@@ -188,7 +191,6 @@ class MessageService {
            // winston.debug("updatedMessage", updatedMessage);
 
            that.emitMessage(updatedMessage);
-
             return resolve(updatedMessage);
           });
     });