Merge pull request #249 from MOONSHOT-Team/feature/#248

[Fix] KeyResult, Task 생성, 삭제 시 Index 위치 조정 로직 변경
MOONSHOT-Team · Mar 12, 2024 · 4a4edd5 · 4a4edd5
2 parents b4ed228 + 52c0baa
commit 4a4edd5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/moonshot-api/src/main/java/org/moonshot/keyresult/service/KeyResultService.java b/moonshot-api/src/main/java/org/moonshot/keyresult/service/KeyResultService.java
@@ -92,9 +92,8 @@ public void createKeyResult(final KeyResultCreateRequestDto request, final Long
         validateActiveKRSizeExceeded(krList.size());
         validateIndexUnderMaximum(request.idx(), krList.size());
 
-        for (int i = request.idx(); i < krList.size(); i++) {
-            krList.get(i).incrementIdx();
-        }
+        keyResultRepository.bulkUpdateIdxIncrease(request.idx(), krList.size(), objective.getId(), -1L);
+
         KeyResult keyResult = keyResultRepository.save(KeyResult.builder()
                 .objective(objective)
                 .title(request.title())
@@ -113,6 +112,7 @@ public void deleteKeyResult(final Long keyResultId, final Long userId) {
         logRepository.deleteAllInBatch(logRepository.findAllByKeyResult(keyResult));
         taskRepository.deleteAllInBatch(taskRepository.findAllByKeyResult(keyResult));
         keyResultRepository.delete(keyResult);
+        keyResultRepository.bulkUpdateIdxDecrease(keyResult.getIdx(), 3, keyResult.getObjective().getId(), -1L);
     }
 
     public void deleteKeyResult(final Objective objective) {

diff --git a/moonshot-api/src/main/java/org/moonshot/objective/service/ObjectiveService.java b/moonshot-api/src/main/java/org/moonshot/objective/service/ObjectiveService.java
@@ -71,6 +71,8 @@ public DashboardResponseDto deleteObjective(final Long userId, final Long object
 
         keyResultService.deleteKeyResult(objective);
         objectiveRepository.delete(objective);
+        objectiveRepository.bulkUpdateIdxDecreaseAfter(objective.getIdx(), userId);
+
         return getObjectiveInDashboard(userId, null);
     }
 

diff --git a/moonshot-api/src/main/java/org/moonshot/task/service/TaskService.java b/moonshot-api/src/main/java/org/moonshot/task/service/TaskService.java
@@ -39,9 +39,8 @@ public void createTask(final TaskSingleCreateRequestDto request, final Long user
         validateActiveTaskSizeExceeded(taskList.size());
         validateIndexUnderMaximum(request.idx(), taskList.size());
 
-        for (int i = request.idx(); i < taskList.size(); i++) {
-            taskList.get(i).incrementIdx();
-        }
+        taskRepository.bulkUpdateTaskIdxIncrease(request.idx(), taskList.size(), keyResult.getId(), -1L);
+
         saveTask(keyResult, request);
     }
 
@@ -90,6 +89,7 @@ public void deleteTask(final Long userId, Long taskId) {
         validateUserAuthorization(task.getKeyResult().getObjective().getUser().getId(), userId);
 
         taskRepository.deleteById(taskId);
+        taskRepository.bulkUpdateTaskIdxDecrease(task.getIdx(), 3, task.getKeyResult().getId(), -1L);
     }
 
 }
diff --git a/moonshot-domain/src/main/java/org/moonshot/objective/repository/ObjectiveJpaRepository.java b/moonshot-domain/src/main/java/org/moonshot/objective/repository/ObjectiveJpaRepository.java
@@ -2,18 +2,15 @@
 
 import java.util.List;
 import java.util.Optional;
-
-import org.moonshot.keyresult.model.KeyResult;
 import org.moonshot.objective.model.Objective;
+import org.moonshot.user.model.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
-import org.moonshot.user.model.User;
 
 public interface ObjectiveJpaRepository extends JpaRepository<Objective, Long> {
 
-    Long countAllByUserAndIsClosed(User user, boolean isClosed);
     @Query("select o from Objective o join fetch o.user where o.id = :objective_id")
     Optional<Objective> findObjectiveAndUserById(@Param("objective_id") Long objectiveId);
     @Query("select distinct o from Objective o left join fetch o.keyResultList kr left join kr.taskList t where o.id = :objectiveId and o.isClosed = false")
@@ -23,13 +20,16 @@ public interface ObjectiveJpaRepository extends JpaRepository<Objective, Long> {
     @Modifying(clearAutomatically = true)
     @Query("UPDATE Objective o SET o.idx = o.idx + 1 WHERE o.user.id = :userId")
     void bulkUpdateIdxIncrease(@Param("userId") Long userId);
-    Long countAllByUserId(Long userId);
     @Modifying(clearAutomatically = true)
     @Query("UPDATE Objective o SET o.idx = o.idx + 1 WHERE o.idx >= :lBound AND o.idx < :uBound AND o.user.id = :userId AND o.id != :targetId")
     void bulkUpdateIdxIncrease(@Param("lBound") int lowerBound, @Param("uBound") int upperBound, @Param("userId") Long userId, @Param("targetId") Long targetId);
     @Modifying(clearAutomatically = true)
     @Query("UPDATE Objective o SET o.idx = o.idx - 1 WHERE o.idx >= :lBound AND o.idx <= :uBound AND o.user.id = :userId AND o.id != :targetId")
     void bulkUpdateIdxDecrease(@Param("lBound") int lowerBound, @Param("uBound") int upperBound, @Param("userId") Long userId, @Param("targetId") Long targetId);
+    @Modifying(clearAutomatically = true)
+    @Query("UPDATE Objective  o SET o.idx = o.idx - 1 WHERE o.idx >= :lBound AND o.user.id = :userId")
+    void bulkUpdateIdxDecreaseAfter(@Param("lBound") int lowerBound, @Param("userId") Long userId);
     List<Objective> findAllByUserIn(List<User> userList);
+    Long countAllByUserId(Long userId);
 
 }