Ticket 24 : Display case plan instances

Author: Thierry Habart

Architecture.pptx

@@ -35,8 +35,9 @@ public class CasePlanInstancesController : Controller
         private readonly IActivateCommandHandler _activateCommandHandler;
         private readonly ICasePlanInstanceQueryRepository _cmmnWorkflowInstanceQueryRepository;
         private readonly ICaseFileItemRepository _caseFileItemRepository;
+        private readonly IRoleQueryRepository _roleQueryRepository;
 
-        public CasePlanInstancesController(ICreateCaseInstanceCommandHandler createCaseInstanceCommandHandler, ILaunchCaseInstanceCommandHandler launchCaseInstanceCommandHandler, ISuspendCommandHandler suspendCommandHandler, IResumeCommandHandler resumeCommandHandler, ITerminateCommandHandler terminateCommandHandler, IReactivateCommandHandler reactivateCommandHandler, ICloseCommandHandler closeCommandHandler, IConfirmFormCommandHandler confirmFormCommandHandler, IActivateCommandHandler activateCommandHandler, ICasePlanInstanceQueryRepository cmmnWorkflowInstanceQueryRepository, ICaseFileItemRepository caseFileItemRepository)
+        public CasePlanInstancesController(ICreateCaseInstanceCommandHandler createCaseInstanceCommandHandler, ILaunchCaseInstanceCommandHandler launchCaseInstanceCommandHandler, ISuspendCommandHandler suspendCommandHandler, IResumeCommandHandler resumeCommandHandler, ITerminateCommandHandler terminateCommandHandler, IReactivateCommandHandler reactivateCommandHandler, ICloseCommandHandler closeCommandHandler, IConfirmFormCommandHandler confirmFormCommandHandler, IActivateCommandHandler activateCommandHandler, ICasePlanInstanceQueryRepository cmmnWorkflowInstanceQueryRepository, ICaseFileItemRepository caseFileItemRepository, IRoleQueryRepository roleQueryRepository)
         {
             _createCaseInstanceCommandHandler = createCaseInstanceCommandHandler;
             _launchCaseInstanceCommandHandler = launchCaseInstanceCommandHandler;
@@ -49,6 +50,7 @@ public CasePlanInstancesController(ICreateCaseInstanceCommandHandler createCaseI
             _activateCommandHandler = activateCommandHandler;
             _cmmnWorkflowInstanceQueryRepository = cmmnWorkflowInstanceQueryRepository;
             _caseFileItemRepository = caseFileItemRepository;
+            _roleQueryRepository = roleQueryRepository;
         }
 
         [HttpGet("search")]
@@ -60,6 +62,18 @@ public async Task<IActionResult> Search()
             return new OkObjectResult(ToDto(result));
         }
 
+        [HttpGet("me/search")]
+        [Authorize("me_search_caseplaninstance")]
+        public async Task<IActionResult> SearchMe()
+        {
+            var query = HttpContext.Request.Query.ToEnumerable();
+            var roles = await _roleQueryRepository.FindRolesByUser(this.GetNameIdentifier());
+            var parameter = ExtractFindParameter(query);
+            parameter.Roles = roles.Select(r => r.Id).ToList();
+            var result = await _cmmnWorkflowInstanceQueryRepository.Find(parameter);
+            return new OkObjectResult(ToDto(result));
+        }
+
         [HttpGet("me/{id}")]
         [Authorize("me_get_caseplaninstance")]
         public async Task<IActionResult> GetMe(string id)
@@ -417,6 +431,13 @@ private async Task<IActionResult> InternalSuspend(SuspendCommand suspendCommand)
                     { "bad_request", "case instance doesn't exist" }
                 }, HttpStatusCode.NotFound, Request);
             }
+            catch (UnknownCaseInstanceElementException)
+            {
+                return this.ToError(new Dictionary<string, string>
+                {
+                    { "bad_request", "case instance element doesn't exist" }
+                }, HttpStatusCode.NotFound, Request);
+            }
             catch (AggregateValidationException ex)
             {
                 return this.ToError(ex.Errors, HttpStatusCode.BadRequest, Request);
@@ -444,6 +465,13 @@ private async Task<IActionResult> InternalReactivate(ReactivateCommand cmd)
                     { "bad_request", "case instance doesn't exist" }
                 }, HttpStatusCode.NotFound, Request);
             }
