From 58c613c5268adc9d96ec6e2602b88a9babbef140 Mon Sep 17 00:00:00 2001 From: Divakar Konakalla Date: Tue, 6 Dec 2016 17:47:34 +0530 Subject: [PATCH 01/11] Bots UI related changes & enhancements. --- .../bots/controller/audittrailCtrl.js | 4 +- .../bots/controller/botScheduleCtrl.js | 99 +++++++++++ .../bots/controller/editParamsCtrl.js | 2 +- .../dashboard/bots/controller/libraryCtrl.js | 10 +- .../sections/dashboard/bots/view/botInfo.html | 17 +- .../dashboard/bots/view/botSchedule.html | 155 ++++++++++++++++++ .../dashboard/bots/view/editParams.html | 15 +- .../design/view/blueprintCreate.html | 4 +- .../orchestration/popups/newTask.html | 2 +- .../popups/orchestrationHistoryCtrl.js | 27 ++- 10 files changed, 301 insertions(+), 34 deletions(-) create mode 100644 client/cat3/src/partials/sections/dashboard/bots/controller/botScheduleCtrl.js create mode 100644 client/cat3/src/partials/sections/dashboard/bots/view/botSchedule.html diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js index 3ea895ba0..fa65efd2d 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js @@ -10,7 +10,7 @@ angular.module('dashboard.bots') .controller('audittrailCtrl',['$scope', '$rootScope', '$state', 'genericServices', 'confirmbox', 'workzoneServices', 'toastr', 'workzoneUIUtils', '$modal', function ($scope, $rootScope, $state, genSevs, confirmbox, workzoneServices, toastr, workzoneUIUtils, $modal) { - var treeNames = ['Bots','Audit Trail']; + var treeNames = ['BOTs','Audit Trail']; $rootScope.$emit('treeNameUpdate', treeNames); var audit=this; audit.gridOptions={ @@ -30,7 +30,7 @@ 'row.entity.taskType'+ 'row.entity.auditTrailConfig.executionType'+ 'row.entity.botType',cellTooltip: true}, - { name: 'BOT Name',displayName: 'BOT Name',field:'auditTrailConfig.name'}, + { name: 'BOT Name',displayName: 'BOT Name',field:'auditTrailConfig.name',cellTooltip: true}, { name: 'Status',field:'status', cellTemplate:'' + '' + diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/botScheduleCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/botScheduleCtrl.js new file mode 100644 index 000000000..b440bfbb2 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/botScheduleCtrl.js @@ -0,0 +1,99 @@ +/* Copyright (C) Relevance Lab Private Limited- All Rights Reserved + * Unauthorized copying of this file, via any medium is strictly prohibited + * Proprietary and confidential + * Written by Relevance UI Team, + * Oct 2016 + */ + +(function (angular) { + "use strict"; + angular.module('library',[]) + .controller('botScheduleCtrl',['$scope', '$rootScope', 'genericServices', 'workzoneServices', 'toastr', '$modalInstance', 'items', '$timeout', function ($scope, $rootScope, genSevs, workzoneServices, toastr, $modalInstance, items, $timeout) { + console.log(items); + $scope.defaultSelection = function() { + $scope.repeatsType = 'Minutes';//default selection. + $scope.schedulerStartOn=moment(new Date()).format('MM/DD/YYYY'); + $scope.schedulerEndOn=moment(new Date()).format('MM/DD/YYYY'); + }; + if(items.type !== 'new'){ + if(items.chefJenkScriptTaskObj !==undefined){ + if(items.chefJenkScriptTaskObj.cronStartOn && items.chefJenkScriptTaskObj.cronEndOn) { + var newStartOn = parseInt(items.chefJenkScriptTaskObj.cronStartOn); + var newDate = new Date(newStartOn).toLocaleDateString(); + var datearray = newDate.split("/"); + var newdate = datearray[1] + '/' + datearray[0] + '/' + datearray[2]; + $scope.schedulerStartOn = newdate; + var newEndOn = parseInt(items.chefJenkScriptTaskObj.cronEndOn); + var newEndData = new Date(newEndOn).toLocaleDateString(); + var datearrayNew = newEndData.split("/"); + var newdateEnd = datearrayNew[1] + '/' + datearrayNew[0] + '/' + datearrayNew[2]; + $scope.schedulerEndOn = newdateEnd; + } else { + $scope.schedulerStartOn = items.chefJenkScriptTaskObj.cronStart; + $scope.schedulerEndOn = items.chefJenkScriptTaskObj.cronEnd; + } + + $scope.repeatBy = items.chefJenkScriptTaskObj.repeatBy || items.chefJenkScriptTaskObj.cronRepeatEvery.toString(); + $scope.repeatsType = items.chefJenkScriptTaskObj.repeats || items.chefJenkScriptTaskObj.cronFrequency; + $scope.timeEventType = items.chefJenkScriptTaskObj.startTime; + $scope.timeEventMinute = items.chefJenkScriptTaskObj.startTimeMinute; + $scope.weekOfTheDay = items.chefJenkScriptTaskObj.dayOfWeek; + $scope.currentDate = items.chefJenkScriptTaskObj.startDate; + $scope.selectedDayOfTheMonth = items.chefJenkScriptTaskObj.selectedDayOfTheMonth; + $scope.selectedMonth = items.chefJenkScriptTaskObj.monthOfYear; + } else { + $scope.defaultSelection(); + } + } else { + $scope.defaultSelection(); + } + + $scope.dateChange= function () { + var startDate = Date.parse($scope.schedulerStartOn); + var endDate = Date.parse($scope.schedulerEndOn); + if(startDate > endDate){ + $scope.validDateRange=true; + } else { + $scope.validDateRange=false; + } + + }; + + $scope.repeatCount = function(max, step) { + step = step || 1; + var input = []; + for (var i = 1; i <= max; i += step) { + input.push(i); + } + return input; + }; + $scope.isDaySelected = { + flag:true + } + + $scope.daysOfWeek = [ 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' ]; + + $scope.monthOfYear = [ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ]; + $scope.cancel = function() { + $modalInstance.dismiss('cancel'); + }; + $scope.ok=function(){ + $scope.eventParams = { + repeats: $scope.repeatsType, + repeatBy: $scope.repeatBy, + cronStart: $scope.schedulerStartOn, + cronEnd: $scope.schedulerEndOn, + startTime: $scope.timeEventType, + startTimeMinute: $scope.timeEventMinute, + dayOfWeek: $scope.weekOfTheDay, + selectedDayOfTheMonth: $scope.selectedDayOfTheMonth, + monthOfYear: $scope.selectedMonth + }; + $modalInstance.close($scope.eventParams); + }; + + $scope.cancel = function() { + $modalInstance.dismiss('cancel'); + }; +}]); +})(angular); \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js index 29be3d631..4120bac26 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js @@ -69,7 +69,7 @@ } $scope.jenkinsparams = items.taskConfig.parameterized; - $scope.scriptparams = items.taskConfig.scriptDetails; + $scope.scriptparams = items.taskConfig.scriptDetails[0]; $scope.parameters=['']; var cookbookAttributes = []; var scriptParams = []; diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js index 2ffd2c656..bb222c0b2 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -9,7 +9,7 @@ "use strict"; angular.module('dashboard.bots') .controller('libraryCtrl',['$scope', '$rootScope', '$state', 'genericServices', 'confirmbox', 'toastr', 'workzoneUIUtils', '$modal', function ($scope, $rootScope, $state, genSevs, confirmbox, toastr, workzoneUIUtils, $modal) { - var treeNames = ['Bots','Library']; + var treeNames = ['BOTs','Library']; $rootScope.$emit('treeNameUpdate', treeNames); var lib=this; $scope.totalBotsSelected = true; @@ -25,10 +25,10 @@ 'row.entity.taskType'+ 'row.entity.taskType'+ 'row.entity.botType',cellTooltip: true}, - { name: 'BOT Type',displayName: 'BOT Type',field:'botType'}, - { name: 'BOT Name',displayName: 'BOT Name',field:'name'}, - { name: 'Category',field:'botCategory'}, - { name: 'description',field:'shortDesc'}, + { name: 'BOT Type',displayName: 'BOT Type',field:'botType',cellTooltip: true}, + { name: 'BOT Name',displayName: 'BOT Name',field:'name',cellTooltip: true}, + { name: 'Category',field:'botCategory',cellTooltip: true}, + { name: 'description',field:'shortDesc',cellTooltip: true}, { name: 'Total Runs',field:'executionCount'}, { name: 'BOT History',displayName: 'BOT History',cellTemplate:'NA'+ ''}, diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html b/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html index b16ae05ce..a82e48010 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html @@ -22,12 +22,23 @@

- + Task Type: + + Blueprint Type + + + + + + + + + Bot Type @@ -35,13 +46,13 @@

- Category + BOT Category - Description + BOT Description diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botSchedule.html b/client/cat3/src/partials/sections/dashboard/bots/view/botSchedule.html new file mode 100644 index 000000000..014c1901b --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botSchedule.html @@ -0,0 +1,155 @@ +
+
+
+ × +

 Schedule your Bot

+
+
+ +
+ + +
+
+ + + Start Date should be less than End date ! +
+
+
+
+ Interval +
+ + +
+
+ + +
+ + + + +
+ + +
+
+ + +
+ +
+ + +
+ + +
+ + +
+ + + +
+
+
+ + +
+
+
+ + \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html b/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html index 60d344947..0d61b631b 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html @@ -3,7 +3,7 @@
× -

  Execute Bot - {{botName}}

+

  Execute BOT - {{botName}}

@@ -81,21 +81,24 @@

Add Parameters:

- + - + + - + + {{param}} - + +
- Add More +
diff --git a/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html b/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html index 9e7e8d3f0..886049f3c 100755 --- a/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html +++ b/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html @@ -256,7 +256,7 @@
-
-
"}else{IconSection="
"}if(settings.icon==undefined){BoxSmall="
"+settings.title+"

"+settings.content+"

"+IconSection+"
"}else{BoxSmall="
"+settings.title+"

"+settings.content+"

"+IconSection+"
"}if(SmallBoxes==1){$("#divSmallBoxes").append(BoxSmall);SmallBoxesAnchos=$("#smallbox"+SmallBoxes).height()+40}else{var SmartExist=$(".SmallBox").size();if(SmartExist==0){$("#divSmallBoxes").append(BoxSmall);SmallBoxesAnchos=$("#smallbox"+SmallBoxes).height()+40}else{$("#divSmallBoxes").append(BoxSmall);$("#smallbox"+SmallBoxes).css("top",SmallBoxesAnchos);SmallBoxesAnchos=SmallBoxesAnchos+$("#smallbox"+SmallBoxes).height()+20;$(".SmallBox").each(function(index){if(index==0){$(this).css("top",20);heightPrev=$(this).height()+40;SmallBoxesAnchos=$(this).height()+40}else{$(this).css("top",heightPrev);heightPrev=heightPrev+$(this).height()+20;SmallBoxesAnchos=SmallBoxesAnchos+$(this).height()+20}})}}var ThisSmallBox=$("#smallbox"+SmallBoxes);if(settings.color==undefined){ThisSmallBox.css("background-color","#004d60")}else{ThisSmallBox.css("background-color",settings.color)}var ColorTimeInterval;if(settings.colors!=undefined&&settings.colors.length>0){ThisSmallBox.attr("colorcount","0");ColorTimeInterval=setInterval(function(){var ColorIndex=ThisSmallBox.attr("colorcount");ThisSmallBox.animate({backgroundColor:settings.colors[ColorIndex].color});if(ColorIndex-1){if(ver>=8){msg="You're using a recent copy of Windows Internet Explorer."}else{msg="You should upgrade your copy of Windows Internet Explorer."}}alert(msg)}function isIE8orlower(){var msg="0";var ver=getInternetExplorerVersion();if(ver>-1){if(ver>=9){msg=0}else{msg=1}}return msg}; \ No newline at end of file +$(document).ready(function(){$("body").append("
");$("body").append("
")});function SmartUnLoading(){$(".divMessageBox").fadeOut(300,function(){$(this).remove()});$(".LoadingBoxContainer").fadeOut(300,function(){$(this).remove()})}var ExistMsg=0,SmartMSGboxCount=0,PrevTop=0;(function($){$.SmartMessageBox=function(settings,callback){var SmartMSG,Content;settings=$.extend({title:"",content:"",NormalButton:undefined,ActiveButton:undefined,buttons:undefined,input:undefined,placeholder:"",options:undefined},settings);var PlaySound=0;PlaySound=1;if(isIE8orlower()==0){var audioElement=document.createElement("audio");audioElement.setAttribute("src","sound/messagebox.mp3");$.get();audioElement.addEventListener("load",function(){audioElement.play()},true);audioElement.pause();audioElement.play()}SmartMSGboxCount=SmartMSGboxCount+1;if(ExistMsg==0){ExistMsg=1;SmartMSG="
";$("body").append(SmartMSG);if(isIE8orlower()==1){$("#MsgBoxBack").addClass("MessageIE")}}var InputType="";var HasInput=0;if(settings.input!=undefined){HasInput=1;settings.input=settings.input.toLowerCase();switch(settings.input){case"text":InputType="

";break;case"password":InputType="

";break;case"select":if(settings.options==undefined){alert("For this type of input, the options parameter is required.")}else{InputType=""}break;default:alert("That type of input is not handled yet")}}Content="
";Content+="
";Content+=""+settings.title+"";Content+="

"+settings.content+"

";Content+=InputType;Content+="
";if(settings.buttons==undefined){settings.buttons="[Accept]"}settings.buttons=$.trim(settings.buttons);settings.buttons=settings.buttons.split("");var Name="";var NumBottons=0;if(settings.NormalButton==undefined){settings.NormalButton="#232323"}if(settings.ActiveButton==undefined){settings.ActiveButton="#ed145b"}for(var i=0;i<=settings.buttons.length-1;i++){if(settings.buttons[i]=="["){Name=""}else{if(settings.buttons[i]=="]"){NumBottons=NumBottons+1;Name="";Content+=Name}else{Name+=settings.buttons[i]}}}Content+="
";Content+="
";Content+="
";if(SmartMSGboxCount>1){$(".MessageBoxContainer").hide();$(".MessageBoxContainer").css("z-index",99999)}$(".divMessageBox").append(Content);if(HasInput==1){$("#txt"+SmartMSGboxCount).focus()}$(".botTempo").hover(function(){var ThisID=$(this).attr("id")},function(){var ThisID=$(this).attr("id")});$(".botTempo").click(function(){var ThisID=$(this).attr("id");var MsgBoxID=ThisID.substr(ThisID.indexOf("-")+1);var Press=$.trim($(this).text());if(HasInput==1){if(typeof callback=="function"){var IDNumber=MsgBoxID.replace("Msg","");var Value=$("#txt"+IDNumber).val();if(callback){callback(Press,Value)}}}else{if(typeof callback=="function"){if(callback){callback(Press)}}}$("#"+MsgBoxID).addClass("animated fadeOut fast");SmartMSGboxCount=SmartMSGboxCount-1;if(SmartMSGboxCount==0){$("#MsgBoxBack").removeClass("fadeIn").addClass("fadeOut").delay(300).queue(function(){ExistMsg=0;$(this).remove()})}})}})(jQuery);var BigBoxes=0;(function($){$.bigBox=function(settings,callback){var boxBig,content;settings=$.extend({title:"",content:"",icon:undefined,number:undefined,color:undefined,sound:true,timeout:undefined,colortime:1500,colors:undefined},settings);if(settings.sound===true){if(isIE8orlower()==0){var audioElement=document.createElement("audio");if(navigator.userAgent.match("Firefox/")){audioElement.setAttribute("src","sound/bigbox.ogg")}else{audioElement.setAttribute("src","sound/bigbox.mp3")}$.get();audioElement.addEventListener("load",function(){audioElement.play()},true);audioElement.pause();audioElement.play()}}BigBoxes=BigBoxes+1;boxBig="
";boxBig+=""+settings.title+"";boxBig+="

"+settings.content+"

";boxBig+="
";if(settings.icon==undefined){settings.icon="fa fa-cloud"}boxBig+="";boxBig+="
";boxBig+="
";if(settings.number!=undefined){boxBig+=settings.number}boxBig+="
";boxBig+="
";$("#divbigBoxes").append(boxBig);if(settings.color==undefined){settings.color="#004d60"}$("#bigBox"+BigBoxes).css("background-color",settings.color);$("#divMiniIcons").append("
");$("#miniIcon"+BigBoxes).bind("click",function(){var FrontBox=$(this).attr("id");var FrontBigBox=FrontBox.replace("miniIcon","bigBox");var FronBigBoxColor=FrontBox.replace("miniIcon","bigBoxColor");$(".cajita").each(function(index){var BackBox=$(this).attr("id");var BigBoxID=BackBox.replace("miniIcon","bigBox");$("#"+BigBoxID).css("z-index",9998)});$("#"+FrontBigBox).css("z-index",9999);$("#"+FronBigBoxColor).removeClass("animated fadeIn").delay(1).queue(function(){$(this).show();$(this).addClass("animated fadeIn");$(this).clearQueue()})});var ThisBigBoxCloseCross=$("#botClose"+BigBoxes);var ThisBigBox=$("#bigBox"+BigBoxes);var ThisMiniIcon=$("#miniIcon"+BigBoxes);var ColorTimeInterval;if(settings.colors!=undefined&&settings.colors.length>0){ThisBigBoxCloseCross.attr("colorcount","0");ColorTimeInterval=setInterval(function(){var ColorIndex=ThisBigBoxCloseCross.attr("colorcount");ThisBigBoxCloseCross.animate({backgroundColor:settings.colors[ColorIndex].color});ThisBigBox.animate({backgroundColor:settings.colors[ColorIndex].color});ThisMiniIcon.animate({backgroundColor:settings.colors[ColorIndex].color});if(ColorIndex"}else{IconSection="
"}if(settings.icon==undefined){BoxSmall="
"+settings.title+"

"+settings.content+"

"+IconSection+"
"}else{BoxSmall="
"+settings.title+"

"+settings.content+"

"+IconSection+"
"}if(SmallBoxes==1){$("#divSmallBoxes").append(BoxSmall);SmallBoxesAnchos=$("#smallbox"+SmallBoxes).height()+40}else{var SmartExist=$(".SmallBox").size();if(SmartExist==0){$("#divSmallBoxes").append(BoxSmall);SmallBoxesAnchos=$("#smallbox"+SmallBoxes).height()+40}else{$("#divSmallBoxes").append(BoxSmall);$("#smallbox"+SmallBoxes).css("top",SmallBoxesAnchos);SmallBoxesAnchos=SmallBoxesAnchos+$("#smallbox"+SmallBoxes).height()+20;$(".SmallBox").each(function(index){if(index==0){$(this).css("top",20);heightPrev=$(this).height()+40;SmallBoxesAnchos=$(this).height()+40}else{$(this).css("top",heightPrev);heightPrev=heightPrev+$(this).height()+20;SmallBoxesAnchos=SmallBoxesAnchos+$(this).height()+20}})}}var ThisSmallBox=$("#smallbox"+SmallBoxes);if(settings.color==undefined){ThisSmallBox.css("background-color","#004d60")}else{ThisSmallBox.css("background-color",settings.color)}var ColorTimeInterval;if(settings.colors!=undefined&&settings.colors.length>0){ThisSmallBox.attr("colorcount","0");ColorTimeInterval=setInterval(function(){var ColorIndex=ThisSmallBox.attr("colorcount");ThisSmallBox.animate({backgroundColor:settings.colors[ColorIndex].color});if(ColorIndex-1){if(ver>=8){msg="You're using a recent copy of Windows Internet Explorer."}else{msg="You should upgrade your copy of Windows Internet Explorer."}}alert(msg)}function isIE8orlower(){var msg="0";var ver=getInternetExplorerVersion();if(ver>-1){if(ver>=9){msg=0}else{msg=1}}return msg}; \ No newline at end of file diff --git a/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js b/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js index 8fcd80b06..579c4a211 100755 --- a/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js +++ b/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js @@ -303,7 +303,7 @@ AWSInstanceBlueprintSchema.methods.launch = function (launchParams, callback) { } auditTrailService.updateAuditTrail('BOTs', launchParams.auditTrailId, resultTaskExecution, function (err, auditTrail) { if (err) { - logger.error("Failed to create or update bot Log: ", err); + logger.error("Failed to create or update bots Log: ", err); } }); } @@ -377,7 +377,7 @@ AWSInstanceBlueprintSchema.methods.launch = function (launchParams, callback) { } auditTrailService.updateAuditTrail('BOTs', launchParams.auditTrailId, resultTaskExecution, function (err, auditTrail) { if (err) { - logger.error("Failed to create or update bot Log: ", err); + logger.error("Failed to create or update bots Log: ", err); } }); } @@ -449,7 +449,7 @@ AWSInstanceBlueprintSchema.methods.launch = function (launchParams, callback) { } auditTrailService.updateAuditTrail('BOTs', launchParams.auditTrailId, resultTaskExecution, function (err, auditTrail) { if (err) { - logger.error("Failed to create or update bot Log: ", err); + logger.error("Failed to create or update bots Log: ", err); } }); } @@ -502,7 +502,7 @@ AWSInstanceBlueprintSchema.methods.launch = function (launchParams, callback) { } auditTrailService.updateAuditTrail('BOTs', launchParams.auditTrailId, resultTaskExecution, function (err, auditTrail) { if (err) { - logger.error("Failed to create or update bot Log: ", err); + logger.error("Failed to create or update bots Log: ", err); } }); } @@ -619,7 +619,7 @@ AWSInstanceBlueprintSchema.methods.launch = function (launchParams, callback) { } auditTrailService.updateAuditTrail('BOTs', launchParams.auditTrailId, resultTaskExecution, function (err, auditTrail) { if (err) { - logger.error("Failed to create or update bot Log: ", err); + logger.error("Failed to create or update bots Log: ", err); } }); } @@ -661,7 +661,7 @@ AWSInstanceBlueprintSchema.methods.launch = function (launchParams, callback) { } auditTrailService.updateAuditTrail('BOTs', launchParams.auditTrailId, resultTaskExecution, function (err, auditTrail) { if (err) { - logger.error("Failed to create or update bot Log: ", err); + logger.error("Failed to create or update bots Log: ", err); } }); } @@ -768,7 +768,7 @@ AWSInstanceBlueprintSchema.methods.launch = function (launchParams, callback) { } auditTrailService.updateAuditTrail('BOTs', launchParams.auditTrailId, resultTaskExecution, function (err, auditTrail) { if (err) { - logger.error("Failed to create or update bot Log: ", err); + logger.error("Failed to create or update bots Log: ", err); } }); } diff --git a/server/app/model/blueprint/blueprint-types/instance-blueprint/azure-blueprint/azure-blueprint.js b/server/app/model/blueprint/blueprint-types/instance-blueprint/azure-blueprint/azure-blueprint.js index 4588aee93..24a811da5 100755 --- a/server/app/model/blueprint/blueprint-types/instance-blueprint/azure-blueprint/azure-blueprint.js +++ b/server/app/model/blueprint/blueprint-types/instance-blueprint/azure-blueprint/azure-blueprint.js @@ -404,7 +404,7 @@ azureInstanceBlueprintSchema.methods.launch = function(launchParams, callback) { } auditTrailService.updateAuditTrail('BOTs',launchParams.auditTrailId,resultTaskExecution,function(err,auditTrail){ if (err) { - logger.error("Failed to create or update bot Log: ", err); + logger.error("Failed to create or update bots Log: ", err); } }); } @@ -533,7 +533,7 @@ azureInstanceBlueprintSchema.methods.launch = function(launchParams, callback) { } auditTrailService.updateAuditTrail('BOTs',launchParams.auditTrailId,resultTaskExecution,function(err,auditTrail){ if (err) { - logger.error("Failed to create or update bot Log: ", err); + logger.error("Failed to create or update bots Log: ", err); } }); } @@ -574,7 +574,7 @@ azureInstanceBlueprintSchema.methods.launch = function(launchParams, callback) { } auditTrailService.updateAuditTrail('BOTs',launchParams.auditTrailId,resultTaskExecution,function(err,auditTrail){ if (err) { - logger.error("Failed to create or update bot Log: ", err); + logger.error("Failed to create or update bots Log: ", err); } }); } @@ -650,7 +650,7 @@ azureInstanceBlueprintSchema.methods.launch = function(launchParams, callback) { } auditTrailService.updateAuditTrail('BOTs',launchParams.auditTrailId,resultTaskExecution,function(err,auditTrail){ if (err) { - logger.error("Failed to create or update bot Log: ", err); + logger.error("Failed to create or update bots Log: ", err); } }); } diff --git a/server/app/model/blueprint/blueprint-types/instance-blueprint/openstack-blueprint/openstack-blueprint.js b/server/app/model/blueprint/blueprint-types/instance-blueprint/openstack-blueprint/openstack-blueprint.js index 9d6878f7c..04485019f 100755 --- a/server/app/model/blueprint/blueprint-types/instance-blueprint/openstack-blueprint/openstack-blueprint.js +++ b/server/app/model/blueprint/blueprint-types/instance-blueprint/openstack-blueprint/openstack-blueprint.js @@ -300,7 +300,7 @@ openstackInstanceBlueprintSchema.methods.launch = function(launchParams, callbac } auditTrailService.updateAuditTrail('BOTs',launchParams.auditTrailId,resultTaskExecution,function(err,auditTrail){ if (err) { - logger.error("Failed to create or update bot Log: ", err); + logger.error("Failed to create or update bots Log: ", err); } }); } @@ -488,7 +488,7 @@ openstackInstanceBlueprintSchema.methods.launch = function(launchParams, callbac } auditTrailService.updateAuditTrail('BOTs',launchParams.auditTrailId,resultTaskExecution,function(err,auditTrail){ if (err) { - logger.error("Failed to create or update bot Log: ", err); + logger.error("Failed to create or update bots Log: ", err); } }); } @@ -524,7 +524,7 @@ openstackInstanceBlueprintSchema.methods.launch = function(launchParams, callbac } auditTrailService.updateAuditTrail('BOTs',launchParams.auditTrailId,resultTaskExecution,function(err,auditTrail){ if (err) { - logger.error("Failed to create or update bot Log: ", err); + logger.error("Failed to create or update bots Log: ", err); } }); } @@ -599,7 +599,7 @@ openstackInstanceBlueprintSchema.methods.launch = function(launchParams, callbac } auditTrailService.updateAuditTrail('BOTs',launchParams.auditTrailId,resultTaskExecution,function(err,auditTrail){ if (err) { - logger.error("Failed to create or update bot Log: ", err); + logger.error("Failed to create or update bots Log: ", err); } }); } diff --git a/server/app/model/blueprint/blueprint-types/instance-blueprint/vmware-blueprint/vmware-blueprint.js b/server/app/model/blueprint/blueprint-types/instance-blueprint/vmware-blueprint/vmware-blueprint.js index 242966f74..6233ada97 100755 --- a/server/app/model/blueprint/blueprint-types/instance-blueprint/vmware-blueprint/vmware-blueprint.js +++ b/server/app/model/blueprint/blueprint-types/instance-blueprint/vmware-blueprint/vmware-blueprint.js @@ -291,7 +291,7 @@ vmwareInstanceBlueprintSchema.methods.launch = function(launchParams, callback) } auditTrailService.updateAuditTrail('BOTs',launchParams.auditTrailId,resultTaskExecution,function(err,auditTrail){ if (err) { - logger.error("Failed to create or update bot Log: ", err); + logger.error("Failed to create or update bots Log: ", err); } }); } @@ -373,7 +373,7 @@ vmwareInstanceBlueprintSchema.methods.launch = function(launchParams, callback) } auditTrailService.updateAuditTrail('BOTs',launchParams.auditTrailId,resultTaskExecution,function(err,auditTrail){ if (err) { - logger.error("Failed to create or update bot Log: ", err); + logger.error("Failed to create or update bots Log: ", err); } }); } @@ -477,7 +477,7 @@ vmwareInstanceBlueprintSchema.methods.launch = function(launchParams, callback) } auditTrailService.updateAuditTrail('BOTs',launchParams.auditTrailId,resultTaskExecution,function(err,auditTrail){ if (err) { - logger.error("Failed to create or update bot Log: ", err); + logger.error("Failed to create or update bots Log: ", err); } }); } @@ -583,7 +583,7 @@ vmwareInstanceBlueprintSchema.methods.launch = function(launchParams, callback) } auditTrailService.updateAuditTrail('BOTs',launchParams.auditTrailId,resultTaskExecution,function(err,auditTrail){ if (err) { - logger.error("Failed to create or update bot Log: ", err); + logger.error("Failed to create or update bots Log: ", err); } }); } @@ -618,7 +618,7 @@ vmwareInstanceBlueprintSchema.methods.launch = function(launchParams, callback) } auditTrailService.updateAuditTrail('BOTs',launchParams.auditTrailId,resultTaskExecution,function(err,auditTrail){ if (err) { - logger.error("Failed to create or update bot Log: ", err); + logger.error("Failed to create or update bots Log: ", err); } }); } diff --git a/server/app/model/blueprint/blueprint.js b/server/app/model/blueprint/blueprint.js index 63c91ec4b..ddd1e70b9 100755 --- a/server/app/model/blueprint/blueprint.js +++ b/server/app/model/blueprint/blueprint.js @@ -486,7 +486,8 @@ BlueprintSchema.statics.createNew = function(blueprintData, callback) { shortDesc:blueprintData.shortDesc, botType:blueprintData.botType, serviceDeliveryCheck:blueprintData.serviceDeliveryCheck, - botCategory:blueprintData.botCategory + botCategory:blueprintData.botCategory, + manualExecutionTime:blueprintData.manualExecutionTime }; var blueprint = new Blueprints(blueprintObj); logger.debug(blueprint); @@ -1433,7 +1434,6 @@ BlueprintSchema.statics.getBlueprintsByProviderId = function(providerId, callbac }); }; BlueprintSchema.statics.getBlueprintByOrgBgProjectProviderType = function(query, callback) { - console.log(JSON.stringify(query)); Blueprints.paginate(query.queryObj, query.options, function(err, blueprints) { if (err) { logger.error("Failed to getBlueprintByOrgBgProjectProviderType", err); diff --git a/server/app/model/bots/bots.js b/server/app/model/bots/bots.js new file mode 100644 index 000000000..6a509cf8a --- /dev/null +++ b/server/app/model/bots/bots.js @@ -0,0 +1,293 @@ +/* + Copyright [2016] [Relevance Lab] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +var mongoose = require('mongoose'); +var ObjectId = require('mongoose').Types.ObjectId; +var mongoosePaginate = require('mongoose-paginate'); +var Schema = mongoose.Schema; + +var BotsSchema = new Schema ({ + botId: { + type: String, + trim: true, + required: true + }, + botName: { + type: String, + trim: true, + required: true + }, + botType: { + type: String, + trim: true, + required: true + }, + botCategory: { + type: String, + trim: true, + required: true + }, + botDesc: { + type: String, + trim: true, + required: true + }, + masterDetails: { + orgName: { + type: String, + trim: true, + required: false + }, + orgId: { + type: String, + trim: true, + required: false + }, + bgName: { + type: String, + trim: true, + required: false + }, + bgId: { + type: String, + trim: true, + required: false + }, + projectName: { + type: String, + trim: true, + required: false + }, + projectId: { + type: String, + trim: true, + required: false + }, + envName: { + type: String, + trim: true, + required: false + }, + envId: { + type: String, + trim: true, + required: false + } + }, + botLinkedCategory: { + type: String, + trim: true, + required: false + }, + botLinkedSubCategory: { + type: String, + trim: true, + required: false + }, + manualExecutionTime: { + type: Number, + default: 10 + }, + executionCount: { + type: Number, + default: 0 + }, + isBotScheduled: { + type: Boolean, + default: false + }, + botScheduler:{ + cronStartOn: { + type: String, + required: false, + trim: true + }, + cronEndOn: { + type: String, + required: false, + trim: true + }, + cronPattern: { + type: String, + required: false, + trim: true + }, + cronRepeatEvery: { + type: Number, + required: false + }, + cronFrequency: { + type: String, + required: false, + trim: true + }, + cronMinute:{ + type: Number, + required: false, + trim: true + }, + cronHour:{ + type: Number, + required: false + }, + cronWeekDay:{ + type: Number, + required: false + }, + cronDate:{ + type: Number, + required: false + }, + cronMonth:{ + type: String, + required: false, + trim: true + }, + cronYear:{ + type: Number, + required: false + } + }, + cronJobId:{ + type: String, + required: false, + trim: true + }, + createdOn:{ + type: Number, + default: Date.now() + }, + isDeleted: { + type: Boolean, + default: false + }, +}); +BotsSchema.plugin(mongoosePaginate); + + +BotsSchema.statics.createNew = function(botsDetail,callback){ + var botsData = new Bots(botsDetail); + botsData.save(function(err, data) { + if (err) { + logger.error("createNew Failed", err, data); + callback(err,null); + return; + } + callback(null,data); + return; + }); +} +BotsSchema.statics.updateBotsDetail = function(botId,botsDetail,callback){ + Bots.update({botId:botId},{$set:botsDetail},{upsert:false}, function(err, updateBotDetail) { + if (err) { + logger.error(err); + var error = new Error('Internal server error'); + error.status = 500; + return callback(error); + } + return callback(null, updateBotDetail); + }); +}; + +BotsSchema.statics.getBotsList = function(botsQuery,callback){ + botsQuery.queryObj.isDeleted = false; + Bots.paginate(botsQuery.queryObj, botsQuery.options, function(err, botsList) { + if (err) { + logger.error(err); + var error = new Error('Internal server error'); + error.status = 500; + return callback(error); + } + return callback(null, botsList); + }); +}; + +BotsSchema.statics.getBotsById = function(botId,callback){ + Bots.find({botId:botId}, function(err, bots) { + if (err) { + logger.error(err); + var error = new Error('Internal server error'); + error.status = 500; + return callback(error); + }else if(bots.length > 0){ + return callback(null, bots); + }else{ + return callback(null, []); + } + }); +}; + +BotsSchema.statics.getAllBots = function(callback){ + Bots.find({}, function(err, bots) { + if (err) { + logger.error(err); + var error = new Error('Internal server error'); + error.status = 500; + return callback(error); + }else if(bots.length > 0){ + return callback(null, bots); + }else{ + return callback(null, []); + } + }); +}; + +BotsSchema.statics.removeBotsById = function(botId,callback){ + Bots.remove({botId:botId}, function(err, bots) { + if (err) { + logger.error(err); + var error = new Error('Internal server error'); + error.status = 500; + return callback(error); + }else { + return callback(null, bots); + } + }); +}; + +BotsSchema.statics.removeSoftBotsById = function(botId,callback){ + Bots.update({botId:botId},{$set:{isDeleted:true}}, function(err, bots) { + if (err) { + logger.error(err); + var error = new Error('Internal server error'); + error.status = 500; + return callback(error); + }else { + return callback(null, bots); + } + }); +}; + +BotsSchema.statics.updateBotsExecutionCount = function updateBotsExecutionCount(botId,count,callback) { + Bots.update({ + botId: botId, + }, { + $set: { + executionCount: count + } + }, { + upsert: false + }, function (err, data) { + if (err) { + callback(err, null); + return; + } + callback(null, data); + }); +}; + +var Bots = mongoose.model('bots', BotsSchema); +module.exports = Bots; diff --git a/server/app/model/classes/tasks/tasks.js b/server/app/model/classes/tasks/tasks.js index 17d65b945..03fb2d04a 100755 --- a/server/app/model/classes/tasks/tasks.js +++ b/server/app/model/classes/tasks/tasks.js @@ -368,31 +368,38 @@ taskSchema.methods.execute = function(userName, baseUrl, choiceParam, appData, b } else { self.lastTaskStatus = TASK_STATUS.FAILED; } + var resultTaskExecution = null; + if(taskHistoryData.taskType === TASK_TYPE.JENKINS_TASK){ + resultTaskExecution = { + "actionStatus":self.lastTaskStatus, + "status":self.lastTaskStatus, + "endedOn":self.timestampEnded, + "actionLogId":taskHistory.jenkinsServerId, + "auditTrailConfig.jenkinsBuildNumber":taskHistory.buildNumber, + "auditTrailConfig.jenkinsJobName":taskHistory.jobName + }; + }else{ + resultTaskExecution = { + "actionStatus":self.lastTaskStatus, + "status":self.lastTaskStatus, + "endedOn":self.timestampEnded, + "actionLogId":taskHistory.nodeIdsWithActionLog[0].actionLogId, + "auditTrailConfig.nodeIdsWithActionLog":taskHistory.nodeIdsWithActionLog + }; + } + if(auditTrailId !== null && resultTaskExecution !== null){ + auditTrailService.updateAuditTrail('BOTs',auditTrailId,resultTaskExecution,function(err,auditTrail){ + if (err) { + logger.error("Failed to create or update bots Log: ", err); + } + }); + } self.save(); //updating task history if (taskHistory) { taskHistory.timestampEnded = self.timestampEnded; taskHistory.status = self.lastTaskStatus; - var resultTaskExecution = null; - if(taskHistoryData.taskType === TASK_TYPE.JENKINS_TASK){ - resultTaskExecution = { - "actionStatus":self.lastTaskStatus, - "status":self.lastTaskStatus, - "endedOn":self.timestampEnded, - "actionLogId":taskHistory.jenkinsServerId, - "auditTrailConfig.jenkinsBuildNumber":taskHistory.buildNumber, - "auditTrailConfig.jenkinsJobName":taskHistory.jobName - }; - }else{ - resultTaskExecution = { - "actionStatus":self.lastTaskStatus, - "status":self.lastTaskStatus, - "endedOn":self.timestampEnded, - "actionLogId":taskHistory.nodeIdsWithActionLog[0].actionLogId, - "auditTrailConfig.nodeIdsWithActionLog":taskHistory.nodeIdsWithActionLog - }; - } if (resultData) { if (resultData.instancesResults && resultData.instancesResults.length) { taskHistory.executionResults = resultData.instancesResults; @@ -402,13 +409,6 @@ taskSchema.methods.execute = function(userName, baseUrl, choiceParam, appData, b } } - if(auditTrailId !== null && resultTaskExecution !== null){ - auditTrailService.updateAuditTrail('BOTs',auditTrailId,resultTaskExecution,function(err,auditTrail){ - if (err) { - logger.error("Failed to create or update bot Log: ", err); - } - }); - } taskHistory.save(); } diff --git a/server/app/routes/v1.0/routes.js b/server/app/routes/v1.0/routes.js index 420008cf0..99ae4e9f3 100755 --- a/server/app/routes/v1.0/routes.js +++ b/server/app/routes/v1.0/routes.js @@ -75,6 +75,7 @@ var fileUpload = require('./routes_fileUpload'); var settingWizard = require('./routes_setting_wizard'); var configData = require('./routes_config_data'); var monitors = require('./routes_monitors'); +var bots = require('./routes_bots'); /* * @TODO * Change app to router in internal routes files @@ -187,6 +188,8 @@ module.exports.setRoutes = function(app) { configData.setRoutes(app, sessionVerificationFunc); + bots.setRoutes(app, sessionVerificationFunc); + app.get('/', function(req, res) { res.redirect('/cat3'); diff --git a/server/app/routes/v1.0/routes_audit_trails.js b/server/app/routes/v1.0/routes_audit_trails.js index 4419edd8c..239101dec 100644 --- a/server/app/routes/v1.0/routes_audit_trails.js +++ b/server/app/routes/v1.0/routes_audit_trails.js @@ -47,7 +47,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { }) }); - app.get('/audit-trail/bot-summary', function(req,res){ + app.get('/audit-trail/bots-summary', function(req,res){ auditTrailService.getBOTsSummary(function(err,botSummary){ if(err){ logger.error(err); diff --git a/server/app/routes/v1.0/routes_blueprints.js b/server/app/routes/v1.0/routes_blueprints.js index 08e511a5c..d7073131c 100755 --- a/server/app/routes/v1.0/routes_blueprints.js +++ b/server/app/routes/v1.0/routes_blueprints.js @@ -24,6 +24,8 @@ var credentialcryptography = require('_pr/lib/credentialcryptography'); var fs = require('fs'); var blueprintService = require('_pr/services/blueprintService.js'); var auditTrailService = require('_pr/services/auditTrailService'); +var bots = require('_pr/model/bots/bots.js'); +var botsService = require('_pr/services/botsService.js'); module.exports.setRoutes = function(app, sessionVerificationFunc) { app.all('/blueprints/*', sessionVerificationFunc); @@ -229,6 +231,24 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { res.send(500, errorResponses.db.error); return; } + if(blueprintUpdateData.serviceDeliveryCheck === true){ + Blueprints.getById(req.params.blueprintId, function(err, blueprintData) { + if (err) { + logger.error("Failed to get blueprint ", err); + return; + } else { + botsService.createNew(blueprintData, 'Blueprint', blueprintUpdateData.blueprintType, 'edit', function (err, data) { + logger.error("Error in creating bots entry." + err); + }); + } + }); + }else{ + botsService.removeSoftBotsById(req.params.blueprintId, function (err, data) { + if (err) { + logger.error("Error in updating bots entry." + err); + } + }); + } var latestVersionData = updatedBlueprint.getLatestVersion(); if (latestVersionData) { res.send({ @@ -238,7 +258,6 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { res.send(200); } - }); }); @@ -288,6 +307,11 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { res.send(500, errorResponses.db.error); return; } + bots.removeBotsById(req.params.blueprintId,function(err,botsData){ + if(err){ + logger.error("Failed to delete Bots ", err); + } + }); res.send(200, { message: "deleted" }); @@ -432,6 +456,20 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { nodeIdsWithActionLog:[] }; blueprint.envId= req.query.envId; + bots.getBotsById(blueprint._id,function(err,botData){ + if(err){ + logger.error(err); + }else if(botData.length > 0){ + var botExecutionCount = botData[0].executionCount + 1; + bots.updateBotsExecutionCount(blueprint._id,botExecutionCount,function(err,data){ + if(err){ + logger.error("Error while updating Bot Execution Count"); + } + }); + }else{ + logger.debug("There is no Bots Data present in DB"); + } + }); auditTrailService.insertAuditTrail(blueprint,auditTrailObj,actionObj,function(err,data){ if(err){ logger.error(err); diff --git a/server/app/routes/v1.0/routes_bots.js b/server/app/routes/v1.0/routes_bots.js new file mode 100644 index 000000000..8f4f01c9c --- /dev/null +++ b/server/app/routes/v1.0/routes_bots.js @@ -0,0 +1,64 @@ +/* + Copyright [2016] [Relevance Lab] + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +// The file contains all the end points for AppDeploy + +var logger = require('_pr/logger')(module); +var botsService = require('_pr/services/botsService.js'); + + +module.exports.setRoutes = function(app, sessionVerificationFunc) { + app.all('/bots/*', sessionVerificationFunc); + + app.get('/bots',function(req,res){ + botsService.getBotsList(req.query, function(err,data){ + if (err) { + return res.status(500).send(err); + } else { + return res.status(200).send(data); + } + }) + }); + + + app.delete('/bots/:botId',function(req,res){ + botsService.removeSoftBotsById(req.params.botId, function(err,data){ + if (err) { + return res.status(500).send(err); + } else { + return res.status(200).send(data); + } + }) + }); + + app.delete('/bots/:botId/bots-history',function(req,res){ + botsService.getBotsHistory(req.params.botId, function(err,data){ + if (err) { + return res.status(500).send(err); + } else { + return res.status(200).send(data); + } + }) + }); + + app.put('/bots/:botId/scheduler',function(req,res){ + botsService.updateBotsScheduler(req.params.botId,req.body, function(err,data){ + if (err) { + return res.status(500).send(err); + } else { + return res.status(200).send(data); + } + }) + }); + +}; \ No newline at end of file diff --git a/server/app/routes/v1.0/routes_config_data.js b/server/app/routes/v1.0/routes_config_data.js index 1c6b79643..ceddfadd7 100644 --- a/server/app/routes/v1.0/routes_config_data.js +++ b/server/app/routes/v1.0/routes_config_data.js @@ -29,7 +29,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); // Bot Type List - app.get('/config-data/bot-type', function(req, res) { + app.get('/config-data/bots-type', function(req, res) { var botTypeList = appConfig.botTypeList; res.send(botTypeList); }); diff --git a/server/app/routes/v1.0/routes_organizations.js b/server/app/routes/v1.0/routes_organizations.js index ab1879030..e7408f192 100755 --- a/server/app/routes/v1.0/routes_organizations.js +++ b/server/app/routes/v1.0/routes_organizations.js @@ -53,6 +53,7 @@ var instanceLogModel = require('_pr/model/log-trail/instanceLog.js'); var compositeBlueprintModel = require('_pr/model/composite-blueprints/composite-blueprints.js'); var Cryptography = require('_pr/lib/utils/cryptography'); var catalystSync = require('_pr/cronjobs/catalyst-scheduler/catalystScheduler.js'); +var botsService = require('_pr/services/botsService.js'); module.exports.setRoutes = function(app, sessionVerification) { /* @@ -665,7 +666,7 @@ module.exports.setRoutes = function(app, sessionVerification) { // }); // return; // } - Blueprints.createNew(blueprintData, function(err, data) { + Blueprints.createNew(blueprintData, function(err, bluePrintData) { if (err) { logger.error('error occured while saving blueorint', err); res.status(500).send({ @@ -673,7 +674,26 @@ module.exports.setRoutes = function(app, sessionVerification) { }); return; } - + if(bluePrintData.serviceDeliveryCheck === true){ + masterUtil.getParticularProject(projectId, function(err, project) { + if (err) { + logger.error(err); + } else if (project.length > 0) { + bluePrintData.orgName = project[0].orgname; + bluePrintData.bgName = project[0].productgroupname; + bluePrintData.projectName = project[0].projectname; + botsService.createOrUpdateBots(bluePrintData, 'Blueprint', blueprintType, function (err, botsData) { + if(err) { + logger.error("Error in creating bots entry. " + err); + }else{ + logger.debug("Successfully added data for Bots.") + } + }); + } else { + logger.debug("Unable to find Project Information from project id:"); + } + }); + } res.send(data); }); @@ -1019,6 +1039,11 @@ module.exports.setRoutes = function(app, sessionVerification) { catalystSync.executeSerialScheduledTasks(); } }; + if(task.serviceDeliveryCheck === true){ + botsService.createOrUpdateBots(task,'Task',task.taskType,function(err,data){ + logger.error("Error in creating bots entry."+err); + }); + } res.send(task); logger.debug("Exit post() for /organizations/%s/businessGroups/%s/projects/%s/environments/%s/tasks", req.params.orgId, req.params.bgId, req.params.projectId, req.params.environments); }); @@ -1039,6 +1064,11 @@ module.exports.setRoutes = function(app, sessionVerification) { } }; + if(task.serviceDeliveryCheck === true){ + botsService.createOrUpdateBots(task,'Task',task.taskType,function(err,data){ + logger.error("Error in creating bots entry."+err); + }); + } res.send(task); logger.debug("Exit post() for /organizations/%s/businessGroups/%s/projects/%s/environments/%s/tasks", req.params.orgId, req.params.bgId, req.params.projectId, req.params.environments); }); diff --git a/server/app/routes/v1.0/routes_tasks.js b/server/app/routes/v1.0/routes_tasks.js index b8b48a41e..4c9e49b9f 100755 --- a/server/app/routes/v1.0/routes_tasks.js +++ b/server/app/routes/v1.0/routes_tasks.js @@ -29,7 +29,7 @@ var apiUtil = require('_pr/lib/utils/apiUtil.js'); var Cryptography = require('_pr/lib/utils/cryptography'); var schedulerService = require('_pr/services/schedulerService'); var catalystSync = require('_pr/cronjobs/catalyst-scheduler/catalystScheduler.js'); - +var botsService = require('_pr/services/botsService.js'); var appConfig = require('_pr/config'); @@ -184,6 +184,11 @@ module.exports.setRoutes = function(app, sessionVerification) { logger.error("Failed to remove history: ", err); } }); + botsService.removeBotsById(req.params.taskId,function(err,botsData){ + if(err){ + logger.error("Failed to delete Bots ", err); + } + }); res.send({ deleteCount: deleteCount }); @@ -520,6 +525,8 @@ module.exports.setRoutes = function(app, sessionVerification) { if(taskData.taskScheduler && taskData.taskScheduler !== null && Object.keys(taskData.taskScheduler).length !== 0) { taskData.taskScheduler = apiUtil.createCronJobPattern(taskData.taskScheduler); taskData.isTaskScheduled = true; + }else{ + taskData.isTaskScheduled = false; } if(taskData.manualExecutionTime && taskData.manualExecutionTime !== null){ taskData.manualExecutionTime = parseInt(taskData.manualExecutionTime); @@ -554,6 +561,25 @@ module.exports.setRoutes = function(app, sessionVerification) { catalystSync.executeSerialScheduledTasks(); } }; + if(taskData.serviceDeliveryCheck === true) { + Tasks.getTaskById(req.params.taskId, function (err, task) { + if (err) { + logger.error(err); + } else { + botsService.createNew(task, 'Task', task.taskType, function (err, data) { + if (err) { + logger.error("Error in creating bots entry." + err); + } + }); + } + }); + }else{ + botsService.removeSoftBotsById(req.params.taskId, function (err, data) { + if (err) { + logger.error("Error in updating bots entry." + err); + } + }); + } res.send({ updateCount: updateCount }); @@ -582,6 +608,19 @@ module.exports.setRoutes = function(app, sessionVerification) { catalystSync.executeSerialScheduledTasks(); } }; + if(taskData.serviceDeliveryCheck === true) { + Tasks.getTaskById(req.params.taskId, function (err, task) { + if (err) { + logger.error(err); + } else { + botsService.createNew(task, 'Task', task.taskType, function (err, data) { + if (err) { + logger.error("Error in creating bots entry." + err); + } + }); + } + }); + } res.send({ updateCount: updateCount }); diff --git a/server/app/services/auditTrailService.js b/server/app/services/auditTrailService.js index be0df8c7e..133477124 100644 --- a/server/app/services/auditTrailService.js +++ b/server/app/services/auditTrailService.js @@ -19,8 +19,7 @@ var instanceAuditTrail = require('_pr/model/audit-trail/instance-audit-trail.js' var botAuditTrail = require('_pr/model/audit-trail/bot-audit-trail.js'); var containerAuditTrail = require('_pr/model/audit-trail/container-audit-trail.js'); var auditTrail = require('_pr/model/audit-trail/audit-trail.js'); -var blueprints = null; -var tasks = null; +var bots = require('_pr/model/bots/bots.js');; const errorType = 'auditTrailService'; @@ -176,26 +175,13 @@ auditTrailService.getAuditTrailActionLogs = function getAuditTrailActionLogs(act auditTrailService.getBOTsSummary = function getBOTsSummary(callback){ async.parallel({ totalNoOfBots: function(callback){ - blueprints = require('_pr/model/blueprint'); - tasks = require('_pr/model/classes/tasks/tasks.js'); - async.parallel({ - botsTask:function(callback){ - tasks.getAllServiceDeliveryTask('true',callback); - }, - botsBlueprint:function(callback){ - blueprints.getAllServiceDeliveryBlueprint('true',callback); - } - },function(err,results){ + bots.getAllBots(function(err,botsList){ if(err){ - logger.error(err); callback(err,null); - return; + }else { + callback(null, botsList.length); } - var totalNoOfBots = results.botsTask.length + results.botsBlueprint.length; - callback(null,totalNoOfBots); - return; - }) - + }); }, totalNoOfSuccessBots: function(callback){ var query={ @@ -205,8 +191,9 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){ auditTrail.getAuditTrails(query,function(err,data){ if(err){ callback(err,null); + }else { + callback(null, data.length); } - callback(null,data.length); }); }, @@ -218,8 +205,9 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){ auditTrail.getAuditTrails(query,function(err,data){ if(err){ callback(err,null); + }else { + callback(null, data.length); } - callback(null,data.length); }); }, @@ -258,8 +246,9 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){ auditTrail.getAuditTrails(query,function(err,data){ if(err){ callback(err,null); + }else { + callback(null, data.length); } - callback(null,data.length); }); } @@ -275,6 +264,20 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){ }) } +auditTrailService.getBotsAuditTrailHistory = function getBotsAuditTrailHistory(botId,callback){ + var query={ + auditType:'BOTs', + auditId:botId + }; + auditTrail.getAuditTrails(query,function(err,data){ + if(err){ + callback(err,null); + }else { + callback(null, data); + } + }); +} + function getExecutionTime(endTime,startTime){ var executionTimeInMS = endTime-startTime; diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js new file mode 100644 index 000000000..67f575d9d --- /dev/null +++ b/server/app/services/botsService.js @@ -0,0 +1,190 @@ + +/* + Copyright [2016] [Relevance Lab] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +var logger = require('_pr/logger')(module); +var bots = require('_pr/model/bots/bots.js'); +var async = require("async"); +var apiUtil = require('_pr/lib/utils/apiUtil.js'); +var taskService = require('_pr/services/taskService.js'); +var auditTrailService = require('_pr/services/auditTrailService.js'); +var blueprintService = require('_pr/services/blueprintService.js'); + +const errorType = 'botsService'; + +var botsService = module.exports = {}; + +botsService.createOrUpdateBots = function createOrUpdateBots(botsDetail,linkedCategory,linkedSubCategory,callback) { + logger.debug("In createOrUpdateBots...."); + var botsObj = { + botId: botsDetail._id, + botName:botsDetail.name, + botType: botsDetail.botType, + botCategory: botsDetail.botCategory, + botDesc: botsDetail.shortDesc, + masterDetails:{ + orgId: botsDetail.orgId, + orgName: botsDetail.orgName, + bgId: botsDetail.bgId, + bgName: botsDetail.bgName, + projectId: botsDetail.projectId, + projectName: botsDetail.projectName, + envId: botsDetail.envId ? botsDetail.envId : null, + envName: botsDetail.envName?botsDetail.envName: null + }, + botLinkedCategory: linkedCategory, + botLinkedSubCategory:linkedSubCategory, + manualExecutionTime:botsDetail.manualExecutionTime, + createdOn: new Date().getTime() + }; + bots.getBotsById(botsDetail._id,function(err,data){ + if(err){ + callback(err,null); + return; + }else if(data.length === 0){ + bots.createNew(botsObj, function (err, saveBotsData) { + if (err) { + logger.error(err); + callback(err, null); + return; + } + callback(null, saveBotsData); + return; + }) + }else{ + botsObj.isDeleted = false; + bots.updateBotsDetail(botsObj.botId,botsObj,function(err,updateBotsData){ + if(err){ + logger.error(err); + callback(err,null); + return; + } + callback(null,updateBotsData); + return; + }); + } + }); +} + +botsService.updateBotsScheduler = function updateBotsScheduler(botId,botObj,callback) { + if(botObj.botScheduler && botObj.botScheduler !== null && Object.keys(botObj.botScheduler).length !== 0) { + botObj.botScheduler = apiUtil.createCronJobPattern(botObj.botScheduler); + } + bots.updateBotsDetail(botId,botObj,function(err,data){ + if(err){ + logger.error(err); + callback(err,null); + return; + } + callback(null,data); + return; + }); +} + +botsService.getBotsList = function getBotsList(botsQuery,callback) { + var reqData = {}; + async.waterfall([ + function(next) { + apiUtil.paginationRequest(botsQuery, 'bots', next); + }, + function(paginationReq, next) { + paginationReq['searchColumns'] = ['botName', 'botType', 'botCategory', 'botLinkedCategory','botLinkedSubCategory', 'masterDetails.orgName', 'masterDetails.bgName', 'masterDetails.projectName', 'masterDetails.envName']; + reqData = paginationReq; + apiUtil.databaseUtil(paginationReq, next); + }, + function(queryObj, next) { + bots.getBotsList(queryObj, next); + }, + function(auditTrailList, next) { + apiUtil.paginationResponse(auditTrailList, reqData, next); + } + ],function(err, results) { + if (err){ + logger.error(err); + callback(err,null); + return; + } + callback(null,results) + return; + }); +} + +botsService.removeSoftBotsById = function removeSoftBotsById(botId,callback){ + async.waterfall([ + function(next){ + bots.getBotsById(botId,next); + }, + function(bots,next){ + if(bots.length > 0){ + async.parallel({ + bots:function(callback){ + if(bots[0].botLinkedCategory === 'Task'){ + taskService.deleteServiceDeliveryTask(botId, callback); + }else{ + blueprintService.deleteServiceDeliveryBlueprint(botId,callback) + } + }, + services: function(callback){ + bots.removeSoftBotsById(botId,callback); + } + },function(err,results){ + if(err){ + next(err,null); + }else{ + next(null,results); + } + }) + }else{ + next({errCode:400, errMsg:"Bots is not exist in DB"}) + } + } + ],function(err,results){ + if(err){ + logger.error(err); + callback(err,null); + return; + }else{ + callback(null,results); + return; + } + }); +} +botsService.removeBotsById = function removeBotsById(botId,callback){ + bots.removeBotsById(botId,function(err,data){ + if(err){ + logger.error(err); + callback(err,null); + return; + } + callback(null,data); + return; + }); +} + +botsService.getBotsHistory = function getBotsHistory(botId,callback){ + auditTrailService.getBotsAuditTrailHistory(botId,function(err,data){ + if(err){ + logger.error(err); + callback(err,null); + return; + } + callback(null,data); + return; + }); +} + + + diff --git a/server/app/services/taskService.js b/server/app/services/taskService.js index 6e057995e..c43067f6a 100644 --- a/server/app/services/taskService.js +++ b/server/app/services/taskService.js @@ -16,6 +16,7 @@ var logger = require('_pr/logger')(module); var taskDao = require('_pr/model/classes/tasks/tasks.js'); +var bots = require('_pr/model/bots/bots.js'); var masterUtil = require('_pr/lib/utils/masterUtil.js'); var d4dModelNew = require('_pr/model/d4dmasters/d4dmastersmodelnew.js'); var TaskHistory = require('_pr/model/classes/tasks/taskHistory'); @@ -181,6 +182,20 @@ taskService.executeTask = function executeTask(taskId, user, hostProtocol, choic manualExecutionTime:task.manualExecutionTime, nodeIdsWithActionLog:[] }; + bots.getBotsById(task._id,function(err,data){ + if(err){ + logger.error(err); + }else if(data.length > 0){ + var botExecutionCount = data[0].executionCount + 1; + bots.updateBotsExecutionCount(task._id,botExecutionCount,function(err,data){ + if(err){ + logger.error("Error while updating Bot Execution Count"); + } + }); + }else{ + logger.debug("There is not BOTs data present in DB"); + } + }); auditTrailService.insertAuditTrail(task,auditTrailObj,actionObj,function(err,data) { if (err) { logger.error(err); @@ -188,32 +203,6 @@ taskService.executeTask = function executeTask(taskId, user, hostProtocol, choic auditTrailId = data._id; task.execute(user, hostProtocol, choiceParam, appData, blueprintIds, task.envId, auditTrailId, function (err, taskRes, historyData) { if (err) { - if (auditTrailId !== null) { - var resultTaskExecution = null; - if(task.taskType === 'jenkins'){ - resultTaskExecution = { - "actionStatus":'failed', - "status":'failed', - "endedOn":new Date().getTime(), - "actionLogId":historyData.jenkinsServerId, - "auditTrailConfig.jenkinsBuildNumber":historyData.buildNumber, - "auditTrailConfig.jenkinsJobName":historyData.jobName - }; - }else{ - resultTaskExecution = { - "actionStatus": 'failed', - "status": "failed", - "endedOn": new Date().getTime(), - "actionLogId": historyData.nodeIdsWithActionLog[0].actionLogId, - "auditTrailConfig.nodeIdsWithActionLog": historyData.nodeIdsWithActionLog - }; - } - auditTrailService.updateAuditTrail('BOTs', auditTrailId, resultTaskExecution, function (err, auditTrail) { - if (err) { - logger.error("Failed to create or update bot Log: ", err); - } - }); - } var error = new Error('Failed to execute task.'); error.status = 500; return callback(error, null); @@ -228,32 +217,6 @@ taskService.executeTask = function executeTask(taskId, user, hostProtocol, choic }else{ task.execute(user, hostProtocol, choiceParam, appData, blueprintIds, task.envId,auditTrailId,function(err, taskRes, historyData) { if (err) { - if(auditTrailId !== null) { - var resultTaskExecution = null; - if(task.taskType === 'jenkins'){ - resultTaskExecution = { - "actionStatus":'failed', - "status":'failed', - "endedOn":new Date().getTime(), - "actionLogId":historyData.jenkinsServerId, - "auditTrailConfig.jenkinsBuildNumber":historyData.buildNumber, - "auditTrailConfig.jenkinsJobName":historyData.jobName - }; - }else{ - resultTaskExecution = { - "actionStatus": 'failed', - "status": "failed", - "endedOn": new Date().getTime(), - "actionLogId": historyData.nodeIdsWithActionLog[0].actionLogId, - "auditTrailConfig.nodeIdsWithActionLog": historyData.nodeIdsWithActionLog - }; - } - auditTrailService.updateAuditTrail('BOTs', auditTrailId, resultTaskExecution, function (err, auditTrail) { - if (err) { - logger.error("Failed to create or update bot Log: ", err); - } - }); - } var error = new Error('Failed to execute task.'); error.status = 500; return callback(error, null); From 1c0d0122393c7556fbc866e78005ab96aa724177 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 7 Dec 2016 15:48:44 +0530 Subject: [PATCH 05/11] Stop cron Job after updating --- server/app/routes/v1.0/routes_tasks.js | 47 +++++++++++++++----------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/server/app/routes/v1.0/routes_tasks.js b/server/app/routes/v1.0/routes_tasks.js index 4c9e49b9f..a14087bff 100755 --- a/server/app/routes/v1.0/routes_tasks.js +++ b/server/app/routes/v1.0/routes_tasks.js @@ -30,11 +30,11 @@ var Cryptography = require('_pr/lib/utils/cryptography'); var schedulerService = require('_pr/services/schedulerService'); var catalystSync = require('_pr/cronjobs/catalyst-scheduler/catalystScheduler.js'); var botsService = require('_pr/services/botsService.js'); - +var cronTab = require('node-crontab'); var appConfig = require('_pr/config'); var uuid = require('node-uuid'); -var fileIo = require('_pr/lib/utils/fileio'); + module.exports.setRoutes = function(app, sessionVerification) { @@ -560,7 +560,11 @@ module.exports.setRoutes = function(app, sessionVerification) { }else{ catalystSync.executeSerialScheduledTasks(); } - }; + }else if(scriptTask.cronJobId && scriptTask.cronJobId !== null){ + cronTab.cancelJob(scriptTask.cronJobId); + }else{ + logger.debug("There is no cron job associated with Task "); + } if(taskData.serviceDeliveryCheck === true) { Tasks.getTaskById(req.params.taskId, function (err, task) { if (err) { @@ -601,26 +605,29 @@ module.exports.setRoutes = function(app, sessionVerification) { return; } if (updateCount) { - if(taskData.isTaskScheduled === true){ - if(taskData.executionOrder === 'PARALLEL'){ - catalystSync.executeParallelScheduledTasks(); - }else{ - catalystSync.executeSerialScheduledTasks(); + Tasks.getTaskById(req.params.taskId, function (err, task) { + if (err) { + logger.error(err); } - }; - if(taskData.serviceDeliveryCheck === true) { - Tasks.getTaskById(req.params.taskId, function (err, task) { - if (err) { - logger.error(err); + if (task.isTaskScheduled === true) { + if (taskData.executionOrder === 'PARALLEL') { + catalystSync.executeParallelScheduledTasks(); } else { - botsService.createNew(task, 'Task', task.taskType, function (err, data) { - if (err) { - logger.error("Error in creating bots entry." + err); - } - }); + catalystSync.executeSerialScheduledTasks(); } - }); - } + }else if(task.cronJobId && task.cronJobId !== null){ + cronTab.cancelJob(task.cronJobId); + }else{ + logger.debug("There is no cron job associated with Task "); + } + if (task.serviceDeliveryCheck === true) { + botsService.createNew(task, 'Task', task.taskType, function (err, data) { + if (err) { + logger.error("Error in creating bots entry." + err); + } + }); + } + }) res.send({ updateCount: updateCount }); From 087de531de101db48c1ac72f3c035c4d9c334720 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 7 Dec 2016 18:45:03 +0530 Subject: [PATCH 06/11] BOTs FilterBy/Search/Pagination/Scheduler Implementation --- server/app/model/audit-trail/audit-trail.js | 25 ++++++++++++++++ .../app/model/audit-trail/base-audit-trail.js | 4 +++ server/app/model/bots/bots.js | 2 +- server/app/routes/v1.0/routes_blueprints.js | 5 ++++ server/app/routes/v1.0/routes_bots.js | 2 +- .../app/routes/v1.0/routes_organizations.js | 8 +++-- server/app/routes/v1.0/routes_tasks.js | 10 +++++-- server/app/services/auditTrailService.js | 30 +++++++++++++++++++ server/app/services/blueprintService.js | 2 +- server/app/services/botsService.js | 5 ++++ server/app/services/taskService.js | 2 +- server/install.js | 3 +- 12 files changed, 89 insertions(+), 9 deletions(-) diff --git a/server/app/model/audit-trail/audit-trail.js b/server/app/model/audit-trail/audit-trail.js index 47debe2eb..b9fc9735d 100644 --- a/server/app/model/audit-trail/audit-trail.js +++ b/server/app/model/audit-trail/audit-trail.js @@ -24,6 +24,7 @@ var AuditTrailSchema = new BaseAuditTrail(); AuditTrailSchema.plugin(mongoosePaginate); AuditTrailSchema.statics.getAuditTrailList = function(auditTrailQuery,callback){ + auditTrailQuery.queryObj.isDeleted = false; AuditTrail.paginate(auditTrailQuery.queryObj, auditTrailQuery.options, function(err, auditTrailList) { if (err) { logger.error(err); @@ -59,6 +60,30 @@ AuditTrailSchema.statics.removeAuditTrails = function(queryObj,callback){ }); }; +AuditTrailSchema.statics.softRemoveAuditTrails = function(auditId,callback){ + AuditTrail.update({auditId:auditId},{$set:{isDeleted:true}},{multi:true}, function(err, sortDeleteAuditTrail) { + if (err) { + logger.error(err); + var error = new Error('Internal server error'); + error.status = 500; + return callback(error); + } + return callback(null, sortDeleteAuditTrail); + }); +}; + +AuditTrailSchema.statics.updateSoftRemoveAuditTrails = function(auditId,callback){ + AuditTrail.update({auditId:auditId},{$set:{isDeleted:false}},{multi:true}, function(err, sortDeleteAuditTrail) { + if (err) { + logger.error(err); + var error = new Error('Internal server error'); + error.status = 500; + return callback(error); + } + return callback(null, sortDeleteAuditTrail); + }); +}; + var AuditTrail = mongoose.model('auditTrails', AuditTrailSchema); module.exports = AuditTrail; diff --git a/server/app/model/audit-trail/base-audit-trail.js b/server/app/model/audit-trail/base-audit-trail.js index d44ee44f4..f8ef79ee5 100644 --- a/server/app/model/audit-trail/base-audit-trail.js +++ b/server/app/model/audit-trail/base-audit-trail.js @@ -116,6 +116,10 @@ var AuditTrailSchema = function AuditTrail() { type: String, trim:true, required:false + }, + isDeleted: { + type: Boolean, + default:false } }); }; diff --git a/server/app/model/bots/bots.js b/server/app/model/bots/bots.js index 6a509cf8a..87f5405b6 100644 --- a/server/app/model/bots/bots.js +++ b/server/app/model/bots/bots.js @@ -231,7 +231,7 @@ BotsSchema.statics.getBotsById = function(botId,callback){ }; BotsSchema.statics.getAllBots = function(callback){ - Bots.find({}, function(err, bots) { + Bots.find({isDeleted:false}, function(err, bots) { if (err) { logger.error(err); var error = new Error('Internal server error'); diff --git a/server/app/routes/v1.0/routes_blueprints.js b/server/app/routes/v1.0/routes_blueprints.js index a46ca2840..7cb630573 100755 --- a/server/app/routes/v1.0/routes_blueprints.js +++ b/server/app/routes/v1.0/routes_blueprints.js @@ -312,6 +312,11 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { logger.error("Failed to delete Bots ", err); } }); + auditTrailService.removeAuditTrailById(req.params.taskId,function(err,auditTrailData){ + if(err){ + logger.error("Failed to delete Audit Trail ", err); + } + }); res.send(200, { message: "deleted" }); diff --git a/server/app/routes/v1.0/routes_bots.js b/server/app/routes/v1.0/routes_bots.js index 8f4f01c9c..79ebabc1b 100644 --- a/server/app/routes/v1.0/routes_bots.js +++ b/server/app/routes/v1.0/routes_bots.js @@ -41,7 +41,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { }) }); - app.delete('/bots/:botId/bots-history',function(req,res){ + app.get('/bots/:botId/bots-history',function(req,res){ botsService.getBotsHistory(req.params.botId, function(err,data){ if (err) { return res.status(500).send(err); diff --git a/server/app/routes/v1.0/routes_organizations.js b/server/app/routes/v1.0/routes_organizations.js index a86ea00a8..0a852c9eb 100755 --- a/server/app/routes/v1.0/routes_organizations.js +++ b/server/app/routes/v1.0/routes_organizations.js @@ -1042,7 +1042,9 @@ module.exports.setRoutes = function(app, sessionVerification) { }; if(task.serviceDeliveryCheck === true){ botsService.createOrUpdateBots(task,'Task',task.taskType,function(err,data){ - logger.error("Error in creating bots entry."+err); + if(err) { + logger.error("Error in creating bots entry." + err); + } }); } res.send(task); @@ -1067,7 +1069,9 @@ module.exports.setRoutes = function(app, sessionVerification) { }; if(task.serviceDeliveryCheck === true){ botsService.createOrUpdateBots(task,'Task',task.taskType,function(err,data){ - logger.error("Error in creating bots entry."+err); + if(err) { + logger.error("Error in creating bots entry." + err); + } }); } res.send(task); diff --git a/server/app/routes/v1.0/routes_tasks.js b/server/app/routes/v1.0/routes_tasks.js index a14087bff..ec3976d6a 100755 --- a/server/app/routes/v1.0/routes_tasks.js +++ b/server/app/routes/v1.0/routes_tasks.js @@ -30,6 +30,7 @@ var Cryptography = require('_pr/lib/utils/cryptography'); var schedulerService = require('_pr/services/schedulerService'); var catalystSync = require('_pr/cronjobs/catalyst-scheduler/catalystScheduler.js'); var botsService = require('_pr/services/botsService.js'); +var auditTrailService = require('_pr/services/auditTrailService.js'); var cronTab = require('node-crontab'); var appConfig = require('_pr/config'); @@ -189,6 +190,11 @@ module.exports.setRoutes = function(app, sessionVerification) { logger.error("Failed to delete Bots ", err); } }); + auditTrailService.removeAuditTrailById(req.params.taskId,function(err,auditTrailData){ + if(err){ + logger.error("Failed to delete Audit Trail ", err); + } + }); res.send({ deleteCount: deleteCount }); @@ -570,7 +576,7 @@ module.exports.setRoutes = function(app, sessionVerification) { if (err) { logger.error(err); } else { - botsService.createNew(task, 'Task', task.taskType, function (err, data) { + botsService.createOrUpdateBots(task, 'Task', task.taskType, function (err, data) { if (err) { logger.error("Error in creating bots entry." + err); } @@ -621,7 +627,7 @@ module.exports.setRoutes = function(app, sessionVerification) { logger.debug("There is no cron job associated with Task "); } if (task.serviceDeliveryCheck === true) { - botsService.createNew(task, 'Task', task.taskType, function (err, data) { + botsService.createOrUpdateBots(task, 'Task', task.taskType, function (err, data) { if (err) { logger.error("Error in creating bots entry." + err); } diff --git a/server/app/services/auditTrailService.js b/server/app/services/auditTrailService.js index 133477124..1aafa8f3e 100644 --- a/server/app/services/auditTrailService.js +++ b/server/app/services/auditTrailService.js @@ -278,6 +278,36 @@ auditTrailService.getBotsAuditTrailHistory = function getBotsAuditTrailHistory(b }); } +auditTrailService.softRemoveAuditTrailById = function softRemoveAuditTrailById(auditId,callback){ + auditTrail.softRemoveAuditTrails(auditId,function(err,data){ + if(err){ + return callback(err,null); + }else { + return callback(null, data); + } + }); +} + +auditTrailService.updateSoftRemoveAuditTrailById = function updateSoftRemoveAuditTrailById(auditId,callback){ + auditTrail.updateSoftRemoveAuditTrails(auditId,function(err,data){ + if(err){ + return callback(err,null); + }else { + return callback(null, data); + } + }); +} + +auditTrailService.removeAuditTrailById = function removeAuditTrailById(auditId,callback){ + auditTrail.removeAuditTrails({auditId:auditId},function(err,data){ + if(err){ + return callback(err,null); + }else { + return callback(null, data); + } + }); +} + function getExecutionTime(endTime,startTime){ var executionTimeInMS = endTime-startTime; diff --git a/server/app/services/blueprintService.js b/server/app/services/blueprintService.js index 663b35315..bda985fd0 100644 --- a/server/app/services/blueprintService.js +++ b/server/app/services/blueprintService.js @@ -77,7 +77,7 @@ blueprintService.deleteServiceDeliveryBlueprint = function deleteServiceDelivery Blueprints.removeServiceDeliveryBlueprints(blueprintId, next); }, function (deleteTaskCheck, next) { - auditTrail.removeAuditTrails({auditId:blueprintId},next); + auditTrail.softRemoveAuditTrails({auditId:blueprintId},next); } ],function (err, results) { if (err) { diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index 67f575d9d..620b3ab2f 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -72,6 +72,11 @@ botsService.createOrUpdateBots = function createOrUpdateBots(botsDetail,linkedCa callback(err,null); return; } + auditTrailService.updateSoftRemoveAuditTrailById(botsObj.botId,function(err,data){ + if(err){ + logger.error("Error in updating soft audit Trails"); + } + }) callback(null,updateBotsData); return; }); diff --git a/server/app/services/taskService.js b/server/app/services/taskService.js index c43067f6a..4e89cc437 100644 --- a/server/app/services/taskService.js +++ b/server/app/services/taskService.js @@ -116,7 +116,7 @@ taskService.deleteServiceDeliveryTask = function deleteServiceDeliveryTask(taskI taskDao.removeServiceDeliveryTask(taskId, next); }, function (deleteTaskCheck, next) { - auditTrail.removeAuditTrails({auditId:taskId},next); + auditTrail.softRemoveAuditTrails({auditId:taskId},next); } ],function (err, results) { if (err) { diff --git a/server/install.js b/server/install.js index 3ea196fd5..390085f4d 100755 --- a/server/install.js +++ b/server/install.js @@ -114,7 +114,8 @@ function getDefaultsConfig() { "chefNodes":"createdOn", "blueprints":"name", "compositeBlueprints":"name", - "containerLogs":"createdOn" + "containerLogs":"createdOn", + "bots":"createdOn" }, skip_Records : 1, max_record_limit : 200, From 308379a6254b90f6c491fccc613065698529c0b6 Mon Sep 17 00:00:00 2001 From: Divakar Konakalla Date: Wed, 7 Dec 2016 19:51:25 +0530 Subject: [PATCH 07/11] changes to show selected icon in blue color in the header, minor UI changes in Bots. --- client/cat3/main.html | 1 - client/cat3/src/clientRoutes.js | 4 + client/cat3/src/main.js | 3 + .../src/partials/globals/header/header.scss | 4 + .../globals/header/headerDashboard.html | 8 +- .../sections/dashboard/bots/botsCtrl.js | 8 +- .../bots/controller/botScheduleCtrl.js | 99 ------------- .../dashboard/bots/controller/libraryCtrl.js | 131 +++++++++++++++++- .../dashboard/bots/view/botsTreeMenu.html | 6 +- 9 files changed, 153 insertions(+), 111 deletions(-) delete mode 100644 client/cat3/src/partials/sections/dashboard/bots/controller/botScheduleCtrl.js diff --git a/client/cat3/main.html b/client/cat3/main.html index 47e20ce9d..da9406da0 100644 --- a/client/cat3/main.html +++ b/client/cat3/main.html @@ -112,7 +112,6 @@ - diff --git a/client/cat3/src/clientRoutes.js b/client/cat3/src/clientRoutes.js index 527ec017d..fca4c6c1e 100644 --- a/client/cat3/src/clientRoutes.js +++ b/client/cat3/src/clientRoutes.js @@ -36,6 +36,7 @@ function routeConfig($stateProvider, $urlRouterProvider, $httpProvider, modulePe url: "/workzone", templateUrl: "src/partials/sections/dashboard/workzone/workzone.html", controller: "workzoneCtrl", + params:{filterView:{workzone:true}}, onEnter: function () { }, onExit: function () { @@ -57,6 +58,7 @@ function routeConfig($stateProvider, $urlRouterProvider, $httpProvider, modulePe url: "/design", templateUrl: "src/partials/sections/dashboard/design/design.html", controller: "designCtrl as desCtrl", + params:{filterView:{design:true}}, resolve: { auth: ["$q", function ($q) { var deferred = $q.defer(); @@ -74,6 +76,7 @@ function routeConfig($stateProvider, $urlRouterProvider, $httpProvider, modulePe url: "/analytics/", templateUrl: "src/partials/sections/dashboard/analytics/analytics.html", controller: "analyticsCtrl as analytic", + params:{filterView:{analytics:true}}, resolve: { auth: ["$q", function ($q) { var deferred = $q.defer(); @@ -92,6 +95,7 @@ function routeConfig($stateProvider, $urlRouterProvider, $httpProvider, modulePe url: "/bots", templateUrl: "src/partials/sections/dashboard/bots/bots.html", controller: "botsCtrl as bts", + params:{filterView:{bots:true}}, resolve: { auth: ["$q", function ($q) { var deferred = $q.defer(); diff --git a/client/cat3/src/main.js b/client/cat3/src/main.js index ae79ed6fd..55ec51ab8 100644 --- a/client/cat3/src/main.js +++ b/client/cat3/src/main.js @@ -101,6 +101,9 @@ angularApp.controller('HeadNavigatorCtrl', ['$scope', '$rootScope', '$http', '$l $rootScope.analyticsBool = _permSet.analyticsBool; $rootScope.serviceBool = _permSet.serviceBool; }); + $scope.$watch(function() { + $rootScope.moduleSelection = $state.params; + }); $rootScope.$emit('SET_HEADER', $rootScope.appDetails); $scope.showLogoutConfirmationSection = false; $scope.logoutConfirmation = function () { diff --git a/client/cat3/src/partials/globals/header/header.scss b/client/cat3/src/partials/globals/header/header.scss index 481632dd3..e52098f80 100755 --- a/client/cat3/src/partials/globals/header/header.scss +++ b/client/cat3/src/partials/globals/header/header.scss @@ -18,6 +18,10 @@ .cursor { cursor:pointer; } + + .header-selected-item { + color: #40BAF1; + } .header-logo-image { height: 40px; diff --git a/client/cat3/src/partials/globals/header/headerDashboard.html b/client/cat3/src/partials/globals/header/headerDashboard.html index 012caee01..25c5f30bc 100644 --- a/client/cat3/src/partials/globals/header/headerDashboard.html +++ b/client/cat3/src/partials/globals/header/headerDashboard.html @@ -16,13 +16,13 @@
  • - WORKZONE + WORKZONE
  • - DESIGN + DESIGN
    • @@ -35,12 +35,12 @@
  • - ANALYTICS + ANALYTICS
  • - BOTS + BOTS
  • diff --git a/client/cat3/src/partials/sections/dashboard/bots/botsCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/botsCtrl.js index 34b9e2b0a..1249a53f6 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/botsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/botsCtrl.js @@ -13,7 +13,7 @@ url: "/library", templateUrl: "src/partials/sections/dashboard/bots/view/library.html", controller: "libraryCtrl as libr", - params:{filterView:{library:true}}, + parameters:{filterView:{library:true}}, resolve: { auth: ["$q", function ($q) { var deferred = $q.defer(); @@ -31,7 +31,7 @@ url: "/audittrail", templateUrl: "src/partials/sections/dashboard/bots/view/audittrail.html", controller: "audittrailCtrl as audit", - params:{filterView:{audittrail:true}}, + parameters:{filterView:{audittrail:true}}, resolve: { auth: ["$q", function ($q) { var deferred = $q.defer(); @@ -49,6 +49,8 @@ }]) .controller('botsCtrl',['$scope', '$rootScope', '$state', function ($scope, $rootScope, $state) { $state.go('dashboard.bots.library'); - $rootScope.stateItems = $state.params; + $scope.$watch(function() { + $rootScope.stateItems = $state.current.name; + }); }]); })(angular); \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/botScheduleCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/botScheduleCtrl.js deleted file mode 100644 index b440bfbb2..000000000 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/botScheduleCtrl.js +++ /dev/null @@ -1,99 +0,0 @@ -/* Copyright (C) Relevance Lab Private Limited- All Rights Reserved - * Unauthorized copying of this file, via any medium is strictly prohibited - * Proprietary and confidential - * Written by Relevance UI Team, - * Oct 2016 - */ - -(function (angular) { - "use strict"; - angular.module('library',[]) - .controller('botScheduleCtrl',['$scope', '$rootScope', 'genericServices', 'workzoneServices', 'toastr', '$modalInstance', 'items', '$timeout', function ($scope, $rootScope, genSevs, workzoneServices, toastr, $modalInstance, items, $timeout) { - console.log(items); - $scope.defaultSelection = function() { - $scope.repeatsType = 'Minutes';//default selection. - $scope.schedulerStartOn=moment(new Date()).format('MM/DD/YYYY'); - $scope.schedulerEndOn=moment(new Date()).format('MM/DD/YYYY'); - }; - if(items.type !== 'new'){ - if(items.chefJenkScriptTaskObj !==undefined){ - if(items.chefJenkScriptTaskObj.cronStartOn && items.chefJenkScriptTaskObj.cronEndOn) { - var newStartOn = parseInt(items.chefJenkScriptTaskObj.cronStartOn); - var newDate = new Date(newStartOn).toLocaleDateString(); - var datearray = newDate.split("/"); - var newdate = datearray[1] + '/' + datearray[0] + '/' + datearray[2]; - $scope.schedulerStartOn = newdate; - var newEndOn = parseInt(items.chefJenkScriptTaskObj.cronEndOn); - var newEndData = new Date(newEndOn).toLocaleDateString(); - var datearrayNew = newEndData.split("/"); - var newdateEnd = datearrayNew[1] + '/' + datearrayNew[0] + '/' + datearrayNew[2]; - $scope.schedulerEndOn = newdateEnd; - } else { - $scope.schedulerStartOn = items.chefJenkScriptTaskObj.cronStart; - $scope.schedulerEndOn = items.chefJenkScriptTaskObj.cronEnd; - } - - $scope.repeatBy = items.chefJenkScriptTaskObj.repeatBy || items.chefJenkScriptTaskObj.cronRepeatEvery.toString(); - $scope.repeatsType = items.chefJenkScriptTaskObj.repeats || items.chefJenkScriptTaskObj.cronFrequency; - $scope.timeEventType = items.chefJenkScriptTaskObj.startTime; - $scope.timeEventMinute = items.chefJenkScriptTaskObj.startTimeMinute; - $scope.weekOfTheDay = items.chefJenkScriptTaskObj.dayOfWeek; - $scope.currentDate = items.chefJenkScriptTaskObj.startDate; - $scope.selectedDayOfTheMonth = items.chefJenkScriptTaskObj.selectedDayOfTheMonth; - $scope.selectedMonth = items.chefJenkScriptTaskObj.monthOfYear; - } else { - $scope.defaultSelection(); - } - } else { - $scope.defaultSelection(); - } - - $scope.dateChange= function () { - var startDate = Date.parse($scope.schedulerStartOn); - var endDate = Date.parse($scope.schedulerEndOn); - if(startDate > endDate){ - $scope.validDateRange=true; - } else { - $scope.validDateRange=false; - } - - }; - - $scope.repeatCount = function(max, step) { - step = step || 1; - var input = []; - for (var i = 1; i <= max; i += step) { - input.push(i); - } - return input; - }; - $scope.isDaySelected = { - flag:true - } - - $scope.daysOfWeek = [ 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' ]; - - $scope.monthOfYear = [ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ]; - $scope.cancel = function() { - $modalInstance.dismiss('cancel'); - }; - $scope.ok=function(){ - $scope.eventParams = { - repeats: $scope.repeatsType, - repeatBy: $scope.repeatBy, - cronStart: $scope.schedulerStartOn, - cronEnd: $scope.schedulerEndOn, - startTime: $scope.timeEventType, - startTimeMinute: $scope.timeEventMinute, - dayOfWeek: $scope.weekOfTheDay, - selectedDayOfTheMonth: $scope.selectedDayOfTheMonth, - monthOfYear: $scope.selectedMonth - }; - $modalInstance.close($scope.eventParams); - }; - - $scope.cancel = function() { - $modalInstance.dismiss('cancel'); - }; -}]); -})(angular); \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js index bb222c0b2..e93bb2371 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -34,7 +34,9 @@ ''}, { name: 'BOT Info',displayName: 'BOT Info',cellTemplate: ''}, - { name: 'BOT Action',displayName: 'BOT Action',cellTemplate:'' + + { name: 'BOT Action',displayName: 'BOT Action',cellTemplate: + '' + + '' + '' + '' } @@ -72,6 +74,46 @@ console.log('Modal Dismissed at ' + new Date()); }); }; + $scope.botSchedule = function() { + $modal.open({ + templateUrl: 'src/partials/sections/dashboard/bots/view/botSchedule.html', + controller: 'botScheduleCtrl', + backdrop: 'static', + keyboard: false, + resolve: { + items: function () { + return { + chefJenkScriptTaskObj:$scope.chefJenkScriptTaskObj, + type:$scope.type + } + } + } + }).result.then(function (chefEventDetails) { + $scope.isEventAvailable = true; + $scope.chefJenkScriptTaskObj = chefEventDetails; + var startTimeMinute,startTimeHour,dayOfWeek,selectedDayOfTheMonth,selectedMonth; + startTimeMinute = $scope.chefJenkScriptTaskObj.startTimeMinute; + startTimeHour = $scope.chefJenkScriptTaskObj.startTime; + dayOfWeek = $scope.chefJenkScriptTaskObj.dayOfWeek; + selectedDayOfTheMonth = $scope.chefJenkScriptTaskObj.selectedDayOfTheMonth; + selectedMonth = $scope.chefJenkScriptTaskObj.monthOfYear; + $scope.type = 'edit'; + $scope._isEventSelected = true; + + $scope.repeatPattern = 'Repeat Every -' + $scope.chefJenkScriptTaskObj.repeats; + $scope.cronDetails = { + cronStartOn : $scope.chefJenkScriptTaskObj.cronStart, + cronEndOn : $scope.chefJenkScriptTaskObj.cronEnd, + cronRepeatEvery : $scope.chefJenkScriptTaskObj.repeatBy, + cronFrequency: $scope.chefJenkScriptTaskObj.repeats, + cronTime: typeof startTimeHour !=='undefined'? startTimeHour : new Date().getHours() + ':' + typeof startTimeMinute !=='undefined'? startTimeMinute:new Date().getMinutes(), + cronDays: $scope.chefJenkScriptTaskObj.dayOfWeek, + cronMonth: $scope.chefJenkScriptTaskObj.monthOfYear + } + }, function () { + console.log('Dismiss time is ' + new Date()); + }); + }; $scope.deleteBotTask = function(task) { var modalOptions = { closeButtonText: 'Cancel', @@ -215,5 +257,92 @@ $scope.cancel= function() { $modalInstance.dismiss('cancel'); }; + }]).controller('botScheduleCtrl',['$scope', '$rootScope', 'genericServices', 'workzoneServices', 'toastr', '$modalInstance', 'items', '$timeout', function ($scope, $rootScope, genSevs, workzoneServices, toastr, $modalInstance, items, $timeout) { + console.log(items); + $scope.defaultSelection = function() { + $scope.repeatsType = 'Minutes';//default selection. + $scope.schedulerStartOn=moment(new Date()).format('MM/DD/YYYY'); + $scope.schedulerEndOn=moment(new Date()).format('MM/DD/YYYY'); + }; + if(items.type !== 'new'){ + if(items.chefJenkScriptTaskObj !==undefined){ + if(items.chefJenkScriptTaskObj.cronStartOn && items.chefJenkScriptTaskObj.cronEndOn) { + var newStartOn = parseInt(items.chefJenkScriptTaskObj.cronStartOn); + var newDate = new Date(newStartOn).toLocaleDateString(); + var datearray = newDate.split("/"); + var newdate = datearray[1] + '/' + datearray[0] + '/' + datearray[2]; + $scope.schedulerStartOn = newdate; + var newEndOn = parseInt(items.chefJenkScriptTaskObj.cronEndOn); + var newEndData = new Date(newEndOn).toLocaleDateString(); + var datearrayNew = newEndData.split("/"); + var newdateEnd = datearrayNew[1] + '/' + datearrayNew[0] + '/' + datearrayNew[2]; + $scope.schedulerEndOn = newdateEnd; + } else { + $scope.schedulerStartOn = items.chefJenkScriptTaskObj.cronStart; + $scope.schedulerEndOn = items.chefJenkScriptTaskObj.cronEnd; + } + + $scope.repeatBy = items.chefJenkScriptTaskObj.repeatBy || items.chefJenkScriptTaskObj.cronRepeatEvery.toString(); + $scope.repeatsType = items.chefJenkScriptTaskObj.repeats || items.chefJenkScriptTaskObj.cronFrequency; + $scope.timeEventType = items.chefJenkScriptTaskObj.startTime; + $scope.timeEventMinute = items.chefJenkScriptTaskObj.startTimeMinute; + $scope.weekOfTheDay = items.chefJenkScriptTaskObj.dayOfWeek; + $scope.currentDate = items.chefJenkScriptTaskObj.startDate; + $scope.selectedDayOfTheMonth = items.chefJenkScriptTaskObj.selectedDayOfTheMonth; + $scope.selectedMonth = items.chefJenkScriptTaskObj.monthOfYear; + } else { + $scope.defaultSelection(); + } + } else { + $scope.defaultSelection(); + } + + $scope.dateChange= function () { + var startDate = Date.parse($scope.schedulerStartOn); + var endDate = Date.parse($scope.schedulerEndOn); + if(startDate > endDate){ + $scope.validDateRange=true; + } else { + $scope.validDateRange=false; + } + + }; + + $scope.repeatCount = function(max, step) { + step = step || 1; + var input = []; + for (var i = 1; i <= max; i += step) { + input.push(i); + } + return input; + }; + $scope.isDaySelected = { + flag:true + } + + $scope.daysOfWeek = [ 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' ]; + + $scope.monthOfYear = [ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ]; + $scope.cancel = function() { + $modalInstance.dismiss('cancel'); + }; + $scope.ok=function(){ + $scope.eventParams = { + repeats: $scope.repeatsType, + repeatBy: $scope.repeatBy, + cronStart: $scope.schedulerStartOn, + cronEnd: $scope.schedulerEndOn, + startTime: $scope.timeEventType, + startTimeMinute: $scope.timeEventMinute, + dayOfWeek: $scope.weekOfTheDay, + selectedDayOfTheMonth: $scope.selectedDayOfTheMonth, + monthOfYear: $scope.selectedMonth + }; + $modalInstance.close($scope.eventParams); + }; + + $scope.cancel = function() { + $modalInstance.dismiss('cancel'); + }; }]); })(angular); \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botsTreeMenu.html b/client/cat3/src/partials/sections/dashboard/bots/view/botsTreeMenu.html index f1eb28512..8aa22a16c 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/botsTreeMenu.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botsTreeMenu.html @@ -17,7 +17,7 @@
    BOT Library - +
    • @@ -26,7 +26,7 @@
    Audit Trail - +
    @@ -38,4 +38,4 @@ - + \ No newline at end of file From d122a05d60792ac1bfe32ce9dad74eb7646f518d Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Thu, 8 Dec 2016 14:52:31 +0530 Subject: [PATCH 08/11] BOTs FilterBy/Search/Pagination/Scheduler Implementation --- server/app/app.js | 1 + .../catalyst-scheduler/catalystScheduler.js | 77 ++++++++ server/app/model/bots/bots.js | 48 +++++ server/app/routes/v1.0/routes_blueprints.js | 166 +++--------------- server/app/routes/v1.0/routes_bots.js | 10 ++ server/app/services/blueprintService.js | 120 +++++++++++++ server/app/services/botsService.js | 41 +++++ server/app/services/schedulerService.js | 36 ++++ 8 files changed, 354 insertions(+), 145 deletions(-) diff --git a/server/app/app.js b/server/app/app.js index 0d5796431..3f657ad76 100755 --- a/server/app/app.js +++ b/server/app/app.js @@ -219,6 +219,7 @@ cronTabManager.start(); catalystSync.executeScheduledInstances(); catalystSync.executeSerialScheduledTasks(); catalystSync.executeParallelScheduledTasks(); +catalystSync.executeScheduledBots(); server.listen(app.get('port'), function() { logger.debug('Express server listening on port ' + app.get('port')); }); \ No newline at end of file diff --git a/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js b/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js index 724081f6d..0cea183c5 100644 --- a/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js +++ b/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js @@ -1,6 +1,7 @@ var logger = require('_pr/logger')(module); var instancesDao = require('_pr/model/classes/instance/instance'); var taskDao = require('_pr/model/classes/tasks/tasks.js'); +var botsDao = require('_pr/model/bots/bots.js'); var schedulerService = require('_pr/services/schedulerService'); var async = require('async'); var cronTab = require('node-crontab'); @@ -86,6 +87,44 @@ catalystSync.executeParallelScheduledTasks = function executeParallelScheduledTa }); } +catalystSync.executeParallelScheduledTasks = function executeParallelScheduledTasks() { + taskDao.getScheduledTasks('PARALLEL',function(err, tasks) { + if (err) { + logger.error("Failed to fetch tasks: ", err); + return; + } + if (tasks && tasks.length) { + var parallelTaskList=[]; + for (var i = 0; i < tasks.length; i++) { + (function(task) { + if(task.cronJobId && task.cronJobId !== null){ + cronTab.cancelJob(task.cronJobId); + } + parallelTaskList.push(function(callback){schedulerService.executeParallelScheduledTasks(task,callback);}); + if(parallelTaskList.length === tasks.length){ + if(parallelTaskList.length > 0) { + async.parallel(parallelTaskList, function (err, results) { + if (err) { + logger.error(err); + return; + } + logger.debug("Task Scheduler Completed for Parallel"); + return; + }) + }else{ + logger.debug("There is no Parallel scheduled Task right now."); + return; + } + } + })(tasks[i]); + } + }else{ + logger.debug("There is no Parallel scheduled Task right now."); + return; + } + }); +} + catalystSync.executeSerialScheduledTasks = function executeSerialScheduledTasks() { taskDao.getScheduledTasks('SERIAL',function(err, tasks) { if (err) { @@ -135,6 +174,44 @@ catalystSync.executeSerialScheduledTasks = function executeSerialScheduledTasks( }); } +catalystSync.executeScheduledBots = function executeScheduledBots() { + botsDao.getScheduledBots(function(err, bots) { + if (err) { + logger.error("Failed to fetch bots: ", err); + return; + } + if (bots && bots.length) { + var botsList=[]; + for (var i = 0; i < bots.length; i++) { + (function(bot) { + if(bot.cronJobId && bot.cronJobId !== null){ + cronTab.cancelJob(bot.cronJobId); + } + botsList.push(function(callback){schedulerService.executeScheduledBots(bot,callback);}); + if(botsList.length === bots.length){ + if(botsList.length > 0) { + async.parallel(botsList, function (err, results) { + if (err) { + logger.error(err); + return; + } + logger.debug("Bots Scheduler Completed"); + return; + }) + }else{ + logger.debug("There is no scheduled Bots right now."); + return; + } + } + })(bots[i]); + } + }else{ + logger.debug("There is no scheduled Bots right now."); + return; + } + }); +} + function cancelOldCronJobs(ids){ if(ids.length > 0){ var count = 0; diff --git a/server/app/model/bots/bots.js b/server/app/model/bots/bots.js index 87f5405b6..80626fa56 100644 --- a/server/app/model/bots/bots.js +++ b/server/app/model/bots/bots.js @@ -289,5 +289,53 @@ BotsSchema.statics.updateBotsExecutionCount = function updateBotsExecutionCount( }); }; +BotsSchema.statics.getScheduledBots = function getScheduledBots(callback) { + Bots.find({ + isBotScheduled: true + }, function (err, bots) { + if (err) { + logger.error(err); + return callback(err, null); + } + return callback(null, bots); + }) +} + +BotsSchema.statics.updateCronJobIdByBotId = function updateCronJobIdByBotId(botId, cronJobId, callback) { + Bots.update({ + "_id": new ObjectId(botId), + }, { + $set: { + cronJobId: cronJobId + } + }, { + upsert: false + }, function (err, data) { + if (err) { + callback(err, null); + return; + } + callback(null, data); + }); +}; + +BotsSchema.statics.updateBotsScheduler = function updateBotsScheduler(botId, callback) { + Bots.update({ + "_id": new ObjectId(botId), + }, { + $set: { + isBotBScheduled: false + } + }, { + upsert: false + }, function (err, data) { + if (err) { + callback(err, null); + return; + } + callback(null, data); + }); +}; + var Bots = mongoose.model('bots', BotsSchema); module.exports = Bots; diff --git a/server/app/routes/v1.0/routes_blueprints.js b/server/app/routes/v1.0/routes_blueprints.js index 7cb630573..5f5da4246 100755 --- a/server/app/routes/v1.0/routes_blueprints.js +++ b/server/app/routes/v1.0/routes_blueprints.js @@ -378,159 +378,35 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { app.get('/blueprints/:blueprintId/launch', function(req, res) { logger.debug("Enter /blueprints/%s/launch -- ", req.params.blueprintId); - //verifying if the user has permission - logger.debug('Verifying User permission set for execute.'); if (!req.query.envId) { res.send(400, { "message": "Invalid Environment Id" }); return; } - var user = req.session.user; - var category = 'blueprints'; - var permissionto = 'execute'; - usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function(err, data) { - if (!err) { - logger.debug('Returned from haspermission : launch ' + data + ' , Condition State : ' + (data == false)); - if (data == false) { - logger.debug('No permission to ' + permissionto + ' on ' + category); - res.send(401); - return; - } else { - - Blueprints.getById(req.params.blueprintId, function(err, blueprint) { - if (err) { - logger.error('Failed to getBlueprint. Error = ', err); - res.send(500, errorResponses.db.error); - return; - } - if (!blueprint) { - res.send(404, { - message: "Blueprint Does Not Exist" - }); - return; - } - var stackName = null; - var domainName = null; - var blueprintLaunchCount = 0; - if(blueprint.executionCount) { - blueprintLaunchCount = blueprint.executionCount + 1; - }else{ - blueprintLaunchCount = 1; - } - Blueprints.updateBlueprintExecutionCount(blueprint._id,blueprintLaunchCount,function(err,data){ - if(err){ - logger.error("Error while updating Blueprint Execution Count"); - } - }); - if (blueprint.blueprintType === 'aws_cf' || blueprint.blueprintType === 'azure_arm') { - stackName = req.query.stackName; - if (!stackName) { - res.send(400, { - message: "Invalid stack name" - }); - return; - } - } - if(blueprint.domainNameCheck === true) { - domainName = req.query.domainName; - if (!domainName) { - res.send(400, { - message: "Invalid domainName" - }); - return; - } - } - var monitorId = null; - if (req.query.monitorId) { - monitorId = req.query.monitorId; - } - if(blueprint.serviceDeliveryCheck === true){ - var actionObj={ - auditType:'BOTs', - auditCategory:'Blueprint', - status:'running', - action:'BOTs Blueprint Execution', - actionStatus:'running', - catUser:req.session.user.cn - }; - var auditTrailObj = { - name:blueprint.name, - type:blueprint.botType, - description:blueprint.shortDesc, - category:blueprint.botCategory, - executionType:blueprint.blueprintType, - manualExecutionTime:blueprint.manualExecutionTime, - nodeIdsWithActionLog:[] - }; - blueprint.envId= req.query.envId; - bots.getBotsById(blueprint._id,function(err,botData){ - if(err){ - logger.error(err); - }else if(botData.length > 0){ - var botExecutionCount = botData[0].executionCount + 1; - bots.updateBotsExecutionCount(blueprint._id,botExecutionCount,function(err,data){ - if(err){ - logger.error("Error while updating Bot Execution Count"); - } - }); - }else{ - logger.debug("There is no Bots Data present in DB"); - } - }); - auditTrailService.insertAuditTrail(blueprint,auditTrailObj,actionObj,function(err,data){ - if(err){ - logger.error(err); - } - blueprint.launch({ - envId: req.query.envId, - ver: req.query.version, - stackName: stackName, - domainName: domainName, - sessionUser: req.session.user.cn, - tagServer: req.query.tagServer, - monitorId: monitorId, - auditTrailId: data._id - }, function (err, launchData) { - if (err) { - res.status(500).send({ - message: "Server Behaved Unexpectedly" - }); - return; - } - res.status(200).send(launchData) - }); - }); - }else{ - blueprint.launch({ - envId: req.query.envId, - ver: req.query.version, - stackName: stackName, - domainName: domainName, - sessionUser: req.session.user.cn, - tagServer: req.query.tagServer, - monitorId: monitorId, - auditTrailId: null - }, function (err, launchData) { - if (err) { - res.status(500).send({ - message: "Server Behaved Unexpectedly" - }); - return; - } - res.status(200).send(launchData) - }); - } - }); - } - } else { - logger.error("Hit and error in haspermission:", err); - res.send(500); + var reqBody = { + userName:req.session.user.cn, + category:"blueprints", + permissionTo:"execute", + permissionSet:req.session.user.permissionset, + envId:req.query.envId, + monitorId:req.query.monitorId, + domainName:req.query.domainName, + stackName:req.query.stackName, + version:req.query.version, + tagServer:req.query.tagServer + } + blueprintService.launch(req.params.blueprintId,reqBody,function(err,data){ + if (err) { + res.status(500).send({ + message: "Server Behaved Unexpectedly" + }); + return; + }else{ + res.status(200).send(data); return; } - return; - - }); // end haspermission + }); }); app.get('/blueprints/organization/:orgId/businessgroup/:bgId/project/:projectId', function (req, res) { var orgId = req.params.orgId; diff --git a/server/app/routes/v1.0/routes_bots.js b/server/app/routes/v1.0/routes_bots.js index 79ebabc1b..da2c8fa87 100644 --- a/server/app/routes/v1.0/routes_bots.js +++ b/server/app/routes/v1.0/routes_bots.js @@ -51,6 +51,16 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { }) }); + app.get('/bots/:botId/execute',function(req,res){ + botsService.executeBots(req.params.botId, function(err,data){ + if (err) { + return res.status(500).send(err); + } else { + return res.status(200).send(data); + } + }) + }); + app.put('/bots/:botId/scheduler',function(req,res){ botsService.updateBotsScheduler(req.params.botId,req.body, function(err,data){ if (err) { diff --git a/server/app/services/blueprintService.js b/server/app/services/blueprintService.js index bda985fd0..bdc5faebb 100644 --- a/server/app/services/blueprintService.js +++ b/server/app/services/blueprintService.js @@ -31,6 +31,10 @@ var vmImageDao = require('_pr/model/classes/masters/vmImage.js'); var Blueprints = require('_pr/model/blueprint'); var AWSKeyPair = require('_pr/model/classes/masters/cloudprovider/keyPair.js'); var auditTrail = require('_pr/model/audit-trail/audit-trail.js'); +var usersDao = require('_pr/model/users.js'); +var auditTrailService = require('_pr/services/auditTrailService'); +var bots = require('_pr/model/bots/bots.js'); +var botsService = require('_pr/services/botsService.js'); @@ -89,6 +93,122 @@ blueprintService.deleteServiceDeliveryBlueprint = function deleteServiceDelivery }); }; +blueprintService.launch = function launch(blueprintId,reqBody, callback) { + async.waterfall([ + function (next) { + usersDao.haspermission(reqBody.userName, reqBody.category, reqBody.permissionTo, null, reqBody.permissionSet,next); + }, + function (launchPermission, next) { + if(launchPermission === true){ + Blueprints.getById(blueprintId,next); + }else{ + logger.debug('No permission to ' + reqBody.permissionTo + ' on ' + reqBody.category); + next({errCode:401,errMsg:'No permission to ' + reqBody.permissionTo + ' on ' + reqBody.category},null); + } + }, + function(blueprint,next){ + if(blueprint){ + var stackName = null,domainName = null,monitorId = null,blueprintLaunchCount = 0; + if(blueprint.executionCount) { + blueprintLaunchCount = blueprint.executionCount + 1; + }else{ + blueprintLaunchCount = 1; + } + Blueprints.updateBlueprintExecutionCount(blueprint._id,blueprintLaunchCount,function(err,data){ + if(err){ + logger.error("Error while updating Blueprint Execution Count"); + } + }); + if (blueprint.blueprintType === 'aws_cf' || blueprint.blueprintType === 'azure_arm') { + stackName = reqBody.stackName; + if (!stackName) { + next({errCode:400,errMsg:"Invalid stack name"},null); + } + } + if(blueprint.domainNameCheck === true) { + domainName = reqBody.domainName; + if (!domainName) { + next({errCode:400,errMsg:"Invalid Domain name"},null); + } + } + if (reqBody.monitorId && reqBody.monitorId !== null) { + monitorId = reqBody.monitorId; + } + if(blueprint.serviceDeliveryCheck === true){ + var actionObj={ + auditType:'BOTs', + auditCategory:'Blueprint', + status:'running', + action:'BOTs Blueprint Execution', + actionStatus:'running', + catUser:reqBody.userName + }; + var auditTrailObj = { + name:blueprint.name, + type:blueprint.botType, + description:blueprint.shortDesc, + category:blueprint.botCategory, + executionType:blueprint.blueprintType, + manualExecutionTime:blueprint.manualExecutionTime, + nodeIdsWithActionLog:[] + }; + blueprint.envId= reqBody.envId; + bots.getBotsById(blueprint._id,function(err,botData){ + if(err){ + logger.error(err); + }else if(botData.length > 0){ + var botExecutionCount = botData[0].executionCount + 1; + bots.updateBotsExecutionCount(blueprint._id,botExecutionCount,function(err,data){ + if(err){ + logger.error("Error while updating Bot Execution Count"); + } + }); + }else{ + logger.debug("There is no Bots Data present in DB"); + } + }); + auditTrailService.insertAuditTrail(blueprint,auditTrailObj,actionObj,function(err,data){ + if(err){ + logger.error(err); + } + blueprint.launch({ + envId: reqBody.envId, + ver: reqBody.version, + stackName: stackName, + domainName: domainName, + sessionUser: reqBody.userName, + tagServer: reqBody.tagServer, + monitorId: monitorId, + auditTrailId: data._id + },next); + }); + }else{ + blueprint.launch({ + envId: reqBody.envId, + ver: reqBody.version, + stackName: stackName, + domainName: domainName, + sessionUser: reqBody.userName, + tagServer: reqBody.tagServer, + monitorId: monitorId, + auditTrailId: null + },next); + } + }else{ + logger.debug("Blueprint Does Not Exist"); + next({errCode:404,errMsg:"Blueprint Does Not Exist"},null); + } + } + ],function (err, results) { + if (err) { + callback(err, null); + return; + } + callback(null, results); + return; + }); +}; + blueprintService.getAllServiceDeliveryBlueprint = function getAllServiceDeliveryBlueprint(queryObj, callback) { if(queryObj.serviceDeliveryCheck === true && queryObj.actionStatus && queryObj.actionStatus !== null) { var query = { diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index 620b3ab2f..fffff5886 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -191,5 +191,46 @@ botsService.getBotsHistory = function getBotsHistory(botId,callback){ }); } +botsService.executeBots = function executeBots(botId,callback){ + async.waterfall([ + function(next){ + bots.getBotsById(botId,next); + }, + function(bots,next){ + if(bots.length > 0){ + async.parallel({ + bots:function(callback){ + if(bots[0].botLinkedCategory === 'Task'){ + taskService.deleteServiceDeliveryTask(botId, callback); + }else{ + blueprintService.deleteServiceDeliveryBlueprint(botId,callback) + } + }, + services: function(callback){ + bots.removeSoftBotsById(botId,callback); + } + },function(err,results){ + if(err){ + next(err,null); + }else{ + next(null,results); + } + }) + }else{ + next({errCode:400, errMsg:"Bots is not exist in DB"}) + } + } + ],function(err,results){ + if(err){ + logger.error(err); + callback(err,null); + return; + }else{ + callback(null,results); + return; + } + }); +} + diff --git a/server/app/services/schedulerService.js b/server/app/services/schedulerService.js index 7b10aefaf..392c4a70b 100644 --- a/server/app/services/schedulerService.js +++ b/server/app/services/schedulerService.js @@ -37,9 +37,11 @@ var azureCloud = require('_pr/lib/azure'); var fs = require('fs'); var providerService = require('_pr/services/providerService.js'); var taskService = require('_pr/services/taskService.js'); +var botsService = require('_pr/services/botsService.js'); var gcpProviderModel = require('_pr/model/v2.0/providers/gcp-providers'); var GCP = require('_pr/lib/gcp.js'); var crontab = require('node-crontab'); +var botsDao = require('_pr/model/bots/bots.js'); schedulerService.executeSchedulerForInstances = function executeSchedulerForInstances(instance,callback) { logger.debug("Instance Scheduler is started for Instance. "+instance.platformId); @@ -135,6 +137,40 @@ schedulerService.executeParallelScheduledTasks = function executeParallelSchedul } } +schedulerService.executeScheduledBots = function executeScheduledBots(bots,callback) { + logger.debug("Bots Scheduler is started for - "+bots.botName); + var currentDate = new Date(); + if(currentDate >= bots.botScheduler.cronEndOn){ + crontab.cancelJob(bots.cronJobId); + botsDao.updateBotScheduler(bots._id,function(err, updatedData) { + if (err) { + logger.error("Failed to update Bots Scheduler: ", err); + callback(err,null); + return; + } + logger.debug("Scheduler is ended on for Bots. "+bots.botName); + callback(null,updatedData); + return; + }); + }else{ + var cronJobId = cronTab.scheduleJob(bots.botScheduler.cronPattern, function () { + botsDao.updateCronJobIdByBotId(bots._id,cronJobId,function(err,data){ + if(err){ + logger.error("Error in updating cron job Ids. "+err); + } + }) + botsService.executeBots(bots._id,function(err, historyData) { + if (err) { + logger.error("Failed to execute Bots.", err); + return; + } + logger.debug("Bots Execution Success for - ", bots.botName); + return; + }); + }); + } +} + schedulerService.executeSerialScheduledTasks = function executeSerialScheduledTasks(task,callback) { logger.debug("Task Scheduler is started for Serial Task. "+task.name); var currentDate = new Date(); From a879392392d3b4d40201771a7d8ba693d6731dab Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Fri, 9 Dec 2016 12:23:22 +0530 Subject: [PATCH 09/11] BOTs Scheduler and Launch Implementation --- server/app/model/bots/bots.js | 2 + server/app/routes/v1.0/routes_bots.js | 64 ++++++++++++++++++++++--- server/app/routes/v1.0/routes_tasks.js | 1 - server/app/services/blueprintService.js | 5 ++ server/app/services/botsService.js | 30 ++++-------- server/app/services/schedulerService.js | 2 +- server/app/services/taskService.js | 18 +++++-- 7 files changed, 89 insertions(+), 33 deletions(-) diff --git a/server/app/model/bots/bots.js b/server/app/model/bots/bots.js index 80626fa56..319d807af 100644 --- a/server/app/model/bots/bots.js +++ b/server/app/model/bots/bots.js @@ -45,6 +45,8 @@ var BotsSchema = new Schema ({ trim: true, required: true }, + botsConfig:Schema.Types.Mixed, + runTimeParams:Schema.Types.Mixed, masterDetails: { orgName: { type: String, diff --git a/server/app/routes/v1.0/routes_bots.js b/server/app/routes/v1.0/routes_bots.js index da2c8fa87..9f988d19d 100644 --- a/server/app/routes/v1.0/routes_bots.js +++ b/server/app/routes/v1.0/routes_bots.js @@ -15,6 +15,8 @@ var logger = require('_pr/logger')(module); var botsService = require('_pr/services/botsService.js'); +var appConfig = require('_pr/config'); +var Cryptography = require('_pr/lib/utils/cryptography'); module.exports.setRoutes = function(app, sessionVerificationFunc) { @@ -51,14 +53,62 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { }) }); - app.get('/bots/:botId/execute',function(req,res){ - botsService.executeBots(req.params.botId, function(err,data){ - if (err) { - return res.status(500).send(err); - } else { - return res.status(200).send(data); + app.post('/bots/:botId/execute',function(req,res){ + var reqBody = null; + if(req.body.category && req.body.category ==='Blueprints') { + if (!req.body.envId) { + res.send(400, { + "message": "Invalid Environment Id" + }); + return; } - }) + reqBody = { + userName: req.session.user.cn, + category: "blueprints", + permissionTo: "execute", + permissionSet: req.session.user.permissionset, + envId: req.body.envId, + monitorId: req.body.monitorId, + domainName: req.body.domainName, + stackName: req.body.stackName, + version: req.body.version, + tagServer: req.body.tagServer + } + }else{ + reqBody = { + userName: req.session.user.cn, + hostProtocol: req.protocol + '://' + req.get('host'), + choiceParam: req.body.choiceParam, + appData: req.body.appData, + tagServer: req.body.tagServer + } + var paramOptions = { + cookbookAttributes: req.body.cookbookAttributes, + scriptParams: req.body.scriptParams + }; + + if (paramOptions.scriptParams && paramOptions.scriptParams.length) { + var cryptoConfig = appConfig.cryptoSettings; + var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); + var encryptedParams = []; + for (var i = 0; i < paramOptions.scriptParams.length; i++) { + var encryptedText = cryptography.encryptText(paramOptions.scriptParams[i], cryptoConfig.encryptionEncoding, + cryptoConfig.decryptionEncoding); + encryptedParams.push(encryptedText); + } + paramOptions.scriptParams = encryptedParams; + } + reqBody.paramOptions=paramOptions; + } + if(reqBody !== null) { + botsService.executeBots(req.params.botId, reqBody, function (err, data) { + if (err) { + return res.status(500).send(err); + } else { + return res.status(200).send(data); + } + }) + } }); app.put('/bots/:botId/scheduler',function(req,res){ diff --git a/server/app/routes/v1.0/routes_tasks.js b/server/app/routes/v1.0/routes_tasks.js index ec3976d6a..daa1cdffa 100755 --- a/server/app/routes/v1.0/routes_tasks.js +++ b/server/app/routes/v1.0/routes_tasks.js @@ -112,7 +112,6 @@ module.exports.setRoutes = function(app, sessionVerification) { app.post('/tasks/:taskId/run', function(req, res) { - var taskId = req.params.taskId; var user = req.session.user.cn; var hostProtocol = req.protocol + '://' + req.get('host'); diff --git a/server/app/services/blueprintService.js b/server/app/services/blueprintService.js index bdc5faebb..cc9370839 100644 --- a/server/app/services/blueprintService.js +++ b/server/app/services/blueprintService.js @@ -163,6 +163,11 @@ blueprintService.launch = function launch(blueprintId,reqBody, callback) { logger.error("Error while updating Bot Execution Count"); } }); + bots.updateBotsDetail(blueprint._id,{runTimeParams:reqBody},function(err,data){ + if(err){ + logger.error("Error while updating Bots Configuration"); + } + }); }else{ logger.debug("There is no Bots Data present in DB"); } diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index fffff5886..93e06da8e 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -45,6 +45,7 @@ botsService.createOrUpdateBots = function createOrUpdateBots(botsDetail,linkedCa envId: botsDetail.envId ? botsDetail.envId : null, envName: botsDetail.envName?botsDetail.envName: null }, + botConfig:botsDetail.taskConfig ? botsDetail.taskConfig : null, botLinkedCategory: linkedCategory, botLinkedSubCategory:linkedSubCategory, manualExecutionTime:botsDetail.manualExecutionTime, @@ -153,7 +154,7 @@ botsService.removeSoftBotsById = function removeSoftBotsById(botId,callback){ } }) }else{ - next({errCode:400, errMsg:"Bots is not exist in DB"}) + next({errCode:400, errMsg:"Bots is not exist in DB"},null) } } ],function(err,results){ @@ -191,33 +192,20 @@ botsService.getBotsHistory = function getBotsHistory(botId,callback){ }); } -botsService.executeBots = function executeBots(botId,callback){ +botsService.executeBots = function executeBots(botId,reqBody,callback){ async.waterfall([ function(next){ bots.getBotsById(botId,next); }, function(bots,next){ if(bots.length > 0){ - async.parallel({ - bots:function(callback){ - if(bots[0].botLinkedCategory === 'Task'){ - taskService.deleteServiceDeliveryTask(botId, callback); - }else{ - blueprintService.deleteServiceDeliveryBlueprint(botId,callback) - } - }, - services: function(callback){ - bots.removeSoftBotsById(botId,callback); - } - },function(err,results){ - if(err){ - next(err,null); - }else{ - next(null,results); - } - }) + if(bots[0].botLinkedCategory === 'Task'){ + taskService.executeTask(botId,reqBody.userName,reqBody.hostProtocol,reqBody.choiceParam,reqBody.appData,reqBody.paramOptions,reqBody.tagServer, callback); + }else{ + blueprintService.launch(botId,reqBody,callback) + } }else{ - next({errCode:400, errMsg:"Bots is not exist in DB"}) + next({errCode:400, errMsg:"Bots is not exist in DB"},null) } } ],function(err,results){ diff --git a/server/app/services/schedulerService.js b/server/app/services/schedulerService.js index 392c4a70b..58b8fe4ad 100644 --- a/server/app/services/schedulerService.js +++ b/server/app/services/schedulerService.js @@ -159,7 +159,7 @@ schedulerService.executeScheduledBots = function executeScheduledBots(bots,callb logger.error("Error in updating cron job Ids. "+err); } }) - botsService.executeBots(bots._id,function(err, historyData) { + botsService.executeBots(bots._id,bots.botsConfig,function(err, historyData) { if (err) { logger.error("Failed to execute Bots.", err); return; diff --git a/server/app/services/taskService.js b/server/app/services/taskService.js index 4e89cc437..1644e6886 100644 --- a/server/app/services/taskService.js +++ b/server/app/services/taskService.js @@ -144,7 +144,6 @@ taskService.executeTask = function executeTask(taskId, user, hostProtocol, choic } else if (task.taskType.SCRIPT_TASK) { paramOptions = paramOptions.scriptDetails; } - var blueprintIds = []; if (task.blueprintIds && task.blueprintIds.length) { blueprintIds = task.blueprintIds; @@ -191,9 +190,22 @@ taskService.executeTask = function executeTask(taskId, user, hostProtocol, choic if(err){ logger.error("Error while updating Bot Execution Count"); } - }); + }); + var reqBody = { + userName: user, + hostProtocol: hostProtocol, + choiceParam: choiceParam, + appData: appData, + tagServer: botTagServer, + paramOptions:paramOptions + } + bots.updateBotsDetail(task._id,{runTimeParams:reqBody},function(err,data){ + if(err){ + logger.error("Error while updating Bots Configuration"); + } + }); }else{ - logger.debug("There is not BOTs data present in DB"); + logger.debug("There is no BOTs data present in DB"); } }); auditTrailService.insertAuditTrail(task,auditTrailObj,actionObj,function(err,data) { From 961ba20c6920a58e8dd458450d23ccfa93c8f26e Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Fri, 9 Dec 2016 14:17:04 +0530 Subject: [PATCH 10/11] BOTs Scheduler and Launch Implementation --- server/app/routes/v1.0/routes_bots.js | 6 ++++- server/app/services/botsService.js | 36 +++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/server/app/routes/v1.0/routes_bots.js b/server/app/routes/v1.0/routes_bots.js index 9f988d19d..4a741d0db 100644 --- a/server/app/routes/v1.0/routes_bots.js +++ b/server/app/routes/v1.0/routes_bots.js @@ -23,7 +23,11 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { app.all('/bots/*', sessionVerificationFunc); app.get('/bots',function(req,res){ - botsService.getBotsList(req.query, function(err,data){ + var actionStatus = null; + if(req.query.actionStatus && req.query.actionStatus !== null){ + actionStatus = req.query.actionStatus; + } + botsService.getBotsList(req.query,actionStatus, function(err,data){ if (err) { return res.status(500).send(err); } else { diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index 93e06da8e..5d127bf6e 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -22,6 +22,7 @@ var apiUtil = require('_pr/lib/utils/apiUtil.js'); var taskService = require('_pr/services/taskService.js'); var auditTrailService = require('_pr/services/auditTrailService.js'); var blueprintService = require('_pr/services/blueprintService.js'); +var auditTrail = require('_pr/model/audit-trail/audit-trail.js'); const errorType = 'botsService'; @@ -100,7 +101,7 @@ botsService.updateBotsScheduler = function updateBotsScheduler(botId,botObj,call }); } -botsService.getBotsList = function getBotsList(botsQuery,callback) { +botsService.getBotsList = function getBotsList(botsQuery,actionStatus,callback) { var reqData = {}; async.waterfall([ function(next) { @@ -112,7 +113,38 @@ botsService.getBotsList = function getBotsList(botsQuery,callback) { apiUtil.databaseUtil(paginationReq, next); }, function(queryObj, next) { - bots.getBotsList(queryObj, next); + if(actionStatus !== null){ + var query = { + auditType: 'BOTs', + actionStatus: actionStatus, + auditCategory: 'Task' + }; + var botsIds = []; + auditTrail.getAuditTrails(query, function(err,botsAudits){ + if(err){ + next(err,null); + }else if (botsAudits.length > 0) { + var results = []; + for (var i = 0; i < botsAudits.length; i++) { + if (botsIds.indexOf(botsAudits[i].auditId) < 0) { + botsIds.push(botsAudits[i].auditId); + results.push(botsAudits[i].auditId); + } else { + results.push(botsAudits[i].auditId); + } + } + if (results.length === botsAudits.length) { + queryObj.queryObj.botId = {$in:botsIds}; + bots.getBotsList(queryObj, next); + } + } else { + queryObj.queryObj.botId = null; + bots.getBotsList(queryObj, next); + } + }); + }else{ + bots.getBotsList(queryObj, next); + } }, function(auditTrailList, next) { apiUtil.paginationResponse(auditTrailList, reqData, next); From 2e44d4848db39adfc24b2da655044e1b5a54cc3b Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Fri, 9 Dec 2016 14:25:36 +0530 Subject: [PATCH 11/11] BOTs Scheduler and Launch Implementation --- server/app/services/botsService.js | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index 5d127bf6e..8dbe63bf6 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -23,6 +23,8 @@ var taskService = require('_pr/services/taskService.js'); var auditTrailService = require('_pr/services/auditTrailService.js'); var blueprintService = require('_pr/services/blueprintService.js'); var auditTrail = require('_pr/model/audit-trail/audit-trail.js'); +var catalystSync = require('_pr/cronjobs/catalyst-scheduler/catalystScheduler.js'); +var cronTab = require('node-crontab'); const errorType = 'botsService'; @@ -95,9 +97,25 @@ botsService.updateBotsScheduler = function updateBotsScheduler(botId,botObj,call logger.error(err); callback(err,null); return; + }else { + bots.getBotsById(botId, function (err, botsData) { + if (err) { + logger.error(err); + } else if(botData.length > 0){ + if (botsData[0].isBotScheduled === true) { + catalystSync.executeScheduledBots(); + } else if (botsData[0].cronJobId && botsData[0].cronJobId !== null) { + cronTab.cancelJob(botsData[0].cronJobId); + } else { + logger.debug("There is no cron job associated with Bot "); + } + } else{ + logger.debug("There is no Bots "); + } + }); + callback(null, data); + return; } - callback(null,data); - return; }); }