fix: put logined user on top of the list

JNU-econovation · Jul 24, 2024 · da3c1d6 · da3c1d6
1 parent 0272ebd
commit da3c1d6
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/main/java/gymmi/service/WorkspaceService.java b/src/main/java/gymmi/service/WorkspaceService.java
@@ -226,14 +226,21 @@ private void deleteTaskAndWorker(User loginedUser, Long workspaceId) {
     }
 
     public InsideWorkspaceResponse enterWorkspace(User logiendUser, Long workspaceId) {
-        validateIfWorkerIsInWorkspace(logiendUser.getId(), workspaceId);
+        Worker worker = validateIfWorkerIsInWorkspace(logiendUser.getId(), workspaceId);
 
         Workspace workspace = workspaceRepository.getWorkspaceById(workspaceId);
         List<Worker> sortedWorkers = workerRepository.getAllByWorkspaceIdOrderByContributedScore(workspaceId);
 
-        List<Integer> workerRanks = rankTied(sortedWorkers);
+        List<Worker> workers = sortedWorkers.stream()
+                .filter(w -> !w.equals(worker))
+                .toList();
+        workers.add(0, worker);
+
+        List<Integer> workerRanks = rankTied(workers);
+        // hot-fix
         int achievementScore = workspaceRepository.getAchievementScore(workspaceId);
 
+
         return InsideWorkspaceResponse.builder()
                 .workspace(workspace)
                 .achievementScore(achievementScore)