Ticket #106 & #105 : Pass tokens + start to manage notifications

Author: habarthierry-hue

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

@@ -87,12 +87,13 @@ public async Task<IActionResult> Launch(string id, CancellationToken token)
             }
         }
 
-        [HttpGet("{id}/suspend")]
+        [HttpPost("{id}/suspend")]
         [Authorize("suspend_caseplaninstance")]
-        public async Task<IActionResult> Suspend(string id, CancellationToken token)
+        public async Task<IActionResult> Suspend(string id, [FromBody] SuspendCommand suspendCommand, CancellationToken token)
         {
             try
             {
+                suspendCommand.CasePlanInstanceId = id;
                 await _mediator.Send(new SuspendCommand(id, null), token);
                 return new OkResult();
             }
@@ -123,13 +124,15 @@ public async Task<IActionResult> Suspend(string id, CancellationToken token)
             }
         }
 
-        [HttpGet("{id}/suspend/{elt}")]
+        [HttpPost("{id}/suspend/{elt}")]
         [Authorize("suspend_caseplaninstance")]
-        public async Task<IActionResult> Suspend(string id, string elt, CancellationToken token)
+        public async Task<IActionResult> Suspend(string id, string elt, [FromBody] SuspendCommand suspendCommand, CancellationToken token)
         {
             try
             {
-                await _mediator.Send(new SuspendCommand(id, elt), token);
+                suspendCommand.CasePlanInstanceId = id;
+                suspendCommand.CasePlanInstanceElementId = elt;
+                await _mediator.Send(suspendCommand, token);
                 return new OkResult();
             }
             catch (UnknownCasePlanInstanceException)
@@ -159,13 +162,14 @@ public async Task<IActionResult> Suspend(string id, string elt, CancellationToke
             }
         }
 
-        [HttpGet("{id}/reactivate")]
+        [HttpPost("{id}/reactivate")]
         [Authorize("reactivate_caseplaninstance")]
-        public async Task<IActionResult> Reactivate(string id, CancellationToken token)
+        public async Task<IActionResult> Reactivate(string id, [FromBody] ReactivateCommand reactivateCommand, CancellationToken token)
         {
             try
             {
-                await _mediator.Send(new ReactivateCommand(id, null), token);
+                reactivateCommand.CaseInstanceId = id;
+                await _mediator.Send(reactivateCommand, token);
                 return new OkResult();
             }
             catch (UnknownCasePlanInstanceException)
@@ -195,13 +199,15 @@ public async Task<IActionResult> Reactivate(string id, CancellationToken token)
             }
         }
 
-        [HttpGet("{id}/reactivate/{elt}")]
+        [HttpPost("{id}/reactivate/{elt}")]
         [Authorize("reactivate_caseplaninstance")]
-        public async Task<IActionResult> Reactivate(string id, string elt, CancellationToken token)
+        public async Task<IActionResult> Reactivate(string id, string elt, [FromBody] ReactivateCommand reactivateCommand, CancellationToken token)
         {
             try
             {
-                await _mediator.Send(new ReactivateCommand(id, elt), token);
+                reactivateCommand.CaseInstanceId = id;
+                reactivateCommand.CaseInstanceElementId = elt;
+                await _mediator.Send(reactivateCommand, token);
                 return new OkResult();
             }
             catch (UnknownCasePlanInstanceException)
@@ -231,13 +237,14 @@ public async Task<IActionResult> Reactivate(string id, string elt, CancellationT
             }
         }
 
-        [HttpGet("{id}/resume")]
+        [HttpPost("{id}/resume")]
         [Authorize("resume_caseplaninstance")]
-        public async Task<IActionResult> Resume(string id, CancellationToken token)
+        public async Task<IActionResult> Resume(string id, [FromBody] ResumeCommand resumeCommand, CancellationToken token)
         {
             try
             {
-                await _mediator.Send(new ResumeCommand(id, null), token);
+                resumeCommand.CasePlanInstanceId = id;
+                await _mediator.Send(resumeCommand, token);
                 return new OkResult();
             }
             catch (UnknownCasePlanInstanceException)
@@ -260,13 +267,15 @@ public async Task<IActionResult> Resume(string id, CancellationToken token)
             }
         }
 
