@tiledesk/tiledesk-server 2.10.64 → 2.10.66

package/CHANGELOG.md

@@ -5,6 +5,12 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.10.66
+- Updated QuoteService with new plans
+
+# 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

package/package.json

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

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/QuoteManager.js

@@ -14,16 +14,23 @@ 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,     voice_duration: 0,       email: 200,     chatbots: 20,      namespace: 3,   kbs: 50     }, // same as PREMIUM
-    SANDBOX:    { requests: 200,    messages: 0,    tokens: 100000,     voice_duration: 0,       email: 200,     chatbots: 2,       namespace: 1,   kbs: 50     },
-    BASIC:      { requests: 800,    messages: 0,    tokens: 2000000,    voice_duration: 0,       email: 200,     chatbots: 5,       namespace: 1,   kbs: 150    },
-    PREMIUM:    { requests: 3000,   messages: 0,    tokens: 5000000,    voice_duration: 0,       email: 200,     chatbots: 20,      namespace: 3,   kbs: 300    },
-    TEAM:       { requests: 5000,   messages: 0,    tokens: 10000000,   voice_duration: 0,       email: 200,     chatbots: 50,      namespace: 10,  kbs: 1000   },
-    CUSTOM:     { requests: 5000,   messages: 0,    tokens: 10000000,   voice_duration: 120000,  email: 200,     chatbots: 50,      namespace: 10,  kbs: 1000   },
+    //FREE_TRIAL: { requests: 200,    messages: 0,    tokens: 100000,     voice_duration: 0,       email: 200,     chatbots: 20,      namespace: 3,   kbs: 50     }, // same as PREMIUM
+    SANDBOX:    { requests: 200,    messages: 0,    tokens: 100000,     voice_duration: 0,          email: 200,     chatbots: 2,    namespace: 1,   kbs: 50 },
+    BASIC:      { requests: 800,    messages: 0,    tokens: 2000000,    voice_duration: 0,          email: 200,     chatbots: 5,    namespace: 1,   kbs: 150 },
+    PREMIUM:    { requests: 3000,   messages: 0,    tokens: 5000000,    voice_duration: 0,          email: 200,     chatbots: 20,   namespace: 3,   kbs: 300 },
+    TEAM:       { requests: 5000,   messages: 0,    tokens: 10000000,   voice_duration: 0,          email: 200,     chatbots: 50,   namespace: 10,  kbs: 1000 },
+    //CUSTOM:     { requests: 5000,   messages: 0,    tokens: 10000000,   voice_duration: 120000,  email: 200,     chatbots: 50,      namespace: 10,  kbs: 1000   },
+    // FROM MARCH 2025
+    FREE_TRIAL: { requests: 3000,   messages: 0,    tokens: 5000000,    voice_duration: 120000,     email: 200,     chatbots: 5,    namespace: 1,   kbs: 50 },  // same as PRO
+    STARTER:    { requests: 800,    messages: 0,    tokens: 2000000,    voice_duration: 0,          email: 200,     chatbots: 5,    namespace: 1,   kbs: 150 },
+    PRO:        { requests: 3000,   messages: 0,    tokens: 5000000,    voice_duration: 0,          email: 200,     chatbots: 20,   namespace: 3,   kbs: 300 },
+    BUSINESS:   { requests: 5000,   messages: 0,    tokens: 10000000,   voice_duration: 0,          email: 200,     chatbots: 50,   namespace: 10,  kbs: 1000 },
+    CUSTOM:     { requests: 5000,   messages: 0,    tokens: 10000000,   voice_duration: 120000,     email: 200,     chatbots: 50,   namespace: 10,  kbs: 1000 }
 }
 
+
+
 const typesList = ['requests', 'messages', 'email', 'tokens', 'voice_duration', 'chatbots', 'kbs']
 
 let quotes_enabled = true;
@@ -88,7 +95,7 @@ class QuoteManager {
             winston.debug("QUOTES DISABLED - incrementTokenCount")
             return key;
         }
-        
+
         let tokens = data.tokens * data.multiplier;
         await this.tdCache.incrbyfloat(key, tokens);
         // await this.tdCache.incrby(key, tokens);
@@ -110,7 +117,7 @@ class QuoteManager {
         if (request?.duration) {
             let duration = Math.round(request.duration / 1000); // from ms to s
             await this.tdCache.incrby(key, duration);
-    
+
             this.sendEmailIfQuotaExceeded(project, request, 'voice_duration', key);
         }
     }
@@ -261,7 +268,7 @@ class QuoteManager {
     }
 
     async checkQuoteForAlert(project, object, type) {
-        
+
         if (quotes_enabled === false) {
             winston.verbose("QUOTES DISABLED - checkQuote for type " + type);
             return (null, null);
@@ -283,7 +290,7 @@ class QuoteManager {
     }
 
     async sendEmailIfQuotaExceeded(project, object, type, key) {
-        
+
         let data = await this.checkQuoteForAlert(project, object, type);
         let limits = data.limits;
         let limit = data.limits[type];
@@ -312,7 +319,7 @@ class QuoteManager {
             }
 
             emailEvent.emit('email.send.quote.checkpoint', data);
-            await this.tdCache.set(nKey, 'true', {EX: 2592000}); //seconds in one month = 2592000
+            await this.tdCache.set(nKey, 'true', { EX: 2592000 }); //seconds in one month = 2592000
         } else {
             winston.verbose("Quota checkpoint reached email already sent.")
         }
@@ -320,7 +327,7 @@ class QuoteManager {
     }
 
     async percentageCalculator(limit, quote) {
-        
+
         let p = (quote / limit) * 100;
 
         if (p >= 100) { return 100; }
@@ -339,10 +346,10 @@ class QuoteManager {
         let requests_key = await this.generateKey(obj, 'requests');
         let tokens_key = await this.generateKey(obj, 'tokens');
         let email_key = await this.generateKey(obj, 'email');
-        
+
         let checkpoints = ['50', '75', '95', '100']
 
-        checkpoints.forEach( async (checkpoint) => {
+        checkpoints.forEach(async (checkpoint) => {
             let nrequests_key = requests_key + ":notify:" + checkpoint;
             let ntokens_key = tokens_key + ":notify:" + checkpoint;
             let nemail_key = email_key + ":notify:" + checkpoint;
@@ -390,7 +397,22 @@ class QuoteManager {
 
         if (this.project.profile.type === 'payment') {
 
+            if (this.project.isActiveSubscription === false) {
+                limits = PLANS_LIST.SANDBOX;
+                return limits;
+
+            }
+
             switch (plan) {
+                case 'Starter':
+                    limits = PLANS_LIST.STARTER
+                    break;
+                case 'Pro':
+                    limits = PLANS_LIST.PRO
+                    break;
+                case 'Business':
+                    limits = PLANS_LIST.BUSINESS
+                    break;
                 case 'Basic':
                     limits = PLANS_LIST.BASIC;
                     break;
@@ -415,6 +437,7 @@ class QuoteManager {
                 default:
                     limits = PLANS_LIST.FREE_TRIAL;
             }
+
         } else {
 
             if (this.project.trialExpired === false) {
@@ -424,6 +447,7 @@ class QuoteManager {
             }
 
         }
+
         if (this.project?.profile?.quotes) {
             let profile_quotes = this.project?.profile?.quotes;
             const merged_quotes = Object.assign({}, limits, profile_quotes);
@@ -454,7 +478,7 @@ class QuoteManager {
                 winston.debug("Subscription date from project createdAt: " + subscriptionDate.toISOString());
             }
         }
-        
+
         let now = moment();
         winston.debug("now: ", now);
 

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);
+})
+