From 0994f14b3bfa22e0ea8d07d333d5cb90f5b37287 Mon Sep 17 00:00:00 2001
From: tge20 <72377965+tge20@users.noreply.github.com>
Date: Wed, 20 Jan 2021 09:06:03 +0100
Subject: [PATCH] TSK-1498: Created specific error message if workbasket
 already exists (#1399)

---
 .../api/exceptions/WorkbasketAlreadyExistException.java   | 8 +++-----
 .../test/java/acceptance/task/CompleteTaskAccTest.java    | 2 +-
 .../test/java/acceptance/task/TransferTaskAccTest.java    | 7 ++++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/exceptions/WorkbasketAlreadyExistException.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/exceptions/WorkbasketAlreadyExistException.java
index 2bf55246b..183ec8301 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/exceptions/WorkbasketAlreadyExistException.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/exceptions/WorkbasketAlreadyExistException.java
@@ -8,12 +8,10 @@ public class WorkbasketAlreadyExistException extends TaskanaException {
 
   public WorkbasketAlreadyExistException(Workbasket workbasket) {
     super(
-        "ID='"
-            + workbasket.getId()
-            + "', KEY=' "
+        "A workbasket with key '"
             + workbasket.getKey()
-            + "', DOMAIN='"
+            + "' already exists in domain '"
             + workbasket.getDomain()
-            + "';");
+            + "'.");
   }
 }
diff --git a/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java
index 780a9a0e3..0862e171b 100644
--- a/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java
+++ b/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java
@@ -192,7 +192,7 @@ class CompleteTaskAccTest extends AbstractAccTest {
     assertThat(createdTask).isNotNull();
     assertThat(createdTask.getOwner()).isEqualTo("other_user");
 
-    Instant beforeForceClaim = Instant.now();
+    Instant beforeForceClaim = Instant.now().truncatedTo(ChronoUnit.MILLIS);
     Task taskAfterClaim = TASK_SERVICE.forceClaim(createdTask.getId());
 
     assertThat(taskAfterClaim.getOwner())
diff --git a/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java
index ec1df3999..b8a37d196 100644
--- a/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java
+++ b/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java
@@ -6,6 +6,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import acceptance.AbstractAccTest;
 import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -197,7 +198,7 @@ class TransferTaskAccTest extends AbstractAccTest {
   @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN)
   @Test
   void should_BulkTransferTasks_When_WorkbasketIdIsProvided() throws Exception {
-    final Instant before = Instant.now();
+    final Instant before = Instant.now().truncatedTo(ChronoUnit.MILLIS);
     TaskService taskService = taskanaEngine.getTaskService();
     ArrayList<String> taskIdList = new ArrayList<>();
     taskIdList.add("TKI:000000000000000000000000000000000004");
@@ -236,7 +237,7 @@ class TransferTaskAccTest extends AbstractAccTest {
     TaskService taskService = taskanaEngine.getTaskService();
     final Workbasket wb =
         taskanaEngine.getWorkbasketService().getWorkbasket("USER-1-1", "DOMAIN_A");
-    final Instant before = Instant.now();
+    final Instant before = Instant.now().truncatedTo(ChronoUnit.MILLIS);
     ArrayList<String> taskIdList = new ArrayList<>();
     taskIdList.add("TKI:000000000000000000000000000000000006"); // working
     taskIdList.add("TKI:000000000000000000000000000000000041"); // NotAuthorized READ
@@ -358,7 +359,7 @@ class TransferTaskAccTest extends AbstractAccTest {
   @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN)
   @Test
   void should_BulkTransferTasks_When_WorkbasketKeyAndDomainIsProvided() throws Exception {
-    final Instant before = Instant.now();
+    final Instant before = Instant.now().truncatedTo(ChronoUnit.MILLIS);
     TaskService taskService = taskanaEngine.getTaskService();
     List<String> taskIdList = new ArrayList<>();