@tiledesk/tiledesk-server 2.10.63 → 2.10.65

package/CHANGELOG.md

@@ -5,8 +5,16 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.10.65
+- fix issue con /rating called by chatbot
+
+# 2.10.64
+- updated tybot-connector to 0.3.4
+- updated whatsapp-connector to 0.1.81
+- fix bug: not existing err variable on requestService 
+
 # 2.10.63
-- updated tybot-connector to 0.3.2
+- updated tybot-connector to 0.3.3
 - updated multi-worker to 0.1.20
 
 # 2.10.62

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.10.63",
+  "version": "2.10.65",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -47,8 +47,8 @@
     "@tiledesk/tiledesk-messenger-connector": "^0.1.23",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
     "@tiledesk/tiledesk-telegram-connector": "^0.1.14",
-    "@tiledesk/tiledesk-tybot-connector": "^0.3.3",
-    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.79",
+    "@tiledesk/tiledesk-tybot-connector": "^0.3.4",
+    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.81",
     "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.11",
     "@tiledesk/tiledesk-sms-connector": "^0.1.11",
     "@tiledesk/tiledesk-vxml-connector": "^0.1.67",

package/routes/user-request.js

@@ -12,7 +12,6 @@ router.patch('/:requestid/rating', function (req, res) {
   winston.debug(req.body);
   const update = {};
 
-
   if (req.body.rating) {
     update.rating = req.body.rating;
   }
@@ -20,13 +19,16 @@ router.patch('/:requestid/rating', function (req, res) {
   if (req.body.rating_message) {
     update.rating_message = req.body.rating_message;
   }
-
-
   
   winston.debug("Request user patch update",update);
 
-  // var query = {"request_id":req.params.requestid};
-  var query = {"request_id":req.params.requestid, "requester": req.projectuser.id};
+  let query = {
+    request_id: req.params.requestid
+  }
+
+  if (req.projectuser) {
+    query.requester = req.projectuser.id
+  }
 
     //cacheinvalidation
   return Request.findOneAndUpdate(query, { $set: update }, { new: true, upsert: false })

package/services/requestService.js

@@ -1503,13 +1503,13 @@ class RequestService {
 
 
     return new Promise(function (resolve, reject) {
-      winston.debug("changeFirstTextAndPreflightByRequestId", request_id);
+      winston.debug("changeFirstTextAndPreflightByRequestId" + request_id);
       // winston.debug("request_id", request_id);
       // winston.debug("newstatus", newstatus);
 
       if (!first_text) {
-        winston.error(err);
-        return reject({ err: " Error changing first text. The field first_text is empty" });
+        winston.error("Error changing first text. The field first_text is empty for request " + request_id);
+        return reject({ err: "Error changing first text. The field first_text is empty" });
       }
 
       return Request

package/test/userRequestRoute.js

@@ -0,0 +1,125 @@
+process.env.NODE_ENV = 'test';
+
+let chai = require('chai');
+let chaiHttp = require('chai-http');
+let server = require('../app');
+let should = chai.should();
+
+chai.use(chaiHttp);
+
+var expect = require('chai').expect;
+var assert = require('chai').assert;
+var config = require('../config/database');
+
+var mongoose = require('mongoose');
+var winston = require('../config/winston');
+
+let log = false;
+
+// var databaseUri = process.env.DATABASE_URI || process.env.MONGODB_URI;
+// if (!databaseUri) {
+//   console.log('DATABASE_URI not specified, falling back to localhost.');
+// }
+
+// mongoose.connect(databaseUri || config.database);
+mongoose.connect(config.databasetest);
+
+var userService = require('../services/userService');
+const projectService = require('../services/projectService');
+var leadService = require('../services/leadService');
+var requestService = require('../services/requestService');
+const faqService = require('../services/faqService');
+var Bot = require("../models/faq_kb");
+
+var jwt = require('jsonwebtoken');
+const uuidv4 = require('uuid/v4');
+
+
+describe('UserService()', function () {
+
+    it('request-rating', function (done) {
+
+        var email = "test-UserRequest-signup-" + Date.now() + "@email.com";
+        var pwd = "pwd";
+
+        userService.signup(email, pwd, "Test Firstname", "Test lastname").then(function (savedUser) {
+            var userid = savedUser.id;
+
+            projectService.createAndReturnProjectAndProjectUser("createWithId", savedUser.id).then(function (savedProjectAndPU) {
+                var savedProject = savedProjectAndPU.project;
+
+                faqService.create("testbot", null, savedProject._id, savedUser._id, "tilebot", null, null, null, "en", "blank").then(async function (savedFaq_kb) {
+
+                    var signOptions = {
+                        issuer: 'https://tiledesk.com',
+                        subject: 'bot',
+                        audience: 'https://tiledesk.com/bots/' + savedFaq_kb._id,
+                        jwtid: uuidv4()
+                    };
+
+                    let botPayload = savedFaq_kb.toObject();
+                    let botSecret = botPayload.secret;
+
+                    var bot_token = jwt.sign(botPayload, botSecret, signOptions);
+
+                    leadService.createIfNotExists("leadfullname", "email@email.com", savedProject._id).then(function (createdLead) {
+                        var now = Date.now();
+                        var request = {
+                            request_id: "request_id-createObjSimple-" + now, project_user_id: savedProjectAndPU.project_user._id, lead_id: createdLead._id,
+                            id_project: savedProject._id, first_text: "first_text",
+                            lead: createdLead, requester: savedProjectAndPU.project_user
+                        };
+
+                        requestService.create(request).then(function (savedRequest) {
+
+                            chai.request(server)
+                                .patch('/' + savedProject._id + '/requests/' + savedRequest.request_id + "/rating")
+                                .set('Authorization', "JWT " + bot_token)
+                                .send({ rating: 4, rating_message: "Good" })
+                                .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');
+                                    expect(res.body.rating).to.equal(4);
+                                    expect(res.body.rating_message).to.equal('Good');
+
+                                    done()
+                                });
+                        });
+                    });
+
+
+
+                });
+
+
+
+                // console.log("savedProject: ", savedProject)
+                // leadService.createIfNotExists("leadfullname", "email@email.com", savedProject._id).then(function (createdLead) {
+                //     var now = Date.now();
+                //     var request = {
+                //         request_id: "request_id-createObjSimple-" + now, project_user_id: savedProjectAndPU.project_user._id, lead_id: createdLead._id,
+                //         id_project: savedProject._id, first_text: "first_text",
+                //         lead: createdLead, requester: savedProjectAndPU.project_user
+                //     };
+
+                //     console.log("request: ", request)
+
+
+                //     requestService.create(request).then(function (savedRequest) {
+
+                //         console.log("savedRequest: ", savedRequest);
+                //         done();
+                //     });
+                // });
+            });
+
+        })
+
+
+    }).timeout(10000);
+})
+