Closes Taskana#2542 - Flag that counts the comments has been added

MM1277 · Mar 21, 2024 · e91ecb3 · e91ecb3
1 parent 83d6cba
commit e91ecb3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/...skana-core-test/src/test/java/acceptance/taskcomment/create/CreateTaskCommentAccTest.java b/...skana-core-test/src/test/java/acceptance/taskcomment/create/CreateTaskCommentAccTest.java
@@ -87,7 +87,7 @@ void should_CreateTaskComment_For_TaskThatAlreadyHasComments() throws Exception
         taskService.getTaskComments(taskWithComments.getId());
     assertThat(taskCommentsAfterInsert)
         .containsExactlyInAnyOrder(comment1, comment2, taskCommentToCreate);
-
+    assertThat(3 == taskService.getTask(taskWithComments.getId()).getNumberOfComments());
     // Deleting the comment so that the comments remain the same in different tests inside this
     // class
     taskService.deleteTaskComment(taskCommentToCreate.getId());

diff --git a/...skana-core-test/src/test/java/acceptance/taskcomment/delete/DeleteTaskCommentAccTest.java b/...skana-core-test/src/test/java/acceptance/taskcomment/delete/DeleteTaskCommentAccTest.java
@@ -84,6 +84,7 @@ void should_DeleteTaskComment_For_TaskCommentId() throws Exception {
 
     List<TaskComment> taskCommentsAfterDeletion = taskService.getTaskComments(task1.getId());
     assertThat(taskCommentsAfterDeletion).hasSize(0);
+    assertThat(0 == taskService.getTask(task1.getId()).getNumberOfComments());
   }
 
   @WithAccessId(user = "user-1-2", groups = "user-1-1")
@@ -104,6 +105,7 @@ void should_FailToDeleteTaskComment_When_UserHasNoAuthorization() throws Excepti
 
     List<TaskComment> taskCommentsAfterDeletion = taskService.getTaskComments(task1.getId());
     assertThat(taskCommentsAfterDeletion).hasSize(1);
+    assertThat(1 == taskService.getTask(task1.getId()).getNumberOfComments());
 
     taskanaEngine.runAsAdmin(
         () -> {

diff --git a/...skana-core-test/src/test/java/acceptance/taskcomment/update/UpdateTaskCommentAccTest.java b/...skana-core-test/src/test/java/acceptance/taskcomment/update/UpdateTaskCommentAccTest.java
@@ -76,6 +76,7 @@ void should_UpdateTaskComment_For_TaskComment() throws Exception {
     assertThat(taskCommentsAfterUpdate)
         .extracting(TaskComment::getTextField)
         .containsExactly("updated textfield");
+    assertThat(1 == taskService.getTask(task.getId()).getNumberOfComments());
   }
 
   @WithAccessId(user = "user-1-2")

diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskCommentServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskCommentServiceImpl.java
@@ -143,9 +143,9 @@ void deleteTaskComment(String taskCommentId)
           || taskanaEngine.getEngine().isUserInRole(TaskanaRole.ADMIN)
           || taskanaEngine.getEngine().isUserInRole(TaskanaRole.TASK_ADMIN)) {
 
-        taskCommentMapper.delete(taskCommentId);
         TaskImpl task =
             (TaskImpl) taskService.getTask(taskCommentMapper.findById(taskCommentId).getTaskId());
+        taskCommentMapper.delete(taskCommentId);
         taskMapper.decrementNumberOfComments(task.getId(), Instant.now());
         task.decrementNumberOfComments();