-        [HttpGet("{id}/resume/{elt}")]
+        [HttpPost("{id}/resume/{elt}")]
         [Authorize("resume_caseplaninstance")]
-        public async Task<IActionResult> Resume(string id, string elt, CancellationToken token)
+        public async Task<IActionResult> Resume(string id, string elt, [FromBody] ResumeCommand resumeCommand, CancellationToken token)
         {
             try
             {
-                await _mediator.Send(new ResumeCommand(id, elt), token);
+                resumeCommand.CasePlanInstanceId = id;
+                resumeCommand.CasePlanInstanceElementId = elt;
+                await _mediator.Send(resumeCommand, token);
                 return new OkResult();
             }
             catch (UnknownCasePlanInstanceException)
@@ -327,13 +336,14 @@ public async Task<IActionResult> Complete(string id, string elt, [FromBody] Comp
             }
         }
 
-        [HttpGet("{id}/terminate")]
+        [HttpPost("{id}/terminate")]
         [Authorize("terminate_caseplaninstance")]
-        public async Task<IActionResult> Terminate(string id, CancellationToken token)
+        public async Task<IActionResult> Terminate(string id, [FromBody] TerminateCommand terminateCommand, CancellationToken token)
         {
             try
             {
-                await _mediator.Send(new TerminateCommand(id, null), token);
+                terminateCommand.CaseInstanceId = id;
+                await _mediator.Send(terminateCommand, token);
                 return new OkResult();
             }
             catch (UnknownCasePlanInstanceException)
@@ -363,13 +373,15 @@ public async Task<IActionResult> Terminate(string id, CancellationToken token)
             }
         }
 
-        [HttpGet("{id}/terminate/{elt}")]
+        [HttpPost("{id}/terminate/{elt}")]
         [Authorize("terminate_caseplaninstance")]
-        public async Task<IActionResult> Terminate(string id, string elt, CancellationToken token)
+        public async Task<IActionResult> Terminate(string id, string elt, [FromBody] TerminateCommand terminateCommand, CancellationToken token)
         {
             try
             {
-                await _mediator.Send(new TerminateCommand(id, elt), token);
+                terminateCommand.CaseInstanceId = id;
+                terminateCommand.CaseInstanceElementId = elt;
+                await _mediator.Send(terminateCommand, token);
                 return new OkResult();
             }
             catch (UnknownCasePlanInstanceException)
@@ -399,13 +411,14 @@ public async Task<IActionResult> Terminate(string id, string elt, CancellationTo
             }
         }
 
-        [HttpGet("{id}/close")]
+        [HttpPost("{id}/close")]
         [Authorize("close_caseplaninstance")]
-        public async Task<IActionResult> Close(string id, CancellationToken token)
+        public async Task<IActionResult> Close(string id, [FromBody] CloseCommand closeCommand, CancellationToken token)
         {
             try
             {
-                await _mediator.Send(new CloseCommand(id), token);
+                closeCommand.CasePlanInstanceId = id;
+                await _mediator.Send(closeCommand, token);
                 return new OkResult();
             }
             catch (UnknownCasePlanInstanceException)
@@ -428,13 +441,15 @@ public async Task<IActionResult> Close(string id, CancellationToken token)
             }
         }
 
-        [HttpGet("{id}/activate/{elt}")]
+        [HttpPost("{id}/activate/{elt}")]
         [Authorize("activate_caseplaninstance")]
-        public async Task<IActionResult> Activate(string id, string elt, CancellationToken token)
+        public async Task<IActionResult> Activate(string id, string elt, [FromBody] ActivateCommand activateCommand, CancellationToken token)
         {
             try
             {
-                await _mediator.Send(new ActivateCommand(id, elt), token);
+                activateCommand.CasePlanInstanceId = id;
+                activateCommand.CasePlanElementInstanceId = elt;
+                await _mediator.Send(activateCommand, token);
                 return new OkResult();
             }
             catch (UnknownCasePlanInstanceException)
@@ -461,13 +476,15 @@ public async Task<IActionResult> Activate(string id, string elt, CancellationTok
             }
         }
 
-        [HttpGet("{id}/disable/{elt}")]
+        [HttpPost("{id}/disable/{elt}")]
         [Authorize("disable_caseplaninstance")]
