@tiledesk/tiledesk-server 2.3.6 → 2.3.7-1.2

package/models/faq.js

@@ -9,27 +9,27 @@ var defaultFullTextLanguage = process.env.DEFAULT_FULLTEXT_INDEX_LANGUAGE || "no
 var FaqSchema = new Schema({
   id_faq_kb: {
     type: String,
-    index: true    
+    index: true
   },
-  intent_id: { 
+  intent_id: {
     type: String,
     required: false,
-    index:true,
-    default: function() {
+    index: true,
+    default: function () {
       return uuidv4();
-    } 
+    }
   },
   intent_display_name: { //documentare
     type: String,
-    required: false,  
-    index:true,
-    default: function() {
+    required: false,
+    index: true,
+    default: function () {
       return nanoid(6);
-    } 
+    }
   },
   question: {
     type: String,
-    required: true 
+    required: false
   },
 
   webhook_enabled: { //usa questo
@@ -39,7 +39,17 @@ var FaqSchema = new Schema({
   },
   answer: {
     type: String,
-    required: true
+    //required: true
+    required: false
+  },
+  reply: {
+    type: Object,
+    required: false,
+  },
+  enabled: {
+    type: Boolean,
+    required: false,
+    default: true,
   },
   id_project: {
     type: String,
@@ -64,17 +74,25 @@ var FaqSchema = new Schema({
     index: true
   },
 
-//   "stats":{  
-//     "conversation_count":2,
-//     "all_done_count":0,
-//     "wait_for_team_count":2
-//  }
+  //   "stats":{  
+  //     "conversation_count":2,
+  //     "all_done_count":0,
+  //     "wait_for_team_count":2
+  //  }
 
   createdBy: {
     type: String,
     required: true
+  },
+  form: {
+    type: Object,
+    required: false
+  },
+  actions: {
+    type: Array,
+    required: false
   }
-},{
+}, {
   timestamps: true,
   toJSON: { virtuals: true } //used to polulate messages in toJSON// https://mongoosejs.com/docs/populate.html
 }
@@ -88,26 +106,60 @@ FaqSchema.virtual('faq_kb', {
   //options: { sort: { name: -1 }, limit: 5 } // Query options, see http://bit.ly/mongoose-query-options
 });
 
-FaqSchema.index({ id_project: 1, id_faq_kb: 1, question: 1 }); 
+FaqSchema.index({ id_project: 1, id_faq_kb: 1, question: 1 });
 
 // https://docs.mongodb.com/manual/core/index-text/
 // https://docs.mongodb.com/manual/tutorial/specify-language-for-text-index/
 // https://docs.mongodb.com/manual/reference/text-search-languages/#text-search-languages
 
-
-FaqSchema.index({question: 'text'},
- {"name":"faq_fulltext","default_language": defaultFullTextLanguage,"language_override": "language"}); // schema level
+// In testing...
+// FaqSchema.index({ question: "text", answer: "text" }, { weights: { question: 5, answer: 3 } })
+
+// FaqSchema.statics = {
+//   searchPartial: function (q, callback) {
+//     return this.find({
+//       $or: [
+//         { "question": new RegExp(q, "gi") },
+//         { "answer": new RegExp(q, "gi") },
+//       ]
+//     }, callback)
+//   },
+
+//   searchFull: function (q, callback) {
+//     return this.find({
+//       $text: { $search: q, $caseSensitive: false }
+//     }, callback)
+//   },
+
+//   searchFull: function (q, callback) {
+//     return this.find({
+//       $text: { $search: q, $caseSensitive: false }
+//     }, callback)
+//   },
+
+//   search: function (q, callback) {
+//     this.searchFull(q, (err, data) => {
+//       if (err) return callback(err, data);
+//       if (!err && data.length) return callback(err, data);
+//       if (!err && data.length === 0) return this.searchPartial(q, callback);
+//     });
+//   },
+
+// }
+
+FaqSchema.index({ question: 'text' },
+  { "name": "faq_fulltext", "default_language": defaultFullTextLanguage, "language_override": "language" }); // schema level
 
 //  FaqSchema.index({question: 'text', answer: 'text'},
-//  {"name":"faq_fulltext","default_language": defaultFullTextLanguage,"language_override": "language", weights: {question: 10,answer: 1}}); // schema level
+//  {"name":"faq_fulltext","default_language": defaultFqullTextLanguage,"language_override": "language", weights: {question: 10,answer: 1}}); // schema level
 
 
-FaqSchema.index({ id_project: 1, id_faq_kb: 1, intent_display_name: 1  }, { unique: true }); 
+FaqSchema.index({ id_project: 1, id_faq_kb: 1, intent_display_name: 1 }, { unique: true });
 
 
- var faq = mongoose.model('faq', FaqSchema);
+var faq = mongoose.model('faq', FaqSchema);
 
- faq.on('index', function(error) {
+faq.on('index', function (error) {
   // "_id index cannot be sparse"
   winston.debug('index', error);
 });

package/models/faq_kb.js

@@ -65,6 +65,25 @@ var Faq_kbSchema = new Schema({
   createdBy: {
     type: String,
     required: true
+  },
+  public: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  certified: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  mainCategory: {
+    type: String,
+    required: false
+  },
+  intentsEngine: {
+    type: String,
+    required: false,
+    default: 'none'
   }
 },{
   timestamps: true

package/models/message.js

@@ -20,7 +20,7 @@ var MessageSchema = new Schema({
   senderFullname: {
     type: String,
     required: false,
-    default: "Guest"
+    default: "Guest" // guest_here
   },
   recipient: {
     type: String,
@@ -45,13 +45,13 @@ var MessageSchema = new Schema({
   },
   text: {
     type: String,
-    required: function() {
-      if (this.type === "text") {
-        return true;
-      }else {
-        return false;
-      }
-    }
+    // required: function() {
+    //   if (this.type === "text") {
+    //     return true;
+    //   }else {
+    //     return false;
+    //   }
+    // }
   },
   language: { //ISO 639-1 (Two letter codes) https://docs.mongodb.com/manual/reference/text-search-languages/#text-search-languages
     type: String,
@@ -97,6 +97,8 @@ MessageSchema.index({ recipient: 1, updatedAt:1 });
 MessageSchema.index({ id_project: 1, recipient:1, updatedAt: 1 });
 MessageSchema.index({ id_project: 1, "attributes._answerid": 1 });
 
+
+
 // https://docs.mongodb.com/manual/core/index-text/
 // https://docs.mongodb.com/manual/tutorial/specify-language-for-text-index/
 // https://docs.mongodb.com/manual/reference/text-search-languages/#text-search-languages

package/models/project.js

@@ -111,6 +111,16 @@ var ProjectSchema = new Schema({
   ipFilter: [{
     type: String
   }],
+  ipFilterDenyEnabled:{
+    type: Boolean,
+    default: false
+  },
+  ipFilterDeny: [{
+    type: String
+  }],
+  bannedUsers: [{
+     id: String, ip: String
+  }],
   // defaultLanguage: {
   //   type: String,
   //   required: true,

package/models/project_user.js

@@ -37,6 +37,9 @@ var TagSchema = require("../models/tag");
       index: true
       // required: true
     },
+    profileStatus: {
+      type: String,
+    },
     presence: PresenceSchema,
     attributes: {
       type: Object,
@@ -108,5 +111,12 @@ Project_userSchema.virtual('isAuthenticated').get(function () {
   // Project_user.find({ id_project: projectid, id_user: { $in : group[0].members}, role: { $in : [RoleConstants.OWNER, RoleConstants.ADMIN, RoleConstants.AGENT]} })
   Project_userSchema.index({ id_project: 1, id_user:1, role: 1 }); 
 
+  // suggested by atlas
+  Project_userSchema.index({ id_project: 1, role: 1, status: 1, createdAt: 1  }); 
+
+
+
+
+
   module.exports = mongoose.model('project_user', Project_userSchema);;
 

package/models/request.js

@@ -273,7 +273,16 @@ var RequestSchema = new Schema({
     required: true,
     index: true
   },
-
+  smartAssignment: {
+    type: Boolean,
+    default: true,
+    index: true
+  },
+  workingStatus: { //new, pending
+    type: String,
+    required: false,
+    index: true
+  },
   createdBy: {
     type: String,
     required: true
@@ -465,6 +474,8 @@ RequestSchema.index({ id_project: 1, createdAt: 1, preflight: 1});
 RequestSchema.index({ hasBot: 1, status: 1, createdAt: 1});
 
 
+
+
 //   cannot index parallel arrays [agents] [participants] {"driv
 // RequestSchema.index({ id_project: 1, status: 1, preflight:1, participants:1, "agents.id_user":1, updatedAt: -1 }); //NN LO APPLICA
  

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.3.6",
+  "version": "2.3.71.2",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -14,7 +14,7 @@
     "enable-ent": "echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} > .npmrc"
   },
   "private": false,
-  "author": "Andrea Leo - Frontiere21 SRL",
+  "author": "Andrea Leo - Tiledesk SRL",
   "license": "AGPL-3.0",
   "homepage": "https://www.tiledesk.com",
   "repository": {
@@ -29,29 +29,31 @@
     "tiledesk-server": "./bin/www"
   },
   "optionalDependencies": {
-    "@tiledesk-ent/tiledesk-server-cache": "^1.1.10",
-    "@tiledesk-ent/tiledesk-server-dialogflow": "^1.1.6",
     "@tiledesk-ent/tiledesk-server-jwthistory": "^1.1.9",
     "@tiledesk-ent/tiledesk-server-payments": "^1.1.6",
-    "@tiledesk-ent/tiledesk-server-queue": "^1.1.11",
     "@tiledesk-ent/tiledesk-server-request-history": "^1.1.5",
-    "@tiledesk-ent/tiledesk-server-routing-queue": "^1.1.11",
     "@tiledesk-ent/tiledesk-server-visitorcounter": "^1.1.1",
     "@tiledesk-ent/tiledesk-server-enterprise": "^1.0.0"
   },
   "dependencies": {
-    "@tiledesk/tiledesk-chat21-app": "^1.1.4",
+    "@tiledesk/tiledesk-apps": "^1.0.9",
+    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.19",
+    "@tiledesk/tiledesk-chat21-app": "^1.1.7",
     "@tiledesk/tiledesk-chatbot-util": "^0.8.33",
     "@tiledesk/tiledesk-json-rules-engine": "^4.0.3",
-    "@tiledesk/tiledesk-rasa-connector": "^1.0.7",
+    "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
+    "@tiledesk/tiledesk-tybot-connector": "^0.1.42",
+    "@tiledesk/tiledesk-dialogflow-connector": "^1.8.3",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",
     "body-parser": "^1.20.0",
+    "cachegoose": "^8.0.0",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
     "csv-express": "^1.2.2",
     "debug": "^4.3.4",
     "dotenv": "^8.6.0",
+    "amqplib": "^0.5.5",
     "email-templates": "^8.1.0",
     "eventemitter2": "^6.4.4",
     "express": "^4.17.3",
@@ -61,6 +63,7 @@
     "fast-csv": "^4.3.6",
     "geoip-lite": "^1.4.5",
     "handlebars": "^4.7.7",
+    "handlebars-dateformat": "^1.1.3",
     "html-entities": "^2.3.3",
     "http": "0.0.0",
     "immutable": "^4.1.0",
@@ -106,9 +109,7 @@
     "loadtest": "^5.2.0",
     "mocha": "^8.4.0",
     "mongodb-runner": "4.8.3",
-    "nodemon": "^2.0.16",
-    "sinon": "^9.2.4",
-    "sinon-mongoose": "^2.3.0"
+    "nodemon": "^2.0.16"
   },
   "bugs": {
     "url": "https://github.com/Tiledesk/tiledesk-server/issues"