@tiledesk/tiledesk-server 2.9.2 → 2.9.4

package/CHANGELOG.md

@@ -5,6 +5,13 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.9.4
+- Update tybot-connector to 0.2.86
+- Added time-slots management
+
+# 2.9.3
+- Added log for AMQP error in closeOnErr
+
 # 2.9.2
 - Updated tybot-connector to 0.2.84
 

package/models/project.js

@@ -34,6 +34,9 @@ var ProjectSchema = new Schema({
   operatingHours: {
     type: Object,
   },
+  timeSlots: {
+    type: Object,
+  },
   settings: {
     type: Object,
     default: function () {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.9.2",
+  "version": "2.9.4",
   "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.84",
+    "@tiledesk/tiledesk-tybot-connector": "^0.2.86",
     "@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

@@ -307,6 +307,10 @@ router.put('/:projectid', [passport.authenticate(['basic', 'jwt'], { session: fa
   if (req.body.operatingHours!=undefined) {
     update.operatingHours = req.body.operatingHours;
   }
+
+  if (req.body.timeSlots!=undefined) {
+    update.timeSlots = req.body.timeSlots;
+  }
   
   if (req.body.settings!=undefined) {
     update.settings = req.body.settings;
@@ -849,16 +853,32 @@ router.get('/', [passport.authenticate(['basic', 'jwt'], { session: false }), va
 
 // GET ALL PROJECTS BY CURRENT USER ID. usaed by unisalento to know if a project is open 
 router.get('/:projectid/isopen', function (req, res) {
-   operatingHoursService.projectIsOpenNow(req.params.projectid, function (isOpen, err) {
-    winston.debug('project', req.params.projectid, 'isopen: ', isOpen);
 
-    if (err) {
-      winston.error('Error getting projectIsOpenNow', err);
-      return res.status(500).send({ success: false, msg: err });
-    } 
-     res.json({"isopen":isOpen});
-  });
+  let project_id = req.params.projectid;
+  // Check if a timeSlot is passed
+  if (req.query.timeSlot) {
+    let slot_id = req.query.timeSlot;
+    operatingHoursService.slotIsOpenNow(project_id, slot_id, (isOpen, err) => {
+
+      if (err) {
+        winston.error("Error getting slotIsOpenNow ", err);
+        return res.status(500).send({ success: false, error: err });
+      }
+      return res.status(200).send({ isopen: isOpen})
+    })
+
+  } else {
 
+    operatingHoursService.projectIsOpenNow(project_id, function (isOpen, err) {
+     winston.debug('project', project_id, 'isopen: ', isOpen);
+  
+      if (err) {
+        winston.error('Error getting projectIsOpenNow', err);
+        return res.status(500).send({ success: false, msg: err });
+      } 
+      return res.status(200).send({ isopen: isOpen})
+   });
+  }
 });
 
 //togli questo route da qui e mettilo in altra route

package/services/operatingHoursService.js

@@ -175,7 +175,101 @@ class OperatingHoursService {
 
   } // ./end projectIsOpenNow
 
+  slotIsOpenNow(projectId, slot_id, callback) {
 
+    let q = Project.findOne({ _id: projectId, status: 100});
+    if (cacheEnabler.project) { 
+      q.cache(cacheUtil.longTTL, "projects:id:"+projectId)  //project_cache
+      winston.debug('project cache enabled for slotIsOpenNow');
+    }
+    q.exec( async (err, project) => {
+
+      if (err) {
+        winston.error("(slotIsOpenNow) Error getting project: ", err);
+        callback(null, { errorCode: 1000, msg: "Error getting project." })
+        return;
+      }
+      if (!project) {
+        winston.warn("(slotIsOpenNow) Project not found with id: " + projectId);
+        callback(null, { errorCode: 1010, msg: 'Project not found for id' + projectId });
+        return;
+      }
+
+      // Return ALWAYS true if the plan is free, trial is expired or the subscription is not active
+      if (project.profile && (project.profile.type === 'free' && project.trialExpired === true) || (project.profile.type === 'payment' && project.isActiveSubscription === false)) {
+        winston.debug('(slotIsOpenNow) Trial Expired or Subscription NOT Active') 
+        callback(true, null) ;
+        return;
+      }
+
+      if (!project.timeSlots) {
+        winston.warn("(slotIsOpenNow) No time slots specified for the project " + projectId);
+        callback(true, null)
+        return
+      }
+
+      let timeSlot = project.timeSlots[slot_id];
+      console.log("timeSlot: ", timeSlot);
+
+      if (!timeSlot) {
+        callback(null, { errorCode: 1030, msg: 'Slot not found with id ' + slot_id })
+        return;
+      }
+
+      if (timeSlot.active == false) {
+        winston.verbose("(slotIsOpenNow) selected slot is not active")
+        callback(true, null);
+        return;
+      }
+
+      if (!timeSlot.hours) {
+        callback(null, { errorCode: 1020, msg: 'Operating hours is empty' });
+        return;
+      }
+
+      const hours = JSON.parse(timeSlot.hours);
+      const tzname = hours.tzname;
+      delete hours.tzname;
+
+      // Get the current time in the specified timezone
+      const currentTime = moment_tz.tz(tzname);
+      const currentWeekday = currentTime.isoWeekday();
+
+      const daySlots = hours[currentWeekday];
+      if (!daySlots) {
+        callback(false, null)
+      }
+
+      let promises = [];
+
+      daySlots.forEach((slot) => {
+        promises.push(slotCheck(currentTime, slot))
+      })
+  
+      await Promise.all(promises).then((resp) => {
+        if (resp.indexOf(true) != -1) {
+          callback(true, null);
+          return;
+        }
+        callback(false, null);
+        return;
+      })
+    })
+  }
+}
+
+function slotCheck(currentTime, slot) {
+  return new Promise((resolve) => {
+
+    const startTime = moment_tz(slot.start, 'HH:mm');
+    const endTime = moment_tz(slot.end, 'HH:mm');
+
+    if (currentTime.isBetween(startTime, endTime, null, '[)')) {
+      resolve(true)
+    } else {
+      resolve(false);
+    }
+  })
 }
 
 function addOrSubstractProjcTzOffsetFromDateNow(prjcTimezoneName) {

package/test/projectRoute.js

@@ -2,7 +2,7 @@
 process.env.NODE_ENV = 'test';
 process.env.ADMIN_EMAIL = "admin@tiledesk.com";
 
-let log = false;
+let log = true;
 var projectService = require('../services/projectService');
 var userService = require('../services/userService');
 
@@ -19,6 +19,26 @@ const path = require('path');
 var expect = chai.expect;
 var assert = chai.assert;
 
+let timeSlotsSample = {
+    "819559cc": {
+        name: "Slot1",
+        active: true,
+        hours: "{\"1\":[{\"start\":\"09:00\",\"end\":\"13:00\"},{\"start\":\"14:00\",\"end\":\"18:00\"}],\"3\":[{\"start\":\"09:00\",\"end\":\"13:00\"},{\"start\":\"14:00\",\"end\":\"18:00\"}],\"5\":[{\"start\":\"09:00\",\"end\":\"13:00\"},{\"start\":\"14:00\",\"end\":\"18:00\"}],\"tzname\":\"Europe/Rome\"}"
+    },
+    "5d4368de": {
+        name: "Slot2",
+        active: true,
+        hours: "{\"0\":[{\"start\":\"09:00\",\"end\":\"13:00\"},{\"start\":\"14:00\",\"end\":\"18:00\"}],\"6\":[{\"start\":\"09:00\",\"end\":\"13:00\"},{\"start\":\"14:00\",\"end\":\"18:00\"}],\"tzname\":\"Europe/Rome\"}"
+    },
+    "2975ec45": {
+        name: "Slot3",
+        active: false,
+        hours: "{\"0\":[{\"start\":\"09:00\",\"end\":\"13:00\"},{\"start\":\"14:00\",\"end\":\"18:00\"}],\"6\":[{\"start\":\"09:00\",\"end\":\"13:00\"},{\"start\":\"14:00\",\"end\":\"18:00\"}],\"tzname\":\"Europe/Rome\"}"
+    }
+}
+
+
+
 chai.use(chaiHttp);
 
 describe('ProjectRoute', () => {
@@ -50,7 +70,7 @@ describe('ProjectRoute', () => {
                                 // .put('/projects/' + savedProject._id + "/update")
                                 .put('/projects/' + savedProject._id)
                                 .set('Authorization', superadmin_token)
-                                .send({ profile: { name: "Custom", quotes: { kbs: 1000} } })
+                                .send({ profile: { name: "Custom", quotes: { kbs: 1000 } } })
                                 .end((err, res) => {
 
                                     if (log) { console.log("update project profile res.body: ", res.body) };
@@ -78,7 +98,7 @@ describe('ProjectRoute', () => {
                         .put('/projects/' + savedProject._id)
                         // .put('/projects/' + savedProject._id + "/update")
                         .auth(email, pwd)
-                        .send({ profile: { name: "Custom", quotes: { kbs: 1000} } })
+                        .send({ profile: { name: "Custom", quotes: { kbs: 1000 } } })
                         .end((err, res) => {
 
                             if (log) { console.log("update project profile res.body: ", res.body) };
@@ -90,6 +110,72 @@ describe('ProjectRoute', () => {
                 })
             })
         }).timeout(10000)
+
+        it('updateProjectTimeSlots', (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)
+                        // .put('/projects/' + savedProject._id + "/update")
+                        .put('/projects/' + savedProject._id)
+                        .auth(email, pwd)
+                        .send({ timeSlots: timeSlotsSample })
+                        .end((err, res) => {
+
+                            if (log) { console.log("update project time slots res.body: ", res.body) };
+                            res.should.have.status(200);
+                            res.body.should.be.a('object');
+
+                            done();
+                        })
+                })
+            })
+        }).timeout(10000)
+
+        it('isOpenTimeSlot', (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)
+                        // .put('/projects/' + savedProject._id + "/update")
+                        .put('/projects/' + savedProject._id)
+                        .auth(email, pwd)
+                        .send({ timeSlots: timeSlotsSample })
+                        .end((err, res) => {
+
+                            if (log) { console.log("update project time slots res.body: ", res.body) };
+                            res.should.have.status(200);
+                            res.body.should.be.a('object');
+
+                            chai.request(server)
+                                .get('/projects/' + savedProject._id + '/isopen?timeSlot=819559cc')
+                                .auth(email, pwd)
+                                .end((err, res) => {
+
+                                    if (err) { console.error("err: ", err) };
+                                    if (log) { console.log("res.body isopen: ", res.body) };
+
+                                    // Unable to do other checks due to currentTime change.
+                                    res.should.have.status(200);
+
+                                    done();
+
+                                })
+                        })
+
+
+                })
+            })
+        }).timeout(10000)
+
     });
 
 });

package/utils/jobs-worker-queue-manager/queueManagerClassV2.js

@@ -322,7 +322,7 @@ processMsg2(msg) {
 
 closeOnErr(err) {
   if (!err) return false;
-  if (this.debug) {console.log("[JobWorker] AMQP error", err);}
+  console.error("[JobWorker] AMQP error", err);
   this.amqpConn.close();
   return true;
 }