Closes #2296 - add ownerLongName during update

lib/taskana-core-test/src/test/java/acceptance/task/update/UpdateTaskAccTest.java

@@ -51,8 +51,10 @@ import pro.taskana.testapi.TaskanaInject;
 import pro.taskana.testapi.TaskanaIntegrationTest;
 import pro.taskana.testapi.builder.ObjectReferenceBuilder;
 import pro.taskana.testapi.builder.TaskBuilder;
+import pro.taskana.testapi.builder.UserBuilder;
 import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
 import pro.taskana.testapi.security.WithAccessId;
+import pro.taskana.user.api.UserService;
 import pro.taskana.workbasket.api.WorkbasketPermission;
 import pro.taskana.workbasket.api.WorkbasketService;
 import pro.taskana.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException;
@@ -61,6 +63,8 @@ import pro.taskana.workbasket.api.models.WorkbasketSummary;
 @TaskanaIntegrationTest
 public class UpdateTaskAccTest {
   @TaskanaInject TaskService taskService;
+  @TaskanaInject UserService userService;
+
   @TaskanaInject ClassificationService classificationService;
   @TaskanaInject WorkbasketService workbasketService;
 
@@ -569,12 +573,30 @@ public class UpdateTaskAccTest {
 
   @Nested
   @TestInstance(Lifecycle.PER_CLASS)
-  class WithEnforceServiceLevelDisabled implements TaskanaConfigurationModifier {
+  class WithEnforceServiceLevelDisabledAndAdditionalUserInfoEnabled
+      implements TaskanaConfigurationModifier {
     @TaskanaInject TaskService taskService;
 
     @Override
     public TaskanaConfiguration.Builder modify(TaskanaConfiguration.Builder builder) {
-      return builder.enforceServiceLevel(false);
+      return builder.addAdditionalUserInfo(true).enforceServiceLevel(false);
+    }
+
+    @WithAccessId(user = "businessadmin")
+    @BeforeAll
+    void setup() throws Exception {
+      UserBuilder.newUser()
+          .id("user-1-2")
+          .firstName("Max")
+          .lastName("Mustermann")
+          .longName("Max Mustermann")
+          .buildAndStore(userService, "businessadmin");
+      UserBuilder.newUser()
+          .id("user-1-1")
+          .firstName("Ella")
+          .lastName("Mustermann")
+          .longName("Ella Mustermann")
+          .buildAndStore(userService, "businessadmin");
     }
 
     @WithAccessId(user = "user-1-2")
@@ -596,5 +618,42 @@ public class UpdateTaskAccTest {
       assertThat(updatedTask.getPlanned()).isEqualTo(planned);
       assertThat(updatedTask.getDue()).isEqualTo(due);
     }
+
+    @WithAccessId(user = "user-1-2")
+    @Test
+    void should_SetOwnerLongName_When_NotChangingOwner() throws Exception {
+      Task task =
+          TaskBuilder.newTask()
+              .owner("user-1-2")
+              .classificationSummary(defaultClassificationSummary)
+              .workbasketSummary(defaultWorkbasketSummary)
+              .primaryObjRef(defaultObjectReference)
+              .buildAndStore(taskService);
+
+      task.setNote("New Note");
+      Task updatedTask = taskService.updateTask(task);
+
+      assertThat(updatedTask.getNote()).isEqualTo("New Note");
+      assertThat(updatedTask.getOwner()).isEqualTo("user-1-2");
+      assertThat(updatedTask.getOwnerLongName()).isEqualTo("Max Mustermann");
+    }
+
+    @WithAccessId(user = "user-1-2")
+    @Test
+    void should_SetOwnerLongName_When_ChangingOwner() throws Exception {
+      Task task =
+          TaskBuilder.newTask()
+              .owner("user-1-2")
+              .classificationSummary(defaultClassificationSummary)
+              .workbasketSummary(defaultWorkbasketSummary)
+              .primaryObjRef(defaultObjectReference)
+              .buildAndStore(taskService);
+
+      task.setOwner("user-1-1");
+      Task updatedTask = taskService.updateTask(task);
+
+      assertThat(updatedTask.getOwner()).isEqualTo("user-1-1");
+      assertThat(updatedTask.getOwnerLongName()).isEqualTo("Ella Mustermann");
+    }
   }
 }

lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskServiceImpl.java

@@ -157,27 +157,21 @@ public class TaskServiceImpl implements TaskService {
 
   @Override
   public Task claim(String taskId)
-      throws TaskNotFoundException,
+      throws TaskNotFoundException, InvalidOwnerException, NotAuthorizedOnWorkbasketException,
-          InvalidOwnerException,
-          NotAuthorizedOnWorkbasketException,
           InvalidTaskStateException {
     return claim(taskId, false);
   }
 
   @Override
   public Task forceClaim(String taskId)
-      throws TaskNotFoundException,
+      throws TaskNotFoundException, InvalidOwnerException, NotAuthorizedOnWorkbasketException,
-          InvalidOwnerException,
-          NotAuthorizedOnWorkbasketException,
           InvalidTaskStateException {
     return claim(taskId, true);
   }
 
   @Override
   public Task cancelClaim(String taskId)
-      throws TaskNotFoundException,
+      throws TaskNotFoundException, InvalidOwnerException, NotAuthorizedOnWorkbasketException,
-          InvalidOwnerException,
-          NotAuthorizedOnWorkbasketException,
           InvalidTaskStateException {
     return this.cancelClaim(taskId, false);
   }
@@ -194,67 +188,51 @@ public class TaskServiceImpl implements TaskService {
 
   @Override
   public Task requestReview(String taskId)
-      throws InvalidTaskStateException,
+      throws InvalidTaskStateException, TaskNotFoundException, InvalidOwnerException,
-          TaskNotFoundException,
-          InvalidOwnerException,
           NotAuthorizedOnWorkbasketException {
     return requestReview(taskId, false);
   }
 
   @Override
   public Task forceRequestReview(String taskId)
-      throws InvalidTaskStateException,
+      throws InvalidTaskStateException, TaskNotFoundException, InvalidOwnerException,
-          TaskNotFoundException,
-          InvalidOwnerException,
           NotAuthorizedOnWorkbasketException {
     return requestReview(taskId, true);
   }
 
   @Override
   public Task requestChanges(String taskId)
-      throws InvalidTaskStateException,
+      throws InvalidTaskStateException, TaskNotFoundException, InvalidOwnerException,
-          TaskNotFoundException,
-          InvalidOwnerException,
           NotAuthorizedOnWorkbasketException {
     return requestChanges(taskId, false);
   }
 
   @Override
   public Task forceRequestChanges(String taskId)
-      throws InvalidTaskStateException,
+      throws InvalidTaskStateException, TaskNotFoundException, InvalidOwnerException,
-          TaskNotFoundException,
-          InvalidOwnerException,
           NotAuthorizedOnWorkbasketException {
     return requestChanges(taskId, true);
   }
 
   @Override
   public Task completeTask(String taskId)
-      throws TaskNotFoundException,
+      throws TaskNotFoundException, InvalidOwnerException, NotAuthorizedOnWorkbasketException,
-          InvalidOwnerException,
-          NotAuthorizedOnWorkbasketException,
           InvalidTaskStateException {
     return completeTask(taskId, false);
   }
 
   @Override
   public Task forceCompleteTask(String taskId)
-      throws TaskNotFoundException,
+      throws TaskNotFoundException, InvalidOwnerException, NotAuthorizedOnWorkbasketException,
-          InvalidOwnerException,
-          NotAuthorizedOnWorkbasketException,
           InvalidTaskStateException {
     return completeTask(taskId, true);
   }
 
   @Override
   public Task createTask(Task taskToCreate)
-      throws WorkbasketNotFoundException,
+      throws WorkbasketNotFoundException, ClassificationNotFoundException,
-          ClassificationNotFoundException,
+          TaskAlreadyExistException, InvalidArgumentException, AttachmentPersistenceException,
-          TaskAlreadyExistException,
+          ObjectReferencePersistenceException, NotAuthorizedOnWorkbasketException {
-          InvalidArgumentException,
-          AttachmentPersistenceException,
-          ObjectReferencePersistenceException,
-          NotAuthorizedOnWorkbasketException {
 
     if (createTaskPreprocessorManager.isEnabled()) {
       taskToCreate = createTaskPreprocessorManager.processTaskBeforeCreation(taskToCreate);
@@ -434,18 +412,14 @@ public class TaskServiceImpl implements TaskService {
 
   @Override
   public Task transfer(String taskId, String destinationWorkbasketId, boolean setTransferFlag)
-      throws TaskNotFoundException,
+      throws TaskNotFoundException, WorkbasketNotFoundException, NotAuthorizedOnWorkbasketException,
-          WorkbasketNotFoundException,
-          NotAuthorizedOnWorkbasketException,
           InvalidTaskStateException {
     return taskTransferrer.transfer(taskId, destinationWorkbasketId, setTransferFlag);
   }
 
   @Override
   public Task transfer(String taskId, String workbasketKey, String domain, boolean setTransferFlag)
-      throws TaskNotFoundException,
+      throws TaskNotFoundException, WorkbasketNotFoundException, NotAuthorizedOnWorkbasketException,
-          WorkbasketNotFoundException,
-          NotAuthorizedOnWorkbasketException,
           InvalidTaskStateException {
     return taskTransferrer.transfer(taskId, workbasketKey, domain, setTransferFlag);
   }
@@ -527,13 +501,9 @@ public class TaskServiceImpl implements TaskService {
 
   @Override
   public Task updateTask(Task task)
-      throws InvalidArgumentException,
+      throws InvalidArgumentException, TaskNotFoundException, ConcurrencyException,
-          TaskNotFoundException,
+          AttachmentPersistenceException, ObjectReferencePersistenceException,
-          ConcurrencyException,
+          ClassificationNotFoundException, NotAuthorizedOnWorkbasketException,
-          AttachmentPersistenceException,
-          ObjectReferencePersistenceException,
-          ClassificationNotFoundException,
-          NotAuthorizedOnWorkbasketException,
           InvalidTaskStateException {
     String userId = taskanaEngine.getEngine().getCurrentUserContext().getUserid();
     TaskImpl newTaskImpl = (TaskImpl) task;
@@ -582,8 +552,7 @@ public class TaskServiceImpl implements TaskService {
   @Override
   public BulkOperationResults<String, TaskanaException> transferTasks(
       String destinationWorkbasketId, List<String> taskIds, boolean setTransferFlag)
-      throws InvalidArgumentException,
+      throws InvalidArgumentException, WorkbasketNotFoundException,
-          WorkbasketNotFoundException,
           NotAuthorizedOnWorkbasketException {
     return taskTransferrer.transfer(taskIds, destinationWorkbasketId, setTransferFlag);
   }
@@ -594,8 +563,7 @@ public class TaskServiceImpl implements TaskService {
       String destinationWorkbasketDomain,
       List<String> taskIds,
       boolean setTransferFlag)
-      throws InvalidArgumentException,
+      throws InvalidArgumentException, WorkbasketNotFoundException,
-          WorkbasketNotFoundException,
           NotAuthorizedOnWorkbasketException {
     return taskTransferrer.transfer(
         taskIds, destinationWorkbasketKey, destinationWorkbasketDomain, setTransferFlag);
@@ -603,21 +571,15 @@ public class TaskServiceImpl implements TaskService {
 
   @Override
   public void deleteTask(String taskId)
-      throws TaskNotFoundException,
+      throws TaskNotFoundException, NotAuthorizedException, NotAuthorizedOnWorkbasketException,
-          NotAuthorizedException,
+          InvalidTaskStateException, InvalidCallbackStateException {
-          NotAuthorizedOnWorkbasketException,
-          InvalidTaskStateException,
-          InvalidCallbackStateException {
     deleteTask(taskId, false);
   }
 
   @Override
   public void forceDeleteTask(String taskId)
-      throws TaskNotFoundException,
+      throws TaskNotFoundException, NotAuthorizedException, NotAuthorizedOnWorkbasketException,
-          NotAuthorizedException,
+          InvalidTaskStateException, InvalidCallbackStateException {
-          NotAuthorizedOnWorkbasketException,
-          InvalidTaskStateException,
-          InvalidCallbackStateException {
     deleteTask(taskId, true);
   }
 
@@ -763,30 +725,22 @@ public class TaskServiceImpl implements TaskService {
 
   @Override
   public TaskComment updateTaskComment(TaskComment taskComment)
-      throws ConcurrencyException,
+      throws ConcurrencyException, TaskCommentNotFoundException, TaskNotFoundException,
-          TaskCommentNotFoundException,
+          InvalidArgumentException, NotAuthorizedOnTaskCommentException,
-          TaskNotFoundException,
-          InvalidArgumentException,
-          NotAuthorizedOnTaskCommentException,
           NotAuthorizedOnWorkbasketException {
     return taskCommentService.updateTaskComment(taskComment);
   }
 
   @Override
   public void deleteTaskComment(String taskCommentId)
-      throws TaskCommentNotFoundException,
+      throws TaskCommentNotFoundException, TaskNotFoundException, InvalidArgumentException,
-          TaskNotFoundException,
+          NotAuthorizedOnTaskCommentException, NotAuthorizedOnWorkbasketException {
-          InvalidArgumentException,
-          NotAuthorizedOnTaskCommentException,
-          NotAuthorizedOnWorkbasketException {
     taskCommentService.deleteTaskComment(taskCommentId);
   }
 
   @Override
   public TaskComment getTaskComment(String taskCommentid)
-      throws TaskCommentNotFoundException,
+      throws TaskCommentNotFoundException, TaskNotFoundException, InvalidArgumentException,
-          TaskNotFoundException,
-          InvalidArgumentException,
           NotAuthorizedOnWorkbasketException {
     return taskCommentService.getTaskComment(taskCommentid);
   }
@@ -911,9 +865,7 @@ public class TaskServiceImpl implements TaskService {
 
   @Override
   public Task terminateTask(String taskId)
-      throws TaskNotFoundException,
+      throws TaskNotFoundException, NotAuthorizedException, NotAuthorizedOnWorkbasketException,
-          NotAuthorizedException,
-          NotAuthorizedOnWorkbasketException,
           InvalidTaskStateException {
 
     taskanaEngine.getEngine().checkRoleMembership(TaskanaRole.ADMIN, TaskanaRole.TASK_ADMIN);
@@ -1257,9 +1209,7 @@ public class TaskServiceImpl implements TaskService {
   }
 
   private Task claim(String taskId, boolean forceClaim)
-      throws TaskNotFoundException,
+      throws TaskNotFoundException, InvalidOwnerException, NotAuthorizedOnWorkbasketException,
-          InvalidOwnerException,
-          NotAuthorizedOnWorkbasketException,
           InvalidTaskStateException {
     TaskImpl task;
     try {
@@ -1303,9 +1253,7 @@ public class TaskServiceImpl implements TaskService {
   }
 
   private Task requestReview(String taskId, boolean force)
-      throws TaskNotFoundException,
+      throws TaskNotFoundException, InvalidTaskStateException, InvalidOwnerException,
-          InvalidTaskStateException,
-          InvalidOwnerException,
           NotAuthorizedOnWorkbasketException {
     String userId = taskanaEngine.getEngine().getCurrentUserContext().getUserid();
     TaskImpl task;
@@ -1356,9 +1304,7 @@ public class TaskServiceImpl implements TaskService {
   }
 
   private Task requestChanges(String taskId, boolean force)
-      throws InvalidTaskStateException,
+      throws InvalidTaskStateException, TaskNotFoundException, InvalidOwnerException,
-          TaskNotFoundException,
-          InvalidOwnerException,
           NotAuthorizedOnWorkbasketException {
     String userId = taskanaEngine.getEngine().getCurrentUserContext().getUserid();
     TaskImpl task;
@@ -1487,9 +1433,7 @@ public class TaskServiceImpl implements TaskService {
   }
 
   private Task cancelClaim(String taskId, boolean forceUnclaim)
-      throws TaskNotFoundException,
+      throws TaskNotFoundException, InvalidOwnerException, NotAuthorizedOnWorkbasketException,
-          InvalidOwnerException,
-          NotAuthorizedOnWorkbasketException,
           InvalidTaskStateException {
     String userId = taskanaEngine.getEngine().getCurrentUserContext().getUserid();
     TaskImpl task;
@@ -1533,9 +1477,7 @@ public class TaskServiceImpl implements TaskService {
   }
 
   private Task completeTask(String taskId, boolean isForced)
-      throws TaskNotFoundException,
+      throws TaskNotFoundException, InvalidOwnerException, NotAuthorizedOnWorkbasketException,
-          InvalidOwnerException,
-          NotAuthorizedOnWorkbasketException,
           InvalidTaskStateException {
     String userId = taskanaEngine.getEngine().getCurrentUserContext().getUserid();
     TaskImpl task;
@@ -1578,11 +1520,8 @@ public class TaskServiceImpl implements TaskService {
   }
 
   private void deleteTask(String taskId, boolean forceDelete)
-      throws TaskNotFoundException,
+      throws TaskNotFoundException, NotAuthorizedException, NotAuthorizedOnWorkbasketException,
-          NotAuthorizedException,
+          InvalidTaskStateException, InvalidCallbackStateException {
-          NotAuthorizedOnWorkbasketException,
-          InvalidTaskStateException,
-          InvalidCallbackStateException {
     taskanaEngine.getEngine().checkRoleMembership(TaskanaRole.ADMIN);
     TaskImpl task;
     try {
@@ -1736,10 +1675,8 @@ public class TaskServiceImpl implements TaskService {
   }
 
   private void standardSettingsOnTaskCreation(TaskImpl task, Classification classification)
-      throws InvalidArgumentException,
+      throws InvalidArgumentException, ClassificationNotFoundException,
-          ClassificationNotFoundException,
+          AttachmentPersistenceException, ObjectReferencePersistenceException {
-          AttachmentPersistenceException,
-          ObjectReferencePersistenceException {
     final Instant now = Instant.now();
     task.setId(IdGenerator.generateWithPrefix(IdGenerator.ID_PREFIX_TASK));
     if (task.getExternalId() == null) {
@@ -2110,6 +2047,12 @@ public class TaskServiceImpl implements TaskService {
       throw new InvalidTaskStateException(
           oldTaskImpl.getId(), oldTaskImpl.getState(), TaskState.READY, TaskState.READY_FOR_REVIEW);
     }
+    if (isOwnerChanged && taskanaEngine.getEngine().getConfiguration().isAddAdditionalUserInfo()) {
+      User user = userMapper.findById(newTaskImpl.getOwner());
+      if (user != null) {
+        newTaskImpl.setOwnerLongName(user.getLongName());
+      }
+    }
   }
 
   private void updateClassificationSummary(TaskImpl newTaskImpl, TaskImpl oldTaskImpl)