nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-550: When completing a Task twice, just return the completed Task

This commit is contained in:
BVier 2018-06-06 16:10:40 +02:00 committed by Holger Hagen
parent 51d53525da
commit 38a9e82309
3 changed files with 90 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/taskana-core/src/main/java/pro/taskana/TaskService.java
View File

@ -95,6 +95,7 @@ public interface TaskService {
/**
* Complete a claimed Task as owner/admin and update State and Timestamps.
* If task is already completed, the task is returned as itself.
*
* @param taskId
* - Id of the Task which should be completed.
@ -113,6 +114,7 @@ public interface TaskService {
/**
* Complete a Task and update State and Timestamps in every case if the Task exists.
* If task is already completed, the task is returned as itself.
*
* @param taskId
* - Id of the Task which should be completed.

4
lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java
View File

@ -196,6 +196,10 @@ public class TaskServiceImpl implements TaskService {
taskanaEngine.openConnection();
task = (TaskImpl) this.getTask(taskId);
if (task.getState() == TaskState.COMPLETED) {
return task;
}
// check pre-conditions for non-forced invocation
if (!isForced) {
if (task.getClaimed() == null || task.getState() != TaskState.CLAIMED) {

84
lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java Normal file
View File

@ -0,0 +1,84 @@
package acceptance.task;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import acceptance.AbstractAccTest;
import pro.taskana.Task;
import pro.taskana.TaskService;
import pro.taskana.exceptions.InvalidOwnerException;
import pro.taskana.exceptions.InvalidStateException;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.exceptions.TaskNotFoundException;
import pro.taskana.security.JAASRunner;
import pro.taskana.security.WithAccessId;
/**
* Acceptance tests for all claim and complete scenarios.
*/
@RunWith(JAASRunner.class)
public class CompleteTaskAccTest extends AbstractAccTest {
public CompleteTaskAccTest() {
super();
}
@WithAccessId(
userName = "user_1_1",
groupNames = {"group_1"})
@Test
public void testCompleteTask()
throws TaskNotFoundException, InvalidStateException, InvalidOwnerException, NotAuthorizedException {
TaskService taskService = taskanaEngine.getTaskService();
Task completedTask = taskService.completeTask("TKI:000000000000000000000000000000000001");
assertNotNull(completedTask);
}
@WithAccessId(
userName = "user_1_1",
groupNames = {"group_1"})
@Test
public void testCompleteTaskTwice() throws TaskNotFoundException, InvalidStateException, InvalidOwnerException, NotAuthorizedException {
TaskService taskService = taskanaEngine.getTaskService();
Task completedTask = taskService.completeTask("TKI:000000000000000000000000000000000002");
Task completedTask2 = taskService.completeTask("TKI:000000000000000000000000000000000002");
assertEquals(completedTask, completedTask2);
}
@WithAccessId(
userName = "user_1_1",
groupNames = {"group_1"})
@Test
public void testCompleteTaskThrowsErrors() {
TaskService taskService = taskanaEngine.getTaskService();
try {
taskService.completeTask("TKI:0000000000000000000000000000000000xx");
} catch (Exception e) {
Assert.assertEquals(TaskNotFoundException.class, e.getClass());
}
try {
taskService.completeTask("TKI:000000000000000000000000000000000004");
} catch (Exception e) {
Assert.assertEquals(NotAuthorizedException.class, e.getClass());
}
try {
taskService.completeTask("TKI:000000000000000000000000000000000025");
} catch (Exception e) {
Assert.assertEquals(InvalidStateException.class, e.getClass());
}
try {
taskService.completeTask("TKI:000000000000000000000000000000000026");
} catch (Exception e) {
Assert.assertEquals(InvalidOwnerException.class, e.getClass());
}
}
}