Skip to content

Commit 810bca6

Browse files
habarthierry-huehabarthierry-hue
committed
Ticket #105 : Update rendering
1 parent 42a96f9 commit 810bca6

35 files changed

+156
-463
lines changed

‎src/CaseManagement.HumanTask.Host/Startup.cs‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,6 @@ public void ConfigureServices(IServiceCollection services)
5050
.SetPotentialOwnerUserIdentifiers(new List<string> { "businessanalyst" })
5151
.AddName("fr", "Capturer les détails de la réclamation")
5252
.AddName("en", "Capture claim details")
53-
.AddTxt("firstName", cb =>
54-
{
55-
cb.AddLabel("fr", "Prénom");
56-
cb.AddLabel("en", "Firstname");
57-
})
58-
.AddTxt("lastName", cb =>
59-
{
60-
cb.AddLabel("fr", "Nom");
61-
cb.AddLabel("en", "Lastname");
62-
})
63-
.AddTxt("claim", cb =>
64-
{
65-
cb.AddLabel("fr", "Motif de la réclamation");
66-
cb.AddLabel("en", "Claim");
67-
})
6853
.AddOutputOperationParameter("firstName", ParameterTypes.STRING, true)
6954
.AddOutputOperationParameter("lastName", ParameterTypes.STRING, true)
7055
.AddOutputOperationParameter("claim", ParameterTypes.STRING, true)
@@ -74,16 +59,13 @@ public void ConfigureServices(IServiceCollection services)
7459
.SetPotentialOwnerUserIdentifiers(new List<string> { "businessanalyst" })
7560
.AddName("fr", "Saisir la température")
7661
.AddName("en", "Enter degree")
77-
.AddTxt("degree", cb => cb.AddLabel("fr", "Température"))
7862
.AddOutputOperationParameter("degree", ParameterTypes.INT, true)
7963
.Build();
8064
var updateClaimantContactDetailsForm = HumanTaskDefBuilder.New("updateClaimantContactDetailsForm")
8165
.SetTaskInitiatorUserIdentifiers(new List<string> { "businessanalyst" })
8266
.SetPotentialOwnerUserIdentifiers(new List<string> { "businessanalyst" })
8367
.AddName("fr", "Mettre à jour les informations de contact du 'Claimant'")
8468
.AddName("en", "Update claimant contact details")
85-
.AddTxt("firstName", cb => cb.AddLabel("fr", "Firstname"))
86-
.AddTxt("lastName", cb => cb.AddLabel("fr", "Lastname"))
8769
.AddOutputOperationParameter("firstName", ParameterTypes.STRING, true)
8870
.AddOutputOperationParameter("lastName", ParameterTypes.STRING, true)
8971
.Build();

