@tiledesk/tiledesk-server 2.17.3 → 2.18.1

package/test/departmentService.js

@@ -48,6 +48,7 @@ describe('DepartmentService()', function () {
               id_project: savedProject._id,
               id_user: savedUser2._id,
               role: roleConstants.AGENT,
+              roleType : RoleConstants.TYPE_AGENTS,   
               user_available: true,
               createdBy: savedUser2._id,
               updatedBy: savedUser2._id,
@@ -62,6 +63,7 @@ describe('DepartmentService()', function () {
                 id_project: savedProject._id,
                 id_user: savedUser3._id,
                 role: roleConstants.AGENT,
+                roleType : RoleConstants.TYPE_AGENTS,                   
                 user_available: true,
                 createdBy: savedUser3._id,
                 updatedBy: savedUser3._id,
@@ -126,6 +128,7 @@ describe('DepartmentService()', function () {
               id_project: savedProject._id,
               id_user: savedUser2._id,
               role: roleConstants.AGENT,
+              roleType : RoleConstants.TYPE_AGENTS,   
               user_available: true,
               createdBy: savedUser2._id,
               updatedBy: savedUser2._id,
@@ -247,6 +250,7 @@ describe('DepartmentService()', function () {
               id_project: savedProject._id,
               id_user: savedUser2._id,
               role: roleConstants.AGENT,
+              roleType : RoleConstants.TYPE_AGENTS,   
               user_available: false,
               createdBy: savedUser2._id,
               updatedBy: savedUser2._id,
@@ -325,6 +329,7 @@ describe('DepartmentService()', function () {
             id_project: savedProject._id,
             id_user: savedUser2._id,
             role: roleConstants.AGENT,
+            roleType : RoleConstants.TYPE_AGENTS,  
             user_available: false,
             createdBy: savedUser2._id,
             updatedBy: savedUser2._id,

package/test/messageRoute.js

@@ -9,7 +9,7 @@ var userService = require('../services/userService');
 var leadService = require('../services/leadService');
 var messageService = require('../services/messageService');
 var Project_user = require("../models/project_user");
-var roleConstants = require('../models/roleConstants');
+var RoleConstants = require('../models/roleConstants');
 const uuidv4 = require('uuid/v4');
 
 //Require the dev-dependencies
@@ -223,7 +223,8 @@ describe('MessageRoute', () => {
             // _id: new mongoose.Types.ObjectId(),
             id_project: savedProject._id,
             id_user: savedUser2._id,
-            role: roleConstants.AGENT,
+            role: RoleConstants.AGENT,
+            roleType : RoleConstants.TYPE_AGENTS,   
             user_available: true,
             createdBy: savedUser2._id,
             updatedBy: savedUser2._id,
@@ -298,7 +299,8 @@ describe('MessageRoute', () => {
           // _id: new mongoose.Types.ObjectId(),
           id_project: savedProject._id,
           uuid_user: uid,
-          role: roleConstants.USER,
+          role: RoleConstants.USER,
+          roleType : RoleConstants.TYPE_USERS,   
           user_available: true,
           createdBy: savedUser._id,
           updatedBy: savedUser._id,
@@ -875,7 +877,8 @@ describe('MessageRoute', () => {
             // _id: new mongoose.Types.ObjectId(),
             id_project: savedProject._id,
             id_user: savedUser2._id,
-            role: roleConstants.USER,
+            role: RoleConstants.USER,
+            roleType : RoleConstants.TYPE_USERS,   
             user_available: true,
             createdBy: savedUser2._id,
             updatedBy: savedUser2._id,

package/test/projectUserRoute.js

@@ -0,0 +1,116 @@
+//During the test the env variable is set to test
+process.env.NODE_ENV = 'test';
+process.env.LOG_LEVEL = 'error';
+process.env.ADMIN_EMAIL = "admin@tiledesk.com";
+
+let log = false;
+var projectService = require('../services/projectService');
+var userService = require('../services/userService');
+
+//Require the dev-dependencies
+let chai = require('chai');
+let chaiHttp = require('chai-http');
+let server = require('../app');
+let should = chai.should();
+var fs = require('fs');
+const path = require('path');
+
+// chai.config.includeStack = true;
+
+var expect = chai.expect;
+var assert = chai.assert;
+
+chai.use(chaiHttp);
+
+describe('ProjectUserRoute', () => {
+
+  describe('Delete', () => {
+
+    it('delete-project-user-and-remove-from-group', (done) => {
+
+      let email_owner = "owner-signup-" + Date.now() + "@email.com";
+      let email_agent = "agent-signup-" + Date.now() + "@email.com";
+      var pwd = "pwd";
+
+      userService.signup(email_owner, pwd, "Owner Firstname", "Owner Lastname").then((owner) => {
+        userService.signup(email_agent, pwd, "Agent Firstname", "Agent Lastname").then((agent) => {
+          projectService.create("test-project", owner._id).then((project) => {
+
+            // Invite agent on the project
+            chai.request(server)
+              .post('/' + project._id + "/project_users/invite")
+              .auth(email_owner, pwd)
+              .set('content-type', 'application/json')
+              .send({ email: email_agent, role: "agent", userAvailable: false })
+              .end((err, res) => {
+
+                if (err) { console.error("err: ", err); }
+                if (log) { console.log("Invite agent to project res.body: ", res.body) };
+
+                res.should.have.status(200);
+                res.body.should.be.a('object');
+                expect(res.body.id_user).to.equal(agent._id.toString());
+
+                let pu_id = res.body._id;
+
+                // Create group
+                chai.request(server)
+                  .post('/' + project._id + "/groups")
+                  .auth(email_owner, pwd)
+                  .set('content-type', 'application/json')
+                  .send({ name: "test-group", members: [owner._id, agent._id] })
+                  .end((err, res) => {
+
+                    if (err) { console.error("err: ", err); }
+                    if (log) { console.log("Create group res.body: ", res.body) };
+
+                    res.should.have.status(200);
+                    res.body.should.be.a('object');
+                    expect(res.body.name).to.equal("test-group");
+                    expect(res.body.members.length).to.equal(2);
+                    expect(res.body.members[0]).to.equal(owner._id.toString())
+                    expect(res.body.members[1]).to.equal(agent._id.toString())
+
+                    let group_id = res.body._id;
+
+                    // Remove project user from project
+                    chai.request(server)
+                      .delete('/' + project._id + '/project_users/' + pu_id + '?soft=true')
+                      .auth(email_owner, pwd)
+                      .set('content-type', 'application/json')
+                      .end((err, res) => {
+
+                        if (err) { console.error("err: ", err); }
+                        if (log) { console.log("Delete project user res.body: ", res.body) };
+
+                        res.should.have.status(200);
+                        res.body.should.be.a('object');
+
+                        // Check group
+                        chai.request(server)
+                          .get('/' + project._id + '/groups/' + group_id)
+                          .auth(email_owner, pwd)
+                          .set('content-type', 'application/json')
+                          .end((err, res) => {
+                            if (err) { console.error("err: ", err); }
+                            if (log) { console.log("Check group res.body: ", res.body) };
+
+                            res.should.have.status(200);
+                            res.body.should.be.a('object');
+                            expect(res.body.members.length).to.equal(1);
+                            expect(res.body.members[0]).to.equal(owner._id.toString())
+
+                            done()
+                          })
+
+                      })
+                  })
+              })
+          })
+        })
+      })
+    }).timeout(5000);
+
+  })
+
+});

package/test/requestService.js

@@ -10,6 +10,7 @@ let should = chai.should();
 var config = require('../config/database');
 var mongoose = require('mongoose');
 var winston = require('../config/winston');
+var RoleConstants = require('../models/roleConstants');
 
 let log = false;
 
@@ -991,7 +992,8 @@ describe('RequestService', function () {
             // _id: new mongoose.Types.ObjectId(),
             id_project: savedProject._id.toString(),
             id_user: savedUser2._id.toString(),
-            role: "agent",
+            role: RoleConstants.AGENT,
+            roleType : RoleConstants.TYPE_AGENTS,   
             user_available: false,
             createdBy: userid,
             updatedBy: userid
@@ -1073,7 +1075,8 @@ describe('RequestService', function () {
             // _id: new mongoose.Types.ObjectId(),
             id_project: savedProject._id.toString(),
             id_user: savedUser2._id.toString(),
-            role: "agent",
+            role: RoleConstants.AGENT,
+            roleType : RoleConstants.TYPE_AGENTS,  
             user_available: false,
             createdBy: userid,
             updatedBy: userid
@@ -1338,7 +1341,8 @@ describe('RequestService', function () {
             // _id: new mongoose.Types.ObjectId(),
             id_project: savedProject._id.toString(),
             id_user: savedUser2._id.toString(),
-            role: "agent",
+            role: RoleConstants.AGENT,
+            roleType : RoleConstants.TYPE_AGENTS,  
             user_available: true,
             createdBy: userid,
             updatedBy: userid

package/test-int/bot.js

@@ -16,7 +16,7 @@ var Department = require('../models/department');
 var Faq = require('../models/faq');
 var faqBotSupport = require('../services/faqBotSupport');
 var Project_user = require("../models/project_user");
-
+var RoleConstants = require('../models/roleConstants');
 var expect = chai.expect;
 var assert = chai.assert;
 
@@ -255,7 +255,8 @@ describe('bot', () => {
                 // _id: new mongoose.Types.ObjectId(),
                 id_project: savedProject._id.toString(),
                 id_user: savedUser2._id.toString(),
-                role: "agent",           
+                role: RoleConstants.AGENT,
+                roleType : RoleConstants.TYPE_AGENTS,     
                 user_available: true, 
                 createdBy: savedUser._id,
                 updatedBy: savedUser._id