-        public async Task<IActionResult> Disable(string id, string elt, CancellationToken token)
+        public async Task<IActionResult> Disable(string id, string elt, [FromBody] DisableCommand disableCommand, CancellationToken token)
         {
             try
             {
-                await _mediator.Send(new DisableCommand(id, elt), token);
+                disableCommand.CasePlanInstanceId = id;
+                disableCommand.CasePlanElementInstanceId = elt;
+                await _mediator.Send(disableCommand, token);
                 return new OkResult();
             }
             catch (UnknownCasePlanInstanceException)
@@ -494,13 +511,15 @@ public async Task<IActionResult> Disable(string id, string elt, CancellationToke
             }
         }
 
-        [HttpGet("{id}/reenable/{elt}")]
+        [HttpPost("{id}/reenable/{elt}")]
         [Authorize("reenable_caseplaninstance")]
-        public async Task<IActionResult> Reenable(string id, string elt, CancellationToken token)
+        public async Task<IActionResult> Reenable(string id, string elt, [FromBody] ReenableCommand reenableCommand, CancellationToken token)
         {
             try
             {
-                await _mediator.Send(new ReenableCommand(id, elt), token);
+                reenableCommand.CasePlanInstanceId = id;
+                reenableCommand.CasePlanElementInstanceId = elt;
+                await _mediator.Send(reenableCommand, token);
                 return new OkResult();
             }
             catch (UnknownCasePlanInstanceException)

src/CaseManagement.CMMN.Persistence.EF/DomainMapping/SubscriptionMapper.cs

@@ -1,5 +1,7 @@
 using CaseManagement.CMMN.Infrastructure.ExternalEvts;
 using CaseManagement.CMMN.Persistence.EF.Models;
+using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace CaseManagement.CMMN.Persistence.EF.DomainMapping
 {
@@ -14,7 +16,8 @@ public static Subscription ToDomain(this SubscriptionModel sub)
                 EventName = sub.EventName,
                 CasePlanElementInstanceId = sub.CasePlanElementInstanceId,
                 CasePlanInstanceId = sub.CasePlanInstanceId,
-                IsCaptured = sub.IsCaptured
+                IsCaptured = sub.IsCaptured,
+                Parameters = string.IsNullOrEmpty(sub.Parameters) ? new Dictionary<string, string>() : JsonConvert.DeserializeObject<Dictionary<string, string>> (sub.Parameters)
             };
         }
 
@@ -27,7 +30,8 @@ public static SubscriptionModel ToModel(this Subscription sub)
                 EventName = sub.EventName,
                 CasePlanElementInstanceId = sub.CasePlanElementInstanceId,
                 CasePlanInstanceId = sub.CasePlanInstanceId,
-                IsCaptured = sub.IsCaptured
+                IsCaptured = sub.IsCaptured,
+                Parameters = sub.Parameters == null ? null : JsonConvert.SerializeObject(sub.Parameters)
             };
         }
     }

src/CaseManagement.CMMN.Persistence.EF/Models/SubscriptionModel.cs

@@ -9,6 +9,7 @@ public class SubscriptionModel
         public string CasePlanInstanceId { get; set; }
         public string CasePlanElementInstanceId { get; set; }
         public bool IsCaptured { get; set; }
+        public string Parameters { get; set; }
         public DateTime? CaptureDateTime { get; set; }
         public DateTime CreationDateTime { get; set; }
     }

src/CaseManagement.CMMN.Persistence.EF/Persistence/SubscriberRepository.cs

@@ -2,6 +2,7 @@
 using CaseManagement.CMMN.Persistence.EF.DomainMapping;
 using CaseManagement.CMMN.Persistence.EF.Models;
 using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
@@ -26,20 +27,20 @@ public async Task<Subscription> Get(string casePlanInstanceId, string casePlanEl
             }
         }
 
-        public async Task<bool> TryReset(string casePlanInstanceId, string casePlanElementInstanceId, string evtName, CancellationToken token)
+        public async Task<Subscription> TryReset(string casePlanInstanceId, string casePlanElementInstanceId, string evtName, CancellationToken token)
         {
             using (await _dbContext.Lock())
             {
                 var result = await _dbContext.SubscriptionLst.FirstOrDefaultAsync(_ => _.CasePlanInstanceId == casePlanInstanceId && _.CasePlanElementInstanceId == casePlanElementInstanceId && _.EventName == evtName, token);
                 if (result == null)
                 {
-                    return false;
+                    return null;
                 }
 
                 result.IsCaptured = false;
                 result.CaptureDateTime = null;
                 await _dbContext.SaveChangesAsync(token);
-                return true;
+                return result.ToDomain();
             }
         }
 