+            catch(UnknownCaseInstanceElementException)
+            {
+                return this.ToError(new Dictionary<string, string>
+                {
+                    { "bad_request", "case instance element doesn't exist" }
+                }, HttpStatusCode.NotFound, Request);
+            }
             catch (AggregateValidationException ex)
             {
                 return this.ToError(ex.Errors, HttpStatusCode.BadRequest, Request);

src/CaseManagement.CMMN.AspNetCore/Apis/CasePlanInstancesController.cs

@@ -105,6 +105,12 @@ public void ConfigureServices(IServiceCollection services)
                 policy.AddPolicy("get_forminstances", p => p.RequireClaim("scope", "get_forminstances"));
                 // Case plan instance
                 policy.AddPolicy("search_caseplaninstance", p => p.RequireClaim("scope", "search_caseplaninstance"));
+                policy.AddPolicy("me_search_caseplaninstance", p =>
+                {
+                    p.AuthenticationSchemes.Clear();
+                    p.AuthenticationSchemes.Add("IdentityServer");
+                    p.RequireAuthenticatedUser();
+                });
                 policy.AddPolicy("me_get_caseplaninstance", p =>
                 {
                     p.AuthenticationSchemes.Clear();

src/CaseManagement.CMMN.Host/Startup.cs

@@ -10,6 +10,7 @@ public class WorkflowBuilder
         private readonly string _name;
         private readonly string _description;
         private readonly CaseFileAggregate _caseFile;
+        private readonly ICollection<string> _roles;
         private ICollection<CasePlanElement> _elements { get; set; }
         private ICollection<Criteria> _exitCriterias { get; set; }
         private string _caseOwner;
@@ -19,6 +20,7 @@ private WorkflowBuilder(string casePlanId, string name, string description, Case
             _casePlanId = casePlanId;
             _name = name;
             _caseFile = caseFile;
+            _roles = new List<string>();
             _elements = new List<CasePlanElement>();
             _exitCriterias = new List<Criteria>();
         }
@@ -167,9 +169,15 @@ public WorkflowBuilder SetCaseOwner(string caseOwner)
             return this;
         }
 
+        public WorkflowBuilder AddRole(string role)
+        {
+            this._roles.Add(role);
+            return this;
+        }
+
         public CasePlanAggregate Build()
         {
-            var result = CasePlanAggregate.New(_casePlanId, _name, _description, _caseOwner, _caseFile.Id, _caseFile.Version, _exitCriterias, _elements);
+            var result = CasePlanAggregate.New(_casePlanId, _name, _description, _caseOwner, _caseFile.Id, _caseFile.Version, _exitCriterias, _elements, _roles);
             return result;
         }
 

src/CaseManagement.CMMN/Builders/WorkflowBuilder.cs

@@ -16,6 +16,7 @@ public static class QueueNames
             public const string CasePlans = "caseplans";
             public const string FormInstances = "forminstances";
             public const string CaseWorkerTasks = "caseworkertasks";
+            public const string Roles = "roles";
         }
 
         public static class RouteNames

src/CaseManagement.CMMN/CMMNConstants.cs

@@ -3,7 +3,6 @@
 using CaseManagement.CMMN.Domains;
 using CaseManagement.CMMN.Infrastructures;
 using CaseManagement.CMMN.Infrastructures.EvtStore;
-using CaseManagement.CMMN.Parser;
 using System.Threading.Tasks;
 
 namespace CaseManagement.CMMN.CaseFile.CommandHandlers
@@ -30,12 +29,6 @@ public async Task<string> Handle(PublishCaseFileCommand publishCaseFileCommand)
             var newCaseFile = caseFile.Publish(publishCaseFileCommand.Performer, publishCaseFileCommand.BypassUserValidation);
             await _commitAggregateHelper.Commit(caseFile, CaseFileAggregate.GetStreamName(caseFile.Id), CMMNConstants.QueueNames.CaseFiles);
             await _commitAggregateHelper.Commit(newCaseFile, CaseFileAggregate.GetStreamName(newCaseFile.Id), CMMNConstants.QueueNames.CaseFiles);
-            var tDefinitions = CMMNParser.ParseWSDL(caseFile.Payload);
-            foreach (var casePlan in CMMNParser.ExtractCasePlans(tDefinitions, caseFile))
-            {
-                await _commitAggregateHelper.Commit(casePlan, CasePlanAggregate.GetStreamName(casePlan.Id), CMMNConstants.QueueNames.CasePlans);
-            }
-
             return newCaseFile.Id;
         }
     }

src/CaseManagement.CMMN/CaseFile/CommandHandlers/PublishCaseFileCommandHandler.cs

