@tiledesk/tiledesk-server 2.9.5 → 2.9.7

package/CHANGELOG.md

@@ -5,6 +5,13 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.9.7
+- Fix bug: draft conversation was shown in monitor
+- Update tybot-connector to 0.2.92
+
+# 2.9.6
+- Fix bug: wrong timzone in startTime and andTime in operating hours service
+
 # 2.9.5
 - Added raw option in /users/availables
 

package/models/request.js

@@ -300,6 +300,11 @@ var RequestSchema = new Schema({
     type: String,
     required: true
   },
+  draft: {
+    type: Boolean,
+    required: false,
+    index: true
+  }
 
 }, {
   timestamps: true,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.9.5",
+  "version": "2.9.7",
   "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.86",
+    "@tiledesk/tiledesk-tybot-connector": "^0.2.92",
     "@tiledesk/tiledesk-whatsapp-connector": "^0.1.72",
     "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.8",
     "@tiledesk/tiledesk-sms-connector": "^0.1.7",

package/routes/request.js

@@ -902,7 +902,7 @@ router.get('/', function (req, res, next) {
   winston.debug('REQUEST ROUTE - SKIP PAGE ', skip);
 
 
-  var query = { "id_project": req.projectid, "status": { $lt: 1000 }, preflight: false };
+  var query = { "id_project": req.projectid, "status": { $lt: 1000 }, preflight: false, "draft": { $in: [false, null]} };
 
   var projectuser = req.projectuser;
 

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)

package/services/requestService.js

@@ -707,6 +707,10 @@ class RequestService {
           createdAt: createdAt
         });
 
+        if (isTestConversation) {
+          newRequest.draft = true;
+        }
+
         winston.debug('newRequest.', newRequest);
 
 

package/test/requestRoute.js

@@ -22,6 +22,8 @@ var faqService = require('../services/faqService');
 
 // chai.config.includeStack = true;
 
+let log = false;
+
 var expect = chai.expect;
 var assert = chai.assert;
 
@@ -1160,6 +1162,70 @@ describe('RequestRoute', () => {
       });
     });
 
+    it('exludeDraftConversations', (done) => {
+
+      var email = "test-signup-" + Date.now() + "@email.com";
+      var pwd = "pwd";
+
+      userService.signup(email, pwd, "Test Firstname", "Test Lastname").then((savedUser) => {
+        projectService.createAndReturnProjectAndProjectUser("test-draft-conversation", savedUser._id).then((savedProjectAndPU) => {
+          let savedProject = savedProjectAndPU.project;
+          let savedPU = savedProjectAndPU.project_user;
+          leadService.createIfNotExists("Lead Fullname", "email@test.com", savedProject._id).then((createdLead) => {
+            let now = Date.now();
+            let request = {
+              request_id: "request_id-exludeDraftConversations-" + now, 
+              project_user_id: savedPU._id,
+              lead_id: createdLead._id,
+              id_project: savedProject._id,
+              first_text: "first_text",
+              lead: createdLead,
+              requester: savedPU,
+              attributes: { sourcePage: "https://widget-pre.tiledesk.com/v2/index.html?tiledesk_projectid=5ce3d1ceb25ad30017279999&td_draft=true" }
+            }
+
+            requestService.create(request).then(async (savedRequest) => {
+              
+              // Case 1 - request with source page that contains td_draft
+              expect(savedRequest.draft).to.equal(true);
+
+              // Case 2 - request without source page that contains td_draft
+              //expect(savedRequest.draft).to.be.undefined;
+
+              // get all requests -> should be 0
+
+              chai.request(server)
+                  .get('/' + savedProject._id + '/requests')
+                  .auth(email, pwd)
+                  .end((err, res) => {
+
+                    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');
+                    res.body.requests.should.be.a('array');
+
+                    // Case 1 - request with source page that contains td_draft
+                    expect(res.body.requests.length).to.equal(0);
+
+                    // Case 2 - request without source page that contains td_draft
+                    //expect(res.body.requests.length).to.equal(1);
+
+                    done();
+                  })
+
+
+            }).catch((err) => {
+              console.error("error creating request: ", err)
+            })
+          })
+
+        })
+      })
+
+    })
+
     // it('assign', (done) => {