Ticket #17 : Display the workflow definition

Author: habarthierry-hue

CaseManagement.sln

@@ -89,9 +89,9 @@ Global
 		{2D288182-CD6B-46AF-B420-F2038875F6BC} = {A632EFC3-730B-46D7-B669-91962DFA8947}
 		{1A146C2E-708E-4B50-AE46-37B415CEAFC1} = {D16A3E6D-32B6-44CF-9941-A9BDB9DFC6A7}
 		{E4C5F767-299D-4D26-916B-59EC7C93CE90} = {CD2E7CFE-4E9C-4308-A0D3-41CD5AD90FD8}
-		{77FF9E1D-A705-4E04-84CA-FF42D3563F77} = {73DCE7A3-F336-4E72-B36C-9D88860BC897}
+		{77FF9E1D-A705-4E04-84CA-FF42D3563F77} = {A632EFC3-730B-46D7-B669-91962DFA8947}
 		{F005FA4D-312C-428C-93A7-4F02C01136A8} = {A632EFC3-730B-46D7-B669-91962DFA8947}
-		{3DFF3970-7721-4087-8E41-F478D39C2095} = {A632EFC3-730B-46D7-B669-91962DFA8947}
+		{3DFF3970-7721-4087-8E41-F478D39C2095} = {73DCE7A3-F336-4E72-B36C-9D88860BC897}
 		{2B86EDF0-DA2D-4FFE-9877-4CBA2999B0A5} = {CD2E7CFE-4E9C-4308-A0D3-41CD5AD90FD8}
 		{162D547F-D8E8-4B2F-A86C-3F74BF7F4F45} = {A632EFC3-730B-46D7-B669-91962DFA8947}
 	EndGlobalSection

output.txt

@@ -15,12 +15,14 @@ namespace CaseManagement.CMMN.Apis
     public class CaseDefinitionsController : Controller
     {
         private readonly ICMMNWorkflowDefinitionQueryRepository _queryRepository;
+        private readonly IStatisticQueryRepository _staticQueryRepository;
 
-        public CaseDefinitionsController(ICMMNWorkflowDefinitionQueryRepository queryRepository)
+        public CaseDefinitionsController(ICMMNWorkflowDefinitionQueryRepository queryRepository, IStatisticQueryRepository statisticQueryRepository)
         {
             _queryRepository = queryRepository;
+            _staticQueryRepository = statisticQueryRepository;
         }
-                
+        
         [HttpGet("{id}")]
         public async Task<IActionResult> Get(string id)
         {
@@ -33,6 +35,22 @@ public async Task<IActionResult> Get(string id)
             return new OkObjectResult(ToDto(result));
         }
 
+        [HttpGet("{id}/history")]
+        public async Task<IActionResult> GetHistory(string id)
+        {
+            var result = await _staticQueryRepository.FindById(id);
+            if (result == null)
+            {
+                result = new CMMNWorkflowDefinitionStatisticAggregate
+                {
+                    WorkflowDefinitionId = id,
+                    NbInstances = 0
+                };
+            }
+
+            return new OkObjectResult(ToDto(result));
+        }
+
         [HttpGet(".search")]
         public async Task<IActionResult> Search()
         {
@@ -71,6 +89,22 @@ private static JObject ToDto(CMMNWorkflowDefinition def)
             };
         }
 
+        private static JObject ToDto(CMMNWorkflowDefinitionStatisticAggregate def)
+        {
+            return new JObject
+            {
+                { "id", def.WorkflowDefinitionId },
+                { "nb_instances", def.NbInstances },
+                { "elements", new JArray(def.Statistics.Select(s =>
+                    new JObject
+                    {
+                        { "nb_instances", s.NbInstances },
+                        { "element", s.ElementDefinitionId }
+                    }
+                ))}
+            };
+        }
+
         private static FindWorkflowDefinitionsParameter ExtractFindParameter(IQueryCollection query)
         {
             int startIndex;

src/CaseManagement.CMMN/Apis/CaseDefinitionsController.cs

@@ -55,6 +55,18 @@ public async Task<IActionResult> Search()
             return new OkObjectResult(ToDto(result));
         }
 
+        [HttpGet("{id}")]
+        public async Task<IActionResult> Get(string id)
+        {
+            var result = await _cmmnWorkflowInstanceQueryRepository.FindFlowInstanceById(id);
+            if (result == null)
+            {
+                return new NotFoundResult();
+            }
+
+            return new OkObjectResult(ToDto(result));
+        }
+
         [HttpPost]
         public async Task<IActionResult> Create([FromBody] CreateCaseInstanceCommand createCaseInstance)
         {
@@ -93,18 +105,6 @@ public async Task<IActionResult> Launch(string id)
             }
         }
 
-        [HttpGet("{id}")]
-        public async Task<IActionResult> Get(string id)
-        {
-            var flowInstance = await _cmmnWorkflowInstanceQueryRepository.FindFlowInstanceById(id);
-            if (flowInstance == null)
-            {
-                return new NotFoundResult();
-            }
-
-            return new OkObjectResult(ToDto(flowInstance));
-        }
-
         [HttpGet("{id}/suspend")]
         public async Task<IActionResult> Suspend(string id)
         {

src/CaseManagement.CMMN/Apis/CaseInstancesController.cs

@@ -99,7 +99,7 @@ public CMMNWorkflowBuilder AddExitCriteria(string name, Action<CMMNSEntryBuilder
 
         public CMMNWorkflowDefinition Build()
         {
-            var result = CMMNWorkflowDefinition.New(_processFlowTemplateId, _processFlowTemplateId, "", _elements);
+            var result = CMMNWorkflowDefinition.New(_processFlowTemplateId, _processFlowName, _processFlowName, _elements);
             result.ExitCriterias = _exitCriterias;
             return result;
         }