‎src/CaseManagement.HumanTask/Builders/HumanTaskDefBuilder.cs‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -78,36 +78,6 @@ public HumanTaskDefBuilder AddCompletionDeadLine(string name, Action<DeadLineBui
7878

7979
#endregion
8080

81-
#region Rendering elements
82-
83-
public HumanTaskDefBuilder AddTxt(string id, Action<RenderingElementBuilder> callback)
84-
{
85-
var renderingElement = new RenderingElement
86-
{
87-
Id = id,
88-
ValueType = "string"
89-
};
90-
var builder = new RenderingElementBuilder(renderingElement);
91-
callback(builder);
92-
_humanTaskDef.RenderingElements.Add(renderingElement);
93-
return this;
94-
}
95-
96-
public HumanTaskDefBuilder AddSelect(string id, Action<SelectOptionRenderingElementBuilder> callback)
97-
{
98-
var renderingElement = new RenderingElement
99-
{
100-
Id = id,
101-
ValueType = "select"
102-
};
103-
var builder = new SelectOptionRenderingElementBuilder(renderingElement);
104-
callback(builder);
105-
_humanTaskDef.RenderingElements.Add(renderingElement);
106-
return this;
107-
}
108-
109-
#endregion
110-
11181
#region Presentation element
11282

11383
public HumanTaskDefBuilder AddName(string language, string value)

‎src/CaseManagement.HumanTask/Builders/RenderingElementBuilder.cs‎

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

‎src/CaseManagement.HumanTask/Domains/Common/Definition/Rendering.cs‎

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

‎src/CaseManagement.HumanTask/Domains/HumanTaskDef/Events/HumanTaskDefRenderingUpdatedEvent.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
using CaseManagement.Common.Domains;
22
using System;
3-
using System.Collections.Generic;
43
using System.Diagnostics;
54

65
namespace CaseManagement.HumanTask.Domains.HumanTaskDef.Events
76
{
87
[DebuggerDisplay("Update rendering")]
98
public class HumanTaskDefRenderingUpdatedEvent : DomainEvent
109
{
11-
public HumanTaskDefRenderingUpdatedEvent(string id, string aggregateId, int version, ICollection<RenderingElement> renderingElements, DateTime updateDateTime) : base(id, aggregateId, version)
10+
public HumanTaskDefRenderingUpdatedEvent(string id, string aggregateId, int version, string rendering, DateTime updateDateTime) : base(id, aggregateId, version)
1211
{
13-
RenderingElements = renderingElements;
12+
Rendering = rendering;
1413
UpdateDateTime = updateDateTime;
1514
}
1615

17-
public ICollection<RenderingElement> RenderingElements { get; set; }
16+
public string Rendering { get; set; }
1817
public DateTime UpdateDateTime { get; set; }
1918
}
2019
}

‎src/CaseManagement.HumanTask/Domains/HumanTaskDef/HumanTaskDefinitionAggregate.cs‎

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ public HumanTaskDefinitionAggregate()
1717
OperationParameters = new List<Parameter>();
1818
PresentationElements = new List<PresentationElementDefinition>();
1919
PeopleAssignments = new List<PeopleAssignmentDefinition>();
20-
RenderingElements = new List<RenderingElement>();
2120
DeadLines = new List<HumanTaskDefinitionDeadLine>();
2221
Completions = new List<Completion>();
2322
SubTasks = new List<HumanTaskDefinitionSubTask>();
@@ -73,7 +72,7 @@ public HumanTaskDefinitionAggregate()
7372
/// <summary>
7473
/// This element is used to specify rendering method. It is optional.
7574
/// </summary>
76-
public ICollection<RenderingElement> RenderingElements { get; set; }
75+
public string Rendering { get; set; }
7776
/// <summary>
7877
/// This element specifies different deadlines.
7978
/// It is optional.
@@ -110,7 +109,7 @@ public override object Clone()
110109
PresentationParameters = PresentationParameters.Select(_ => (PresentationParameter)_.Clone()).ToList(),
111110
Outcome = Outcome,
112111
SearchBy = SearchBy,
113-
RenderingElements = RenderingElements.Select(_ => (RenderingElement)_.Clone()).ToList(),
112+
Rendering = Rendering,
114113
DeadLines = DeadLines.Select(_ => (HumanTaskDefinitionDeadLine)_.Clone()).ToList(),
115114
CompletionAction = CompletionAction,
116115
InstantiationPattern = InstantiationPattern,
@@ -230,9 +229,9 @@ public void DeleteEscalationDeadline(string completionDeadLineId, string escalat
230229
Handle(evt);
231230
}
232231

233-
public void UpdateRendering(ICollection<RenderingElement> renderingElements)
232+
public void UpdateRendering(string rendering)
234233
{
235-
var evt = new HumanTaskDefRenderingUpdatedEvent(Guid.NewGuid().ToString(), AggregateId, Version + 1, renderingElements, DateTime.UtcNow);
234+
var evt = new HumanTaskDefRenderingUpdatedEvent(Guid.NewGuid().ToString(), AggregateId, Version + 1, rendering, DateTime.UtcNow);
236235
Handle(evt);
237236
}
238237

@@ -480,31 +479,7 @@ private void Handle(HumanTaskDefEscalationDeadlineRemovedEvent evt)
480479

481480
private void Handle(HumanTaskDefRenderingUpdatedEvent evt)
482481
{
483-
RenderingElements.Clear();
484-
foreach(var renderingElt in evt.RenderingElements)
485-
{
486-
RenderingElements.Add(new RenderingElement
487-
{
488-
Default = renderingElt.Default,
489-
Labels = renderingElt.Labels.Select(_ => new Translation
490-
{
491-
Language = _.Language,
492-
Value = _.Value
493-
}).ToList(),
494-
Values = renderingElt.Values.Select(_ => new OptionValue
495-
{
496-
DisplayNames = _.DisplayNames.Select(d => new Translation
497-
{
498-
Language = d.Language,
499-
Value = d.Value
500-
}).ToList()
501-
}).ToList(),
502-
ValueType = renderingElt.ValueType,
503-
XPath = renderingElt.XPath
504-
});
505-
}
506-
507-
RenderingElements = evt.RenderingElements;
482+
Rendering = evt.Rendering;
508483
UpdateDateTime = evt.UpdateDateTime;
509484
Version = evt.Version;
510485
}

‎src/CaseManagement.HumanTask/Domains/HumanTaskInstance/DomainEvts/HumanTaskInstanceCreatedEvent.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public HumanTaskInstanceCreatedEvent(
2626
ICollection<Parameter> operationParameters,
2727
CompletionBehaviors completionBehavior,
2828
ICollection<Completion> completions,
29-
ICollection<RenderingElement> renderingElts,
29+
string rendering,
3030
ICollection<CallbackOperation> callbackOperations,
3131
DateTime? activationDeferralTime = null,
3232
DateTime? expirationTime = null) : base(id, aggregateId, version)
@@ -45,7 +45,7 @@ public HumanTaskInstanceCreatedEvent(
4545
OperationParameters = operationParameters;
4646
CompletionBehavior = completionBehavior;
4747
Completions = completions;
48-
RenderingElts = renderingElts;
48+
Rendering = rendering;
4949
CallbackOperations = callbackOperations;
5050
ActivationDeferralTime = activationDeferralTime;
5151
ExpirationTime = expirationTime;
@@ -65,7 +65,7 @@ public HumanTaskInstanceCreatedEvent(
6565
public ICollection<Parameter> OperationParameters { get; set; }
6666
public CompletionBehaviors CompletionBehavior { get; set; }
6767
public ICollection<Completion> Completions { get; set; }
68-
public ICollection<RenderingElement> RenderingElts { get; set; }
68+
public string Rendering { get; set; }
6969
public ICollection<CallbackOperation> CallbackOperations { get; set; }
7070
public DateTime? ActivationDeferralTime { get; set; }
7171
public DateTime? ExpirationTime { get; set; }

‎src/CaseManagement.HumanTask/Domains/HumanTaskInstance/HumanTaskInstanceAggregate.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public HumanTaskInstanceAggregate()
4141
public ICollection<Parameter> OperationParameters { get; set; }
4242
public ICollection<Parameter> InputOperationParameters { get => OperationParameters.Where(_ => _.Usage == ParameterUsages.INPUT).ToList(); }
4343
public ICollection<Parameter> OutputOperationParameters { get => OperationParameters.Where(_ => _.Usage == ParameterUsages.OUTPUT).ToList(); }
44-
public ICollection<RenderingElement> RenderingElements { get; set; }
44+
public string Rendering { get; set; }
4545
public ICollection<Completion> Completions { get; set; }
4646
public ICollection<PresentationElementInstance> PresentationElements { get; set; }
4747
public ICollection<PresentationElementInstance> Names { get => PresentationElements.Where(_ => _.Usage == PresentationElementUsages.NAME).ToList(); }
@@ -75,7 +75,7 @@ public static HumanTaskInstanceAggregate New(
7575
ICollection<Parameter> operationParameters,
7676
CompletionBehaviors completionBehavior,
7777
ICollection<Completion> completions,
78-
ICollection<RenderingElement> renderingElts,
78+
string rendering,
7979
ICollection<CallbackOperation> callbackOperations)
8080
{
8181
var evt = new HumanTaskInstanceCreatedEvent(
@@ -96,7 +96,7 @@ public static HumanTaskInstanceAggregate New(
9696
operationParameters,
9797
completionBehavior,
9898
completions,
99-
renderingElts,
99+
rendering,
100100
callbackOperations,
101101
activationDeferralTime,
102102
expirationTime);
@@ -134,7 +134,7 @@ public override object Clone()
134134
ParentHumanTaskName = ParentHumanTaskName,
135135
ParentHumanTaskId = ParentHumanTaskId,
136136
Completions = Completions.Select(_ => (Completion)_.Clone()).ToList(),
137-
RenderingElements = RenderingElements.Select(_ => (RenderingElement)_.Clone()).ToList(),
137+
Rendering = Rendering,
138138
CallbackOperations = CallbackOperations.Select(_ => (CallbackOperation)_.Clone()).ToList(),
139139
CompletionBehavior = CompletionBehavior
140140
};
@@ -268,7 +268,7 @@ private void Handle(HumanTaskInstanceCreatedEvent evt)
268268
Completions = evt.Completions;
269269
OperationParameters = evt.OperationParameters;
270270
CallbackOperations = evt.CallbackOperations;
271-
RenderingElements = evt.RenderingElts;
271+
Rendering = evt.Rendering;
272272
UpdateDateTime = evt.CreateDateTime;
273273
CreateDateTime = evt.CreateDateTime;
274274
Version = evt.Version;

‎src/CaseManagement.HumanTask/HumanTaskDef/Commands/Handlers/UpdateHumanTaskDefRenderingCommandHandler.cs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using CaseManagement.HumanTask.Resources;
55
using MediatR;
66
using Microsoft.Extensions.Logging;
7-
using System.Linq;
87
using System.Threading;
98
using System.Threading.Tasks;
109

@@ -28,10 +27,10 @@ public UpdateHumanTaskDefRenderingCommandHandler(
2827

2928
public async Task<bool> Handle(UpdateHumanTaskDefRenderingCommand request, CancellationToken cancellationToken)
3029
{
31-
if (request.RenderingElements == null)
30+
if (request.Rendering == null)
3231
{
33-
_logger.LogError("the parameter 'renderingElements' is missing");
34-
throw new BadRequestException(string.Format(Global.MissingParameter, "renderingElements"));
32+
_logger.LogError("the parameter 'rendering' is missing");
33+
throw new BadRequestException(string.Format(Global.MissingParameter, "rendering"));
3534
}
3635

3736
var result = await _humanTaskDefQueryRepository.Get(request.Id, cancellationToken);
@@ -41,7 +40,7 @@ public async Task<bool> Handle(UpdateHumanTaskDefRenderingCommand request, Cance
4140
throw new UnknownHumanTaskDefException(string.Format(Global.UnknownHumanTaskDef, request.Id));
4241
}
4342

44-
result.UpdateRendering(request.RenderingElements.Select(_ => _.ToDomain()).ToList());
43+
result.UpdateRendering(request.Rendering.ToString());
4544
await _humanTaskDefCommandRepository.Update(result, cancellationToken);
4645
await _humanTaskDefCommandRepository.SaveChanges(cancellationToken);
4746
_logger.LogInformation("The rendering has been updated");

0 commit comments

Comments
 (0)