@tiledesk/tiledesk-server 2.10.40 → 2.10.42

package/CHANGELOG.md

@@ -5,6 +5,12 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.10.42
+- updated tybot-connector to 0.2.140 
+
+# 2.10.41
+- added agents_available field in faq_kb and faq models
+
 # 2.10.40
 - bug fix: empty string for slug and index issue
 

package/app.js

@@ -451,7 +451,7 @@ var projectSetter = function (req, res, next) {
   if (projectid) {
     
     if (!mongoose.Types.ObjectId.isValid(projectid)) {
-      winston.warn(`Invalid ObjectId: ${projectid}`);
+      //winston.warn(`Invalid ObjectId: ${projectid}`);
       return res.status(400).send({ error: "Invalid project id: " + projectid });
     }
     
@@ -462,11 +462,11 @@ var projectSetter = function (req, res, next) {
     }
     q.exec(function(err, project){
       if (err) {
-        winston.warn("Problem getting project with id: " + projectid + " req.originalUrl:  " + req.originalUrl);
+        //winston.warn("Problem getting project with id: " + projectid + " req.originalUrl:  " + req.originalUrl);
       }
       winston.debug("projectSetter project:" + project);
       if (!project) {
-        winston.warn("ProjectSetter project not found with id: " + projectid);
+        //winston.warn("ProjectSetter project not found with id: " + projectid);
         //next();
         return res.status(400).send({ error: "Project not found with id: " + projectid })
       } else {

package/models/analyticResult.js

@@ -18,7 +18,7 @@ var analyticResult= mongoose.model('analyticResult', AnalyticResultSchema);
 
 if (process.env.MONGOOSE_SYNCINDEX) {
   analyticResult.syncIndexes();
-  winston.info("analyticResult syncIndexes")
+  winston.verbose("analyticResult syncIndexes")
 }
 
 

package/models/channel.js

@@ -14,7 +14,7 @@ var channel = mongoose.model('channel', ChannelSchema);;
 
 if (process.env.MONGOOSE_SYNCINDEX) {
   channel.syncIndexes();
-  winston.info("channel syncIndexes")
+  winston.verbose("channel syncIndexes")
 }
 
 

package/models/department.js

@@ -89,7 +89,7 @@ var department = mongoose.model('department', DepartmentSchema);
 
 if (process.env.MONGOOSE_SYNCINDEX) {
   department.syncIndexes();
-  winston.info("department syncIndexes")
+  winston.verbose("department syncIndexes")
 }
 
 

package/models/faq.js

@@ -101,12 +101,20 @@ var FaqSchema = new Schema({
   attributes: {
     type: Object,
   },
+  agents_available: {
+    type: Boolean,
+    required: false,
+    default: function () {
+      return this.isNew ? false : undefined;
+    },
+  }
 }, {
   timestamps: true,
   toJSON: { virtuals: true } //used to polulate messages in toJSON// https://mongoosejs.com/docs/populate.html
 }
 );
 
+
 FaqSchema.virtual('faq_kb', {
   ref: 'faq_kb', // The model to use
   localField: 'id_faq_kb', // Find people where `localField`
@@ -181,7 +189,7 @@ faq.on('index', function (error) {
 
 if (process.env.MONGOOSE_SYNCINDEX) {
   faq.syncIndexes();
-  winston.info("faq syncIndexes")
+  winston.verbose("faq syncIndexes")
 }
 
 

package/models/faq_kb.js

@@ -11,13 +11,13 @@ var Faq_kbSchema = new Schema({
   name: {
     type: String,
     required: true,
-    index:true
+    index: true
   },
   description: {
     type: String,
     // index:true
   },
-  url: { 
+  url: {
     type: String,
     // required: true
   },
@@ -25,7 +25,7 @@ var Faq_kbSchema = new Schema({
     type: String,
     // required: true
   },
-  webhook_enabled: { 
+  webhook_enabled: {
     type: Boolean,
     required: false,
     default: false,
@@ -74,13 +74,13 @@ var Faq_kbSchema = new Schema({
     type: Boolean,
     required: false,
     default: false,
-    index:true
+    index: true
   },
   certified: {
     type: Boolean,
     required: false,
     default: false,
-    index:true
+    index: true
   },
   mainCategory: {
     type: String,
@@ -92,18 +92,18 @@ var Faq_kbSchema = new Schema({
     default: 'none'
   },
   tags: [{
-      type: String
-    }],
+    type: String
+  }],
   score: {
-      type: Number,
-      required: false,
-      index: true,
-      default: 0
-    },
+    type: Number,
+    required: false,
+    index: true,
+    default: 0
+  },
   publishedBy: {
     type: String,
   },
-  publishedAt: { 
+  publishedAt: {
     type: Date
   },
   trained: {
@@ -122,15 +122,22 @@ var Faq_kbSchema = new Schema({
     type: Array,
     required: false
   },
+  agents_available: {
+    type: Boolean,
+    required: false,
+    default: function () {
+      return this.isNew ? false : undefined;
+    },
+  },
   slug: {
     type: String,
     required: false,
     index: true
-  },
+  }
 },{
   timestamps: true
-}
-);
+});
+
 
 Faq_kbSchema.pre("save", async function (next) {
   // Check if the document is new and if the slug has not been set manually
@@ -175,7 +182,7 @@ var faq_kb = mongoose.model('faq_kb', Faq_kbSchema);
 
 if (process.env.MONGOOSE_SYNCINDEX) {
   faq_kb.syncIndexes();
-  winston.info("faq_kb syncIndexes")
+  winston.verbose("faq_kb syncIndexes")
 }
 
 function generateSlug(name) {

package/models/lead.js

@@ -111,7 +111,7 @@ LeadSchema.index({status: 1, id_project: 1, createdAt: -1});
 
  if (process.env.MONGOOSE_SYNCINDEX) {
   lead.syncIndexes();
-  winston.info("lead syncIndexes")
+  winston.verbose("lead syncIndexes")
 }
 
 module.exports = lead;

package/models/message.js

@@ -111,7 +111,7 @@ var message = mongoose.model('message', MessageSchema);
 
 if (process.env.MONGOOSE_SYNCINDEX) {
   message.syncIndexes();
-  winston.info("message syncIndexes")
+  winston.verbose("message syncIndexes")
 }
 
 module.exports = message;

package/models/pending-invitation.js

@@ -36,7 +36,7 @@ var pending= mongoose.model('pending-invitation', PendingInvitation);
 
 if (process.env.MONGOOSE_SYNCINDEX) {
   pending.syncIndexes();
-  winston.info("pending syncIndexes")
+  winston.verbose("pending syncIndexes")
 }
 
 module.exports = pending;

package/models/profile.js

@@ -58,7 +58,7 @@ var profile =mongoose.model('profile', ProfileSchema);
 
 if (process.env.MONGOOSE_SYNCINDEX) {
   profile.syncIndexes();
-  winston.info("profile syncIndexes")
+  winston.verbose("profile syncIndexes")
 }
 
 

package/models/property.js

@@ -43,7 +43,7 @@ var property = mongoose.model('property', PropertySchema);
 
  if (process.env.MONGOOSE_SYNCINDEX) {
   property.syncIndexes();
-  winston.info("property syncIndexes")
+  winston.verbose("property syncIndexes")
 }
 
 module.exports = property;

package/models/request.js

@@ -522,7 +522,7 @@ RequestSchema.index({ id_project: 1, preflight: 1, smartAssignment: 1, "snapshot
 var request =  mongoose.model('request', RequestSchema);
 if (process.env.MONGOOSE_SYNCINDEX) {
   request.syncIndexes();
-  winston.info("message syncIndexes")
+  winston.verbose("message syncIndexes")
 
 }
 

package/models/requester.js

@@ -18,7 +18,7 @@ var requester = mongoose.model('requester', RequesterSchema);
 
 if (process.env.MONGOOSE_SYNCINDEX) {
   requester.syncIndexes();
-  winston.info("requester syncIndexes")
+  winston.verbose("requester syncIndexes")
 }
 
 module.exports = requester;

package/models/segment.js

@@ -61,7 +61,7 @@ var segment = mongoose.model('segment', SegmentSchema);
 
 if (process.env.MONGOOSE_SYNCINDEX) {
     segment.syncIndexes();
-  winston.info("segment syncIndexes")
+  winston.verbose("segment syncIndexes")
 }
 
 module.exports = segment;

package/models/setting.js

@@ -37,7 +37,7 @@ var setting =  mongoose.model('Setting', SettingSchema);
 
 if (process.env.MONGOOSE_SYNCINDEX) {
   setting.syncIndexes();
-  winston.info("setting syncIndexes")
+  winston.verbose("setting syncIndexes")
 }
 
 

package/models/subscription.js

@@ -49,7 +49,7 @@ var subscription = mongoose.model('subscription', SubscriptionSchema);
 
 if (process.env.MONGOOSE_SYNCINDEX) {
   subscription.syncIndexes();
-  winston.info("subscription syncIndexes")
+  winston.verbose("subscription syncIndexes")
 }
 
 module.exports = subscription;

package/models/user.js

@@ -133,7 +133,7 @@ var UserModel = mongoose.model('user', UserSchema);
 
 if (process.env.MONGOOSE_SYNCINDEX) {
     UserModel.syncIndexes();
-    winston.info("UserModel syncIndexes")
+    winston.verbose("UserModel syncIndexes")
 }
 
 module.exports = UserModel;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.10.40",
+  "version": "2.10.42",
   "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.139",
+    "@tiledesk/tiledesk-tybot-connector": "^0.2.140",
     "@tiledesk/tiledesk-whatsapp-connector": "^0.1.76",
     "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.11",
     "@tiledesk/tiledesk-sms-connector": "^0.1.11",

package/routes/auth.js

@@ -854,7 +854,7 @@ router.get(
   "/keycloak/callback",
   passport.authenticate("keycloak"),
   function(req, res) {
-    winston.info("'/keycloak/callback: ");
+    winston.verbose("'/keycloak/callback: ");
     // Successful authentication, redirect home.
     res.redirect('/');
   }

package/routes/auth_newjwt.js

@@ -135,7 +135,7 @@ function (req, res) {
           
           authEvent.emit("projectuser.create", savedProject_user);         
 
-          winston.info('project user created ', savedProject_user.toObject());
+          winston.verbose('project user created ', savedProject_user.toObject());
 
           
           // JWT_HERE
@@ -215,14 +215,14 @@ router.post('/signinWithCustomToken', [
           
             authEvent.emit("projectuser.create", savedProject_user);         
 
-              winston.info('project user created ', savedProject_user.toObject());
+              winston.verbose('project user created ', savedProject_user.toObject());
 
               
 
             return res.json({ success: true, token: req.headers["authorization"], user: req.user });
         });
       }else {
-        winston.info('project user already exists ');
+        winston.verbose('project user already exists ');
         return res.json({ success: true, token: req.headers["authorization"], user: req.user });
       }
 

package/routes/campaigns.js

@@ -15,7 +15,7 @@ var Segment2MongoConverter = require("../utils/segment2mongoConverter");
 var JobManager = require("jobs-worker-queued");
 
 var JOB_RABBITURI = process.env.JOB_RABBITURI;
-winston.info("JobWorkerQueued uri: " + JOB_RABBITURI);
+winston.verbose("JobWorkerQueued uri: " + JOB_RABBITURI);
 
 var jobManager = new JobManager(JOB_RABBITURI,
   {
@@ -44,7 +44,7 @@ router.post('/', function (req, res) {
     req.body.text, req.body.departmentid, req.body.sourcePage,
     req.body.language, req.body.userAgent, null, req.user._id, req.body.attributes, req.body.subject, true, req.body.channel).then(function (savedRequest) {
 
-      winston.info("savedRequest", savedRequest);
+      winston.debug("savedRequest", savedRequest);
 
       // create(sender, senderFullname, recipient, text, id_project, createdBy, status, attributes, type, metadata, language, channel_type) {
       return messageService.create(req.body.sender || req.user._id, req.body.senderFullname || req.user.fullName, savedRequest.request_id, req.body.text,

package/routes/faq.js

@@ -15,6 +15,7 @@ csv = require('csv-express');
 csv.separator = ';';
 const axios = require("axios").default;
 var configGlobal = require('../config/global');
+const roleConstants = require('../models/roleConstants');
 
 const apiUrl = process.env.API_URL || configGlobal.apiUrl;
 
@@ -424,6 +425,9 @@ router.put('/:faqid', function (req, res) {
   if (req.body.attributes != undefined) {
     update.attributes = req.body.attributes;
   }
+  if (req.body.agents_available != undefined) {
+    update.agents_available = req.body.agents_available;
+  }
 
   if (faqid.startsWith("intentId")) {
     let intent_id = faqid.substring(8);
@@ -606,6 +610,13 @@ router.get('/', function (req, res, next) {
     query.intent_display_name = req.query.intent_display_name
   }
 
+  let project_user = req.projectuser;
+  if (project_user && project_user.role === roleConstants.AGENT) {
+    query.agents_available = {
+      $in: [ null, true ]
+    }
+  }
+
 
   winston.debug("GET FAQ query", query);
 

package/routes/faq_kb.js

@@ -325,8 +325,8 @@ router.put('/:faq_kbid', roleChecker.hasRoleOrTypes('admin', ['bot','subscriptio
     update.certifiedTags = req.body.certifiedTags
   }
 
-  if (req.body.agents_visible != undefined) {
-    update.agents_visible = req.body.agents_visible
+  if (req.body.agents_available != undefined) {
+    update.agents_available = req.body.agents_available
   }
 
   if (req.body.slug != undefined) {
@@ -542,13 +542,19 @@ router.get('/', roleChecker.hasRoleOrTypes('agent', ['bot','subscription']), fun
    * if filter only for 'trashed = false', 
    * the bots created before the implementation of the 'trashed' property are not returned 
    */
-  var query = { "id_project": req.projectid, "trashed": { $in: [null, false] } };
+  let query = { "id_project": req.projectid, "trashed": { $in: [null, false] } };
+  
+  if (restricted_mode === true) {
+    query.agents_available = {
+      $in: [ null, true ]
+    }
+  }
 
   if (req.query.all != "true") {
     query.type = { $ne: "identity" }
   }
 
-  var search_obj = {"$search": req.query.text};
+  let search_obj = {"$search": req.query.text};
 
   if (req.query.text) {    
     if (req.query.language) {

package/routes/kb.js

@@ -1445,7 +1445,7 @@ async function scheduleScrape(resources) {
         winston.error("Scheduling error: ", err);
         error_code = 400;
       } else {
-        winston.info("Scheduling result: ", result);
+        winston.verbose("Scheduling result: ", result);
       }
       await updateStatus(r.id, error_code);
     });

package/routes/request.js

@@ -2362,7 +2362,7 @@ async function scheduleTags(id_project, tags) {
       if (err) {
         winston.error("Scheduling error: ", err);
       } else {
-        winston.info("Scheduling result: ", result);
+        winston.verbose("Scheduling result: ", result);
       }
     })
   })

package/services/chatbotService.js

@@ -62,7 +62,7 @@ class ChatbotService {
         },
         method: 'GET'
       }).then((resbody) => {
-        winston.info("(CHATBOT SERVICE) forking public chatbot " + resbody.data.name);
+        winston.debug("(CHATBOT SERVICE) forking public chatbot " + resbody.data.name);
         let chatbot = resbody.data;
         return chatbot
       }).catch((err) => {

package/services/openaiService.js

@@ -165,8 +165,8 @@ class OpenaiService {
   }
 
   getContentChunks(namespace_id, content_id, engine) {
-    winston.info("[OPENAI SERVICE] kb endpoint: " + kb_endpoint_train);
-    winston.info(kb_endpoint_train + "/id/" + content_id + "/namespace/" + namespace_id)
+    winston.debug("[OPENAI SERVICE] kb endpoint: " + kb_endpoint_train);
+
     return new Promise((resolve, reject) => {
 
       let payload = { engine: engine };