@tiledesk/tiledesk-server 2.1.4-0.23 → 2.1.4-0.31

package/models/faq_kb.js

@@ -53,6 +53,11 @@ var Faq_kbSchema = new Schema({
     default: uuidv4(),
     select: false
   },
+  language: {
+    type: String,
+    required: false,
+    // index: true
+  },
   attributes: {
     type: Object,
   },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.1.40.23",
+  "version": "2.1.40.31",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -44,7 +44,7 @@
     "@tiledesk-ent/tiledesk-server-tags": "^1.1.1",
     "@tiledesk-ent/tiledesk-server-groups": "^1.1.2",
     "@tiledesk-ent/tiledesk-server-departments": "^1.1.2",
-    "@tiledesk-ent/tiledesk-server-mt": "^1.1.5",
+    "@tiledesk-ent/tiledesk-server-mt": "^1.1.6",
     "@tiledesk-ent/tiledesk-server-visitorcounter": "^1.1.1"
   },
   "dependencies": {

package/pubmodules/emailNotification/requestNotification.js

@@ -81,7 +81,7 @@ listen() {
 
      requestEvent.on(requestParticipantsUpdateKey, function(data) {
 
-      winston.info("requestEvent request.participants.update");
+      winston.debug("requestEvent request.participants.update");
 
       var request = data.request;
       
@@ -312,7 +312,7 @@ sendAgentEmail(projectid, savedRequest) {
             return winston.verbose("RequestNotification email notification for the project with id : " + projectid + " for all the conversations is blocked");
           }
 
-          winston.info("savedRequest: " + JSON.stringify(savedRequest));
+          winston.debug("savedRequest: " + JSON.stringify(savedRequest));
 
               // TODO fare il controllo anche sul dipartimento con modalità assigned o pooled
                  if (savedRequest.status==RequestConstants.UNASSIGNED) { //POOLED
@@ -338,9 +338,9 @@ sendAgentEmail(projectid, savedRequest) {
 
                   // agents già c'è in quanto viene creato con departmentService.getOperator nella request.create ma nn c'è per request.participants.update
                       snapshotAgents = await Request.findById(savedRequest.id).select({"snapshot":1}).exec();
-                      winston.info('load snapshotAgents with Request.findById ');                              
+                      winston.debug('load snapshotAgents with Request.findById ');                              
                   }
-                  winston.info('snapshotAgents', snapshotAgents);                              
+                  winston.debug('snapshotAgents', snapshotAgents);                              
 
                   if (!snapshotAgents.snapshot.agents) {
                     return winston.warn("RequestNotification snapshotAgents.snapshot.agents is null :(. You are closing an old request?", savedRequest);

package/pubmodules/pubModulesManager.js

@@ -167,7 +167,7 @@ class PubModulesManager {
         if (this.messageTransformer) {
             try {
                 this.messageTransformer.messageTransformerInterceptor.listen();
-                this.messageTransformer.microLanguageTransformerInterceptor.listen();    
+                // this.messageTransformer.microLanguageTransformerInterceptor.listen();    
                 winston.info("PubModulesManager messageTransformer started.");   
             } catch(err) {        
                 winston.info("PubModulesManager error starting messageTransformer module", err);            

package/pubmodules/rules/conciergeBot.js

@@ -43,7 +43,10 @@ devi mandare un messaggio welcome tu altrimenti il bot inserito successivamente
                 // winston.debug(" ConciergeBot message.request.first_text: "+message.request.first_text);
 
                 // lead_id used. Change it?
-                if (message.request && message.request.preflight === true  && message.sender == message.request.lead.lead_id && message.text != message.request.first_text ) {
+                
+                if (message.request && message.request.preflight === true  && message.sender == message.request.lead.lead_id && message.text != message.request.first_text) {
+                    winston.debug("conciergebot: " + message.request.first_text );
+                // if (message.request && message.request.preflight === true  && message.sender == message.request.lead.lead_id && message.text != message.request.first_text ) {
                     // if (message.request.status < 100 && message.sender == message.request.lead.lead_id && message.text != message.request.first_text ) {
                     // if (message.request.status < 100 && message.sender == message.request.lead.lead_id && message.text != message.request.first_text && !botId) {
                 
@@ -64,13 +67,17 @@ devi mandare un messaggio welcome tu altrimenti il bot inserito successivamente
 
 
                         requestService.changeFirstTextAndPreflightByRequestId(message.request.request_id, message.request.id_project, first_text, false).then(function (reqChanged) {
-                        
-                            // requestService.changeFirstTextByRequestId(message.request.request_id, message.request.id_project, message.text).then(function (reqChanged) {
-                            // requestService.changePreflightByRequestId(message.request.request_id, message.request.id_project, false).then(function (reqChanged) {
-
-
-                                // reroute(request_id, id_project, nobot)
-                                requestService.reroute(message.request.request_id, message.request.id_project, false );     
+                        //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) { 
+                                    //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)
+                                    requestService.reroute(message.request.request_id, message.request.id_project, false );     
+                                }
+                                
                                 // updateStatusWitId(lead_id, id_project, status)
                                 // lead_id used. Change it?
                                 leadService.updateStatusWitId(message.request.lead.lead_id, message.request.id_project, LeadConstants.NORMAL);
@@ -242,58 +249,58 @@ devi mandare un messaggio welcome tu altrimenti il bot inserito successivamente
 
 
     // unused
-    welcomeOnJoin(request) {
-        var botId = BotFromParticipant.getBotFromParticipants(request.participants);
-        if (!botId) {                        
-        // if (!request.department.id_bot) {
+    // welcomeOnJoin(request) {
+    //     var botId = BotFromParticipant.getBotFromParticipants(request.participants);
+    //     if (!botId) {                        
+    //     // if (!request.department.id_bot) {
             
-            winston.debug("ConciergeBot send welcome bot message");     
+    //         winston.debug("ConciergeBot send welcome bot message");     
           
-              // TODO if (request is assigned allora manda we are putting inn touch )
-            // controlla dopo reassing
-            if (request.status == RequestConstants.ASSIGNED) {
-                if (request.participants.length==0) {
-                    // if (request.availableAgents.length==0) {
+    //           // TODO if (request is assigned allora manda we are putting inn touch )
+    //         // controlla dopo reassing
+    //         if (request.status == RequestConstants.ASSIGNED) {
+    //             if (request.participants.length==0) {
+    //                 // if (request.availableAgents.length==0) {
                        
-                        // messageService.send(sender, senderFullname, recipient, text, id_project, createdBy, attributes, type);
-                        messageService.send(
-                            'system', 
-                            'Bot',                                     
-                            request.request_id,
-                            i8nUtil.getMessage("NO_AVAILABLE_OPERATOR_MESSAGE", request.language, MessageConstants.LABELS), 
-                            request.id_project,
-                            'system', 
-                            //{"updateconversation" : false, messagelabel: {key: "NO_AVAILABLE_OPERATOR_MESSAGE"}}
-                            {messagelabel: {key: "NO_AVAILABLE_OPERATOR_MESSAGE"}},
-                            undefined,
-                            request.language
+    //                     // messageService.send(sender, senderFullname, recipient, text, id_project, createdBy, attributes, type);
+    //                     messageService.send(
+    //                         'system', 
+    //                         'Bot',                                     
+    //                         request.request_id,
+    //                         i8nUtil.getMessage("NO_AVAILABLE_OPERATOR_MESSAGE", request.language, MessageConstants.LABELS), 
+    //                         request.id_project,
+    //                         'system', 
+    //                         //{"updateconversation" : false, messagelabel: {key: "NO_AVAILABLE_OPERATOR_MESSAGE"}}
+    //                         {messagelabel: {key: "NO_AVAILABLE_OPERATOR_MESSAGE"}},
+    //                         undefined,
+    //                         request.language
                            
 
-                        );
+    //                     );
                     
                         
-                    }else {
+    //                 }else {
         
-                        messageService.send(
-                            'system', 
-                            'Bot',                                     
-                            request.request_id,
-                            i8nUtil.getMessage("JOIN_OPERATOR_MESSAGE", request.language, MessageConstants.LABELS), 
-                            request.id_project,
-                            'system', 
-                            {messagelabel: {key: "JOIN_OPERATOR_MESSAGE"}},
-                            // {"updateconversation" : false, messagelabel: {key: "JOIN_OPERATOR_MESSAGE"}}
-                            undefined,
-                            request.language
-
-                        );
+    //                     messageService.send(
+    //                         'system', 
+    //                         'Bot',                                     
+    //                         request.request_id,
+    //                         i8nUtil.getMessage("JOIN_OPERATOR_MESSAGE", request.language, MessageConstants.LABELS), 
+    //                         request.id_project,
+    //                         'system', 
+    //                         {messagelabel: {key: "JOIN_OPERATOR_MESSAGE"}},
+    //                         // {"updateconversation" : false, messagelabel: {key: "JOIN_OPERATOR_MESSAGE"}}
+    //                         undefined,
+    //                         request.language
+
+    //                     );
         
                        
-                    }
-            }
+    //                 }
+    //         }
             
-        } 
-    }
+    //     } 
+    // }
 
 
 

package/routes/faq_kb.js

@@ -58,8 +58,15 @@ router.post('/askbot', function (req, res) {
          }else {
           query = { "id_project": req.projectid, "id_faq_kb": req.body.id_faq_kb};
 
-          query.$text = {"$search": req.body.question};
-       
+          var search_obj = {"$search": req.body.question};
+
+          if (faq_kb.language) {
+              search_obj["$language"] = faq_kb.language;
+          }
+          query.$text = search_obj;
+          winston.info("fulltext search query", query);  
+
+
           winston.debug('internal ft query: '+ query);
     
            Faq.find(query,  {score: { $meta: "textScore" } })  

package/services/emailService.js

@@ -167,6 +167,15 @@ class EmailService {
 
     var that = this;
 
+     //if the request came from rabbit mq?
+     if (savedRequest.toJSON) {
+      savedRequest = savedRequest.toJSON();
+    }
+
+    if (project.toJSON) {
+      project = project.toJSON();
+    }
+
     this.readHTMLFile('assignedRequest.html', function(err, html) {
 
 
@@ -188,8 +197,8 @@ class EmailService {
 // Stampa anche contact.email
 
       var replacements = {        
-        savedRequest: savedRequest.toJSON(),
-        project: project.toJSON(),
+        savedRequest: savedRequest,
+        project: project,
         baseScope: baseScope    
       };
 
@@ -212,6 +221,15 @@ class EmailService {
 
     var that = this;
 
+    //if the request came from rabbit mq?
+    if (savedRequest.toJSON) {
+      savedRequest = savedRequest.toJSON();
+    }
+
+    if (project.toJSON) {
+      project = project.toJSON();
+    }
+
     this.readHTMLFile('pooledRequest.html', function(err, html) {
 
 
@@ -232,8 +250,8 @@ class EmailService {
 // passa anche tutti i messages in modo da stampare tutto
 // Stampa anche contact.email
       var replacements = {        
-        savedRequest: savedRequest.toJSON(),
-        project: project.toJSON(),
+        savedRequest: savedRequest,
+        project: project,
         baseScope: baseScope    
       };
 
@@ -251,6 +269,11 @@ class EmailService {
 
     var that = this;
 
+    //if the request came from rabbit mq?
+    if (project.toJSON) {
+      project = project.toJSON();
+    }
+
     this.readHTMLFile('newMessage.html', function(err, html) {
 
 
@@ -270,7 +293,7 @@ class EmailService {
 
       var replacements = {        
         message: message,
-        project: project.toJSON(),
+        project: project,
         tokenQueryString: tokenQueryString,
         baseScope: baseScope    
       };
@@ -468,6 +491,11 @@ class EmailService {
    
     var that = this;
 
+    if (savedUser.toJSON) {
+      savedUser = savedUser.toJSON();
+    }
+
+
     this.readHTMLFile('verify.html', function(err, html) {
 
 
@@ -487,7 +515,7 @@ class EmailService {
 
 
       var replacements = {        
-        savedUser: savedUser.toJSON(),      
+        savedUser: savedUser,      
         baseScope: baseScope    
       };
 
@@ -520,6 +548,12 @@ class EmailService {
       
     var that = this;
 
+
+     //if the request came from rabbit mq?
+     if (request.toJSON) {
+      request = request.toJSON();
+    }
+
     this.readHTMLFile('sendTranscript.html', function(err, html) {
 
 
@@ -540,7 +574,7 @@ class EmailService {
 
       var replacements = {        
         messages: messages,    
-        request: request.toJSON(),  
+        request: request,  
         formattedCreatedAt: request.createdAt.toLocaleString('en', { timeZone: 'UTC' }),
         transcriptAsHtml: transcriptAsHtml,
         baseScope: baseScope    

package/services/faqBotHandler.js

@@ -182,7 +182,14 @@ class FaqBotHandler {
                } else {
  
                 query = { "id_project": message.id_project, "id_faq_kb": faq_kb._id};
-                query.$text = {"$search": message.text};
+                
+                var search_obj = {"$search": message.text};
+
+                if (faq_kb.language) {
+                    search_obj["$language"] = faq_kb.language;
+                }
+                query.$text = search_obj;
+                winston.verbose("fulltext search query", query); 
             
                 Faq.find(query,  {score: { $meta: "textScore" } })  
                 .sort( { score: { $meta: "textScore" } } ) //https://docs.mongodb.com/manual/reference/operator/query/text/#sort-by-text-search-score