Skip to content

Commit 4eeb45c

Browse files
Ticket #30 : Start start manual task
1 parent 1fe32f5 commit 4eeb45c

38 files changed

+397
-485
lines changed

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

Lines changed: 0 additions & 29 deletions
This file was deleted.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using CaseManagement.CMMN.CasePlanInstance;
33
using CaseManagement.CMMN.CasePlanInstance.Commands;
44
using CaseManagement.CMMN.CasePlanInstance.Exceptions;
5-
using CaseManagement.CMMN.CaseWorkerTask.Exceptions;
65
using CaseManagement.CMMN.Infrastructures;
76
using Microsoft.AspNetCore.Authorization;
87
using Microsoft.AspNetCore.Http;

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

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Microsoft.AspNetCore.Authorization;
55
using Microsoft.AspNetCore.Http;
66
using Microsoft.AspNetCore.Mvc;
7+
using System.Threading;
78
using System.Threading.Tasks;
89

910
namespace CaseManagement.CMMN.AspNetCore.Apis
@@ -20,38 +21,19 @@ public CasePlansController(ICasePlanService casePlanService)
2021

2122
[HttpGet("count")]
2223
[Authorize("get_statistic")]
23-
public async Task<IActionResult> Count()
24+
public async Task<IActionResult> Count(CancellationToken token)
2425
{
25-
var result = await _casePlanService.Count();
26+
var result = await _casePlanService.Count(token);
2627
return new OkObjectResult(result);
2728
}
2829

29-
[HttpGet("me/{id}")]
30-
[Authorize("me_get_caseplan")]
31-
public async Task<IActionResult> GetMe(string id)
32-
{
33-
try
34-
{
35-
var result = await _casePlanService.GetMe(id, this.GetNameIdentifier());
36-
return new OkObjectResult(result);
37-
}
38-
catch(UnknownCasePlanException)
39-
{
40-
return new NotFoundResult();
41-
}
42-
catch(UnauthorizedCasePlanException)
43-
{
44-
return new UnauthorizedResult();
45-
}
46-
}
47-
4830
[HttpGet("{id}")]
4931
[Authorize("get_caseplan")]
50-
public async Task<IActionResult> Get(string id)
32+
public async Task<IActionResult> Get(string id, CancellationToken token)
5133
{
5234
try
5335
{
54-
var result = await _casePlanService.Get(id);
36+
var result = await _casePlanService.Get(id, token);
5537
return new OkObjectResult(result);
5638
}
5739
catch (UnknownCasePlanException)
@@ -62,10 +44,10 @@ public async Task<IActionResult> Get(string id)
6244

6345
[HttpGet("search")]
6446
[Authorize("get_caseplan")]
65-
public async Task<IActionResult> Search()
47+
public async Task<IActionResult> Search(CancellationToken token)
6648
{
6749
var query = HttpContext.Request.Query.ToEnumerable();
68-
var result = await _casePlanService.Search(query);
50+
var result = await _casePlanService.Search(query, token);
6951
return new OkObjectResult(result);
7052
}
7153
}

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

Lines changed: 0 additions & 9 deletions
This file was deleted.

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

Lines changed: 0 additions & 59 deletions
This file was deleted.

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

Lines changed: 0 additions & 36 deletions
This file was deleted.

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

Lines changed: 0 additions & 106 deletions
This file was deleted.

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

Lines changed: 0 additions & 38 deletions
This file was deleted.

src/CaseManagement.CMMN/Builders/CaseElementInstanceBuilder.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ public class CaseElementInstanceBuilder
88
{
99
private ICollection<CriteriaBuilder> _entryCriterions;
1010

11-
public CaseElementInstanceBuilder()
11+
public CaseElementInstanceBuilder(string id, string name)
1212
{
13+
Id = id;
14+
Name = name;
1315
_entryCriterions = new List<CriteriaBuilder>();
1416
}
1517

@@ -47,6 +49,8 @@ protected virtual CasePlanElementInstance InternalBuild()
4749

4850
public class BaseTaskInstanceBuilder : CaseElementInstanceBuilder
4951
{
52+
public BaseTaskInstanceBuilder(string id, string name) : base(id, name) { }
53+
5054
protected ManualActivationRule ManualActivationRule { get; set; }
5155

5256
public BaseTaskInstanceBuilder SetManualActivationRule(string name, CMMNExpression expression)
@@ -62,6 +66,8 @@ public BaseTaskInstanceBuilder SetManualActivationRule(string name, CMMNExpressi
6266

6367
public class EmptyTaskInstanceBuilder : BaseTaskInstanceBuilder
6468
{
69+
public EmptyTaskInstanceBuilder(string id, string name) : base(id, name) { }
70+
6571
protected override CasePlanElementInstance InternalBuild()
6672
{
6773
return new EmptyTaskElementInstance
@@ -75,6 +81,8 @@ protected override CasePlanElementInstance InternalBuild()
7581

7682
public class HumanTaskInstanceBuilder : BaseTaskInstanceBuilder
7783
{
84+
public HumanTaskInstanceBuilder(string id, string name) : base(id, name) { }
85+
7886
public string PerformerRef { get; set; }
7987

8088
protected override CasePlanElementInstance InternalBuild()

0 commit comments

Comments
 (0)