@@ -2,28 +2,38 @@
 using CaseManagement.CMMN.Domains.Events;
 using CaseManagement.CMMN.Infrastructures;
 using CaseManagement.CMMN.Infrastructures.Bus;
+using CaseManagement.CMMN.Parser;
 using CaseManagement.CMMN.Persistence;
-using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
 namespace CaseManagement.CMMN.CasePlan.EventHandlers
 {
-    public class CasePlanEventHandler : IMessageBrokerConsumerGeneric<CasePlanAddedEvent>
+    public class CasePlanEventHandler : IMessageBrokerConsumerGeneric<CaseFilePublishedEvent>
     {
+        private readonly ICaseFileQueryRepository _caseFileQueryRepository;
         private readonly ICasePlanCommandRepository _casePlanCommandRepository;
+        private readonly ICommitAggregateHelper _commitAggregateHelper;
 
-        public CasePlanEventHandler(ICasePlanCommandRepository casePlanCommandRepository)
+        public CasePlanEventHandler(ICaseFileQueryRepository caseFileQueryRepository, ICasePlanCommandRepository casePlanCommandRepository, ICommitAggregateHelper commitAggregateHelper)
         {
+            _caseFileQueryRepository = caseFileQueryRepository;
             _casePlanCommandRepository = casePlanCommandRepository;
+            _commitAggregateHelper = commitAggregateHelper;
         }
 
-        public string QueueName => CMMNConstants.QueueNames.CasePlans;
+        public string QueueName => CMMNConstants.QueueNames.CaseFiles;
 
-        public async Task Handle(CasePlanAddedEvent @event, CancellationToken cancellationToken)
+        public async Task Handle(CaseFilePublishedEvent @event, CancellationToken cancellationToken)
         {
-            var casePlan = CasePlanAggregate.New(new List<DomainEvent> { @event });
-            _casePlanCommandRepository.Add(casePlan);
+            var caseFile = await _caseFileQueryRepository.FindById(@event.AggregateId);
+            var tDefinitions = CMMNParser.ParseWSDL(caseFile.Payload);
+            foreach (var casePlan in CMMNParser.ExtractCasePlans(tDefinitions, caseFile))
+            {
+                _casePlanCommandRepository.Add(casePlan);
+                await _commitAggregateHelper.Commit(casePlan, CasePlanAggregate.GetStreamName(casePlan.Id), CMMNConstants.QueueNames.CasePlans);
+            }
+
             await _casePlanCommandRepository.SaveChanges();
         }
     }

src/CaseManagement.CMMN/CasePlan/EventHandlers/CasePlanEventHandler.cs

@@ -42,7 +42,7 @@ public async Task Handle(ActivateCommand activateCommand)
             else
             {
                 var roles = await _roleQueryRepository.FindRolesByUser(activateCommand.Performer);
-                activation.Confirm(roles.Select(r => r.Name));
+                activation.Confirm(roles.Select(r => r.Id));
             }
 
             await _commitAggregateHelper.Commit(activation, CaseWorkerTaskAggregate.GetStreamName(id), CMMNConstants.QueueNames.CasePlanInstances);

src/CaseManagement.CMMN/CasePlanInstance/CommandHandlers/ActivateCommandHandler.cs

@@ -45,7 +45,7 @@ public async Task Handle(ConfirmFormCommand confirmFormCommand)
             else
             {
                 var roles = await _roleQueryRepository.FindRolesByUser(confirmFormCommand.Performer);
-                formInstance.Submit(roles.Select(r => r.Name), form, confirmFormCommand.Content);
+                formInstance.Submit(roles.Select(r => r.Id), form, confirmFormCommand.Content);
             }
 
             await _commitAggregateHelper.Commit(formInstance, FormInstanceAggregate.GetStreamName(id), CMMNConstants.QueueNames.FormInstances);

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

@@ -25,9 +25,12 @@ public CreateCaseInstanceCommandHandler(ICasePlanQueryRepository casePlanQueryRe
                 throw new UnknownCaseDefinitionException();
             }
 
-            if (workflowDefinition.CaseOwner != command.Performer)
+            if (!command.BypassUserValidation)
             {
-                throw new UnauthorizedCaseWorkerException(command.Performer, null, null);
+                if (workflowDefinition.CaseOwner != command.Performer)
+                {
+                    throw new UnauthorizedCaseWorkerException(command.Performer, null, null);
+                }
             }
 
             var workflowInstance = Domains.CasePlanInstanceAggregate.New(workflowDefinition);