Merge branch 'master-COLLAUDO' into features-dic24/various-connectors…

…-coll1

# Conflicts:
#	package-lock.json
#	package.json

app.js

@@ -553,7 +553,7 @@ app.use('/:projectid/departments', department);
 channelManager.useUnderProjects(app);
 
 app.use('/:projectid/groups', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])], group);
-app.use('/:projectid/tags', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('agent')], tag);
+app.use('/:projectid/tags', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])], tag);
 app.use('/:projectid/subscriptions', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('admin')], resthook);
 
 //deprecated

jobs.js

@@ -112,6 +112,9 @@ async function main()
     let scheduler = require('./pubmodules/scheduler');    
     jobsManager.listenScheduler(scheduler);
 
+    let multiWorkerQueue = require('@tiledesk/tiledesk-multi-worker');
+    jobsManager.listenMultiWorker(multiWorkerQueue);
+
 
     winston.info("Jobs started"); 
 

jobsManager.js

@@ -87,6 +87,14 @@ class JobsManager {
         // this.whatsappQueue.listen(); // oppure codice
     }
 
+    listenMultiWorker(multiWorkerQueue) {
+        console.log("JobsManager multiWorkerQueue started");
+        console.log("multiWorkerQueue is: ", multiWorkerQueue)
+        if (this.jobWorkerEnabled == true) {
+            return winston.info("JobsManager jobWorkerEnabled is enabled. Skipping listener for MultiWorker Queue");  
+        }
+    }
+
     // listenTrainingQueue(trainingQueue) {
     //     console.log("JobsManager listenTrainingQueue started");
     //     console.log("trainingQueue is: ", trainingQueue)

models/analytics.js

@@ -0,0 +1,29 @@
+var mongoose = require('mongoose');
+var Schema = mongoose.Schema;
+
+var AnalyticsSchema = new Schema({
+  id_project: {
+    type: String,
+    required: true,
+  },
+  type: {
+    type: String,
+    required: true
+  },
+  date: {
+    type: String,
+    required: true
+    //default: () => new Date().setHours(0, 0, 0, 0)
+  },
+  keys: {
+    type: Object,
+    required: true
+  }
+}, {
+  timestamps: true
+})
+
+
+const Analytics = mongoose.model('Analytics', AnalyticsSchema)
+module.exports = Analytics
+

models/transaction.js

@@ -21,6 +21,10 @@ const TransactionSchema = mongoose.Schema({
     type: String,
     required: false
   },
+  broadcast: {
+    type: Boolean,
+    required: false
+  },
   createdAt: {
     type: Date,
     default: Date.now