@tiledesk/tiledesk-server 2.4.82 → 2.4.83

package/CHANGELOG.md

@@ -5,6 +5,11 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.4.83
+- Improved whatsapp log services
+- Updated whatsapp-connector to 0.1.57
+- Updated whatsapp-jobworker to 0.0.7
+
 # 2.4.82
 - Added whatsapp log services
 

package/app.js

@@ -462,7 +462,7 @@ app.use('/files', files);
 app.use('/urls', urls);
 app.use('/users', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken], users);
 app.use('/users_util', usersUtil);
-app.use('/logs', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken], logs);
+// app.use('/logs', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken], logs);
 app.use('/requests_util', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken], requestUtilRoot);
 
 // TODO security issues
@@ -562,6 +562,8 @@ app.use('/:projectid/segments',[passport.authenticate(['basic', 'jwt'], { sessio
 app.use('/:projectid/openai', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent')], openai);
 app.use('/:projectid/kbsettings', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])], kbsettings);
 
+app.use('/:projectid/logs', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('admin')], logs);
+
 
 
 

package/models/transaction.js

@@ -0,0 +1,37 @@
+const mongoose = require('mongoose');
+
+const TransactionSchema = mongoose.Schema({
+  transaction_id: {
+    type: String,
+    required: true
+  },
+  id_project: {
+    type: String,
+    required: true
+  },
+  template_name: {
+    type: String,
+    required: true
+  },
+  status: {
+    type: String,
+    required: false
+  },
+  channel: {
+    type: String,
+    required: false
+  },
+  createdAt: {
+    type: Date,
+    default: Date.now
+  },
+  updatedAt: {
+    type: Date,
+    default: Date.now,
+  }
+})
+
+
+const Transaction = mongoose.model("Transactions", TransactionSchema);
+
+module.exports = { Transaction };

package/models/whatsappLog.js

@@ -1,6 +1,10 @@
 const mongoose = require('mongoose');
 
 const MessageLogSchema = mongoose.Schema({
+  id_project: {
+    type: String,
+    required: true
+  },
   json_message: {
     type: Object,
     required: true

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.4.82",
+  "version": "2.4.83",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -46,8 +46,8 @@
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
     "@tiledesk/tiledesk-telegram-connector": "^0.1.10",
     "@tiledesk/tiledesk-tybot-connector": "^0.2.30",
-    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.56",
-    "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.4",
+    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.57",
+    "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.7",
     "amqplib": "^0.5.5",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",

package/routes/logs.js

@@ -2,6 +2,7 @@ var express = require('express');
 var router = express.Router();
 var winston = require('../config/winston');
 const { MessageLog } = require('../models/whatsappLog');
+const { Transaction } = require('../models/transaction');
 
 
 
@@ -17,16 +18,32 @@ router.post('/', function (req, res, next) {
 });
 
 router.get('/whatsapp', async (req, res) => {
-    res.stats(200).send({ success: true });
+
+    let project_id = req.projectid;
+
+    Transaction.find({ id_project: project_id }, (err, transactions) => {
+        if (err) {
+            winston.error("Error find transactions for project_id: " + project_id);
+            return res.status(400).send({ success: false, message: "Unable to find transaction for project_id " + project_id });
+        }
+
+        winston.verbose("Transactions: ", transactions);
+
+        res.status(200).send(transactions);
+    })
+
+    // res.stats(200).send({ success: true });
 })
 
 
 router.get('/whatsapp/:transaction_id', async (req, res) => {
 
+    let project_id = req.projectid;
+
     let transaction_id = req.params.transaction_id;
     winston.info("Get logs for whatsapp transaction_id " + transaction_id);;
 
-    MessageLog.find({ transaction_id: transaction_id }).lean().exec((err, logs) => {
+    MessageLog.find({ id_project: project_id, transaction_id: transaction_id }).lean().exec((err, logs) => {
         if (err) {
             winston.error("Error find logs for transaction_id " + transaction_id);
             return res.status(400).send({ success: false, message: "Unable to find logs for transaction_id " + transaction_id })
@@ -37,7 +54,7 @@ router.get('/whatsapp/:transaction_id', async (req, res) => {
         let clearLogs = logs.map(({_id, __v, ...keepAttrs}) => keepAttrs)
         winston.verbose("clearLogs: ", clearLogs)
 
-        res.status(200).send(logs);
+        res.status(200).send(clearLogs);
     })
 
 })
@@ -47,6 +64,7 @@ router.post('/whatsapp', async (req, res) => {
     winston.info("save following log: ", req.body);
 
     let log = new MessageLog({
+        id_project: req.body.id_project,
         json_message: req.body.json_message,
         transaction_id: req.body.transaction_id,
         message_id: req.body.message_id,

package/test/logsRoute.js

@@ -16,10 +16,10 @@ let should = chai.should();
 var expect = chai.expect;
 var assert = chai.assert;
 
-let example_log = {
+let mock_log = {
     json_message: {
         messaging_product: "whatsapp",
-        to: "+393484506627",
+        to: "+393484511111",
         type: "template",
         template: {
             name: "codice_sconto",
@@ -39,6 +39,7 @@ let example_log = {
             ]
         }
     },
+    id_project: null,
     transaction_id: null,
     message_id: "wamid.HBgMMzkzNDg0NTA2NjI3FQIAERgSQTRDNzRDOTM3NzA5Mjk3NzJFAA==",
     status: "read",
@@ -59,21 +60,23 @@ describe('LogsRoute', () => {
             userService.signup(email, pwd, "Test Firstname", "Test lastname").then(function (savedUser) {
                 projectService.create("test1", savedUser._id).then(function (savedProject) {
 
-                    example_log.transaction_id = "automation-request-" + savedProject._id;
-                    console.log("example_log.transaction_id: ", example_log.transaction_id);
+                    mock_log.id_project = savedProject._id;
+                    mock_log.transaction_id = "automation-request-" + savedProject._id;
+                    console.log("mock_log.transaction_id: ", mock_log.transaction_id);
 
                     chai.request(server)
-                        .post('/logs/whatsapp')
+                        .post('/' + savedProject._id + '/logs/whatsapp')
                         .auth(email, pwd)
-                        .send(example_log)
+                        .send(mock_log)
                         .end((err, res) => {
                             console.log("err: ", err);
-                            console.log("res.body: ", res.body);
+                            // console.log("res.body: ", res.body);
+                            console.log("Added example log")
                             res.should.have.status(200);
                             res.body.should.be.a('object');
 
                             chai.request(server)
-                                .get('/logs/whatsapp/' + example_log.transaction_id)
+                                .get('/' + savedProject._id + '/logs/whatsapp/' + mock_log.transaction_id)
                                 .auth(email, pwd)
                                 .end((err, res) => {
                                     console.log("err: ", err);