fix: 완료된 할 일 desc -> ascr

Kusitms-POPTATO-DEV · Nov 1, 2024 · 2b75ba7 · 2b75ba7
1 parent 9075bec
commit 2b75ba7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/server/poptato/todo/application/TodoService.java b/src/main/java/server/poptato/todo/application/TodoService.java
@@ -43,7 +43,7 @@ public TodayListResponseDto getTodayList(long userId, int page, int size, LocalD
         todays.addAll(incompleteTodos);
 
         // 완료된 할 일 조회
-        List<Todo> completedTodos = todoRepository.findByUserIdAndTypeAndTodayDateAndTodayStatusOrderByCompletedDateTimeDesc(
+        List<Todo> completedTodos = todoRepository.findByUserIdAndTypeAndTodayDateAndTodayStatusOrderByCompletedDateTimeAsc(
                     userId, Type.TODAY, todayDate, TodayStatus.COMPLETED);
         todays.addAll(completedTodos);
 

diff --git a/src/main/java/server/poptato/todo/domain/repository/TodoRepository.java b/src/main/java/server/poptato/todo/domain/repository/TodoRepository.java
@@ -14,7 +14,7 @@ public interface TodoRepository {
     void deleteAllByUserId(Long userId);
     List<Todo> findByUserIdAndTypeAndTodayDateAndTodayStatusOrderByTodayOrderDesc(
             Long userId, Type type, LocalDate todayDate, TodayStatus todayStatus);
-    List<Todo> findByUserIdAndTypeAndTodayDateAndTodayStatusOrderByCompletedDateTimeDesc(
+    List<Todo> findByUserIdAndTypeAndTodayDateAndTodayStatusOrderByCompletedDateTimeAsc(
             Long userId, Type type, LocalDate todayDate, TodayStatus todayStatus);
     Optional<Todo> findById(Long todoId);
     Optional<Todo> findByIdAndUserId(Long todoId, Long userId);

diff --git a/src/test/java/server/poptato/todo/domain/repository/TodoRepositoryTest.java b/src/test/java/server/poptato/todo/domain/repository/TodoRepositoryTest.java
@@ -29,7 +29,7 @@ class TodoRepositoryTest {
         LocalDate todayDate = LocalDate.of(2024, 10, 16);
 
         //when
-        List<Todo> todos = todoRepository.findByUserIdAndTypeAndTodayDateAndTodayStatusOrderByCompletedDateTimeDesc(
+        List<Todo> todos = todoRepository.findByUserIdAndTypeAndTodayDateAndTodayStatusOrderByCompletedDateTimeAsc(
                 userId, Type.TODAY, todayDate, TodayStatus.COMPLETED);
 
         assertThat(todos).isNotEmpty();
@@ -45,7 +45,7 @@ class TodoRepositoryTest {
 
         // 완료된 할 일은 completeDateTime이 내림차순으로 정렬되어야 함
         for (int i = 0; i < todos.size() - 1; i++) {
-            assertThat(todos.get(i).getCompletedDateTime()).isAfterOrEqualTo(todos.get(i + 1).getCompletedDateTime());
+            assertThat(todos.get(i).getCompletedDateTime()).isBeforeOrEqualTo(todos.get(i + 1).getCompletedDateTime());
         }
     }