@tiledesk/tiledesk-server 2.9.11 → 2.9.13

package/CHANGELOG.md

@@ -5,6 +5,13 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.9.13
+- Updated tybot-connector to 0.2.95
+- Improved /users/availables endpoint with department and smart assignment check
+
+# 2.9.12
+- Added support for Team plan
+
 # 2.9.11
 - Bug fix quotas reset after stripe subscription update
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.9.11",
+  "version": "2.9.13",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -48,7 +48,7 @@
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
     "@tiledesk/tiledesk-telegram-connector": "^0.1.14",
     "@tiledesk/tiledesk-train-jobworker": "^0.0.11",
-    "@tiledesk/tiledesk-tybot-connector": "^0.2.94",
+    "@tiledesk/tiledesk-tybot-connector": "^0.2.95",
     "@tiledesk/tiledesk-whatsapp-connector": "^0.1.72",
     "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.8",
     "@tiledesk/tiledesk-sms-connector": "^0.1.7",

package/routes/project.js

@@ -3,10 +3,13 @@ var router = express.Router();
 var Project = require("../models/project");
 var projectEvent = require("../event/projectEvent");
 var projectService = require("../services/projectService");
+var projectUserService = require("../services/projectUserService");
 
 var Project_user = require("../models/project_user");
 
 var operatingHoursService = require("../services/operatingHoursService");
+var Department = require('../models/department');
+var Group = require('../models/group');
 
 var winston = require('../config/winston');
 var roleChecker = require('../middleware/has-role');
@@ -20,7 +23,7 @@ var RoleConstants = require("../models/roleConstants");
 var cacheUtil = require('../utils/cacheUtil');
 var orgUtil = require("../utils/orgUtil");
 var cacheEnabler = require("../services/cacheEnabler");
-
+var mongoose = require('mongoose');
 
 router.post('/', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken], async (req, res) => {
   
@@ -881,83 +884,181 @@ router.get('/:projectid/isopen', function (req, res) {
   }
 });
 
