Review: Handling tasks by ID instead of project ID and task number

tolgee · Jan 14, 2025 · 9e937bf · 9e937bf
1 parent 2db986d
commit 9e937bf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/ee/backend/app/src/main/kotlin/io/tolgee/ee/component/TaskNotificationEnhancer.kt b/ee/backend/app/src/main/kotlin/io/tolgee/ee/component/TaskNotificationEnhancer.kt
@@ -18,7 +18,7 @@ class TaskNotificationEnhancer(
 
     notifications.forEach { (source, target) ->
       target.linkedTask =
-        convertedTasks.find { it.project.id == source.project?.id && it.number == source.linkedTask?.number }
+        convertedTasks[source.id]
           ?.let { taskModelAssembler.toModel(it) }
     }
   }

diff --git a/ee/backend/app/src/main/kotlin/io/tolgee/ee/service/TaskService.kt b/ee/backend/app/src/main/kotlin/io/tolgee/ee/service/TaskService.kt
@@ -468,9 +468,13 @@ class TaskService(
     }
   }
 
-  fun getTasksWithScope(taskIds: List<Long>): List<TaskWithScopeView> {
+  fun getTasksWithScope(taskIds: List<Long>): Map<Long, TaskWithScopeView> {
     val tasks = taskRepository.findAllById(taskIds)
-    return getTasksWithScope(tasks)
+    val taskIdsWithProjectIdAndNumber = tasks.associate { (it.project.id to it.number) to it.id }
+    val tasksWithScope = getTasksWithScope(tasks)
+    return tasksWithScope.associateBy {
+      taskIdsWithProjectIdAndNumber[it.project.id to it.number] ?: throw IllegalStateException("Item not found")
+    }
   }
 
   private fun getTasksWithScope(tasks: Collection<Task>): List<TaskWithScopeView> {