Bots Audit Trail Logs Implementation

server/app/model/classes/instance/instance.js

@@ -396,8 +396,8 @@ var InstanceSchema = new Schema({
         trim: true
     },
     interval:[Schema.Types.Mixed],
-    cronJobId: {
-        type: String,
+    cronJobIds: {
+        type: [String],
         required: false,
         trim: true
     },
@@ -2283,21 +2283,36 @@ var InstancesDao = function () {
             callback(null, data);
         });
     };
-    this.updateInstanceSchedulerCronJobId = function (instanceId, cronJobId, callback) {
-        Instances.update({
-            "_id": new ObjectId(instanceId),
-        }, {
-            $set: {
-                cronJobId: cronJobId
-            }
-        }, {
-            upsert: false
-        }, function (err, data) {
+    this.updateCronJobIdByInstanceId = function (instanceId, cronJobId, callback) {
+        Instances.find({
+            "_id": new ObjectId(instanceId)
+        }, function (err, instances) {
             if (err) {
-                callback(err, null);
-                return;
+                logger.error(err);
+                return callback(err, null);
             }
-            callback(null, data);
+            var cronJobIds =[];
+            if(instances[0].cronJobIds){
+                cronJobIds = instances[0].cronJobIds;
+                cronJobIds.push(cronJobId);
+            }else{
+                cronJobIds.push(cronJobId);
+            }
+            Instances.update({
+                "_id": new ObjectId(instanceId),
+            }, {
+                $set: {
+                    cronJobIds: cronJobIds
+                }
+            }, {
+                upsert: false
+            }, function (err, data) {
+                if (err) {
+                    callback(err, null);
+                    return;
+                }
+                callback(null, data);
+            });
         });
     };
     this.getScheduledInstances = function (callback) {

server/app/routes/v1.0/routes_audit_trails.js

@@ -38,16 +38,14 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
     });
 
     app.get('/audit-trail/:actionId/logs', function(req,res){
-        auditTrailService.getAuditTrailActionLogs(req.query.actionId,req.query.timestamp,function(err,auditTrailActionLogs){
+        auditTrailService.getAuditTrailActionLogs(req.params.actionId,req.query.timestamp,function(err,auditTrailActionLogs){
             if(err){
                 logger.error(err);
                 return res.status(500).send(err);
             }
             return res.status(200).send(auditTrailActionLogs);
         })
     });
-
-
     app.get('/audit-trail/instance-action', getInstanceActionList);
 
     function getInstanceActionList(req, res, next) {

server/app/services/instanceService.js

@@ -1485,6 +1485,9 @@ function updateScheduler(instanceScheduler, callback) {
             var resultList =[];
             for (var i = 0; i < results.length; i++) {
                 (function(instance) {
+                    if(instance.cronJobIds && instance.cronJobIds.length > 0){
+                        crontab.cancelJobIds(instance.cronJobIds);
+                    }
                     resultList.push(function(callback){schedulerService.executeSchedulerForInstances(instance,callback);});
                     if(resultList.length === results.length){
                         async.parallel(resultList,function(err,results){

server/app/services/schedulerService.js

@@ -637,6 +637,11 @@ function checkSuccessInstanceAction(logReferenceIds,instanceState,instanceLog,ac
 function createCronJob(cronPattern,instanceId,catUser,action,callback){
     var schedulerService = require('_pr/services/schedulerService');
     var cronJobId = cronTab.scheduleJob(cronPattern, function () {
+        instancesDao.updateCronJobIdByInstanceId(instanceId,cronJobId,function(err,data){
+            if(err){
+                logger.error("Error in updating cron job Ids. "+err);
+            }
+        })
         schedulerService.startStopInstance(instanceId, catUser, action, function (err, data) {
             if (err) {
                 callback(err, null);