Skip to content

fixing overwriting of workflowInstance #907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 3, 2023
Merged

fixing overwriting of workflowInstance #907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02e0b20
fixing overwriting of workflowInstance
neildsouth Nov 3, 2023
03ab167
fixup test
neildsouth Nov 3, 2023
c4cea6b
fixing sonarcloud gripes
neildsouth Nov 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,10 @@ private async Task ProcessArtifactReceivedOutputs(ArtifactsReceivedEvent message
}
}

var currentTask = workflowInstance.Tasks?.Find(t => t.TaskId == taskId);

currentTask!.OutputArtifacts = validArtifacts; // added here are the parent function saves the object !

_logger.LogDebug($"adding files to workflowInstance {workflowInstance.Id} :Task {taskId} : {JsonConvert.SerializeObject(validArtifacts)}");
await _workflowInstanceRepository.UpdateTaskOutputArtifactsAsync(workflowInstance.Id, taskId, validArtifacts);
}
Expand Down Expand Up @@ -682,7 +686,7 @@ private async Task<bool> HandleOutputArtifacts(WorkflowInstance workflowInstance
return false;
}

var currentTask = workflowInstance.Tasks?.FirstOrDefault(t => t.TaskId == task.TaskId);
var currentTask = workflowInstance.Tasks?.Find(t => t.TaskId == task.TaskId);

if (currentTask is not null)
{
Expand Down
3 changes: 2 additions & 1 deletion tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3161,6 +3161,7 @@ public async Task ArtifactReceveid_Valid_ReturnesTrue()

Assert.True(result);
}

[Fact]
public async Task ProcessArtifactReceived_Calls_WorkflowInstanceRepository_UpdateTaskOutputArtifactsAsync()
{
Expand All @@ -3174,7 +3175,7 @@ public async Task ProcessArtifactReceived_Calls_WorkflowInstanceRepository_Updat
var workflowInstance = new WorkflowInstance
{
WorkflowId = "789", Tasks = new List<TaskExecution>()
{ new TaskExecution() { TaskId = "not456" } }
{ new TaskExecution() { TaskId = "456" } }
};
_workflowInstanceRepository.Setup(w => w.GetByWorkflowInstanceIdAsync(message.WorkflowInstanceId))!
.ReturnsAsync(workflowInstance);
Expand Down