Skip to content

Commit 60d692a

Browse files
habarthierry-huehabarthierry-hue
committed
Ticket 24 : manage version of the case files
1 parent edb752d commit 60d692a

531 files changed

Lines changed: 7853 additions & 9545 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Architecture.pptx‎

207 KB
Binary file not shown.

‎CaseManagement.sln‎

Lines changed: 49 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,31 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
44
VisualStudioVersion = 16.0.29418.71
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "02. Tests", "02. Tests", "{A632EFC3-730B-46D7-B669-91962DFA8947}"
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "03. Tests", "03. Tests", "{A632EFC3-730B-46D7-B669-91962DFA8947}"
77
EndProject
8-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00. CMMN", "00. CMMN", "{CD2E7CFE-4E9C-4308-A0D3-41CD5AD90FD8}"
8+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "01. CMMN", "01. CMMN", "{CD2E7CFE-4E9C-4308-A0D3-41CD5AD90FD8}"
99
EndProject
1010
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CaseManagement.CMMN", "src\CaseManagement.CMMN\CaseManagement.CMMN.csproj", "{CE4424E0-4EC0-45D0-9791-91864EDEA89B}"
1111
EndProject
1212
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CaseManagement.CMMN.Acceptance.Tests", "tests\CaseManagement.CMMN.Acceptance.Tests\CaseManagement.CMMN.Acceptance.Tests.csproj", "{2D288182-CD6B-46AF-B420-F2038875F6BC}"
1313
EndProject
14-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "01. Website", "01. Website", "{D16A3E6D-32B6-44CF-9941-A9BDB9DFC6A7}"
14+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "02. Website", "02. Website", "{D16A3E6D-32B6-44CF-9941-A9BDB9DFC6A7}"
1515
EndProject
1616
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CaseManagement.Website", "src\CaseManagement.Website\CaseManagement.Website.csproj", "{1A146C2E-708E-4B50-AE46-37B415CEAFC1}"
1717
EndProject
1818
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CaseManagement.CMMN.Host", "src\CaseManagement.CMMN.Host\CaseManagement.CMMN.Host.csproj", "{E4C5F767-299D-4D26-916B-59EC7C93CE90}"
1919
EndProject
2020
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CaseManagement.CMMN.Tests", "tests\CaseManagement.CMMN.Tests\CaseManagement.CMMN.Tests.csproj", "{F005FA4D-312C-428C-93A7-4F02C01136A8}"
2121
EndProject
22-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "03. Benchmark", "03. Benchmark", "{73DCE7A3-F336-4E72-B36C-9D88860BC897}"
22+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "04. Benchmark", "04. Benchmark", "{73DCE7A3-F336-4E72-B36C-9D88860BC897}"
2323
EndProject
2424
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CaseManagement.CMMN.Benchmark", "src\CaseManagement.CMMN.Benchmark\CaseManagement.CMMN.Benchmark.csproj", "{3DFF3970-7721-4087-8E41-F478D39C2095}"
2525
EndProject
2626
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CaseManagement.CMMN.CMIS", "src\CaseManagement.CMMN.CMIS\CaseManagement.CMMN.CMIS.csproj", "{2B86EDF0-DA2D-4FFE-9877-4CBA2999B0A5}"
2727
EndProject
2828
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CaseManagement.CMMN.CMIS.Tests", "tests\CaseManagement.CMMN.CMIS.Tests\CaseManagement.CMMN.CMIS.Tests.csproj", "{162D547F-D8E8-4B2F-A86C-3F74BF7F4F45}"
2929
EndProject
30-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "04. Startup", "04. Startup", "{4A5D2E88-20E8-4A3F-8527-A4934BC0E11F}"
30+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "05. Startup", "05. Startup", "{4A5D2E88-20E8-4A3F-8527-A4934BC0E11F}"
3131
EndProject
3232
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CaseManagement.ConsoleApp", "src\CaseManagement.ConsoleApp\CaseManagement.ConsoleApp.csproj", "{2AF59449-01BC-447B-8156-B285278E7956}"
3333
EndProject
@@ -39,6 +39,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CaseManagement.Performance"
3939
EndProject
4040
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CaseManagement.Identity", "src\CaseManagement.Identity\CaseManagement.Identity.csproj", "{93F12F7C-8657-4725-B6A8-A7AEDCEEC8CE}"
4141
EndProject
42+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CaseManagement.Gateway.Website", "src\CaseManagement.Gateway.Website\CaseManagement.Gateway.Website.csproj", "{A481580E-2098-48D5-B21F-9BAE27F0D61B}"
43+
EndProject
44+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CaseManagement.Gateway.Website.Host", "src\CaseManagement.Gateway.Website.Host\CaseManagement.Gateway.Website.Host.csproj", "{0457CC1C-9A61-4124-8517-F511D13B2AF4}"
45+
EndProject
46+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CaseManagement.Gateway.Website.AspNetCore", "src\CaseManagement.Gateway.Website.AspNetCore\CaseManagement.Gateway.Website.AspNetCore.csproj", "{1DE5CD2C-580E-4E77-AFA9-A827F88AACF6}"
47+
EndProject
48+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CaseManagement.OAuth", "src\CaseManagement.OAuth\CaseManagement.OAuth.csproj", "{C5C20C3E-3C47-4A8B-9B81-FB914E4B3544}"
49+
EndProject
50+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CaseManagement.MessageBroker.Server", "src\CaseManagement.MessageBroker.Server\CaseManagement.MessageBroker.Server.csproj", "{231B8EA6-CD66-45F9-9CE0-8230F9CB0B6A}"
51+
EndProject
52+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00. Infrastructure", "00. Infrastructure", "{F78167C9-BA42-4EF6-BD26-93C5E99342BB}"
53+
EndProject
54+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CaseManagement.MessageBroker.MassTransit", "src\CaseManagement.MessageBroker.MassTransit\CaseManagement.MessageBroker.MassTransit.csproj", "{A8E2C9B1-A0DF-4B3A-A8EE-F284BDF43803}"
55+
EndProject
4256
Global
4357
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4458
Debug|Any CPU = Debug|Any CPU
@@ -97,6 +111,30 @@ Global
97111
{93F12F7C-8657-4725-B6A8-A7AEDCEEC8CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
98112
{93F12F7C-8657-4725-B6A8-A7AEDCEEC8CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
99113
{93F12F7C-8657-4725-B6A8-A7AEDCEEC8CE}.Release|Any CPU.Build.0 = Release|Any CPU
114+
{A481580E-2098-48D5-B21F-9BAE27F0D61B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
115+
{A481580E-2098-48D5-B21F-9BAE27F0D61B}.Debug|Any CPU.Build.0 = Debug|Any CPU
116+
{A481580E-2098-48D5-B21F-9BAE27F0D61B}.Release|Any CPU.ActiveCfg = Release|Any CPU
117+
{A481580E-2098-48D5-B21F-9BAE27F0D61B}.Release|Any CPU.Build.0 = Release|Any CPU
118+
{0457CC1C-9A61-4124-8517-F511D13B2AF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
119+
{0457CC1C-9A61-4124-8517-F511D13B2AF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
120+
{0457CC1C-9A61-4124-8517-F511D13B2AF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
121+
{0457CC1C-9A61-4124-8517-F511D13B2AF4}.Release|Any CPU.Build.0 = Release|Any CPU
122+
{1DE5CD2C-580E-4E77-AFA9-A827F88AACF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
123+
{1DE5CD2C-580E-4E77-AFA9-A827F88AACF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
124+
{1DE5CD2C-580E-4E77-AFA9-A827F88AACF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
125+
{1DE5CD2C-580E-4E77-AFA9-A827F88AACF6}.Release|Any CPU.Build.0 = Release|Any CPU
126+
{C5C20C3E-3C47-4A8B-9B81-FB914E4B3544}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
127+
{C5C20C3E-3C47-4A8B-9B81-FB914E4B3544}.Debug|Any CPU.Build.0 = Debug|Any CPU
128+
{C5C20C3E-3C47-4A8B-9B81-FB914E4B3544}.Release|Any CPU.ActiveCfg = Release|Any CPU
129+
{C5C20C3E-3C47-4A8B-9B81-FB914E4B3544}.Release|Any CPU.Build.0 = Release|Any CPU
130+
{231B8EA6-CD66-45F9-9CE0-8230F9CB0B6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
131+
{231B8EA6-CD66-45F9-9CE0-8230F9CB0B6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
132+
{231B8EA6-CD66-45F9-9CE0-8230F9CB0B6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
133+
{231B8EA6-CD66-45F9-9CE0-8230F9CB0B6A}.Release|Any CPU.Build.0 = Release|Any CPU
134+
{A8E2C9B1-A0DF-4B3A-A8EE-F284BDF43803}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
135+
{A8E2C9B1-A0DF-4B3A-A8EE-F284BDF43803}.Debug|Any CPU.Build.0 = Debug|Any CPU
136+
{A8E2C9B1-A0DF-4B3A-A8EE-F284BDF43803}.Release|Any CPU.ActiveCfg = Release|Any CPU
137+
{A8E2C9B1-A0DF-4B3A-A8EE-F284BDF43803}.Release|Any CPU.Build.0 = Release|Any CPU
100138
EndGlobalSection
101139
GlobalSection(SolutionProperties) = preSolution
102140
HideSolutionNode = FALSE
@@ -115,6 +153,12 @@ Global
115153
{A33A6BDF-FD00-4EFE-BA3F-A73BC63CB321} = {CD2E7CFE-4E9C-4308-A0D3-41CD5AD90FD8}
116154
{8EC2090C-1BF1-4557-B62E-EB088699ED8A} = {D16A3E6D-32B6-44CF-9941-A9BDB9DFC6A7}
117155
{93F12F7C-8657-4725-B6A8-A7AEDCEEC8CE} = {4A5D2E88-20E8-4A3F-8527-A4934BC0E11F}
156+
{A481580E-2098-48D5-B21F-9BAE27F0D61B} = {CD2E7CFE-4E9C-4308-A0D3-41CD5AD90FD8}
157+
{0457CC1C-9A61-4124-8517-F511D13B2AF4} = {4A5D2E88-20E8-4A3F-8527-A4934BC0E11F}
158+
{1DE5CD2C-580E-4E77-AFA9-A827F88AACF6} = {CD2E7CFE-4E9C-4308-A0D3-41CD5AD90FD8}
159+
{C5C20C3E-3C47-4A8B-9B81-FB914E4B3544} = {4A5D2E88-20E8-4A3F-8527-A4934BC0E11F}
160+
{231B8EA6-CD66-45F9-9CE0-8230F9CB0B6A} = {4A5D2E88-20E8-4A3F-8527-A4934BC0E11F}
161+
{A8E2C9B1-A0DF-4B3A-A8EE-F284BDF43803} = {F78167C9-BA42-4EF6-BD26-93C5E99342BB}
118162
EndGlobalSection
119163
GlobalSection(ExtensibilityGlobals) = postSolution
120164
SolutionGuid = {D2CFBF2E-D493-42F7-B339-01A3070C2B5E}

‎src/CaseManagement.CMMN.AspNet/Apis/CaseFilesController.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using CaseManagement.CMMN.Domains.CaseFile;
1+
using CaseManagement.CMMN.Domains;
22
using CaseManagement.CMMN.Extensions;
33
using CaseManagement.CMMN.Persistence;
44
using CaseManagement.CMMN.Persistence.Parameters;
@@ -55,7 +55,7 @@ public async Task<IHttpActionResult> Get(string id)
5555
return Ok(ToDto(result));
5656
}
5757

58-
private static JObject ToDto(FindResponse<CaseFileDefinitionAggregate> resp)
58+
private static JObject ToDto(FindResponse<CaseFileAggregate> resp)
5959
{
6060
return new JObject
6161
{
@@ -73,7 +73,7 @@ private static JObject ToDto(FindResponse<CaseFileDefinitionAggregate> resp)
7373
};
7474
}
7575

76-
private static JObject ToDto(CaseFileDefinitionAggregate resp)
76+
private static JObject ToDto(CaseFileAggregate resp)
7777
{
7878
return new JObject
7979
{
@@ -85,13 +85,13 @@ private static JObject ToDto(CaseFileDefinitionAggregate resp)
8585
};
8686
}
8787

88-
private static FindCaseDefinitionFilesParameter ExtractFindParameter(IEnumerable<KeyValuePair<string, string>> query)
88+
private static FindCaseFilesParameter ExtractFindParameter(IEnumerable<KeyValuePair<string, string>> query)
8989
{
9090
int startIndex;
9191
int count;
9292
string orderBy;
9393
FindOrders findOrder;
94-
var parameter = new FindCaseDefinitionFilesParameter();
94+
var parameter = new FindCaseFilesParameter();
9595
if (query.TryGet("start_index", out startIndex))
9696
{
9797
parameter.StartIndex = startIndex;

‎src/CaseManagement.CMMN.AspNet/Apis/CaseFormInstancesController.cs‎

Lines changed: 6 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -61,39 +61,20 @@ private static JObject ToDto(FindResponse<FormInstanceAggregate> resp)
6161
{ "id", r.Id },
6262
{ "create_datetime", r.CreateDateTime },
6363
{ "update_datetime", r.UpdateDateTime },
64-
{ "performer", r.RoleId },
65-
{ "case_definition_id", r.CaseDefinitionId },
66-
{ "case_instance_id", r.CaseElementInstanceId },
67-
{ "case_element_definition_id", r.CaseElementDefinitionId },
68-
{ "case_element_instance_id", r.CaseElementInstanceId },
69-
{ "status", Enum.GetName(typeof(FormInstanceStatus), r.Status).ToLowerInvariant() },
70-
{ "form_id", r.FormId }
64+
{ "performer", r.PerformerRole },
65+
{ "case_plan_instance_id", r.CasePlanInstanceId },
66+
{ "case_plan_element_instance_id", r.CaseElementInstanceId },
67+
{ "form_id", r.FormId },
68+
{ "status", Enum.GetName(typeof(FormInstanceStatus), r.Status).ToLower() }
7169
};
72-
foreach(var title in r.Titles)
73-
{
74-
result.Add($"title#{title.Language}", title.Value);
75-
}
76-
7770
var content = new JArray();
7871
foreach(var formElt in r.Content)
7972
{
8073
var record = new JObject
8174
{
8275
{ "form_element_id", formElt.FormElementId },
83-
{ "is_required", formElt.IsRequired },
84-
{ "value", formElt.Value },
85-
{ "type", Enum.GetName(typeof(FormElementTypes), formElt.Type).ToLowerInvariant() }
76+
{ "value", formElt.Value }
8677
};
87-
foreach(var name in formElt.Names)
88-
{
89-
record.Add($"name#{name.Language}", name.Value);
90-
}
91-
92-
foreach(var description in formElt.Descriptions)
93-
{
94-
record.Add($"description#{description.Language}", description.Value);
95-
}
96-
9778
content.Add(record);
9879
}
9980

@@ -105,17 +86,11 @@ private static JObject ToDto(FindResponse<FormInstanceAggregate> resp)
10586

10687
private static FindFormInstanceParameter ExtractFindFormInstanceParameter(IEnumerable<KeyValuePair<string, string>> query, IEnumerable<string> roleIds)
10788
{
108-
string caseDefinitionId;
10989
var parameter = new FindFormInstanceParameter
11090
{
11191
RoleIds = roleIds
11292
};
11393
parameter.ExtractFindParameter(query);
114-
if (query.TryGet("case_definition_id", out caseDefinitionId))
115-
{
116-
parameter.CaseDefinitionId = caseDefinitionId;
117-
}
118-
11994
return parameter;
12095
}
12196
}

0 commit comments

Comments
 (0)