fix: 오늘 할 일 조회에 WARMING_UP 상태 추가

depromeet · Mar 1, 2025 · c2f76f4 · c2f76f4
1 parent f738831
commit c2f76f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/kotlin/com/ssak3/timeattack/task/repository/TaskRepositoryCustomImpl.kt b/src/main/kotlin/com/ssak3/timeattack/task/repository/TaskRepositoryCustomImpl.kt
@@ -4,6 +4,7 @@ import com.querydsl.jpa.impl.JPAQueryFactory
 import com.ssak3.timeattack.task.domain.TaskStatus.BEFORE
 import com.ssak3.timeattack.task.domain.TaskStatus.FOCUSED
 import com.ssak3.timeattack.task.domain.TaskStatus.PROCRASTINATING
+import com.ssak3.timeattack.task.domain.TaskStatus.WARMING_UP
 import com.ssak3.timeattack.task.repository.entity.QTaskEntity
 import com.ssak3.timeattack.task.repository.entity.TaskEntity
 import org.springframework.stereotype.Repository
@@ -49,6 +50,7 @@ class TaskRepositoryCustomImpl(
             .where(qTask.member.id.eq(memberId)
                 .and(
                     qTask.status.eq(FOCUSED)
+                        .or(qTask.status.eq(WARMING_UP))
                         .or(qTask.status.eq(PROCRASTINATING))
                         .or(qTask.status.eq(BEFORE)
                             .and(qTask.triggerActionAlarmTime.between(

diff --git a/src/test/kotlin/com/ssak3/timeattack/task/repository/TaskRepositoryCustomImplTest.kt b/src/test/kotlin/com/ssak3/timeattack/task/repository/TaskRepositoryCustomImplTest.kt
@@ -88,10 +88,10 @@ class TaskRepositoryCustomImplTest (
         val tasks = taskRepository.findTodayTasks(checkNotNull(member.id), LocalDate.parse("2025-03-01"))
 
         // then
-        assertEquals(7, tasks.size)
+        assertEquals(8, tasks.size)
 
         val taskNames = tasks.map { it.name }
-        assertTrue(taskNames.containsAll(listOf("urgent task2", "scheduled task1", "scheduled task2", "scheduled task3", "scheduled task4", "scheduled task5", "scheduled task7")))
+        assertTrue(taskNames.containsAll(listOf("urgent task2", "scheduled task1", "scheduled task2", "scheduled task3", "scheduled task4", "scheduled task5", "scheduled task7", "scheduled task10")))
 
     }