Skip to content

added a deleted() check if an IdentityLink is already deleted or not. #4043

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 1 commit into from
May 9, 2025
Merged

added a deleted() check if an IdentityLink is already deleted or not. #4043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 34 additions & 0 deletions ...s/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/task/CmmnTaskServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
import org.flowable.task.api.Task;
import org.flowable.task.api.TaskQuery;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.flowable.task.service.impl.persistence.entity.TaskEntityImpl;
import org.junit.Test;

/**
Expand Down Expand Up @@ -362,6 +363,39 @@ public void testTaskCompletionBuilder() {

}

@Test
public void testTaskIdentityLinkCountWithDeletionOfSameLink() {
Task task = cmmnTaskService.createTaskBuilder().
name("testName").
identityLinks(getDefaultIdentityLinks()).
create();

TaskEntityImpl updatedParentTask = (TaskEntityImpl) cmmnTaskService.createTaskQuery().taskId(task.getId()).singleResult();
assertThat(updatedParentTask.getIdentityLinkCount()).isEqualTo(2);

cmmnEngineConfiguration.getCommandExecutor().execute(
commandContext -> {
cmmnTaskService.deleteUserIdentityLink(task.getId(), "testUserFromBuilder", IdentityLinkType.CANDIDATE);
cmmnTaskService.deleteUserIdentityLink(task.getId(), "testUserFromBuilder", IdentityLinkType.CANDIDATE);
return null;
}
);
updatedParentTask = (TaskEntityImpl) cmmnTaskService.createTaskQuery().taskId(task.getId()).singleResult();
assertThat(updatedParentTask.getIdentityLinkCount()).isEqualTo(1);

cmmnEngineConfiguration.getCommandExecutor().execute(
commandContext -> {
cmmnTaskService.deleteGroupIdentityLink(task.getId(), "testGroupFromBuilder", IdentityLinkType.CANDIDATE);
cmmnTaskService.deleteGroupIdentityLink(task.getId(), "testGroupFromBuilder", IdentityLinkType.CANDIDATE);
return null;
}
);
updatedParentTask = (TaskEntityImpl) cmmnTaskService.createTaskQuery().taskId(task.getId()).singleResult();
assertThat(updatedParentTask.getIdentityLinkCount()).isEqualTo(0);

cmmnTaskService.deleteTask(task.getId(),true);

}
private static Set<IdentityLinkEntityImpl> getDefaultIdentityLinks() {
IdentityLinkEntityImpl identityLinkEntityCandidateUser = new IdentityLinkEntityImpl();
identityLinkEntityCandidateUser.setUserId("testUserFromBuilder");
Expand Down
33 changes: 33 additions & 0 deletions modules/flowable-engine/src/test/java/org/flowable/engine/test/api/task/TaskServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
import org.flowable.task.service.TaskPostProcessor;
import org.flowable.task.service.TaskServiceConfiguration;
import org.flowable.task.service.impl.persistence.CountingTaskEntity;
import org.flowable.task.service.impl.persistence.entity.TaskEntityImpl;
import org.flowable.variable.api.history.HistoricVariableInstance;
import org.flowable.variable.api.persistence.entity.VariableInstance;
import org.junit.jupiter.api.AfterEach;
Expand Down Expand Up @@ -152,6 +153,38 @@ public void testBuilderCreateTaskWithParent() {
}
}

@Test
public void testTaskIdentityLinkCountWithDeletionOfSameLink() {
task = taskService.createTaskBuilder().
name("testName").
identityLinks(getDefaultIdentityLinks()).
create();

TaskEntityImpl updatedParentTask = (TaskEntityImpl) taskService.createTaskQuery().taskId(task.getId()).singleResult();
assertThat(updatedParentTask.getIdentityLinkCount()).isEqualTo(2);

processEngineConfiguration.getCommandExecutor().execute(
commandContext -> {
taskService.deleteUserIdentityLink(task.getId(), "testUserBuilder", IdentityLinkType.CANDIDATE);
taskService.deleteUserIdentityLink(task.getId(), "testUserBuilder", IdentityLinkType.CANDIDATE);
return null;
}
);
updatedParentTask = (TaskEntityImpl) taskService.createTaskQuery().taskId(task.getId()).singleResult();
assertThat(updatedParentTask.getIdentityLinkCount()).isEqualTo(1);

processEngineConfiguration.getCommandExecutor().execute(
commandContext -> {
taskService.deleteGroupIdentityLink(task.getId(), "testGroupBuilder", IdentityLinkType.CANDIDATE);
taskService.deleteGroupIdentityLink(task.getId(), "testGroupBuilder", IdentityLinkType.CANDIDATE);
return null;
}
);
updatedParentTask = (TaskEntityImpl) taskService.createTaskQuery().taskId(task.getId()).singleResult();
assertThat(updatedParentTask.getIdentityLinkCount()).isEqualTo(0);

}

@Test
public void testCreateTaskWithOwnerAssigneeAndIdentityLinks() {
task = taskService.createTaskBuilder().
Expand Down
13 changes: 8 additions & 5 deletions .../flowable/identitylink/service/impl/persistence/entity/IdentityLinkEntityManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,10 @@ public List<IdentityLinkEntity> deleteTaskIdentityLink(String taskId, List<Ident

List<IdentityLinkEntity> removedIdentityLinkEntities = new ArrayList<>();
for (IdentityLinkEntity identityLink : identityLinks) {
delete(identityLink);
removedIdentityLinkEntities.add(identityLink);
if (!identityLink.isDeleted()) {
delete(identityLink);
removedIdentityLinkEntities.add(identityLink);
}
}

if (currentIdentityLinks != null) { // The currentIdentityLinks might contain identity links that are in the cache, but not yet in the db
Expand All @@ -261,9 +263,10 @@ public List<IdentityLinkEntity> deleteTaskIdentityLink(String taskId, List<Ident
if ((userId != null && userId.equals(identityLinkEntity.getUserId()))
|| (groupId != null && groupId.equals(identityLinkEntity.getGroupId()))) {

delete(identityLinkEntity);
removedIdentityLinkEntities.add(identityLinkEntity);

if (!identityLinkEntity.isDeleted()) {
delete(identityLinkEntity);
removedIdentityLinkEntities.add(identityLinkEntity);
}
}
}
}
Expand Down