@tiledesk/tiledesk-server 2.3.28 → 2.3.30

package/test/messageRoute.js

@@ -112,13 +112,14 @@ describe('MessageRoute', () => {
             .end(function(err, res) {
                 //console.log("res",  res);
                 console.log("res.body",  res.body);
-                res.should.have.status(500);                                
+                res.should.have.status(422);                                
           
                done();
             });
     });
   });
-});
+}).timeout(20000);
+
 
 
 
@@ -144,7 +145,7 @@ it('createSimpleNoText', function (done) {
           .end(function(err, res) {
               //console.log("res",  res);
               console.log("res.body",  res.body);
-              res.should.have.status(500);                                
+              res.should.have.status(422);                                
         
              done();
           });
@@ -789,6 +790,387 @@ it('createSimpleWithFollowers', function (done) {
 
 
 
+
+
+
+
+
+// mocha test/messageRoute.js  --grep 'createMultiTextNoSender1'
+
+it('createMultiTextNoSender1', function (done) {
+
+  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-createMultiText", savedUser._id).then(function(savedProjectAndPU) {
+   
+    var savedProject = savedProjectAndPU.project;
+
+
+    chai.request(server)
+    .post('/'+ savedProject._id + '/requests')
+    .auth(email, pwd)
+    .set('content-type', 'application/json')
+    .send({"first_text":"first_text"})
+    .end(function(err, res) {
+
+      console.log("res.body",  res.body);
+      res.should.have.status(200);
+      res.body.should.be.a('object');
+      res.body.should.have.property('first_text').eql('first_text');
+
+      var request_id = res.body.request_id;
+      console.log("request_id",request_id);
+
+        chai.request(server)
+          .post('/'+ savedProject._id + '/requests/'+request_id+'/messages/multi')
+          .auth(email, pwd)
+          .set('content-type', 'application/json')
+          .send([{"text":"text1"}, {"text":"text2"}])
+          .end(function(err, res) {
+              //console.log("res",  res);
+              console.log("res.body",  res.body);
+              res.should.have.status(200);
+              res.body.should.be.a('array');                          
+
+              expect(res.body[0].sender).to.equal(savedUser._id.toString());
+              expect(res.body[0].senderFullname).to.equal("Test Firstname Test lastname");
+              expect(res.body[0].recipient).to.equal(request_id);
+              expect(res.body[0].text).to.equal("text1");
+              expect(res.body[0].id_project).to.equal(savedProject._id.toString());
+              expect(res.body[0].createdBy).to.equal(savedUser._id.toString());
+              expect(res.body[0].status).to.equal(0);            
+              expect(res.body[0].channel_type).to.equal("group");
+              expect(res.body[0].channel.name).to.equal("chat21");             
+        
+
+
+              expect(res.body[1].sender).to.equal(savedUser._id.toString());
+              expect(res.body[0].senderFullname).to.equal("Test Firstname Test lastname");
+              expect(res.body[1].recipient).to.equal(request_id);
+              expect(res.body[1].text).to.equal("text2");
+              expect(res.body[1].id_project).to.equal(savedProject._id.toString());
+              expect(res.body[1].createdBy).to.equal(savedUser._id.toString());
+              expect(res.body[1].status).to.equal(0);            
+              expect(res.body[1].channel_type).to.equal("group");
+              expect(res.body[1].channel.name).to.equal("chat21");             
+
+             done();
+          });
+        });
+  });
+});
+});
+
+
+
+
+
+// mocha test/messageRoute.js  --grep 'createMultiTextNoSenderNoText'
+
+it('createMultiTextNoSenderNoText', function (done) {
+
+  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-createMultiText", savedUser._id).then(function(savedProjectAndPU) {
+   
+    var savedProject = savedProjectAndPU.project;
+
+
+    chai.request(server)
+    .post('/'+ savedProject._id + '/requests')
+    .auth(email, pwd)
+    .set('content-type', 'application/json')
+    .send({"first_text":"first_text"})
+    .end(function(err, res) {
+
+      console.log("res.body",  res.body);
+      res.should.have.status(200);
+      res.body.should.be.a('object');
+      res.body.should.have.property('first_text').eql('first_text');
+
+      var request_id = res.body.request_id;
+      console.log("request_id",request_id);
+
+        chai.request(server)
+          .post('/'+ savedProject._id + '/requests/'+request_id+'/messages/multi')
+          .auth(email, pwd)
+          .set('content-type', 'application/json')
+          .send([{}, {"text":"text2"}])
+          .end(function(err, res) {
+              //console.log("res",  res);
+              console.log("res.body",  res.body);
+              res.should.have.status(500);
+              
+             done();
+          });
+        });
+  });
+});
+});
+
+
+
+
+
+// mocha test/messageRoute.js  --grep 'createMultiTextWithSender'
+
+it('createMultiTextWithSender', function (done) {
+
+  var email = "test-message-create-" + Date.now() + "@email.com";
+  var pwd = "pwd";
+
+  userService.signup( email ,pwd, "Test Firstname", "Test lastname").then(function(savedUser) {
+
+    var email2 = "test-message-createwithsender22-" + Date.now() + "@email.com";
+    var pwd2 = "pwd";
+  
+    userService.signup( email2 ,pwd2, "Test Firstname22", "Test lastname22").then(function(savedUser2) {
+                 
+
+   projectService.createAndReturnProjectAndProjectUser("message-createMultiText", savedUser._id).then(function(savedProjectAndPU) {
+   
+    var savedProject = savedProjectAndPU.project;
+
+
+
+    var pu2 = new Project_user({
+      // _id: new mongoose.Types.ObjectId(),
+      id_project: savedProject._id,
+      id_user: savedUser2._id,
+      role: roleConstants.USER,
+      user_available: true,
+      createdBy: savedUser2._id,
+      updatedBy: savedUser2._id,
+    });
+    pu2.save(function (err, savedProject_user2) {
+
+
+    chai.request(server)
+    .post('/'+ savedProject._id + '/requests')
+    .auth(email, pwd)
+    .set('content-type', 'application/json')
+    .send({"first_text":"first_text"})
+    .end(function(err, res) {
+
+      console.log("res.body",  res.body);
+      res.should.have.status(200);
+      res.body.should.be.a('object');
+
+      res.body.should.have.property('first_text').eql('first_text');
+
+      var request_id = res.body.request_id;
+      console.log("request_id",request_id);
+
+        chai.request(server)
+          .post('/'+ savedProject._id + '/requests/'+request_id+'/messages/multi')
+          .auth(email, pwd)
+          .set('content-type', 'application/json')
+          .send([{"sender":savedUser2._id,"text":"text1"}, {"sender":savedUser2._id,"text":"text2"}])
+          .end(function(err, res) {
+              //console.log("res",  res);
+              console.log("res.body",  res.body);
+              res.should.have.status(200);
+              res.body.should.be.a('array');                          
+
+              expect(res.body[0].sender).to.equal(savedUser2._id.toString());
+              expect(res.body[0].senderFullname).to.equal("Test Firstname Test lastname");
+              expect(res.body[0].recipient).to.equal(request_id);
+              expect(res.body[0].text).to.equal("text1");
+              expect(res.body[0].id_project).to.equal(savedProject._id.toString());
+              expect(res.body[0].createdBy).to.equal(savedUser2._id.toString());
+              expect(res.body[0].status).to.equal(0);
+              expect(res.body[0].channel_type).to.equal("group");
+              expect(res.body[0].channel.name).to.equal("chat21");    
+              
+              
+
+              expect(res.body[1].sender).to.equal(savedUser2._id.toString());
+              expect(res.body[1].senderFullname).to.equal("Test Firstname Test lastname");
+              expect(res.body[1].recipient).to.equal(request_id);
+              expect(res.body[1].text).to.equal("text2");
+              expect(res.body[1].id_project).to.equal(savedProject._id.toString());
+              expect(res.body[1].createdBy).to.equal(savedUser2._id.toString());
+              expect(res.body[1].status).to.equal(0);
+              expect(res.body[1].channel_type).to.equal("group");
+              expect(res.body[1].channel.name).to.equal("chat21");    
+        
+             done();
+          });
+        });
+  });
+});
+});
+  });
+});
+
+
+
+
+
+
+
+
+
+// mocha test/messageRoute.js  --grep 'createMultiTextWithHardcodedSender'
+
+it('createMultiTextWithHardcodedSender', function (done) {
+
+  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-createMultiTextWithHardcodedSender", savedUser._id).then(function(savedProjectAndPU) {
+   
+    var savedProject = savedProjectAndPU.project;
+
+    chai.request(server)
+    .post('/'+ savedProject._id + '/requests')
+    .auth(email, pwd)
+    .set('content-type', 'application/json')
+    .send({"first_text":"first_text"})
+    .end(function(err, res) {
+
+      console.log("res.body",  res.body);
+      res.should.have.status(200);
+      res.body.should.be.a('object');
+
+      res.body.should.have.property('first_text').eql('first_text');
+
+      var request_id = res.body.request_id;
+      console.log("request_id",request_id);
+
+        chai.request(server)
+          .post('/'+ savedProject._id + '/requests/'+request_id+'/messages/multi')
+          .auth(email, pwd)
+          .set('content-type', 'application/json')
+          .send([{"sender":"andrealeo","text":"text1"}, {"sender":"rocco","text":"text2"}])
+          .end(function(err, res) {
+              //console.log("res",  res);
+              console.log("res.body",  res.body);
+              res.should.have.status(200);
+              res.body.should.be.a('array');                          
+
+              expect(res.body[0].sender).to.equal("andrealeo");
+              expect(res.body[0].senderFullname).to.equal("Test Firstname Test lastname");
+              expect(res.body[0].recipient).to.equal(request_id);
+              expect(res.body[0].text).to.equal("text1");
+              expect(res.body[0].id_project).to.equal(savedProject._id.toString());
+              expect(res.body[0].createdBy).to.equal("andrealeo");
+              expect(res.body[0].status).to.equal(0);
+              expect(res.body[0].channel_type).to.equal("group");
+              expect(res.body[0].channel.name).to.equal("chat21");    
+              
+              
+
+              expect(res.body[1].sender).to.equal("rocco");
+              expect(res.body[1].senderFullname).to.equal("Test Firstname Test lastname");
+              expect(res.body[1].recipient).to.equal(request_id);
+              expect(res.body[1].text).to.equal("text2");
+              expect(res.body[1].id_project).to.equal(savedProject._id.toString());
+              expect(res.body[1].createdBy).to.equal("rocco");
+              expect(res.body[1].status).to.equal(0);
+              expect(res.body[1].channel_type).to.equal("group");
+              expect(res.body[1].channel.name).to.equal("chat21");    
+        
+             done();
+          });
+    });
+});
+});
+});
+
+
+
+
+
+
+
+// mocha test/messageRoute.js  --grep 'createMultiTextWithHardcodedSenderAndSenderFullname'
+
+it('createMultiTextWithHardcodedSenderAndSenderFullname', function (done) {
+
+  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-createMultiTextWithHardcodedSenderAndSenderFullname", savedUser._id).then(function(savedProjectAndPU) {
+   
+    var savedProject = savedProjectAndPU.project;
+
+    chai.request(server)
+    .post('/'+ savedProject._id + '/requests')
+    .auth(email, pwd)
+    .set('content-type', 'application/json')
+    .send({"first_text":"first_text"})
+    .end(function(err, res) {
+
+      console.log("res.body",  res.body);
+      res.should.have.status(200);
+      res.body.should.be.a('object');
+
+      res.body.should.have.property('first_text').eql('first_text');
+
+      var request_id = res.body.request_id;
+      console.log("request_id",request_id);
+
+        chai.request(server)
+          .post('/'+ savedProject._id + '/requests/'+request_id+'/messages/multi')
+          .auth(email, pwd)
+          .set('content-type', 'application/json')
+          .send([{"sender":"andrealeo", "senderFullname":"Andrea","text":"text1"}, {"sender":"rocco", "senderFullname":"Rocco", "text":"text2"}])
+          .end(function(err, res) {
+              //console.log("res",  res);
+              console.log("res.body",  res.body);
+              res.should.have.status(200);
+              res.body.should.be.a('array');                          
+
+              expect(res.body[0].sender).to.equal("andrealeo");
+              expect(res.body[0].senderFullname).to.equal("Andrea");
+              expect(res.body[0].recipient).to.equal(request_id);
+              expect(res.body[0].text).to.equal("text1");
+              expect(res.body[0].id_project).to.equal(savedProject._id.toString());
+              expect(res.body[0].createdBy).to.equal("andrealeo");
+              expect(res.body[0].status).to.equal(0);
+              expect(res.body[0].channel_type).to.equal("group");
+              expect(res.body[0].channel.name).to.equal("chat21");    
+              
+              
+
+              expect(res.body[1].sender).to.equal("rocco");
+              expect(res.body[1].senderFullname).to.equal("Rocco");
+              expect(res.body[1].recipient).to.equal(request_id);
+              expect(res.body[1].text).to.equal("text2");
+              expect(res.body[1].id_project).to.equal(savedProject._id.toString());
+              expect(res.body[1].createdBy).to.equal("rocco");
+              expect(res.body[1].status).to.equal(0);
+              expect(res.body[1].channel_type).to.equal("group");
+              expect(res.body[1].channel.name).to.equal("chat21");    
+        
+             done();
+          });
+    });
+});
+});
+});
+
+
+
+
+
+
+
 it('getall', function (done) {
   // this.timeout(10000);
 

package/test-int/cache-project.js

@@ -0,0 +1,90 @@
+
+process.env.NODE_ENV = 'test';
+
+
+//Require the dev-dependencies
+let chai = require('chai');
+let chaiHttp = require('chai-http');
+let server = require('../app');
+var projectService = require('../services/projectService');
+var userService = require('../services/userService');
+let should = chai.should();
+var Project_user = require("../models/project_user");
+
+var expect = chai.expect;
+var assert = chai.assert;
+
+//server client
+var express = require('express');
+const bodyParser = require('body-parser');
+
+//end server client
+
+chai.use(chaiHttp);
+
+describe('Cache', () => {
+
+    if (process.env.CACHE_ENABLED == "true") {
+    
+    }else {
+        console.log("Cache disabled");
+        expect(true).to.equal(false); 
+    }
+  describe('/project', () => {
+ 
+   
+    // mocha test-int/bot.js  --grep 'createSimpleExatMatch'
+    it('getProject', (done) => {
+       
+        var email = "test-bot-" + Date.now() + "@email.com";
+        var pwd = "pwd";
+ 
+       
+
+         userService.signup( email ,pwd, "Test Firstname", "Test lastname").then(function(savedUser) {
+             projectService.create("test-getProject", savedUser._id).then(function(savedProject) {    
+               
+                                        chai.request(server)
+                                        .get('/projects/'+ savedProject._id + '/')
+                                        .auth(email, pwd)
+                                        .set('content-type', 'application/json')
+                                        .send()
+                                        .end((err, res) => {
+                                            console.log("res.body",  JSON.stringify(res.body));
+                                            // console.dir("res.body 1",  res.body);
+                                            console.log("res.headers",  res.headers);
+                                            res.should.have.status(200);
+                                            res.body.should.be.a('object');
+                                            expect(res.body.name).to.equal("test-getProject"); 
+                                            expect(res.body.status).to.equal(100); 
+                                            expect(res.body.isActiveSubscription).to.equal(false); 
+                                            expect(res.body.trialDaysLeft).to.equal(-30); 
+                                            expect(res.body.trialExpired).to.equal(false); 
+                                            
+                                           
+                                        chai.request(server)
+                                        .get('/projects/'+ savedProject._id + '/')
+                                        .auth(email, pwd)
+                                        .set('content-type', 'application/json')        //from cache
+                                        .send()
+                                        .end((err, res) => {
+                                            console.log("res.body",  JSON.stringify(res.body));
+                                            // console.dir("res.body 1",  res.body);
+                                            console.log("res.headers",  res.headers);
+                                            res.should.have.status(200);
+                                            res.body.should.be.a('object');
+                                            expect(res.body.name).to.equal("test-getProject"); 
+                                            expect(res.body.status).to.equal(100); 
+                                            expect(res.body.isActiveSubscription).to.equal(false); 
+                                            expect(res.body.trialDaysLeft).to.equal(-30); 
+                                            expect(res.body.trialExpired).to.equal(false); 
+                                            done()
+                                        });
+            });
+        });
+        });
+
+    });
+  });
+
+});

package/test-int/cache-project_user.js

@@ -0,0 +1,88 @@
+
+process.env.NODE_ENV = 'test';
+
+
+//Require the dev-dependencies
+let chai = require('chai');
+let chaiHttp = require('chai-http');
+let server = require('../app');
+var projectService = require('../services/projectService');
+var userService = require('../services/userService');
+let should = chai.should();
+var Project_user = require("../models/project_user");
+
+var expect = chai.expect;
+var assert = chai.assert;
+
+//server client
+var express = require('express');
+const bodyParser = require('body-parser');
+
+//end server client
+
+chai.use(chaiHttp);
+
+describe('Cache', () => {
+
+  if (process.env.CACHE_ENABLED == "true") {
+    
+  }else {
+      console.log("Cache disabled");
+      expect(true).to.equal(false); 
+  }
+  
+  describe('/project_user', () => {
+ 
+   
+    // mocha test-int/bot.js  --grep 'createSimpleExatMatch'
+    it('getCurrentProjectUser', (done) => {
+       
+        var email = "test-bot-" + Date.now() + "@email.com";
+        var pwd = "pwd";
+ 
+       
+
+         userService.signup( email ,pwd, "Test Firstname", "Test lastname").then(function(savedUser) {
+             projectService.create("test-getCurrentProjectUser", savedUser._id).then(function(savedProject) {    
+               
+                                        chai.request(server)
+                                        .get('/'+ savedProject._id + '/project_users_test/test')
+                                        .auth(email, pwd)
+                                        .set('content-type', 'application/json')
+                                        .send()
+                                        .end((err, res) => {
+                                            console.log("res.body",  JSON.stringify(res.body));
+                                            // console.dir("res.body 1",  res.body);
+                                            console.log("res.headers",  res.headers);
+                                            res.should.have.status(200);
+                                            res.body.should.be.a('object');
+                                            expect(res.body.role).to.equal("owner"); 
+                                            expect(res.body.isAuthenticated).to.equal(true); 
+                                            expect(res.body.id_project).to.equal(savedProject._id.toString()); 
+                                            
+                                           
+                                        chai.request(server)
+                                        .get('/'+ savedProject._id + '/project_users_test/test')
+                                        .auth(email, pwd)
+                                        .set('content-type', 'application/json')        //from cache
+                                        .send()
+                                        .end((err, res) => {
+                                            console.log("res.body",  JSON.stringify(res.body));
+                                            // console.dir("res.body 1",  res.body);
+                                            console.log("res.headers",  res.headers);
+                                            res.should.have.status(200);
+                                            res.body.should.be.a('object');
+                                            expect(res.body.role).to.equal("owner"); 
+                                            expect(res.body.isAuthenticated).to.equal(true); 
+                                            expect(res.body.id_project).to.equal(savedProject._id.toString()); 
+                                            
+                                            done()
+                                        });
+            });
+        });
+        });
+
+    });
+  });
+
+});

package/utils/promiseUtil.js

@@ -0,0 +1,31 @@
+class PromiseUtil {
+
+  async doAllSequentually(promises) {
+    // return new Promise(async function (resolve, reject) {         
+    // console.log("promises",promises);
+    var values = [];
+    for (let i=0; i < promises.length; i++) {
+        // console.log("promises[i]",promises[i]);
+
+    //   const val = await 
+      var value = await promises[i]
+    //   .then(function(value) {
+    //     console.log("done promises[i]",value);
+    //     values.push(value);
+    //     console.log("values before",values);
+    //   });
+        values.push(value);
+    };
+
+    console.log("values",values);
+    // return resolve(values);
+    
+    // });
+    return values;
+  }
+}
+
+var promiseUtil = new PromiseUtil();
+
+
+module.exports = promiseUtil;

package/utils/sendMessageUtil.js

@@ -30,7 +30,7 @@ async send(sender, senderFullname, recipient, text, id_project, createdBy, attri
         } else {
             winston.debug("user id: "+sender);
             var user = await User.findById(sender)
-              //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, "users:id:"+sender)
+              //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, "users:id:"+sender)     //user_cache
               .exec()   
             winston.debug("user", user);        
             senderFullname = user.fullName;