Skip to content

Commit 6a14cf9

Browse files
bjorntorebjorntore
committed
Fix some code style stuff in process engine code that was moved from DefaultTaskEvents.
1 parent c55cfb5 commit 6a14cf9

File tree

8 files changed

+64
-50
lines changed

8 files changed

+64
-50
lines changed

‎src/Altinn.App.Core/Internal/Process/EventHandlers/EndEventEventHandler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public async Task Execute(InstanceEvent instanceEvent, Instance instance)
4646

4747
private async Task AutoDeleteOnProcessEndIfEnabled(Instance instance)
4848
{
49-
var instanceIdentifier = new InstanceIdentifier(instance);
49+
InstanceIdentifier instanceIdentifier = new(instance);
5050
ApplicationMetadata applicationMetadata = await _appMetadata.GetApplicationMetadata();
5151
if (applicationMetadata.AutoDeleteOnProcessEnd && instance.Process?.Ended != null)
5252
{

‎src/Altinn.App.Core/Internal/Process/EventHandlers/ProcessTask/AbandonTaskEventHandler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public async Task Execute(IProcessTask processTask, string taskId, Instance inst
4141
/// <returns></returns>
4242
private async Task RunAppDefinedProcessTaskAbandonHandlers(string taskId, Instance instance)
4343
{
44-
foreach (var taskAbandon in _processTaskAbondons)
44+
foreach (IProcessTaskAbandon taskAbandon in _processTaskAbondons)
4545
{
4646
await taskAbandon.Abandon(taskId, instance);
4747
}

‎src/Altinn.App.Core/Internal/Process/EventHandlers/ProcessTask/EndTaskEventHandler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public async Task Execute(IProcessTask processTask, string taskId, Instance inst
6262
/// <returns></returns>
6363
private async Task RunAppDefinedProcessTaskEndHandlers(string endEvent, Instance instance)
6464
{
65-
foreach (var taskEnd in _processTaskEnds)
65+
foreach (IProcessTaskEnd taskEnd in _processTaskEnds)
6666
{
6767
await taskEnd.End(endEvent, instance);
6868
}

‎src/Altinn.App.Core/Internal/Process/EventHandlers/ProcessTask/StartTaskEventHandler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public async Task Execute(IProcessTask processTask, string taskId, Instance inst
5454
private async Task RunAppDefinedProcessTaskStartHandlers(string taskId, Instance instance,
5555
Dictionary<string, string> prefill)
5656
{
57-
foreach (var processTaskStarts in _processTaskStarts)
57+
foreach (IProcessTaskStart processTaskStarts in _processTaskStarts)
5858
{
5959
await processTaskStarts.Start(taskId, instance, prefill);
6060
}

‎src/Altinn.App.Core/Internal/Process/ProcessTasks/Common/ProcessTaskDataLocker.cs‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ public class ProcessTaskDataLocker : IProcessTaskDataLocker
1111
private readonly IAppMetadata _appMetadata;
1212
private readonly IDataClient _dataClient;
1313

14-
/// <inheritdoc/>
14+
/// <summary>
15+
/// Initializes a new instance of the <see cref="ProcessTaskDataLocker"/> class.
16+
/// </summary>
17+
/// <param name="appMetadata"></param>
18+
/// <param name="dataClient"></param>
1519
public ProcessTaskDataLocker(IAppMetadata appMetadata, IDataClient dataClient)
1620
{
1721
_appMetadata = appMetadata;
@@ -21,13 +25,13 @@ public ProcessTaskDataLocker(IAppMetadata appMetadata, IDataClient dataClient)
2125
/// <inheritdoc/>
2226
public async Task Unlock(string taskId, Instance instance)
2327
{
24-
var applicationMetadata = await _appMetadata.GetApplicationMetadata();
25-
var connectedDataTypes = applicationMetadata.DataTypes.FindAll(dt => dt.TaskId == taskId);
26-
var instanceIdentifier = new InstanceIdentifier(instance);
27-
foreach (var dataType in connectedDataTypes)
28+
ApplicationMetadata applicationMetadata = await _appMetadata.GetApplicationMetadata();
29+
List<DataType> connectedDataTypes = applicationMetadata.DataTypes.FindAll(dt => dt.TaskId == taskId);
30+
InstanceIdentifier instanceIdentifier = new(instance);
31+
foreach (DataType dataType in connectedDataTypes)
2832
{
29-
var dataElements = instance.Data.FindAll(de => de.DataType == dataType.Id);
30-
foreach (var dataElement in dataElements)
33+
List<DataElement> dataElements = instance.Data.FindAll(de => de.DataType == dataType.Id);
34+
foreach (DataElement dataElement in dataElements)
3135
{
3236
await _dataClient.UnlockDataElement(instanceIdentifier, Guid.Parse(dataElement.Id));
3337
}
@@ -37,13 +41,13 @@ public async Task Unlock(string taskId, Instance instance)
3741
/// <inheritdoc/>
3842
public async Task Lock(string taskId, Instance instance)
3943
{
40-
var applicationMetadata = await _appMetadata.GetApplicationMetadata();
41-
var connectedDataTypes = applicationMetadata.DataTypes.FindAll(dt => dt.TaskId == taskId);
42-
var instanceIdentifier = new InstanceIdentifier(instance);
43-
foreach (var dataType in connectedDataTypes)
44+
ApplicationMetadata applicationMetadata = await _appMetadata.GetApplicationMetadata();
45+
List<DataType> connectedDataTypes = applicationMetadata.DataTypes.FindAll(dt => dt.TaskId == taskId);
46+
InstanceIdentifier instanceIdentifier = new(instance);
47+
foreach (DataType dataType in connectedDataTypes)
4448
{
45-
var dataElements = instance.Data.FindAll(de => de.DataType == dataType.Id);
46-
foreach (var dataElement in dataElements)
49+
List<DataElement> dataElements = instance.Data.FindAll(de => de.DataType == dataType.Id);
50+
foreach (DataElement dataElement in dataElements)
4751
{
4852
await _dataClient.LockDataElement(instanceIdentifier, Guid.Parse(dataElement.Id));
4953
}

‎src/Altinn.App.Core/Internal/Process/ProcessTasks/Common/ProcessTaskFinalizer.cs‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ public async Task Finalize(string taskId, Instance instance)
6161

6262
private async Task RemoveDataElementsGeneratedFromTask(Instance instance, string taskId)
6363
{
64-
var appIdentifier = new AppIdentifier(instance.AppId);
65-
var instanceIdentifier = new InstanceIdentifier(instance);
64+
AppIdentifier appIdentifier = new(instance.AppId);
65+
InstanceIdentifier instanceIdentifier = new(instance);
6666
foreach (DataElement dataElement in instance.Data?.Where(de =>
6767
de.References != null &&
6868
de.References.Exists(r =>
@@ -92,8 +92,8 @@ private async Task RemoveFieldsOnTaskComplete(Instance instance, List<DataType>
9292
{
9393
// Download the data
9494
Type modelType = _appModel.GetModelType(dataType.AppLogic.ClassRef);
95-
var instanceGuid = Guid.Parse(instance.Id.Split("/")[1]);
96-
var dataGuid = Guid.Parse(dataElement.Id);
95+
Guid instanceGuid = Guid.Parse(instance.Id.Split("/")[1]);
96+
Guid dataGuid = Guid.Parse(dataElement.Id);
9797
string app = instance.AppId.Split("/")[1];
9898
int instanceOwnerPartyId = int.Parse(instance.InstanceOwner.PartyId);
9999
object data = await _dataClient.GetFormData(
@@ -102,8 +102,9 @@ private async Task RemoveFieldsOnTaskComplete(Instance instance, List<DataType>
102102
// Remove hidden data before validation, ignore hidden rows.
103103
if (_appSettings.Value?.RemoveHiddenData == true)
104104
{
105-
var layoutSet = _appResources.GetLayoutSetForTask(dataType.TaskId);
106-
var evaluationState = await _layoutEvaluatorStateInitializer.Init(instance, data, layoutSet?.Id);
105+
LayoutSet? layoutSet = _appResources.GetLayoutSetForTask(dataType.TaskId);
106+
LayoutEvaluatorState evaluationState =
107+
await _layoutEvaluatorStateInitializer.Init(instance, data, layoutSet?.Id);
107108
LayoutEvaluator.RemoveHiddenData(evaluationState, RowRemovalOption.Ignore);
108109
}
109110

@@ -127,14 +128,15 @@ private async Task RemoveFieldsOnTaskComplete(Instance instance, List<DataType>
127128
if (dataType.AppLogic.ShadowFields.SaveToDataType != null)
128129
{
129130
// Save the shadow fields to another data type
130-
var saveToDataType = dataTypesToLock.Find(dt => dt.Id == dataType.AppLogic.ShadowFields.SaveToDataType);
131+
DataType? saveToDataType =
132+
dataTypesToLock.Find(dt => dt.Id == dataType.AppLogic.ShadowFields.SaveToDataType);
131133
if (saveToDataType == null)
132134
{
133135
throw new ProcessException($"SaveToDataType {dataType.AppLogic.ShadowFields.SaveToDataType} not found");
134136
}
135137

136138
Type saveToModelType = _appModel.GetModelType(saveToDataType.AppLogic.ClassRef);
137-
var updatedData = JsonSerializer.Deserialize(serializedData, saveToModelType);
139+
object? updatedData = JsonSerializer.Deserialize(serializedData, saveToModelType);
138140
await _dataClient.InsertFormData(updatedData, instanceGuid, saveToModelType ?? modelType, instance.Org, app, instanceOwnerPartyId, saveToDataType.Id);
139141
}
140142
else

‎src/Altinn.App.Core/Internal/Process/ProcessTasks/Common/ProcessTaskInitializer.cs‎

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,16 @@ public class ProcessTaskInitializer : IProcessTaskInitializer
2222
private readonly IInstantiationProcessor _instantiationProcessor;
2323
private readonly IInstanceClient _instanceClient;
2424

25-
/// <inheritdoc/>
25+
/// <summary>
26+
/// Initializes a new instance of the <see cref="ProcessTaskInitializer"/> class.
27+
/// </summary>
28+
/// <param name="logger"></param>
29+
/// <param name="appMetadata"></param>
30+
/// <param name="dataClient"></param>
31+
/// <param name="prefillService"></param>
32+
/// <param name="appModel"></param>
33+
/// <param name="instantiationProcessor"></param>
34+
/// <param name="instanceClient"></param>
2635
public ProcessTaskInitializer(ILogger<ProcessTaskInitializer> logger,
2736
IAppMetadata appMetadata,
2837
IDataClient dataClient,
@@ -53,44 +62,44 @@ public async Task Initialize(string taskId, Instance instance, Dictionary<string
5362
_logger.LogDebug("Auto create data element: {DataTypeId}", dataType.Id);
5463

5564
DataElement? dataElement = instance.Data?.Find(d => d.DataType == dataType.Id);
56-
57-
if (dataElement == null)
65+
if (dataElement != null)
5866
{
59-
dynamic data = _appModel.Create(dataType.AppLogic.ClassRef);
67+
continue;
68+
}
6069

61-
// runs prefill from repo configuration if config exists
62-
await _prefillService.PrefillDataModel(instance.InstanceOwner.PartyId, dataType.Id, data, prefill);
63-
await _instantiationProcessor.DataCreation(instance, data, prefill);
70+
dynamic data = _appModel.Create(dataType.AppLogic.ClassRef);
6471

65-
Type type = _appModel.GetModelType(dataType.AppLogic.ClassRef);
72+
// runs prefill from repo configuration if config exists
73+
await _prefillService.PrefillDataModel(instance.InstanceOwner.PartyId, dataType.Id, data, prefill);
74+
await _instantiationProcessor.DataCreation(instance, data, prefill);
6675

67-
ObjectUtils.InitializeAltinnRowId(data);
76+
Type type = _appModel.GetModelType(dataType.AppLogic.ClassRef);
6877

69-
DataElement createdDataElement = await _dataClient.InsertFormData(instance, dataType.Id, data, type);
70-
instance.Data ??= [];
71-
instance.Data.Add(createdDataElement);
78+
ObjectUtils.InitializeAltinnRowId(data);
7279

73-
await UpdatePresentationTextsOnInstance(instance, dataType.Id, data);
74-
await UpdateDataValuesOnInstance(instance, dataType.Id, data);
80+
DataElement createdDataElement = await _dataClient.InsertFormData(instance, dataType.Id, data, type);
81+
instance.Data ??= [];
82+
instance.Data.Add(createdDataElement);
7583

76-
_logger.LogDebug("Created data element: {CreatedDataElementId}", createdDataElement.Id);
77-
}
84+
await UpdatePresentationTextsOnInstance(instance, dataType.Id, data);
85+
await UpdateDataValuesOnInstance(instance, dataType.Id, data);
86+
87+
_logger.LogDebug("Created data element: {CreatedDataElementId}", createdDataElement.Id);
7888
}
7989
}
8090

81-
/// <inheritdoc />
82-
public async Task UpdatePresentationTextsOnInstance(Instance instance, string dataType, dynamic data)
91+
private async Task UpdatePresentationTextsOnInstance(Instance instance, string dataType, dynamic data)
8392
{
8493
ApplicationMetadata applicationMetadata = await _appMetadata.GetApplicationMetadata();
85-
var updatedValues = DataHelper.GetUpdatedDataValues(
94+
dynamic? updatedValues = DataHelper.GetUpdatedDataValues(
8695
applicationMetadata?.PresentationFields,
8796
instance.PresentationTexts,
8897
dataType,
8998
data);
9099

91100
if (updatedValues.Count > 0)
92101
{
93-
var updatedInstance = await _instanceClient.UpdatePresentationTexts(
102+
Instance updatedInstance = await _instanceClient.UpdatePresentationTexts(
94103
int.Parse(instance.Id.Split("/")[0]),
95104
Guid.Parse(instance.Id.Split("/")[1]),
96105
new PresentationTexts { Texts = updatedValues });
@@ -99,19 +108,18 @@ public async Task UpdatePresentationTextsOnInstance(Instance instance, string da
99108
}
100109
}
101110

102-
/// <inheritdoc />
103-
public async Task UpdateDataValuesOnInstance(Instance instance, string dataType, object data)
111+
private async Task UpdateDataValuesOnInstance(Instance instance, string dataType, object data)
104112
{
105113
ApplicationMetadata applicationMetadata = await _appMetadata.GetApplicationMetadata();
106-
var updatedValues = DataHelper.GetUpdatedDataValues(
114+
Dictionary<string, string?> updatedValues = DataHelper.GetUpdatedDataValues(
107115
applicationMetadata?.DataFields,
108116
instance.DataValues,
109117
dataType,
110118
data);
111119

112120
if (updatedValues.Count > 0)
113121
{
114-
var updatedInstance = await _instanceClient.UpdateDataValues(
122+
Instance updatedInstance = await _instanceClient.UpdateDataValues(
115123
int.Parse(instance.Id.Split("/")[0]),
116124
Guid.Parse(instance.Id.Split("/")[1]),
117125
new DataValues { Values = updatedValues });

‎src/Altinn.App.Core/Internal/Process/ServiceTasks/EformidlingServiceTask.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public async Task Execute(string taskId, Instance instance)
4545
{
4646
if (_eFormidlingService != null)
4747
{
48-
var updatedInstance = await _instanceClient.GetInstance(instance);
48+
Instance updatedInstance = await _instanceClient.GetInstance(instance);
4949
await _eFormidlingService.SendEFormidlingShipment(updatedInstance);
5050
}
5151
else

0 commit comments

Comments
 (0)