@tiledesk/tiledesk-server 2.4.48 → 2.4.49

package/models/openai_kbs.js

@@ -16,7 +16,14 @@ var OpenaiKbsSchema = new Schema({
     required: true,
     index: true
   },
-
+  gptkey: {
+    type: String,
+    required: true
+  },
+  createdAt: {
+    type: Date,
+    default: Date.now,
+  }
 });
 
 

package/package.json

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

package/routes/email.js

@@ -303,35 +303,38 @@ if (process.env.ENABLE_TEST_EMAIL_ENDPOINT==true || process.env.ENABLE_TEST_EMAI
 
 
 //TODO add cc
-// router.post('/send', 
-//  async (req, res) => {
-//   let to = req.body.to;
-//   winston.debug("to: " + to);
+router.post('/internal/send', 
+ async (req, res) => {
+  let to = req.body.to;
+  winston.debug("to: " + to);
 
-//   let text = req.body.text;
-//   winston.debug("text: " + text);
+  let text = req.body.text;
+  winston.debug("text: " + text);
 
-//   let request_id = req.body.request_id;
-//   winston.debug("request_id: " + request_id);
+  let request_id = req.body.request_id;
+  winston.debug("request_id: " + request_id);
 
-//   let subject = req.body.subject;
-//   winston.debug("subject: " + subject);
+  let subject = req.body.subject;
+  winston.debug("subject: " + subject);
 
-//   winston.debug("req.project", req.project);
+  winston.debug("req.project", req.project);
 
-//   let newto = await recipientEmailUtil.process(to, req.projectid);
-//   winston.debug("newto: " + newto);
+  let newto = await recipientEmailUtil.process(to, req.projectid);
+  winston.debug("newto: " + newto);
 
-//   let replyto = req.body.replyto;
-//   winston.debug("replyto: " + replyto);
+  let replyto = req.body.replyto;
+  winston.debug("replyto: " + replyto);
 
-//   winston.info("Sending an email with text : " + text + " to " + to);
+  winston.info("Sending an email with text : " + text + " to " + to);
 
-//              //sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage, payload)
-//   emailService.sendEmailDirect(newto, text, req.project, request_id, subject, undefined, undefined, undefined, replyto);
+             //sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage, payload)
+  emailService.sendEmailDirect(newto, text, req.project, request_id, subject, undefined, undefined, undefined, replyto);
   
-//   res.json({"queued": true});
+  res.json({"queued": true});
     
-// });
+});
+
+
+
 
 module.exports = router;

package/routes/openai_kbs.js

@@ -24,7 +24,8 @@ router.post('/', async (req, res) => {
     let new_kbs = new OpenaiKbs({
         name: body.name,
         url: body.url,
-        id_project: req.projectid
+        id_project: req.projectid,
+        gptkey: req.body.gptkey
     })
 
     new_kbs.save(function (err, savedKbs) {
@@ -38,7 +39,7 @@ router.post('/', async (req, res) => {
 })
 
 router.put('/', async (req, res) => {
-
+    // to be implemented
 })
 
 router.delete('/:kbs_id', async (req, res) => {

package/routes/request.js

@@ -6,6 +6,8 @@ var Schema = mongoose.Schema,
   ObjectId = Schema.ObjectId;
 var moment = require('moment');
 var requestService = require('../services/requestService');
+var emailService = require('../services/emailService');
+
 var departmentService = require('../services/departmentService');
 var winston = require('../config/winston');
 const requestEvent = require('../event/requestEvent');
@@ -646,6 +648,62 @@ router.delete('/:requestid/notes/:noteid',  function (req, res) {
 
 
 
+//TODO add cc
+router.post('/:requestid/email/send', 
+ async (req, res) => {
+
+
+  let text = req.body.text;
+  winston.debug("text: " + text);
+
+  let request_id = req.params.requestid;
+  winston.debug("request_id: " + request_id);
+
+  let subject = req.body.subject;
+  winston.info("subject: " + subject);
+
+  winston.debug("req.project", req.project);
+
+  let replyto = req.body.replyto;
+  winston.debug("replyto: " + replyto);
+
+
+  let q = Request.findOne({request_id: request_id, id_project: req.projectid})
+  // .select("+snapshot.agents")
+  .populate('lead')
+  q.exec(function(err, request) {  
+    if (err) {
+      winston.error("error getting request by id ", err);
+      return res.status(500).send({ success: false, msg: 'Error getting object.' });
+    }
+    if (!request) {
+      return res.status(404).send({ success: false, msg: 'Object not found.' });
+    }
+
+
+
+    winston.info("Sending an email with text : " + text + " to request_id " + request_id);
+
+    if (!request.lead.email) {
+      res.json({"no queued": true});
+    }
+
+    let newto = request.lead.email
+    winston.info("Sending an email newto " + newto);
+
+    //sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage, payload)
+    emailService.sendEmailDirect(newto, text, req.project, request_id, subject, undefined, undefined, undefined, replyto);
+
+    res.json({"queued": true});
+
+
+  });
+
+
+
+    
+});
+
 
 
 
@@ -1029,7 +1087,9 @@ router.get('/', function (req, res, next) {
     winston.debug('REQUEST ROUTE - QUERY channel', query.channel);
   }
 
-
+  if (req.query.priority) {
+    query.priority = req.query.priority;
+  }
   
 
   var direction = -1; //-1 descending , 1 ascending

package/services/faqService.js

@@ -114,6 +114,9 @@ class FaqService {
             "text": "I didn't understand. Can you rephrase your question?",
             "attributes": {
               "commands": [{
+                "type": "wait",
+                "time": 500
+              },{
                 "type": "message",
                 "message": {
                   "type": "text",