@tiledesk/tiledesk-server 2.9.4 → 2.9.6

package/CHANGELOG.md

@@ -5,6 +5,12 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.9.6
+- Fix bug: wrong timzone in startTime and andTime in operating hours service
+
+# 2.9.5
+- Added raw option in /users/availables
+
 # 2.9.4
 - Update tybot-connector to 0.2.86
 - Added time-slots management

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.9.4",
+  "version": "2.9.6",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",

package/routes/project.js

@@ -886,52 +886,81 @@ router.get('/:projectid/isopen', function (req, res) {
 router.get('/:projectid/users/availables', function (req, res) {
   //winston.debug("PROJECT ROUTES FINDS AVAILABLES project_users: projectid", req.params.projectid);
 
-  operatingHoursService.projectIsOpenNow(req.params.projectid, function (isOpen, err) {
-    //winston.debug('P ---> [ OHS ] -> [ PROJECT ROUTES ] -> IS OPEN THE PROJECT: ', isOpen);
-
-    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) {
-
-            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);
-          }
-        });
-
+  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);
+            }
+          });
+  } else {
+    operatingHoursService.projectIsOpenNow(req.params.projectid, function (isOpen, err) {
+      //winston.debug('P ---> [ OHS ] -> [ PROJECT ROUTES ] -> IS OPEN THE PROJECT: ', isOpen);
+  
+      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) {
+  
+              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);
+      }
+    });
+  }
 
-    } else {
-     // winston.debug('P ---> [ OHS ] -> [ PROJECT ROUTES ] -> IS OPEN THE PRJCT: ', isOpen, ' -> AVAILABLE EMPTY');
-      // closed
-      user_available_array = [];
-      res.json(user_available_array);
-    }
-  });
+  
 
 });
 
 
 
 
+
 module.exports = router;

package/services/operatingHoursService.js

@@ -209,7 +209,6 @@ class OperatingHoursService {
       }
 
       let timeSlot = project.timeSlots[slot_id];
-      console.log("timeSlot: ", timeSlot);
 
       if (!timeSlot) {
         callback(null, { errorCode: 1030, msg: 'Slot not found with id ' + slot_id })
@@ -233,17 +232,18 @@ class OperatingHoursService {
 
       // Get the current time in the specified timezone
       const currentTime = moment_tz.tz(tzname);
-      const currentWeekday = currentTime.isoWeekday();
 
+      const currentWeekday = currentTime.isoWeekday();
       const daySlots = hours[currentWeekday];
       if (!daySlots) {
         callback(false, null)
+        return;
       }
 
       let promises = [];
 
       daySlots.forEach((slot) => {
-        promises.push(slotCheck(currentTime, slot))
+        promises.push(slotCheck(currentTime, tzname, slot))
       })
   
       await Promise.all(promises).then((resp) => {
@@ -258,11 +258,11 @@ class OperatingHoursService {
   }
 }
 
-function slotCheck(currentTime, slot) {
+function slotCheck(currentTime, tzname, slot) {
   return new Promise((resolve) => {
 
-    const startTime = moment_tz(slot.start, 'HH:mm');
-    const endTime = moment_tz(slot.end, 'HH:mm');
+    const startTime = moment_tz.tz(slot.start, 'HH:mm', tzname);
+    const endTime = moment_tz.tz(slot.end, 'HH:mm', tzname);
 
     if (currentTime.isBetween(startTime, endTime, null, '[)')) {
       resolve(true)