@tiledesk/tiledesk-server 2.10.15 → 2.10.17

package/test/labelService.js

@@ -16,112 +16,105 @@ require('../services/mongoose-cache-fn')(mongoose);
 
 describe('labelService', function () {
 
-  
-
 
   it('getWithoutClonedLabel', function (done) {
     var userid = "5badfe5d553d1844ad654072";
 
-    projectService.create("test1", userid).then(function(savedProject) {
-    
+    projectService.create("test1", userid).then(function (savedProject) {
+
       // get(id_project, language, key) {
-     labelService.get(savedProject._id, "EN", "LABEL_PLACEHOLDER").then(function(label) {
-        
-         expect(label).to.equal("type your message..");
+      labelService.get(savedProject._id, "EN", "LABEL_PLACEHOLDER").then(function (label) {
+
+        expect(label).to.equal("type your message..");
 
         done();
-    }).catch(function(err) {
+      }).catch(function (err) {
         winston.error("test reject", err);
-        assert.isNotOk(err,'Promise error');
+        assert.isNotOk(err, 'Promise error');
         done();
+      });
     });
   });
-  });
-
 
 
   it('getITLanguageButNotPresentInProject', function (done) {
     var userid = "5badfe5d553d1844ad654072";
 
-    projectService.create("test1", userid).then(function(savedProject) {
-    
+    projectService.create("test1", userid).then(function (savedProject) {
+
       // get(id_project, language, key) {
-     labelService.get(savedProject._id, "IT", "LABEL_PLACEHOLDER").then(function(label) {
-        
-         expect(label).to.equal("type your message..");
+      labelService.get(savedProject._id, "IT", "LABEL_PLACEHOLDER").then(function (label) {
+
+        expect(label).to.equal("type your message..");
 
         done();
-    }).catch(function(err) {
+      }).catch(function (err) {
         winston.error("test reject", err);
-        assert.isNotOk(err,'Promise error');
+        assert.isNotOk(err, 'Promise error');
         done();
+      });
     });
   });
-  });
 
 
   it('getWrongLanguage', function (done) {
     var userid = "5badfe5d553d1844ad654072";
 
-    projectService.create("test1", userid).then(function(savedProject) {
-    
+    projectService.create("test1", userid).then(function (savedProject) {
+
       // get(id_project, language, key) {
-     labelService.get(savedProject._id, "OO", "LABEL_PLACEHOLDER").then(function(label) {
-        
-         expect(label).to.equal("type your message..");
+      labelService.get(savedProject._id, "OO", "LABEL_PLACEHOLDER").then(function (label) {
+
+        expect(label).to.equal("type your message..");
 
         done();
-    }).catch(function(err) {
+      }).catch(function (err) {
         winston.error("test reject", err);
-        assert.isNotOk(err,'Promise error');
+        assert.isNotOk(err, 'Promise error');
         done();
+      });
     });
   });
-  });
-
-
 
 
   it('getLanguage', function (done) {
     var userid = "5badfe5d553d1844ad654072";
 
-    projectService.create("test1", userid).then(function(savedProject) {
-    
+    projectService.create("test1", userid).then(function (savedProject) {
+
       // getLanguage(id_project, language) {
-     labelService.getLanguage(savedProject._id, "EN").then(function(labels) {
-  
-         expect(labels.data.LABEL_PLACEHOLDER).to.equal("type your message..");
+      labelService.getLanguage(savedProject._id, "EN").then(function (labels) {
+
+        expect(labels.data.LABEL_PLACEHOLDER).to.equal("type your message..");
 
         done();
-    }).catch(function(err) {
+      }).catch(function (err) {
         winston.error("test reject", err);
-        assert.isNotOk(err,'Promise error');
+        assert.isNotOk(err, 'Promise error');
         done();
+      });
     });
   });
-  });
-
-
 
 
   it('getLanguageWrongLang', function (done) {
     var userid = "5badfe5d553d1844ad654072";
 
-    projectService.create("test1", userid).then(function(savedProject) {
-    
+    projectService.create("test1", userid).then(function (savedProject) {
+
       // getLanguage(id_project, language) {
-     labelService.getLanguage(savedProject._id, "XX").then(function(labels) {
-  
-         expect(labels.data.LABEL_PLACEHOLDER).to.equal("type your message..");
+      labelService.getLanguage(savedProject._id, "XX").then(function (labels) {
+
+        expect(labels.data.LABEL_PLACEHOLDER).to.equal("type your message..");
 
         done();
-    }).catch(function(err) {
+      }).catch(function (err) {
         winston.error("test reject", err);
-        assert.isNotOk(err,'Promise error');
+        assert.isNotOk(err, 'Promise error');
         done();
+      });
     });
   });
-  });
 
 
 });

package/test/leadService.js

@@ -13,175 +13,160 @@ mongoose.connect(config.databasetest);
 var leadService = require('../services/leadService');
 var projectService = require("../services/projectService");
 
+let log = false;
+
 describe('LeadService()', function () {
 
   var userid = "5badfe5d553d1844ad654072";
 
-
   it('create', function (done) {
-    projectService.create("test1", userid).then(function(savedProject) {
-    // create(fullname, email, id_project, createdBy)
-    var attr = {myprop:123};
-     leadService.create("fullname", "email@email.com", savedProject._id, userid, attr).then(function(savedLead) {
+    projectService.create("test1", userid).then(function (savedProject) {
+      // create(fullname, email, id_project, createdBy)
+      var attr = { myprop: 123 };
+      leadService.create("fullname", "email@email.com", savedProject._id, userid, attr).then(function (savedLead) {
         winston.debug("resolve", savedLead.toObject());
-         expect(savedLead.fullname).to.equal("fullname");
-         expect(savedLead.email).to.equal("email@email.com");
-         expect(savedLead.id_project).to.equal(savedProject._id.toString());
-         expect(savedLead.lead_id).to.not.equal(null);
-         expect(savedLead.attributes).to.equal(attr);
-         expect(savedLead.attributes.myprop).to.equal(123);
+        expect(savedLead.fullname).to.equal("fullname");
+        expect(savedLead.email).to.equal("email@email.com");
+        expect(savedLead.id_project).to.equal(savedProject._id.toString());
+        expect(savedLead.lead_id).to.not.equal(null);
+        expect(savedLead.attributes).to.equal(attr);
+        expect(savedLead.attributes.myprop).to.equal(123);
 
         done();
-    }).catch(function(err) {
+      }).catch(function (err) {
         winston.error("test reject", err);
-        assert.isNotOk(err,'Promise error');
+        assert.isNotOk(err, 'Promise error');
         done();
+      });
     });
   });
-  });
-
-
 
 
   it('update', function (done) {
-    projectService.create("test1", userid).then(function(savedProject) {
-    // create(fullname, email, id_project, createdBy)
-    var attr = {myprop:123};
-     leadService.create("fullname", "email@email.com", savedProject._id, userid, attr).then(function(savedLead) {
+    projectService.create("test1", userid).then(function (savedProject) {
+      // create(fullname, email, id_project, createdBy)
+      var attr = { myprop: 123 };
+      leadService.create("fullname", "email@email.com", savedProject._id, userid, attr).then(function (savedLead) {
         winston.debug("resolve", savedLead.toObject());
-         expect(savedLead.fullname).to.equal("fullname");
-         expect(savedLead.email).to.equal("email@email.com");
-         expect(savedLead.id_project).to.equal(savedProject._id.toString());
-         expect(savedLead.lead_id).to.not.equal(null);
-         expect(savedLead.attributes).to.equal(attr);
-         expect(savedLead.attributes.myprop).to.equal(123);
+        expect(savedLead.fullname).to.equal("fullname");
+        expect(savedLead.email).to.equal("email@email.com");
+        expect(savedLead.id_project).to.equal(savedProject._id.toString());
+        expect(savedLead.lead_id).to.not.equal(null);
+        expect(savedLead.attributes).to.equal(attr);
+        expect(savedLead.attributes.myprop).to.equal(123);
 
         //  updateWitId(lead_id, fullname, email, id_project) {
 
-         leadService.updateWitId(savedLead.lead_id, "fullname2", "email2@email2.com", savedProject._id).then(function(updatedLead) {
+        leadService.updateWitId(savedLead.lead_id, "fullname2", "email2@email2.com", savedProject._id).then(function (updatedLead) {
 
           expect(updatedLead.fullname).to.equal("fullname2");
           expect(updatedLead.email).to.equal("email2@email2.com");
           expect(updatedLead.id_project).to.equal(savedProject._id.toString());
           expect(updatedLead.lead_id).to.not.equal(savedLead.id);
 
-            done();
-        }).catch(function(err) {
-            winston.error("test reject", err);
-            assert.isNotOk(err,'Promise error');
-            done();
+          done();
+        }).catch(function (err) {
+          winston.error("test reject", err);
+          assert.isNotOk(err, 'Promise error');
+          done();
         });
+      });
+    });
   });
-  });
-  });
-
-
 
 
   it('createWithoutEmail', function (done) {
-    projectService.create("test1", userid).then(function(savedProject) {
-    // create(fullname, email, id_project, createdBy)
-     leadService.create("fullname", null, savedProject._id, userid).then(function(savedLead) {
+    projectService.create("test1", userid).then(function (savedProject) {
+      // create(fullname, email, id_project, createdBy)
+      leadService.create("fullname", null, savedProject._id, userid).then(function (savedLead) {
         winston.debug("resolve", savedLead.toObject());
-         expect(savedLead.fullname).to.equal("fullname");
-         expect(savedLead.email).to.equal(null);
-         expect(savedLead.id_project).to.equal(savedProject._id.toString());
-         expect(savedLead.lead_id).to.not.equal(null);
-         expect(savedLead.attributes).to.equal(undefined);
+        expect(savedLead.fullname).to.equal("fullname");
+        expect(savedLead.email).to.equal(null);
+        expect(savedLead.id_project).to.equal(savedProject._id.toString());
+        expect(savedLead.lead_id).to.not.equal(null);
+        expect(savedLead.attributes).to.equal(undefined);
         done();
-    }).catch(function(err) {
+      }).catch(function (err) {
         winston.error("test reject", err);
-        assert.isNotOk(err,'Promise error');
+        assert.isNotOk(err, 'Promise error');
         done();
+      });
     });
   });
-  });
-
-
 
 
   it('createIfNotExists-already-exists', function (done) {
-    projectService.create("test1", userid).then(function(savedProject) {
-    // create(fullname, email, id_project, createdBy)
-     leadService.create("fullname", "email@email.com", savedProject._id, userid).then(function(savedLead) {
-      console.log("savedLead", savedLead);
-      leadService.createIfNotExists("fullname", "email@email.com", savedProject._id, userid).then(function(savedLeadIfNotExists) {
-        console.log("savedLeadIfNotExists", savedLeadIfNotExists);
-         expect(savedLead.fullname).to.equal("fullname");
-         expect(savedLead.email).to.equal("email@email.com");
-         expect(savedLead.id_project).to.equal(savedProject._id.toString());
-         expect(savedLeadIfNotExists._id.toString()).to.equal(savedLead._id.toString());
-         expect(savedLeadIfNotExists.lead_id).to.not.equal(null);
+    projectService.create("test1", userid).then(function (savedProject) {
+      // create(fullname, email, id_project, createdBy)
+      leadService.create("fullname", "email@email.com", savedProject._id, userid).then(function (savedLead) {
+        if (log) { console.log("savedLead", savedLead); }
+        leadService.createIfNotExists("fullname", "email@email.com", savedProject._id, userid).then(function (savedLeadIfNotExists) {
+          if (log) { console.log("savedLeadIfNotExists", savedLeadIfNotExists); }
+          expect(savedLead.fullname).to.equal("fullname");
+          expect(savedLead.email).to.equal("email@email.com");
+          expect(savedLead.id_project).to.equal(savedProject._id.toString());
+          expect(savedLeadIfNotExists._id.toString()).to.equal(savedLead._id.toString());
+          expect(savedLeadIfNotExists.lead_id).to.not.equal(null);
+
+          done();
+        }).catch(function (err) {
+          winston.error("test reject", err);
+          assert.isNotOk(err, 'Promise error');
+          done();
+        });
 
-        done();
-    }).catch(function(err) {
-        winston.error("test reject", err);
-        assert.isNotOk(err,'Promise error');
-        done();
+      });
     });
-
-   });
   });
-  });
-
 
 
   it('createIfNotExists-not-exists', function (done) {
-    projectService.create("test1", userid).then(function(savedProject) {
-    // create(fullname, email, id_project, createdBy)
- 
-    
-    leadService.createIfNotExists("fullname2", "email2@email.com", savedProject._id, userid).then(function(savedLeadIfNotExists) {
-      console.log("savedLeadIfNotExists", savedLeadIfNotExists);
-       expect(savedLeadIfNotExists.fullname).to.equal("fullname2");
-       expect(savedLeadIfNotExists.email).to.equal("email2@email.com");
-       expect(savedLeadIfNotExists.id_project).to.equal(savedProject._id.toString());
-       expect(savedLeadIfNotExists.lead_id).to.not.equal(null);
-
-      done();
-    }).catch(function(err) {
-      winston.error("test reject", err);
-      assert.isNotOk(err,'Promise error');
-      done();
-  });
-
-  
-  });
-  });
-
-
-
-
-
-  it('createIfNotExistsWithId-already-exists', function (done) {
-    projectService.create("test1", userid).then(function(savedProject) {
-    // create(fullname, email, id_project, createdBy)
-    var lead_id = "lead_id_" + savedProject._id;
-     leadService.createWitId(lead_id, "fullname","email@email.com", savedProject._id, userid).then(function(savedLead) {
-      console.log("savedLead", savedLead);
-      leadService.createIfNotExistsWithLeadId(lead_id, "fullname", "email@email.com", savedProject._id, userid).then(function(savedLeadIfNotExists) {
-        console.log("savedLeadIfNotExists", savedLeadIfNotExists);
-         expect(savedLead.fullname).to.equal("fullname");
-         expect(savedLead.email).to.equal("email@email.com");
-         expect(savedLead.lead_id).to.equal(lead_id);
-         expect(savedLead.id_project).to.equal(savedProject._id.toString());
-         expect(savedLeadIfNotExists._id.toString()).to.equal(savedLead._id.toString());
-         expect(savedLeadIfNotExists.lead_id).to.equal(lead_id);
+    projectService.create("test1", userid).then(function (savedProject) {
+      // create(fullname, email, id_project, createdBy)
+      leadService.createIfNotExists("fullname2", "email2@email.com", savedProject._id, userid).then(function (savedLeadIfNotExists) {
+        if (log) { console.log("savedLeadIfNotExists", savedLeadIfNotExists); }
+        expect(savedLeadIfNotExists.fullname).to.equal("fullname2");
+        expect(savedLeadIfNotExists.email).to.equal("email2@email.com");
+        expect(savedLeadIfNotExists.id_project).to.equal(savedProject._id.toString());
+        expect(savedLeadIfNotExists.lead_id).to.not.equal(null);
 
         done();
-    }).catch(function(err) {
+      }).catch(function (err) {
         winston.error("test reject", err);
-        assert.isNotOk(err,'Promise error');
+        assert.isNotOk(err, 'Promise error');
         done();
-    });
+      });
 
-   });
-  });
-  });
 
+    });
+  });
 
 
+  it('createIfNotExistsWithId-already-exists', function (done) {
+    projectService.create("test1", userid).then(function (savedProject) {
+      // create(fullname, email, id_project, createdBy)
+      var lead_id = "lead_id_" + savedProject._id;
+      leadService.createWitId(lead_id, "fullname", "email@email.com", savedProject._id, userid).then(function (savedLead) {
+        if (log) { console.log("savedLead", savedLead); }
+        leadService.createIfNotExistsWithLeadId(lead_id, "fullname", "email@email.com", savedProject._id, userid).then(function (savedLeadIfNotExists) {
+          if (log) { console.log("savedLeadIfNotExists", savedLeadIfNotExists); }
+          expect(savedLead.fullname).to.equal("fullname");
+          expect(savedLead.email).to.equal("email@email.com");
+          expect(savedLead.lead_id).to.equal(lead_id);
+          expect(savedLead.id_project).to.equal(savedProject._id.toString());
+          expect(savedLeadIfNotExists._id.toString()).to.equal(savedLead._id.toString());
+          expect(savedLeadIfNotExists.lead_id).to.equal(lead_id);
+
+          done();
+        }).catch(function (err) {
+          winston.error("test reject", err);
+          assert.isNotOk(err, 'Promise error');
+          done();
+        });
 
+      });
+    });
+  });
 
 });
 

package/test/logsRoute.js

@@ -1,5 +1,6 @@
 //During the test the env variable is set to test
 process.env.NODE_ENV = 'test';
+process.env.LOG_LEVEL = 'critical';
 
 var User = require('../models/user');
 var projectService = require('../services/projectService');
@@ -11,11 +12,15 @@ let chaiHttp = require('chai-http');
 let server = require('../app');
 let should = chai.should();
 
+chai.use(chaiHttp);
+
 // chai.config.includeStack = true;
 
 var expect = chai.expect;
 var assert = chai.assert;
 
+let log = false;
+
 let mock_log = {
     json_message: {
         messaging_product: "whatsapp",
@@ -46,7 +51,6 @@ let mock_log = {
     status_code: 3,
     error: null,
 }
-chai.use(chaiHttp);
 
 describe('LogsRoute', () => {
 
@@ -62,16 +66,16 @@ describe('LogsRoute', () => {
 
                     mock_log.id_project = savedProject._id;
                     mock_log.transaction_id = "automation-request-" + savedProject._id;
-                    console.log("mock_log.transaction_id: ", mock_log.transaction_id);
 
                     chai.request(server)
                         .post('/' + savedProject._id + '/logs/whatsapp')
                         .auth(email, pwd)
                         .send(mock_log)
                         .end((err, res) => {
-                            console.log("err: ", err);
-                            // console.log("res.body: ", res.body);
-                            console.log("Added example log")
+
+                            if (err) { console.error("err: ", err); }
+                            if (log) { console.log("res.body: ", res.body); }
+                            
                             res.should.have.status(200);
                             res.body.should.be.a('object');
 
@@ -79,8 +83,10 @@ describe('LogsRoute', () => {
                                 .get('/' + savedProject._id + '/logs/whatsapp/' + mock_log.transaction_id)
                                 .auth(email, pwd)
                                 .end((err, res) => {
-                                    console.log("err: ", err);
-                                    console.log("res.body: ", res.body);
+                                    
+                                    if (err) { console.error("err: ", err); }
+                                    if (log) { console.log("res.body: ", res.body); }
+
                                     res.should.have.status(200);
                                     
                                     done();