@tiledesk/tiledesk-server 2.4.69 → 2.4.70

package/CHANGELOG.md

@@ -5,6 +5,10 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.4.70
+- campaign direct refactoring with job worker
+- segment filter fix for lead
+
 # 2.4.69
 - update tiledesk-tybot-connector to 0.2.15
 

package/package.json

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

package/routes/faq.js

@@ -350,19 +350,28 @@ router.delete('/:faqid', function (req, res) {
   winston.debug('DELETE FAQ - FAQ ID ', req.params.faqid);
 
   let faqid = req.params.faqid;
+  let id_faq_kb;
+  if (req.query && req.query.id_faq_kb) {
+    id_faq_kb = req.query.id_faq_kb;
+  }
   
   if (faqid.startsWith("intentId")) {
-    console.log("faqid is an intent_id")
     let intent_id = faqid.substring(8);
-    console.log("faq intent_id: ", intent_id);
+    if (!id_faq_kb) {
+      return res.status(500).send({ success: false, msg: "Unable to delete object. Query param 'id_faq_kb' is mandatory if you want to delete via intent_id"})
+    }
 
-    Faq.findOneAndDelete({ intent_id: intent_id }, (err, faq) => {
+    Faq.findOneAndDelete({ intent_id: intent_id, id_faq_kb: id_faq_kb }, (err, faq) => {
       if (err) {
         return res.status(500).send({ success: false, msg: "Error deleting object." });
       }
 
+      if (!faq) {
+        return res.status(404).send({ success: false, msg: "Error deleting object. The object does not exists."})
+      }
+
       winston.debug('Deleted FAQ ', faq);
-  
+      
       faqBotEvent.emit('faq.delete', faq);
       faqBotEvent.emit('faq_train.delete', faq.id_faq_kb);
   

package/routes/lead.js

@@ -411,6 +411,15 @@ router.get('/', async(req, res) => {
 
   var query = {};
 
+
+  if (req.query.segment) {
+    let segment = await Segment.findOne({id_project: req.projectid, _id: req.query.segment }).exec();
+    if (!segment) {
+      return res.status(404).send({ success: false, msg: 'Error segment not found' });
+    }
+    Segment2MongoConverter.convert(query, segment);
+  }
+  
   if (req.query.full_text) {
     winston.debug('LEAD ROUTE req.query.fulltext', req.query.full_text);
     query.$text = { "$search": req.query.full_text };
@@ -433,30 +442,21 @@ router.get('/', async(req, res) => {
 
   // aggiungi filtro per data
 
-  if (req.query.status) {
-    query.status = req.query.status;
-  }
 
   if (req.query.tags) {
     winston.debug('req.query.tags', req.query.tags);
     query["tags"] = req.query.tags;
   }
 
-  
-  if (req.query.segment) {
-    let segment = await Segment.findOne({id_project: req.projectid, _id: req.query.segment }).exec();
-    if (!segment) {
-      return res.status(404).send({ success: false, msg: 'Error segment not found' });
-    }
-    Segment2MongoConverter.convert(query, segment);
-  }
-
-
 
   // last query modifier
   query["id_project"] = req.projectid;
   query["status"] = LeadConstants.NORMAL;
 
+  if (req.query.status) {
+    query.status = req.query.status;
+  }
+
   winston.debug("query", query);
 
 

package/test/faqRoute.js

@@ -12,6 +12,7 @@ let server = require('../app');
 let should = chai.should();
 var fs = require('fs');
 const path = require('path');
+const uuidv4 = require('uuid/v4');
 
 
 // chai.config.includeStack = true;
@@ -579,7 +580,7 @@ describe('FaqKBRoute', () => {
             })
         });
 
-        it('delete with intent_id', (done) => {
+        it('deleteWithIntentId', (done) => {
 
             var email = "test-signup-" + Date.now() + "@email.com";
             var pwd = "pwd";
@@ -601,14 +602,14 @@ describe('FaqKBRoute', () => {
                             chai.request(server)
                                 .post('/' + savedProject._id + '/faq')
                                 .auth(email, pwd)
-                                .send({ id_faq_kb: id_faq_kb, question: "question1", answer: "answer1" })
+                                .send({ id_faq_kb: id_faq_kb, question: "question1", answer: "answer1", intent_id: uuidv4() })
                                 .end((err, res) => {
                                     if (log) { console.log("create intent res.body", res.body); }
                                     res.should.have.status(200);
                                     let faqid = res.body.intent_id;
 
                                     chai.request(server)
-                                        .delete('/' + savedProject._id + '/faq/intentId' + faqid)
+                                        .delete('/' + savedProject._id + '/faq/intentId' + faqid + "?id_faq_kb=" + id_faq_kb)
                                         .auth(email, pwd)
                                         .end((err, res) => {
                                             if (log) { console.log("delete intent res.body", res.body); }
@@ -623,6 +624,96 @@ describe('FaqKBRoute', () => {
             })
         });
 
+        it('deleteWithIntentIdError', (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-search-faqs", savedUser._id).then((savedProject) => {
+
+                    chai.request(server)
+                        .post('/' + savedProject._id + '/faq_kb')
+                        .auth(email, pwd)
+                        .send({ "name": "testbot", type: "internal", template: "example", intentsEngine: 'tiledesk-ai' })
+                        .end((err, res) => {
+                            if (log) { console.log("create chatbot res.body", res.body); }
+                            res.should.have.status(200);
+                            res.body.should.be.a('object');
+                            expect(res.body.name).to.equal("testbot");
+                            var id_faq_kb = res.body._id;
+
+                            chai.request(server)
+                                .post('/' + savedProject._id + '/faq')
+                                .auth(email, pwd)
+                                .send({ id_faq_kb: id_faq_kb, question: "question1", answer: "answer1", intent_id: uuidv4() })
+                                .end((err, res) => {
+                                    if (log) { console.log("create intent res.body", res.body); }
+                                    res.should.have.status(200);
+                                    let faqid = res.body.intent_id;
+
+                                    chai.request(server)
+                                        .delete('/' + savedProject._id + '/faq/intentId' + faqid)
+                                        // .delete('/' + savedProject._id + '/faq/intentId' + faqid + "?id_faq_kb=" + id_faq_kb)
+                                        .auth(email, pwd)
+                                        .end((err, res) => {
+                                            if (log) { console.log("delete intent res.body", res.body); }
+                                            res.should.have.status(500);
+
+                                            done();
+                                        })
+
+                                })
+                        })
+                })
+            })
+        });
+
+        it('deleteWithIntentIdErroWrongChatbotId', (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-search-faqs", savedUser._id).then((savedProject) => {
+
+                    chai.request(server)
+                        .post('/' + savedProject._id + '/faq_kb')
+                        .auth(email, pwd)
+                        .send({ "name": "testbot", type: "internal", template: "example", intentsEngine: 'tiledesk-ai' })
+                        .end((err, res) => {
+                            if (log) { console.log("create chatbot res.body", res.body); }
+                            res.should.have.status(200);
+                            res.body.should.be.a('object');
+                            expect(res.body.name).to.equal("testbot");
+                            var id_faq_kb = res.body._id;
+
+                            chai.request(server)
+                                .post('/' + savedProject._id + '/faq')
+                                .auth(email, pwd)
+                                .send({ id_faq_kb: id_faq_kb, question: "question1", answer: "answer1", intent_id: uuidv4() })
+                                .end((err, res) => {
+                                    if (log) { console.log("create intent res.body", res.body); }
+                                    res.should.have.status(200);
+                                    let faqid = res.body.intent_id;
+
+                                    chai.request(server)
+                                        .delete('/' + savedProject._id + '/faq/intentId' + faqid + "?id_faq_kb=11233")
+                                        // .delete('/' + savedProject._id + '/faq/intentId' + faqid + "?id_faq_kb=" + id_faq_kb)
+                                        .auth(email, pwd)
+                                        .end((err, res) => {
+                                            if (log) { console.log("delete intent res.body", res.body); }
+                                            res.should.have.status(404);
+
+                                            done();
+                                        })
+
+                                })
+                        })
+                })
+            })
+        });
+
 
     });