Skip to content

[NAE-2442] Fix dataset update from database and action handling #444

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

Open
renczesstefan wants to merge 2 commits into
base: release/7.0.0-rev10
Choose a base branch
from
Open

[NAE-2442] Fix dataset update from database and action handling #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e86a370
[NAE-2442] Fix dataset update from database and action handling
renczesstefan May 27, 2026
ce8003c
[NAE-2442] Fix dataset update from database and action handling
renczesstefan May 27, 2026
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
2 changes: 1 addition & 1 deletion application-engine/src/main/java/com/netgrif/application/engine/actions/ActionApiImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public GetDataEventOutcome getData(String taskId, Map<String, String> params) {
}

@Override
public SetDataEventOutcome setData(String taskId, Map<String, Map<String, String>> dataSet, Map<String, String> params) throws JsonProcessingException {
public SetDataEventOutcome setData(String taskId, Map<String, Map<String, Object>> dataSet, Map<String, String> params) throws JsonProcessingException {
log.debug("Setting data for task [{}] with params: [{}]", taskId, params == null ? "null" : params.toString());
ObjectMapper mapper = new ObjectMapper();
String json = mapper.writeValueAsString(dataSet);
Expand Down
6 changes: 6 additions & 0 deletions ...on-engine/src/main/java/com/netgrif/application/engine/workflow/service/EventService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ public List<EventOutcome> runActions(List<Action> actions, Case useCase, Optiona
List<Function> functions = useCase == null ? Collections.emptyList() : useCase.getPetriNet().getFunctions();
actions.forEach(action -> {
List<EventOutcome> outcomes = actionsRunner.run(action, useCase, task, params, functions);
if (useCase != null) {
workflowService.updateCaseFromDb(useCase);
}
Comment thread
renczesstefan marked this conversation as resolved.
outcomes.stream().filter(SetDataEventOutcome.class::isInstance)
.forEach(outcome -> {
if (((SetDataEventOutcome) outcome).getChangedFields().isEmpty()) return;
Expand All @@ -75,6 +78,9 @@ public List<EventOutcome> runEventActions(Case useCase, Task task, List<Action>
List<Function> functions = useCase == null ? Collections.emptyList() : useCase.getPetriNet().getFunctions();
actions.forEach(action -> {
List<EventOutcome> outcomes = actionsRunner.run(action, useCase, taskOpt, params, functions);
if (useCase != null) {
workflowService.updateCaseFromDb(useCase);
}
outcomes.stream().filter(SetDataEventOutcome.class::isInstance)
.forEach(outcome -> {
if (((SetDataEventOutcome) outcome).getChangedFields().isEmpty()) return;
Expand Down
10 changes: 10 additions & 0 deletions ...engine/src/main/java/com/netgrif/application/engine/workflow/service/WorkflowService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,16 @@ public Case resolveActorRef(Case useCase, boolean canSaveUseCase) {
return useCase;
}

@Override
public void updateCaseFromDb(Case useCase) {
Case actual = findOne(useCase.getStringId());
actual.getDataSet().forEach((id, dataField) -> {
if (dataField.isNewerThen(useCase.getDataField(id))) {
useCase.getDataSet().put(id, dataField);
}
});
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

/**
* Resolves actor permissions for the useCase based on the actor list data field.
*
Expand Down
2 changes: 2 additions & 0 deletions ...ain/java/com/netgrif/application/engine/workflow/service/interfaces/IWorkflowService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ public interface IWorkflowService {

Case resolveActorRef(Case useCase, boolean canSaveUseCase);

void updateCaseFromDb(Case useCase);

CreateCaseEventOutcome createCase(CreateCaseParams createCaseParams);

Page<Case> findAllByAuthor(String authorId, String petriNet, Pageable pageable);
Expand Down
2 changes: 1 addition & 1 deletion ...dapter/src/main/java/com/netgrif/application/engine/adapter/spring/actions/ActionApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public interface ActionApi {
* @return the outcome of the set data operation
* @throws JsonProcessingException if there is an error processing JSON data
*/
SetDataEventOutcome setData(String taskId, Map<String, Map<String, String>> dataSet, Map<String, String> params) throws JsonProcessingException;
SetDataEventOutcome setData(String taskId, Map<String, Map<String, Object>> dataSet, Map<String, String> params) throws JsonProcessingException;

/**
* Finds a specific case by its ID.
Expand Down
Loading