From 68186138e1ed6596cf2a441a9c93818f087a9967 Mon Sep 17 00:00:00 2001 From: "Kim, Joon" Date: Wed, 11 Feb 2026 00:42:23 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=ED=95=A0=20=EC=9D=BC=20=EC=A0=9C?= =?UTF-8?q?=EC=B6=9C=20=ED=8C=90=EB=8B=A8=20=EA=B8=B0=EC=A4=80=EC=9D=84=20?= =?UTF-8?q?=EB=8B=A4=EB=A5=B8=20=EA=B2=BD=EC=9A=B0=EC=99=80=20=ED=86=B5?= =?UTF-8?q?=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bllsoneshot/mentor/service/MentorDashboardService.kt | 6 +++--- .../goodspace/bllsoneshot/repository/task/TaskRepository.kt | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/goodspace/bllsoneshot/mentor/service/MentorDashboardService.kt b/src/main/kotlin/goodspace/bllsoneshot/mentor/service/MentorDashboardService.kt index 30c579d..d44fd2f 100644 --- a/src/main/kotlin/goodspace/bllsoneshot/mentor/service/MentorDashboardService.kt +++ b/src/main/kotlin/goodspace/bllsoneshot/mentor/service/MentorDashboardService.kt @@ -80,8 +80,8 @@ class MentorDashboardService( val menteeIds = mentees.map { it.id!! } - val unsubmittedMenteeIds = taskRepository - .findMenteeIdsWithUnsubmittedTasks(menteeIds, date) + val incompletedMenteeIds = taskRepository + .findMenteeIdsWithIncompletedTasks(menteeIds, date) .toSet() val recentTaskByMenteeId = taskRepository @@ -98,7 +98,7 @@ class MentorDashboardService( subjects = mentee.subjects.map { it.subject }, recentTaskDate = recentTask?.date, recentTaskName = recentTask?.name, - submitted = mentee.id!! !in unsubmittedMenteeIds + submitted = mentee.id!! !in incompletedMenteeIds ) } diff --git a/src/main/kotlin/goodspace/bllsoneshot/repository/task/TaskRepository.kt b/src/main/kotlin/goodspace/bllsoneshot/repository/task/TaskRepository.kt index ad503a9..80c54b3 100644 --- a/src/main/kotlin/goodspace/bllsoneshot/repository/task/TaskRepository.kt +++ b/src/main/kotlin/goodspace/bllsoneshot/repository/task/TaskRepository.kt @@ -150,14 +150,13 @@ interface TaskRepository : JpaRepository { """ SELECT DISTINCT t.mentee.id FROM Task t - LEFT JOIN t.proofShots ps WHERE t.mentee.id IN :menteeIds AND t.date = :date AND t.isResource = false - AND ps.id IS NULL + AND t.completed = false """ ) - fun findMenteeIdsWithUnsubmittedTasks(menteeIds: List, date: LocalDate): List + fun findMenteeIdsWithIncompletedTasks(menteeIds: List, date: LocalDate): List @Query( """