@@ -100,6 +101,7 @@ public async Task<bool> Update(Subscription subscription, CancellationToken canc
 
                 result.IsCaptured = subscription.IsCaptured;
                 result.CaptureDateTime = subscription.CaptureDateTime;
+                result.Parameters = subscription.Parameters == null ? null : JsonConvert.SerializeObject(subscription.Parameters);
                 await _dbContext.SaveChangesAsync(cancellationToken);
                 return true;
             }

src/CaseManagement.CMMN/Builders/CaseEltInstanceBuilder.cs

@@ -33,12 +33,21 @@ public BaseCaseEltInstance Build()
     public abstract class BaseCasePlanItemEltInstanceBuilder : CaseEltInstanceBuilder
     {
         private ICollection<CriteriaBuilder> _entryCriterions;
+        private int _version = 0;
 
         public BaseCasePlanItemEltInstanceBuilder(string casePlanInstanceId, string eltId, string name) : base(casePlanInstanceId, eltId, name)
         {
             _entryCriterions = new List<CriteriaBuilder>();
         }
 
+        protected int Version => _version;
+
+        public BaseCasePlanItemEltInstanceBuilder SetVersion(int version)
+        {
+            _version = version;
+            return this;
+        }
+
 
         public BaseCasePlanItemEltInstanceBuilder AddEntryCriteria(string name, Action<CriteriaBuilder> callback = null)
         {
@@ -98,15 +107,16 @@ protected override BaseCaseEltInstance InternalBuild()
             var result = new EmptyTaskElementInstance
             {
                 ManualActivationRule = ManualActivationRule,
-                RepetitionRule = RepetitionRule
+                RepetitionRule = RepetitionRule,
+                NbOccurrence = Version
             };
             SeedCasePlanItem(result);
             return result;
         }
 
         protected override string BuildId()
         {
-            return EmptyTaskElementInstance.BuildId(CasePlanInstanceId, EltId, 0);
+            return EmptyTaskElementInstance.BuildId(CasePlanInstanceId, EltId, Version);
         }
     }
 
@@ -126,15 +136,16 @@ protected override BaseCaseEltInstance InternalBuild()
                 ManualActivationRule = ManualActivationRule,
                 RepetitionRule = RepetitionRule,
                 Implemention = Implementation,
-                InputParameters = InputParameters
+                InputParameters = InputParameters,
+                NbOccurrence = Version
             };
             SeedCasePlanItem(result);
             return result;
         }
 
         protected override string BuildId()
         {
-            return HumanTaskElementInstance.BuildId(CasePlanInstanceId, EltId, 0);
+            return HumanTaskElementInstance.BuildId(CasePlanInstanceId, EltId, Version);
         }
     }
 
@@ -147,13 +158,14 @@ public MilestoneInstanceBuilder(string casePlanInstanceId, string id, string nam
         protected override BaseCaseEltInstance InternalBuild()
         {
             var result = new MilestoneElementInstance();
+            result.NbOccurrence = Version;
             SeedCasePlanItem(result);
             return result;
         }
 
         protected override string BuildId()
         {
-            return MilestoneElementInstance.BuildId(CasePlanInstanceId, EltId, 0);
+            return MilestoneElementInstance.BuildId(CasePlanInstanceId, EltId, Version);
         }
     }
 
@@ -189,15 +201,16 @@ protected override BaseCaseEltInstance InternalBuild()
         {
             var result = new TimerEventListener
             {
-                TimerExpression = TimerExpression
+                TimerExpression = TimerExpression,
+                NbOccurrence = Version
             };
             SeedCasePlanItem(result);
             return result;
         }
 
         protected override string BuildId()
         {
-            return TimerEventListener.BuildId(CasePlanInstanceId, EltId, 0);
+            return TimerEventListener.BuildId(CasePlanInstanceId, EltId, Version);
         }
     }
 }