-//togli questo route da qui e mettilo in altra route
-// NEW -  RETURN  THE USER NAME AND THE USER ID OF THE AVAILABLE PROJECT-USER FOR THE PROJECT ID PASSED
-router.get('/:projectid/users/availables', function (req, res) {
-  //winston.debug("PROJECT ROUTES FINDS AVAILABLES project_users: projectid", req.params.projectid);
-
-  if (req.query.raw && (req.query.raw === true || req.query.raw === 'true')) {
-    Project_user.find({ id_project: req.params.projectid, user_available: true, role: { $in : [RoleConstants.OWNER, RoleConstants.ADMIN, RoleConstants.SUPERVISOR, RoleConstants.AGENT]}}).
-          populate('id_user').
-          exec(function (err, project_users) {
-            if (err) {
-              winston.debug('PROJECT ROUTES - FINDS AVAILABLES project_users - ERROR: ', err);
-              return res.status(500).send({ success: false, msg: 'Error getting object.' });
-            }
-            if (project_users) {
-  
-              user_available_array = [];
-              project_users.forEach(project_user => {
-                if (project_user.id_user) {
-                  // winston.debug('PROJECT ROUTES - AVAILABLES PROJECT-USER: ', project_user)
-                  user_available_array.push({ "id": project_user.id_user._id, "firstname": project_user.id_user.firstname });
-                } else {
-                  // winston.debug('PROJECT ROUTES - AVAILABLES PROJECT-USER (else): ', project_user)
-                }
-              });
-  
-              //winston.debug('ARRAY OF THE AVAILABLE USER ', user_available_array);
-              res.json(user_available_array);
+
+router.get('/:projectid/users/availables', async  (req, res) => {
+  
+  let projectid = req.params.projectid;
+  let raw_option = req.query.raw;
+  let dep_id = req.query.department;
+  let isOpen = true;
+
+  winston.debug("(Users Availables) raw_option: " + raw_option);
+  winston.debug("(Users Availables) dep_id: " + dep_id);
+
+  let available_agents_array = [];
+
+  if (!raw_option || raw_option === false) {
+    try {
+      isOpen = await new Promise((resolve, reject) => {
+        operatingHoursService.projectIsOpenNow(projectid, (isOpen, err) => {
+          if (err) reject(err);
+          else resolve(isOpen);
+        });
+      });
+    } catch (err) {
+      wisnton.error("(Users Availables) check operating hours error: ", err);
+      return res.status(500).send({ success: false, msg: err });
+    }
+  }
+
+  if (isOpen === false) {
+    return res.json(available_agents_array);
+  }
+
+  let query = { id_project: projectid, user_available: true, role: { $in : [RoleConstants.OWNER, RoleConstants.ADMIN, RoleConstants.SUPERVISOR, RoleConstants.AGENT]} };
+
+  if (dep_id) {
+    let department = await Department.findById(dep_id).catch((err) => {
+      winston.error("(Users Availables) find department error: ", err)
+      return res.status(500).send({ success: false, error: err })
+    })
+
+    if (!department) {
+      winston.error("(Users Availables) department not found")
+      return res.status(404).send({ success: false, error: "Department " + dep_id + " not found" })
+    }
+
+    let group_id = department.id_group;
+    if (group_id) {
+      let group = await Group.findById(group_id).catch((err) => {
+        winston.error("(Users Availables) find group error: ", err)
+        return res.status(500).send({ success: false, error: err })
+      })
+
+      if (!group) {
+        winston.error("(Users Availables) group not found")
+        return res.status(404).send({ success: false, error: "Group " + group_id + " not found" })
+      }
+
+      query.id_user = { $in: group.members.map(id => mongoose.Types.ObjectId(id) )}
+      
+    }
+  } 
+  
+  winston.debug("(Users Availables) project_users query ", query)
+  Project_user.find(query)
+      .populate('id_user')
+      .exec( async (err, project_users) => {
+        if (err) {
+          winston.debug('PROJECT ROUTES - FINDS AVAILABLES project_users - ERROR: ', err);
+          return res.status(500).send({ success: false, msg: 'Error getting object.' + err});
+        }
+
+        let project = await Project.findById(projectid).catch((err) => {
+          winston.error("find project error: ", err)
+          res.status(500).send({ success: false, error: err })
+        })
+
+        // check on SMART ASSIGNMENT
+        let available_agents = projectUserService.checkAgentsAvailablesWithSmartAssignment(project, project_users);
+        winston.verbose("(Users Availables) available agents after smart assignment check", available_agents);
+
+        if (available_agents) {
+  
+          available_agents_array = [];
+          available_agents.forEach(agent => {
+            if (agent.id_user) {
+              available_agents_array.push({ "id": agent.id_user._id, "firstname": agent.id_user.firstname });
+            } else {
+              winston.warn("(Users Availables) agent.id_user is undefined");
             }
           });
-  } else {
-    operatingHoursService.projectIsOpenNow(req.params.projectid, function (isOpen, err) {
-      //winston.debug('P ---> [ OHS ] -> [ PROJECT ROUTES ] -> IS OPEN THE PROJECT: ', isOpen);
+
+          winston.debug("(Users Availables) return following available_agents_array", available_agents_array);
+          res.json(available_agents_array);
+        }
+      })
   
-      if (err) {
-        winston.debug('P ---> [ OHS ] -> [ PROJECT ROUTES ] -> IS OPEN THE PROJECT - EROR: ', err)
-        // sendError(err, res);
-        return res.status(500).send({ success: false, msg: err });
-      } else if (isOpen) {
-  
-        Project_user.find({ id_project: req.params.projectid, user_available: true, role: { $in : [RoleConstants.OWNER, RoleConstants.ADMIN, RoleConstants.SUPERVISOR, RoleConstants.AGENT]}}).
-          populate('id_user').
-          exec(function (err, project_users) {
-            if (err) {
-              winston.debug('PROJECT ROUTES - FINDS AVAILABLES project_users - ERROR: ', err);
-              return res.status(500).send({ success: false, msg: 'Error getting object.' });
-            }
-            if (project_users) {
+})
+
+// OLD ENDPOINT for /users/availables
+//togli questo route da qui e mettilo in altra route
+// NEW -  RETURN  THE USER NAME AND THE USER ID OF THE AVAILABLE PROJECT-USER FOR THE PROJECT ID PASSED
+// router.get('/:projectid/users/availables', function (req, res) {
+//   //winston.debug("PROJECT ROUTES FINDS AVAILABLES project_users: projectid", req.params.projectid);
+
+//   if (req.query.raw && (req.query.raw === true || req.query.raw === 'true')) {
+//     Project_user.find({ id_project: req.params.projectid, user_available: true, role: { $in : [RoleConstants.OWNER, RoleConstants.ADMIN, RoleConstants.SUPERVISOR, RoleConstants.AGENT]}}).
+//           populate('id_user').
+//           exec(function (err, project_users) {
+//             if (err) {
+//               winston.debug('PROJECT ROUTES - FINDS AVAILABLES project_users - ERROR: ', err);
+//               return res.status(500).send({ success: false, msg: 'Error getting object.' });
+//             }
+//             if (project_users) {
   
-              user_available_array = [];
-              project_users.forEach(project_user => {
-                if (project_user.id_user) {
-                  // winston.debug('PROJECT ROUTES - AVAILABLES PROJECT-USER: ', project_user)
-                  user_available_array.push({ "id": project_user.id_user._id, "firstname": project_user.id_user.firstname });
-                } else {
-                  // winston.debug('PROJECT ROUTES - AVAILABLES PROJECT-USER (else): ', project_user)
-                }
-              });
+//               user_available_array = [];
+//               project_users.forEach(project_user => {
+//                 if (project_user.id_user) {
+//                   // winston.debug('PROJECT ROUTES - AVAILABLES PROJECT-USER: ', project_user)
+//                   user_available_array.push({ "id": project_user.id_user._id, "firstname": project_user.id_user.firstname });
+//                 } else {
+//                   // winston.debug('PROJECT ROUTES - AVAILABLES PROJECT-USER (else): ', project_user)
+//                 }
+//               });
   
-              //winston.debug('ARRAY OF THE AVAILABLE USER ', user_available_array);
+//               //winston.debug('ARRAY OF THE AVAILABLE USER ', user_available_array);
+//               res.json(user_available_array);
+//             }
+//           });
+//   } else {
+//     operatingHoursService.projectIsOpenNow(req.params.projectid, function (isOpen, err) {
+//       //winston.debug('P ---> [ OHS ] -> [ PROJECT ROUTES ] -> IS OPEN THE PROJECT: ', isOpen);
   
-              res.json(user_available_array);
-            }
-          });
+//       if (err) {
+//         winston.debug('P ---> [ OHS ] -> [ PROJECT ROUTES ] -> IS OPEN THE PROJECT - EROR: ', err)
+//         // sendError(err, res);
+//         return res.status(500).send({ success: false, msg: err });
+//       } else if (isOpen) {
   
+//         Project_user.find({ id_project: req.params.projectid, user_available: true, role: { $in : [RoleConstants.OWNER, RoleConstants.ADMIN, RoleConstants.SUPERVISOR, RoleConstants.AGENT]}}).
+//           populate('id_user').
+//           exec(function (err, project_users) {
+//             if (err) {
+//               winston.debug('PROJECT ROUTES - FINDS AVAILABLES project_users - ERROR: ', err);
+//               return res.status(500).send({ success: false, msg: 'Error getting object.' });
+//             }
+//             if (project_users) {
   
-      } else {
-       // winston.debug('P ---> [ OHS ] -> [ PROJECT ROUTES ] -> IS OPEN THE PRJCT: ', isOpen, ' -> AVAILABLE EMPTY');
-        // closed
-        user_available_array = [];
-        res.json(user_available_array);
-      }
-    });
-  }
+//               user_available_array = [];
+//               project_users.forEach(project_user => {
+//                 if (project_user.id_user) {
+//                   // winston.debug('PROJECT ROUTES - AVAILABLES PROJECT-USER: ', project_user)
+//                   user_available_array.push({ "id": project_user.id_user._id, "firstname": project_user.id_user.firstname });
+//                 } else {
+//                   // winston.debug('PROJECT ROUTES - AVAILABLES PROJECT-USER (else): ', project_user)
+//                 }
+//               });
+  
+//               //winston.debug('ARRAY OF THE AVAILABLE USER ', user_available_array);
+  
+//               res.json(user_available_array);
+//             }
+//           });
+  
+  
+//       } else {
+//        // winston.debug('P ---> [ OHS ] -> [ PROJECT ROUTES ] -> IS OPEN THE PRJCT: ', isOpen, ' -> AVAILABLE EMPTY');
+//         // closed
+//         user_available_array = [];
+//         res.json(user_available_array);
+//       }
+//     });
+//   }
 
   
 
-});
+// });
 
 
 

package/services/QuoteManager.js

@@ -13,12 +13,14 @@ const emailEvent = require('../event/emailEvent');
 //     CUSTOM:     { requests: 3000,   messages: 0,    tokens: 5000000,    email: 200,    chatbots: 20,       kbs: 500}
 // }
 
+
 const PLANS_LIST = {
     FREE_TRIAL: { requests: 200,    messages: 0,    tokens: 100000,      email: 200,     chatbots: 20,      namespace: 3,   kbs: 50     }, // same as PREMIUM
     SANDBOX:    { requests: 200,    messages: 0,    tokens: 100000,      email: 200,     chatbots: 2,       namespace: 1,   kbs: 50     },
     BASIC:      { requests: 800,    messages: 0,    tokens: 2000000,     email: 200,     chatbots: 5,       namespace: 1,   kbs: 150    },
     PREMIUM:    { requests: 3000,   messages: 0,    tokens: 5000000,     email: 200,     chatbots: 20,      namespace: 3,   kbs: 300    },
-    CUSTOM:     { requests: 3000,   messages: 0,    tokens: 5000000,     email: 200,     chatbots: 20,      namespace: 3,   kbs: 1000   }
+    TEAM:       { requests: 5000,   messages: 0,    tokens: 10000000,    email: 200,     chatbots: 50,      namespace: 10,  kbs: 1000   },
+    CUSTOM:     { requests: 5000,   messages: 0,    tokens: 10000000,    email: 200,     chatbots: 50,      namespace: 10,  kbs: 1000   },
 }
 
 const typesList = ['requests', 'messages', 'email', 'tokens', 'chatbots', 'kbs']
@@ -333,6 +335,9 @@ class QuoteManager {
                 case 'Premium':
                     limits = PLANS_LIST.PREMIUM;
                     break;
+                case 'Team':
+                    limits = PLANS_LIST.TEAM;
+                    break;
                 case 'Custom':
                     limits = PLANS_LIST.CUSTOM;
                     break;

package/services/projectUserService.js

@@ -9,6 +9,38 @@ var pendinginvitation = require("../services/pendingInvitationService");
 
 class ProjectUserService {
 
+    checkAgentsAvailablesWithSmartAssignment(project, available_agents) {
+
+        let max_assigned_chat;
+        let available_agents_request = [];
+
+        if (project && project.settings && project.settings.chat_limit_on && project.settings.max_agent_assigned_chat) {
+            max_assigned_chat = project.settings.max_agent_assigned_chat;
+            winston.verbose('[ProjectUserService] max_agent_assigned_chat: ' + max_assigned_chat);
+        } else {
+            winston.verbose('[ProjectUserService] chat_limit_on or max_agent_assigned_chat is undefined');
+            return available_agents
+        }
+
+        if (available_agents.length == 0) {
+            return available_agents_request;
+        }
+
+        for (const aa of available_agents) {
+            let max_assigned_chat_specific_user = max_assigned_chat;
+            if (aa.max_assigned_chat && aa.max_assigned_chat != -1) {
+                max_assigned_chat_specific_user = aa.max_assigned_chat;
+            }
+            winston.verbose("[ProjectUserService] max_assigned_chat_specific_user " + max_assigned_chat_specific_user);
+
+            if (aa.number_assigned_requests < max_assigned_chat_specific_user) {
+                available_agents_request.push(aa);
+            }
+        }
+
+        return available_agents_request;
+
+    }
 
 }
 var projectUserService = new ProjectUserService();

package/test/projectRoute.js

@@ -2,7 +2,7 @@
 process.env.NODE_ENV = 'test';
 process.env.ADMIN_EMAIL = "admin@tiledesk.com";
 
-let log = true;
+let log = false;
 var projectService = require('../services/projectService');
 var userService = require('../services/userService');
 
@@ -13,12 +13,16 @@ let server = require('../app');
 let should = chai.should();
 var fs = require('fs');
 const path = require('path');
+const departmentService = require('../services/departmentService');
+const routingConstants = require('../models/routingConstants');
+var Group = require('../models/group');
 
 // chai.config.includeStack = true;
 
 var expect = chai.expect;
 var assert = chai.assert;
 
+
 let timeSlotsSample = {
     "819559cc": {
         name: "Slot1",
@@ -176,6 +180,77 @@ describe('ProjectRoute', () => {
             })
         }).timeout(10000)
 
+        it('availableUsers', (done) => {
+
+            var email = "test-signup-" + Date.now() + "@email.com";
+            var pwd = "pwd";
+
+            userService.signup(email, pwd, "Test Firstname", "Test Lastname").then((savedUser) => {
+                projectService.create("test-project-create", savedUser._id).then((savedProject) => {
+
+                    chai.request(server)
+                        .get('/projects/' + savedProject._id + '/users/availables')
+                        .auth(email, pwd)
+                        .end((err, res) => {
+
+                            console.error("err: ", err);
+                            console.log("res.body: ", res.body);
+
+                            done();
+                        })
+                })
+            })
+        }).timeout(10000)
+
+        it('departmentGroupAvailableUsers', (done) => {
+
+            var email = "test-signup-" + Date.now() + "@email.com";
+            var email2 = "test-signup2-" + Date.now() + "@email.com";
+            var pwd = "pwd";
+
+            userService.signup(email, pwd, "Test Firstname", "Test Lastname").then((savedUser) => {
+                // ignore second user (need to be added to the same project)
+                userService.signup(email2, pwd, "Test Firstname 2", "Test Lastname 2").then((savedUser2) => {
+                    projectService.create("test-project-create", savedUser._id).then((savedProject) => {
+
+                        chai.request(server)
+                            .post('/' + savedProject._id + '/groups')
+                            .auth(email, pwd)
+                            .send({ name: "test-department-group", members: [savedUser._id] })
+                            .end((err, res) => {
+
+                                if (err) { console.error("err: ", err) };
+                                if (log) { console.log("create group res.body: ", res.body); }
+                                let savedGroup = res.body;
+
+                                chai.request(server)
+                                    .post('/' + savedProject._id + '/departments/')
+                                    .auth(email, pwd)
+                                    .send({ id_project: "66977908249376002d57a434", name: "test-department", routing: "assigned", id_group: savedGroup._id })
+                                    .end((err, res) => {
+
+                                        if (err) { console.error("err: ", err) };
+                                        if (log) { console.log("savedDepartment: ", res.body); }
+                                        let savedDepartment = res.body;
+
+                                        chai.request(server)
+                                            .get('/projects/' + savedProject._id + '/users/availables/?department=' + savedDepartment._id)
+                                            .auth(email, pwd)
+                                            .end((err, res) => {
+
+                                                if (err) { console.error("err: ", err); }
+                                                if (log) { console.log("res.body: ", res.body); }
+                                                
+                                                done();
+                                            })
+
+                                    })
+                            })
+                    })
+                })
+            })
+        }).timeout(10000)
+
     });
 
 });