@tiledesk/tiledesk-server 2.19.13 → 2.19.14

package/pubmodules/queue/reconnect.js

@@ -6,6 +6,8 @@ const leadEvent = require('../../event/leadEvent');
 
 const botEvent = require('../../event/botEvent');
 const authEvent = require('../../event/authEvent');
+const kbEvent = require('../../event/kbEvent');
+const projectUserUpdateContextUtil = require('../../utils/projectUserUpdateContextUtil');
 // https://elements.heroku.com/addons/cloudamqp
 // https://gist.github.com/carlhoerberg/006b01ac17a0a94859ba#file-reconnect-js
 // http://www.rabbitmq.com/tutorials/tutorial-one-javascript.html
@@ -160,6 +162,11 @@ function startWorker() {
           winston.info("Data queue", oka)
         });
 
+        ch.bindQueue(_ok.queue, exchange, "request_assigned", {}, function(err3, oka) {
+          winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: request_assigned");
+          winston.info("Data queue", oka)
+        });
+
         ch.bindQueue(_ok.queue, exchange, "request_update", {}, function(err3, oka) {
           winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: request_update");
           winston.info("Data queue", oka)
@@ -189,11 +196,66 @@ function startWorker() {
           winston.info("Data queue", oka)
         });
 
+        ch.bindQueue(_ok.queue, exchange, "project_user_invite", {}, function(err3, oka) {
+          winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: project_user_invite");
+          winston.info("Data queue", oka)
+        });
+
+        ch.bindQueue(_ok.queue, exchange, "project_user_invite_pending", {}, function(err3, oka) {
+          winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: project_user_invite_pending");
+          winston.info("Data queue", oka)
+        });
+
+        ch.bindQueue(_ok.queue, exchange, "project_user_delete", {}, function(err3, oka) {
+          winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: project_user_delete");
+          winston.info("Data queue", oka)
+        });
+
         ch.bindQueue(_ok.queue, exchange, "faqbot_update", {}, function(err3, oka) {
           winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: faqbot_update");
           winston.info("Data queue", oka)
         });
 
+        ch.bindQueue(_ok.queue, exchange, "faqbot_created", {}, function(err3, oka) {
+          winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: faqbot_created");
+          winston.info("Data queue", oka)
+        });
+
+        ch.bindQueue(_ok.queue, exchange, "faqbot_deleted", {}, function(err3, oka) {
+          winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: faqbot_deleted");
+          winston.info("Data queue", oka)
+        });
+
+        ch.bindQueue(_ok.queue, exchange, "faqbot_publish", {}, function(err3, oka) {
+          winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: faqbot_publish");
+          winston.info("Data queue", oka)
+        });
+
+        ch.bindQueue(_ok.queue, exchange, "kb_namespace_create", {}, function(err3, oka) {
+          winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: kb_namespace_create");
+          winston.info("Data queue", oka)
+        });
+
+        ch.bindQueue(_ok.queue, exchange, "kb_namespace_delete", {}, function(err3, oka) {
+          winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: kb_namespace_delete");
+          winston.info("Data queue", oka)
+        });
+
+        ch.bindQueue(_ok.queue, exchange, "kb_contents_add", {}, function(err3, oka) {
+          winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: kb_contents_add");
+          winston.info("Data queue", oka)
+        });
+
+        ch.bindQueue(_ok.queue, exchange, "kb_contents_delete", {}, function(err3, oka) {
+          winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: kb_contents_delete");
+          winston.info("Data queue", oka)
+        });
+
+        ch.bindQueue(_ok.queue, exchange, "kb_content_delete", {}, function(err3, oka) {
+          winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: kb_content_delete");
+          winston.info("Data queue", oka)
+        });
+
         ch.bindQueue(_ok.queue, exchange, "lead_create", {}, function(err3, oka) {
           winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: lead_create");
           winston.info("Data queue", oka)
@@ -278,6 +340,11 @@ function work(msg, cb) {
     // requestEvent.emit('request.update.queue',  msg.content);
     requestEvent.emit('request.participants.update.queue',  JSON.parse(message_string));
   }   
+
+  if (topic === 'request_assigned') {
+    winston.debug("reconnect here topic:" + topic);
+    requestEvent.emit('request.assigned.queue', JSON.parse(message_string));
+  }
   
   if (topic === 'request_close') {
     winston.debug("reconnect here topic:" + topic); 
@@ -307,12 +374,59 @@ function work(msg, cb) {
     authEvent.emit('project_user.update.queue', JSON.parse(message_string));
   }
 
+  if (topic === 'project_user_invite') {
+    winston.debug("reconnect here topic:" + topic);
+    authEvent.emit('project_user.invite.queue', JSON.parse(message_string));
+  }
+
+  if (topic === 'project_user_invite_pending') {
+    winston.debug("reconnect here topic:" + topic);
+    authEvent.emit('project_user.invite.pending.queue', JSON.parse(message_string));
+  }
+
+  if (topic === 'project_user_delete') {
+    winston.debug("reconnect here topic:" + topic);
+    authEvent.emit('project_user.delete.queue', JSON.parse(message_string));
+  }
+
   if (topic === 'faqbot_update') {
     winston.debug("reconnect here topic faqbot_update:" + topic); 
     // requestEvent.emit('request.update.queue',  msg.content);
     botEvent.emit('faqbot.update.queue',  JSON.parse(message_string));
   }
 
+  if (topic === 'faqbot_created') {
+    botEvent.emit('faqbot.created.queue', JSON.parse(message_string));
+  }
+
+  if (topic === 'faqbot_deleted') {
+    botEvent.emit('faqbot.deleted.queue', JSON.parse(message_string));
+  }
+
+  if (topic === 'faqbot_publish') {
+    botEvent.emit('faqbot.publish.queue', JSON.parse(message_string));
+  }
+
+  if (topic === 'kb_namespace_create') {
+    kbEvent.emit('kb.namespace.create.queue', JSON.parse(message_string));
+  }
+
+  if (topic === 'kb_namespace_delete') {
+    kbEvent.emit('kb.namespace.delete.queue', JSON.parse(message_string));
+  }
+
+  if (topic === 'kb_contents_add') {
+    kbEvent.emit('kb.contents.add.queue', JSON.parse(message_string));
+  }
+
+  if (topic === 'kb_contents_delete') {
+    kbEvent.emit('kb.contents.delete.queue', JSON.parse(message_string));
+  }
+
+  if (topic === 'kb_content_delete') {
+    kbEvent.emit('kb.content.delete.queue', JSON.parse(message_string));
+  }
+
   if (topic === 'lead_create') {
     winston.debug("reconnect here topic lead_create:" + topic); 
     // requestEvent.emit('request.update.queue',  msg.content);
@@ -357,6 +471,99 @@ function closeOnErr(err) {
 //   publish(exchange, "request_update", Buffer.from("work2 work work: "+d));
 // }, 1000);
 
+function serializeReqUser(req) {
+  if (!req || !req.user) {
+    return { user: null };
+  }
+  return {
+    user: {
+      id: req.user.id,
+      fullName: req.user.fullName
+    }
+  };
+}
+
+function serializeProjectUserInvitePayload(data) {
+  let user = undefined;
+  let body = undefined;
+  if (data.req) {
+    if (data.req.user) {
+      const u = data.req.user;
+      user = {
+        id: u.id || u._id,
+        _id: u._id,
+        firstname: u.firstname,
+        lastname: u.lastname,
+        fullName: projectUserUpdateContextUtil.userDisplayName(u)
+      };
+    }
+    if (data.req.body) {
+      body = data.req.body;
+    }
+  }
+  return {
+    req: {
+      user: user,
+      body: body,
+      projectid: data.req && data.req.projectid
+    },
+    savedProject_userPopulated: data.savedProject_userPopulated,
+    updatedProject_userPopulated: data.updatedProject_userPopulated,
+    updatedPuserPopulated: data.updatedPuserPopulated,
+    savedPendingInvitation: data.savedPendingInvitation
+  };
+}
+
+function serializeProjectUserDeletePayload(data) {
+  let user = undefined;
+  if (data.req && data.req.user) {
+    const u = data.req.user;
+    user = {
+      id: u.id || u._id,
+      _id: u._id,
+      firstname: u.firstname,
+      lastname: u.lastname,
+      fullName: projectUserUpdateContextUtil.userDisplayName(u)
+    };
+  }
+  return {
+    req: {
+      user: user,
+      projectid: data.req && data.req.projectid
+    },
+    project_userPopulated: data.project_userPopulated,
+    deleteType: data.deleteType
+  };
+}
+
+function serializeFaqbotActivityPayload(data) {
+  return {
+    chatbot: data.chatbot,
+    req: serializeReqUser(data.req),
+    id_project: data.id_project,
+    publishedBotId: data.publishedBotId,
+    release_note: data.release_note
+  };
+}
+
+function serializeKbActivityPayload(data) {
+  return {
+    req: serializeReqUser(data.req),
+    project_id: data.project_id,
+    namespace_id: data.namespace_id,
+    namespace_name: data.namespace_name,
+    savedNamespace: data.savedNamespace,
+    contentAddType: data.contentAddType,
+    count: data.count,
+    type: data.type,
+    source: data.source,
+    deletedCount: data.deletedCount,
+    deleteMode: data.deleteMode,
+    kb_id: data.kb_id,
+    kb: data.kb
+  };
+}
+
 
 function listen() {
 
@@ -398,6 +605,13 @@ function listen() {
       });
     });
 
+    requestEvent.on('request.assigned', function(data) {
+      setImmediate(() => {
+        publish(exchange, "request_assigned", Buffer.from(JSON.stringify(data)));
+        winston.debug("reconnect request.assigned published")
+      });
+    });
+
     requestEvent.on('request.update.preflight', function(request) {
       setImmediate(() => {
         // winston.info("reconnect request.update.preflight")
@@ -446,18 +660,52 @@ function listen() {
         let body = undefined;
         if (data.req ) {
           if (data.req.user) { //i think is null from chat21webhook 
-            user = data.req.user;
+            const u = data.req.user;
+            user = {
+              id: u.id || u._id,
+              _id: u._id,
+              firstname: u.firstname,
+              lastname: u.lastname,
+              fullName: projectUserUpdateContextUtil.userDisplayName(u)
+            };
           }
           if (data.req.body) { 
             body = data.req.body;
           }
         }
-        var dat = {updatedProject_userPopulated: data.updatedProject_userPopulated, req: {user: user, body: body}}; //remove request
+        var dat = {
+          updatedProject_userPopulated: data.updatedProject_userPopulated,
+          req: { user: user, body: body, params: data.req && data.req.params },
+          previousUserAvailable: data.previousUserAvailable,
+          previousProfileStatus: data.previousProfileStatus,
+          updateContext: data.updateContext
+        };
         winston.debug("dat",dat);
         publish(exchange, "project_user_update", Buffer.from(JSON.stringify(dat)));
       });
     });
 
+    authEvent.on('project_user.invite', function(data) {
+      setImmediate(() => {
+        publish(exchange, "project_user_invite", Buffer.from(JSON.stringify(serializeProjectUserInvitePayload(data))));
+        winston.debug("reconnect project_user.invite published");
+      });
+    });
+
+    authEvent.on('project_user.invite.pending', function(data) {
+      setImmediate(() => {
+        publish(exchange, "project_user_invite_pending", Buffer.from(JSON.stringify(serializeProjectUserInvitePayload(data))));
+        winston.debug("reconnect project_user.invite.pending published");
+      });
+    });
+
+    authEvent.on('project_user.delete', function(data) {
+      setImmediate(() => {
+        publish(exchange, "project_user_delete", Buffer.from(JSON.stringify(serializeProjectUserDeletePayload(data))));
+        winston.debug("reconnect project_user.delete published");
+      });
+    });
+
 
     botEvent.on('faqbot.update', function(bot) {
       setImmediate(() => {
@@ -467,6 +715,62 @@ function listen() {
       });
     });
 
+    botEvent.on('faqbot.created', function(data) {
+      setImmediate(() => {
+        publish(exchange, "faqbot_created", Buffer.from(JSON.stringify(serializeFaqbotActivityPayload(data))));
+        winston.debug("reconnect faqbot.created published");
+      });
+    });
+
+    botEvent.on('faqbot.deleted', function(data) {
+      setImmediate(() => {
+        publish(exchange, "faqbot_deleted", Buffer.from(JSON.stringify(serializeFaqbotActivityPayload(data))));
+        winston.debug("reconnect faqbot.deleted published");
+      });
+    });
+
+    botEvent.on('faqbot.publish', function(data) {
+      setImmediate(() => {
+        publish(exchange, "faqbot_publish", Buffer.from(JSON.stringify(serializeFaqbotActivityPayload(data))));
+        winston.debug("reconnect faqbot.publish published");
+      });
+    });
+
+    kbEvent.on('kb.namespace.create', function(data) {
+      setImmediate(() => {
+        publish(exchange, "kb_namespace_create", Buffer.from(JSON.stringify(serializeKbActivityPayload(data))));
+        winston.debug("reconnect kb.namespace.create published");
+      });
+    });
+
+    kbEvent.on('kb.namespace.delete', function(data) {
+      setImmediate(() => {
+        publish(exchange, "kb_namespace_delete", Buffer.from(JSON.stringify(serializeKbActivityPayload(data))));
+        winston.debug("reconnect kb.namespace.delete published");
+      });
+    });
+
+    kbEvent.on('kb.contents.add', function(data) {
+      setImmediate(() => {
+        publish(exchange, "kb_contents_add", Buffer.from(JSON.stringify(serializeKbActivityPayload(data))));
+        winston.debug("reconnect kb.contents.add published");
+      });
+    });
+
+    kbEvent.on('kb.contents.delete', function(data) {
+      setImmediate(() => {
+        publish(exchange, "kb_contents_delete", Buffer.from(JSON.stringify(serializeKbActivityPayload(data))));
+        winston.debug("reconnect kb.contents.delete published");
+      });
+    });
+
+    kbEvent.on('kb.content.delete', function(data) {
+      setImmediate(() => {
+        publish(exchange, "kb_content_delete", Buffer.from(JSON.stringify(serializeKbActivityPayload(data))));
+        winston.debug("reconnect kb.content.delete published");
+      });
+    });
+
 
     leadEvent.on('lead.create', function(lead) {
       setImmediate(() => {
@@ -504,6 +808,7 @@ if (process.env.QUEUE_ENABLED === "true") {
     messageEvent.queueEnabled = true;
     authEvent.queueEnabled = true;
     botEvent.queueEnabled = true;
+    kbEvent.queueEnabled = true;
     leadEvent.queueEnabled = true;
     listen();
     start();

package/pubmodules/rules/conciergeBot.js

@@ -9,6 +9,7 @@ var LeadConstants = require("../../models/leadConstants");
 var winston = require('../../config/winston');
 var i8nUtil = require("../../utils/i8nUtil");
 var BotFromParticipant = require("../../utils/botFromParticipant");
+var assignmentContextUtil = require('../../utils/assignmentContextUtil');
 const RequestConstants = require('../../models/requestConstants');
 
 class ConciergeBot {
@@ -81,7 +82,12 @@ devi mandare un messaggio welcome tu altrimenti il bot inserito successivamente
                                     winston.debug("rerouting");
                                     // reroute(request_id, id_project, nobot)
                                     
-                                    requestService.reroute(message.request.request_id, message.request.id_project, false ).then(function() {
+                                    requestService.reroute(
+                                      message.request.request_id,
+                                      message.request.id_project,
+                                      false,
+                                      assignmentContextUtil.buildInternalOptions('rules', 'auto')
+                                    ).then(function() {
                                         winston.debug("reroute successful from event message.create");
                                     }).catch((err) => {
                                         winston.error("ConciergeBot error reroute: " + err);

package/pubmodules/trigger/rulesTrigger.js

@@ -13,6 +13,7 @@ var Engine = require('@tiledesk/tiledesk-json-rules-engine').Engine;
 
 var messageService = require('../../services/messageService');
 var requestService = require('../../services/requestService');
+var assignmentContextUtil = require('../../utils/assignmentContextUtil');
 var MessageConstants = require("../../models/messageConstants");
 var leadService = require('../../services/leadService');
 var LeadConstants = require('../../models/leadConstants');
@@ -477,7 +478,14 @@ class RulesTrigger {
             winston.debug('runAction action id_project: ' + id_project);
 
             // route(request_id, departmentid, id_project, nobot) {
-            requestService.route(request_id, departmentid, id_project).catch((err) => {
+            requestService.route(
+              request_id,
+              departmentid,
+              id_project,
+              undefined,
+              undefined,
+              assignmentContextUtil.buildInternalOptions('rules', 'auto')
+            ).catch((err) => {
               winston.error("Error runAction route: ", err);
             });
   
@@ -515,7 +523,12 @@ class RulesTrigger {
               winston.debug('runAction action id_project: ' + id_project);
   
               // reroute(request_id, id_project, nobot) {
-              requestService.reroute(request_id, id_project).catch((err) => {
+              requestService.reroute(
+                request_id,
+                id_project,
+                undefined,
+                assignmentContextUtil.buildInternalOptions('rules', 'auto')
+              ).catch((err) => {
                 winston.error("Error runAction on reroute", err);
               });                           
     
@@ -678,7 +691,12 @@ class RulesTrigger {
                 winston.debug('runAction action id_project: ' + id_project);
     
                 //     addParticipantByRequestId(request_id, id_project, member) {
-                requestService.addParticipantByRequestId(request_id, id_project, member).catch((err) => {
+                requestService.addParticipantByRequestId(
+                  request_id,
+                  id_project,
+                  member,
+                  assignmentContextUtil.buildInternalOptions('rules', 'manual_reassign')
+                ).catch((err) => {
                   winston.error("(RulesTrigger) addParticipantByRequestId error", err);
                 });
         
@@ -733,7 +751,12 @@ class RulesTrigger {
 
 
               // reroute(request_id, id_project, nobot) {
-              requestService.reroute(request_id, id_project).then(function(request) {
+              requestService.reroute(
+                request_id,
+                id_project,
+                undefined,
+                assignmentContextUtil.buildInternalOptions('rules', 'auto')
+              ).then(function(request) {
 
                 winston.verbose('request.department.bot.launch action reroute request_id: ' + request_id);
 
@@ -794,7 +817,12 @@ class RulesTrigger {
                 var id_project = eventTrigger.event.id_project;
                 winston.debug('runAction action id_project: ' + id_project);
     
-                 requestService.addParticipantByRequestId(request_id, id_project, member).then(function(request) {
+                 requestService.addParticipantByRequestId(
+                  request_id,
+                  id_project,
+                  member,
+                  assignmentContextUtil.buildInternalOptions('rules', 'manual_reassign')
+                ).then(function(request) {
   
                   winston.verbose('request.bot.launch action request_id: ' + request_id);
   

package/routes/faq_kb.js

@@ -52,6 +52,9 @@ router.post('/', roleChecker.hasRole('admin'), async function (req, res) {
   }
 
   faqService.create(req.projectid, req.user.id, req.body).then((savedFaq_kb) => {
+    if (req.query.skip_activity !== 'true') {
+      botEvent.emit('faqbot.created', { req, chatbot: savedFaq_kb });
+    }
     res.status(200).send(savedFaq_kb);
   }).catch((err) => {
     res.status(500).send({ succes: false, error: err })
@@ -269,7 +272,7 @@ router.put('/:faq_kbid/publish', roleChecker.hasRole('admin'), async (req, res)
 
   try {
     //  fork(id_faq_kb, api_url, token, project_id)
-    let forked = await cs.fork(chatbot_id, api_url, token, current_project_id);
+    let forked = await cs.fork(chatbot_id, api_url, token, current_project_id, { forPublish: true });
     // winston.debug("forked: ", forked)
 
     let forkedChatBotId = forked.bot_id;
@@ -294,6 +297,13 @@ router.put('/:faq_kbid/publish', roleChecker.hasRole('admin'), async (req, res)
 
     botEvent.emit('faqbot.update', updatedOriginalChabot);
 
+    botEvent.emit('faqbot.publish', {
+      req: req,
+      chatbot: updatedOriginalChabot,
+      publishedBotId: forkedChatBotId,
+      release_note: release_note
+    });
+
     return res.status(200).send({ message: "Chatbot published successfully", bot_id: forkedChatBotId });
 
   } catch (e) {
@@ -355,6 +365,13 @@ router.put('/:faq_kbid', roleChecker.hasRoleOrTypes('admin', ['bot', 'subscripti
     }
 
     botEvent.emit('faqbot.update', updatedFaq_kb);
+
+    // A soft-delete is performed via PUT by setting trashed: true (the schema applies a TTL).
+    // Emit faqbot.deleted so the deletion is tracked just like the hard-delete endpoint.
+    if (req.body.trashed === true || req.body.trashed === 'true') {
+      botEvent.emit('faqbot.deleted', { req, chatbot: updatedFaq_kb });
+    }
+
     res.json(updatedFaq_kb);
   });
 });
@@ -460,6 +477,7 @@ router.delete('/:faq_kbid', roleChecker.hasRole('admin'), function (req, res) {
      * WARNING: faq_kb is the operation result, not the faq_kb object. The event subscriber will not receive the object as expected.
      */
     botEvent.emit('faqbot.delete', faq_kb);
+    botEvent.emit('faqbot.deleted', { req, chatbot: faq_kb });
     res.status(200).send({ success: true, message: "Chatbot with id " + req.params.faq_kbid + " deleted successfully" })
   });
 });
@@ -707,6 +725,10 @@ router.post('/fork/:id_faq_kb', roleChecker.hasRole('admin'), async (req, res) =
     return res.status(500).send({ success: false, message: "Unable to import intents in the new chatbot" });
   }
 
+  if (req.query.for_publish !== 'true') {
+    botEvent.emit('faqbot.created', { req, chatbot: savedChatbot, id_project: landing_project_id });
+  }
+
   return res.status(200).send({ message: "Chatbot forked successfully", bot_id: savedChatbot._id });
 
 })
@@ -774,6 +796,7 @@ router.post('/importjson/:id_faq_kb', roleChecker.hasRole('admin'), upload.singl
     })
 
     botEvent.emit('faqbot.create', savedChatbot);
+    botEvent.emit('faqbot.created', { req, chatbot: savedChatbot });
 
     if (json.intents) {