Ticket ## : Display the performance + fix the number of threads created

Author: Thierry Habart

src/CaseManagement.CMMN.Host/Startup.cs

@@ -21,18 +21,17 @@ public Startup(IHostingEnvironment env) { }
 
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme)
-                .AddCookie();
+            services.AddMvc();
+            services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme).AddCookie();
             services.AddAuthorization(policy =>
             {
                 policy.AddPolicy("IsConnected", p => p.RequireAuthenticatedUser());
             });
-            var builder = services.AddCMMN();
             services.AddCors(options => options.AddPolicy("AllowAll", p => p.AllowAnyOrigin()
                 .AllowAnyMethod()
                 .AllowAnyHeader()));
             var files = Directory.EnumerateFiles(Path.Combine(Directory.GetCurrentDirectory(), "Cmmns"), "*.cmmn").ToList();
-            builder.AddDefinitions(files)
+            services.AddCMMN().AddDefinitions(files)
                 .AddCaseProcesses(new List<ProcessAggregate>
                 {
                     new CaseManagementProcessAggregate

src/CaseManagement.CMMN/Apis/CaseDefinitionsController.cs

@@ -14,13 +14,11 @@ namespace CaseManagement.CMMN.Apis
     [Route(CMMNConstants.RouteNames.CaseDefinitions)]
     public class CaseDefinitionsController : Controller
     {
-        private readonly IWorkflowDefinitionQueryRepository _queryRepository;
-        private readonly IStatisticQueryRepository _staticQueryRepository;
+        private readonly ICaseDefinitionQueryRepository _queryRepository;
 
-        public CaseDefinitionsController(IWorkflowDefinitionQueryRepository queryRepository, IStatisticQueryRepository statisticQueryRepository)
+        public CaseDefinitionsController(ICaseDefinitionQueryRepository queryRepository)
         {
             _queryRepository = queryRepository;
-            _staticQueryRepository = statisticQueryRepository;
         }
 
         [HttpGet("{id}")]
@@ -38,10 +36,10 @@ public async Task<IActionResult> Get(string id)
         [HttpGet("{id}/history")]
         public async Task<IActionResult> GetHistory(string id)
         {
-            var result = await _staticQueryRepository.FindById(id);
+            var result = await _queryRepository.FindHistoryById(id);
             if (result == null)
             {
-                result = new CaseDefinitionStatisticAggregate
+                result = new CaseDefinitionHistoryAggregate
                 {
                     CaseDefinitionId = id,
                     NbInstances = 0
@@ -89,7 +87,7 @@ private static JObject ToDto(CaseDefinition def)
             };
         }
 
-        private static JObject ToDto(CaseDefinitionStatisticAggregate def)
+        private static JObject ToDto(CaseDefinitionHistoryAggregate def)
         {
             return new JObject
             {

src/CaseManagement.CMMN/Apis/CaseFilesController.cs

@@ -14,9 +14,9 @@ namespace CaseManagement.CMMN.Apis
     [Route(CMMNConstants.RouteNames.CaseFiles)]
     public class CaseFilesController : Controller
     {
-        private readonly IWorkflowFileQueryRepository _queryRepository;
+        private readonly ICaseFileQueryRepository _queryRepository;
 
-        public CaseFilesController(IWorkflowFileQueryRepository queryRepository)
+        public CaseFilesController(ICaseFileQueryRepository queryRepository)
         {
             _queryRepository = queryRepository;
         }

src/CaseManagement.CMMN/Apis/CaseInstancesController.cs

@@ -31,9 +31,9 @@ public class CaseInstancesController : Controller
         private readonly ICloseCommandHandler _closeCommandHandler;
         private readonly IConfirmFormCommandHandler _confirmFormCommandHandler;
         private readonly IActivateCommandHandler _activateCommandHandler;
-        private readonly IWorkflowInstanceQueryRepository _cmmnWorkflowInstanceQueryRepository;
+        private readonly ICaseInstanceQueryRepository _cmmnWorkflowInstanceQueryRepository;
 
-        public CaseInstancesController(ICreateCaseInstanceCommandHandler createCaseInstanceCommandHandler, ILaunchCaseInstanceCommandHandler launchCaseInstanceCommandHandler, ISuspendCommandHandler suspendCommandHandler, IResumeCommandHandler resumeCommandHandler, ITerminateCommandHandler terminateCommandHandler, IReactivateCommandHandler reactivateCommandHandler, ICloseCommandHandler closeCommandHandler, IConfirmFormCommandHandler confirmFormCommandHandler, IActivateCommandHandler activateCommandHandler, IWorkflowInstanceQueryRepository cmmnWorkflowInstanceQueryRepository)
+        public CaseInstancesController(ICreateCaseInstanceCommandHandler createCaseInstanceCommandHandler, ILaunchCaseInstanceCommandHandler launchCaseInstanceCommandHandler, ISuspendCommandHandler suspendCommandHandler, IResumeCommandHandler resumeCommandHandler, ITerminateCommandHandler terminateCommandHandler, IReactivateCommandHandler reactivateCommandHandler, ICloseCommandHandler closeCommandHandler, IConfirmFormCommandHandler confirmFormCommandHandler, IActivateCommandHandler activateCommandHandler, ICaseInstanceQueryRepository cmmnWorkflowInstanceQueryRepository)
         {
             _createCaseInstanceCommandHandler = createCaseInstanceCommandHandler;
             _launchCaseInstanceCommandHandler = launchCaseInstanceCommandHandler;

src/CaseManagement.CMMN/Apis/StatisticsController.cs

@@ -8,6 +8,7 @@
 using Newtonsoft.Json.Linq;
 using System;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace CaseManagement.CMMN.Apis
@@ -55,6 +56,22 @@ public async Task<IActionResult> Search()
             return new OkObjectResult(ToDto(result));
         }
 
+        [HttpGet("performances")]
+        public async Task<IActionResult> GetPerformances()
+        {
+            var result = await _statisticQueryRepository.GetMachineNames();
+            return new OkObjectResult(result);
+        }
+
+
+        [HttpGet("performances/.search")]
+        public async Task<IActionResult> SearchPerformances()
+        {
+            var query = HttpContext.Request.Query;
+            var result = await _statisticQueryRepository.FindPerformanceStatistics(ExtractFindPerformanceParameter(query));
+            return new OkObjectResult(ToDto(result));
+        }
+
         private static JObject ToDto(FindResponse<DailyStatisticAggregate> resp)
         {
             return new JObject
@@ -65,6 +82,16 @@ private static JObject ToDto(FindResponse<DailyStatisticAggregate> resp)
                 { "content", new JArray(resp.Content.Select(r => ToDto(r))) }
             };
         }
+        private static JObject ToDto(FindResponse<PerformanceStatisticAggregate> resp)
+        {
+            return new JObject
+            {
+                { "start_index", resp.StartIndex },
+                { "total_length", resp.TotalLength },
+                { "count", resp.Count },
+                { "content", new JArray(resp.Content.Select(r => ToDto(r))) }
+            };
+        }
 
         private static JObject ToDto(DailyStatisticAggregate caseStatistic)
         {
@@ -84,6 +111,17 @@ private static JObject ToDto(DailyStatisticAggregate caseStatistic)
             };
         }
 
+        private static JObject ToDto(PerformanceStatisticAggregate performanceStatistic)
+        {
+            return new JObject
+            {
+                { "datetime", performanceStatistic.CaptureDateTime },
+                { "machine_name", performanceStatistic.MachineName },
+                { "nb_working_threads", performanceStatistic.NbWorkingThreads },
+                { "memory_consumed_mb", performanceStatistic.MemoryConsumedMB }
+            };
+        }
+
         private static FindDailyStatisticsParameter ExtractFindParameter(IQueryCollection query)
         {
             DateTime startDateTime;
@@ -102,5 +140,30 @@ private static FindDailyStatisticsParameter ExtractFindParameter(IQueryCollectio
 
             return parameter;
         }
+
+        private static FindPerformanceStatisticsParameter ExtractFindPerformanceParameter(IQueryCollection query)
+        {
+            string machineName;
+            DateTime startDateTime;
+            string groupBy;
+            var parameter = new FindPerformanceStatisticsParameter();
+            parameter.ExtractFindParameter(query);
+            if (query.TryGet("machine_name", out machineName))
+            {
+                parameter.MachineName = machineName;
+            }
+
+            if (query.TryGet("start_datetime", out startDateTime))
+            {
+                parameter.StartDateTime = startDateTime;
+            }
+
+            if (query.TryGet("group_by", out groupBy))
+            {
+                parameter.GroupBy = groupBy;
+            }
+
+            return parameter;
+        }
     }
 }

src/CaseManagement.CMMN/CMMNConstants.cs

@@ -2,6 +2,9 @@
 {
     public static class CMMNConstants
     {
+        public const int WAIT_INTERVAL_MS = 20;
+        public const int MONITORING_INTERVAL_MS = 1000;
+
         public static class RouteNames
         {
             public const string CaseFiles = "case-files";

src/CaseManagement.CMMN/CMMNServerOptions.cs

@@ -0,0 +1,25 @@
+namespace CaseManagement.CMMN
+{
+    public class CMMNServerOptions
+    {
+        public CMMNServerOptions()
+        {
+            PerformanceIntervalInSeconds = 4;
+            BlockThreadMS = 20;
+            MaxNbPerformanceRecords = 10;
+        }
+
+        /// <summary>
+        /// Set the interval time in seconds to compute the performance.
+        /// </summary>
+        public int PerformanceIntervalInSeconds { get; set; }
+        /// <summary>
+        /// Set the time in milliseconds used to block a thread.
+        /// </summary>
+        public int BlockThreadMS { get; set; }
+        /// <summary>
+        /// Set the maximum number of records (performance).
+        /// </summary>
+        public int MaxNbPerformanceRecords { get; set; }
+    }
+}

src/CaseManagement.CMMN/CaseInstance/CommandHandlers/CloseCommandHandler.cs

@@ -3,6 +3,8 @@
 using CaseManagement.CMMN.Domains;
 using CaseManagement.Workflow.Infrastructure.Bus;
 using CaseManagement.Workflow.Infrastructure.EvtStore;
+using System;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace CaseManagement.CMMN.CaseInstance.CommandHandlers
@@ -26,8 +28,16 @@ public async Task Handle(CloseCommand closeCommand)
                 throw new UnknownCaseInstanceException(closeCommand.CaseInstanceId);
             }
 
-            caseInstance.MakeTransition(CMMNTransitions.Close);
-            await _queueProvider.QueueTransition(caseInstance.Id, null, CMMNTransitions.Close);
+            if (caseInstance.State == Enum.GetName(typeof(CaseStates), CaseStates.Suspended))
+            {
+                caseInstance.MakeTransition(CMMNTransitions.Close);
+                await _queueProvider.QueueTransition(caseInstance.Id, null, CMMNTransitions.Close);
+            }
+            else
+            {
+                caseInstance.MakeTransition(CMMNTransitions.Close);
+                await _queueProvider.QueueEvent(caseInstance.DomainEvents.Last());
+            }
         }
     }
 }

src/CaseManagement.CMMN/CaseInstance/CommandHandlers/ConfirmFormCommandHandler.cs

@@ -18,9 +18,9 @@ public class ConfirmFormCommandHandler : IConfirmFormCommandHandler
         private readonly IFormQueryRepository _formQueryRepository;
         private readonly IEventStoreRepository _eventStoreRepository;
         private readonly IRoleQueryRepository _roleQueryRepository;
-        private readonly IWorkflowDefinitionQueryRepository _cmmnWorkflowDefinitionQueryRepository;
+        private readonly ICaseDefinitionQueryRepository _cmmnWorkflowDefinitionQueryRepository;
 
-        public ConfirmFormCommandHandler(IQueueProvider queueProvider, IFormQueryRepository formQueryRepository, IEventStoreRepository eventStoreRepository, IRoleQueryRepository roleQueryRepository, IWorkflowDefinitionQueryRepository cmmnWorkflowDefinitionQueryRepository)
+        public ConfirmFormCommandHandler(IQueueProvider queueProvider, IFormQueryRepository formQueryRepository, IEventStoreRepository eventStoreRepository, IRoleQueryRepository roleQueryRepository, ICaseDefinitionQueryRepository cmmnWorkflowDefinitionQueryRepository)
         {
             _queueProvider = queueProvider;
             _formQueryRepository = formQueryRepository;

src/CaseManagement.CMMN/CaseInstance/CommandHandlers/CreateCaseInstanceCommandHandler.cs

@@ -9,10 +9,10 @@ namespace CaseManagement.CMMN.CaseInstance.CommandHandlers
 {
     public class CreateCaseInstanceCommandHandler : ICreateCaseInstanceCommandHandler
     {
-        private readonly IWorkflowDefinitionQueryRepository _cmmnWorkflowDefinitionQueryRepository;
+        private readonly ICaseDefinitionQueryRepository _cmmnWorkflowDefinitionQueryRepository;
         private readonly ICommitAggregateHelper _commitAggregateHelper;
 
-        public CreateCaseInstanceCommandHandler(IWorkflowDefinitionQueryRepository cmmnWorkflowDefinitionQueryRepository, ICommitAggregateHelper commitAggregateHelper)
+        public CreateCaseInstanceCommandHandler(ICaseDefinitionQueryRepository cmmnWorkflowDefinitionQueryRepository, ICommitAggregateHelper commitAggregateHelper)
         {
             _cmmnWorkflowDefinitionQueryRepository = cmmnWorkflowDefinitionQueryRepository;
             _commitAggregateHelper = commitAggregateHelper;