@tiledesk/tiledesk-server 2.3.106 → 2.3.108

package/channels/chat21/chat21Handler.js

@@ -184,7 +184,6 @@ class Chat21Handler {
 
 
     // quando passa da lead temp a default aggiorna tutti va bene?        
-
          leadEvent.on('lead.update', function(lead) {
             //  non sembra funzionare chiedi a Dario dove prende le info
             setImmediate(() => {
@@ -363,6 +362,7 @@ class Chat21Handler {
 
                                             chat21Event.emit('message.sent', data);
     
+                                                winston.debug("Message changeStatus 1");
                                                 messageService.changeStatus(message._id, MessageConstants.CHAT_MESSAGE_STATUS.DELIVERED) .then(function(upMessage){
                                                     winston.debug("Chat21 message sent ", upMessage.toObject());                                        
                                                 }).catch(function(err) {
@@ -398,7 +398,7 @@ class Chat21Handler {
                                         // chat21.conversations.stopTyping(message.recipient,message.sender);
 
                                         chat21Event.emit('message.sent', data);
-
+                                            winston.debug("Message changeStatus 2");
                                             messageService.changeStatus(message._id, MessageConstants.CHAT_MESSAGE_STATUS.DELIVERED) .then(function(upMessage){
                                                 winston.debug("Chat21 message sent ", upMessage.toObject());                                        
                                             }).catch(function(err) {
@@ -439,7 +439,7 @@ class Chat21Handler {
                                        // chat21.conversations.stopTyping(message.recipient,message.sender);
 
                                        chat21Event.emit('message.sent', data);
-
+                                       winston.debug("Message changeStatus 3");
                                            messageService.changeStatus(message._id, MessageConstants.CHAT_MESSAGE_STATUS.DELIVERED) .then(function(upMessage){
                                                winston.debug("Chat21 message sent ", upMessage.toObject());                                        
                                            }).catch(function(err) {
@@ -545,7 +545,11 @@ class Chat21Handler {
                         // let membersArray = JSON.parse(JSON.stringify(members));
                         // winston.info("membersArray", membersArray);
 
-                        var gAttributes = request.attributes || {};
+                        var gAttributes = requestObj.attributes || {};
+                        // TODO ATTENTION change value by reference
+                        // var gAttributes = request.attributes || {}; //BUG LINK TO event emmiter obiect
+
+
                         // problema requester_id
                         gAttributes["requester_id"] = request.requester_id;
                     
@@ -631,12 +635,12 @@ class Chat21Handler {
 
                         chat21.auth.setAdminToken(adminToken);                      
 
-                        winston.verbose("Chat21Sender archiving conversations for ",request.participants);
+                        winston.debug("Chat21Sender archiving conversations for ",request.participants);
 
                        //iterate request.participant and archive conversation
                        request.participants.forEach(function(participant,index) {
 
-                        winston.verbose("Chat21Sender archiving conversation: " + request.request_id + "for " + participant);
+                        winston.debug("Chat21Sender archiving conversation: " + request.request_id + "for " + participant);
 
                             chat21.conversations.archive(request.request_id, participant)
                                         .then(function(data){

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.3.106",
+  "version": "2.3.108",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -43,8 +43,8 @@
     "@tiledesk/tiledesk-json-rules-engine": "^4.0.3",
     "@tiledesk/tiledesk-kaleyra-proxy": "^0.1.7",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
-    "@tiledesk/tiledesk-tybot-connector": "^0.1.63",
-    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.38",
+    "@tiledesk/tiledesk-tybot-connector": "^0.1.65",
+    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.39",
     "amqplib": "^0.5.5",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",

package/routes/message.js

@@ -184,6 +184,8 @@ async (req, res)  => {
   
                 return requestService.create(new_request).then(function (savedRequest) {
 
+                  winston.debug("returning savedRequest to", savedRequest.toJSON());
+
                   // createWithIdAndRequester(request_id, project_user_id, lead_id, id_project, first_text, departmentid, sourcePage, language, userAgent, status, 
                   //  createdBy, attributes, subject, preflight, channel, location) {
                     
@@ -204,26 +206,41 @@ async (req, res)  => {
 
                           winston.debug("returning message to", message);
                           
-                          savedRequest
+                          winston.debug("returning savedRequest2210 to", savedRequest.toJSON());
+
+
+                          savedRequest //bug
+                          // Request.findById(savedRequest.id)
                             .populate('lead')
                             .populate('department')
                             .populate('participatingBots')
                             .populate('participatingAgents') 
                             // .populate('followers')  
                             .populate({path:'requester',populate:{path:'id_user'}})
-                            .execPopulate(function (err, savedRequestPopulated){    
+                            // .exec(function (err, savedRequestPopulated){    
+                              .execPopulate(function (err, savedRequestPopulated){   //bug with  execPopulate request.attributes are invalid (NOT real data). but this bug is related to chat21 listener changes by reference. i think populate suffer from this problem bacause it it the same obect passed by reference 
 
                             if (err) {
                               return winston.error("Error gettting savedRequestPopulated for send Message", err);
-                            }            
+                            }       
+                            
+                            winston.debug("returning savedRequest221 to", savedRequest.toJSON());
+
+
+                            winston.debug("savedRequestPopulated", savedRequestPopulated.toJSON());
+
+                            winston.debug("returning savedRequest22 to", savedRequest.toJSON());
+
 
                             message.request = savedRequestPopulated;
+                            winston.debug("returning2 message to", message);
 
 
                             return res.json(message);
                           });
                         });
                     }).catch(function(err){    //pubblica questo
+                      winston.error('Error creating request: '+ JSON.stringify(err));
                       winston.log({
                         level: 'error',
                         message: 'Error creating request: '+ JSON.stringify(err) + " " + JSON.stringify(req.body) ,

package/test/messageRoute.js

@@ -155,6 +155,75 @@ it('createSimpleNoText', function (done) {
 
 
 
+
+// mocha test/messageRoute.js  --grep 'createSimpleWithAttributes'
+
+it('createSimpleWithAttributes', function (done) {
+  // this.timeout(10000);
+
+  var email = "test-message-create-" + Date.now() + "@email.com";
+  var pwd = "pwd";
+
+  userService.signup( email ,pwd, "Test Firstname", "Test lastname").then(function(savedUser) {
+   projectService.createAndReturnProjectAndProjectUser("message-create", savedUser._id).then(function(savedProjectAndPU) {
+   
+    var savedProject = savedProjectAndPU.project;
+
+        chai.request(server)
+          .post('/'+ savedProject._id + '/requests/req123-createSimpleWithAttributes/messages')
+          .auth(email, pwd)
+          .set('content-type', 'application/json')
+          .send({"text":"text","attributes": {"a":"b"}})
+          .end(function(err, res) {
+              //console.log("res",  res);
+              console.log("res.body",  res.body);
+              res.should.have.status(200);
+              res.body.should.be.a('object');                          
+
+              expect(res.body.sender).to.equal(savedUser._id.toString());
+              // expect(res.body.sender).to.equal(savedProjectAndPU.project_user._id.toString());
+              // expect(res.body.senderFullname).to.equal("senderFullname");
+              expect(res.body.recipient).to.equal("req123-createSimpleWithAttributes");
+              expect(res.body.text).to.equal("text");
+              expect(res.body.id_project).to.equal(savedProject._id.toString());
+              expect(res.body.createdBy).to.equal(savedUser._id.toString());
+              expect(res.body.status).to.equal(0);
+              expect(res.body.attributes.a).to.equal("b");
+
+              expect(res.body.request.request_id).to.equal("req123-createSimpleWithAttributes");
+              expect(res.body.request.requester._id).to.equal(savedProjectAndPU.project_user._id.toString());
+              // expect(res.body.request.requester_id).to.equal("sender");
+              expect(res.body.request.first_text).to.equal("text");
+              expect(res.body.request.id_project).to.equal(savedProject._id.toString());
+              expect(res.body.request.createdBy).to.equal(savedUser._id.toString());
+
+              // expect(res.body.request.messages_count).to.equal(1);
+
+              expect(res.body.request.status).to.equal(200);                                
+              expect(res.body.request.snapshot.agents.length).to.equal(1);
+              expect(res.body.request.participants.length).to.equal(1);
+              expect(res.body.request.department).to.not.equal(null);
+              expect(res.body.request.lead).to.not.equal(null);               
+              
+              expect(res.body.request.attributes.a).to.equal("b");
+
+              expect(res.body.channel_type).to.equal("group");
+              expect(res.body.channel.name).to.equal("chat21");
+              expect(res.body.request.channel.name).to.equal("chat21");
+
+
+              expect(res.body.request.location).to.equal(undefined);
+             
+        
+             done();
+          });
+  });
+});
+});
+
+
+
+
 // mocha test/messageRoute.js  --grep 'createWithSender'
 
 it('createWithSender', function (done) {