Merge pull request #145 from kjoon418/main

feat: 할 일 제출 판단 기준을 다른 경우와 통일

Author: kjoon418

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
             )
         }
 

src/main/kotlin/goodspace/bllsoneshot/repository/task/TaskRepository.kt

@@ -150,14 +150,13 @@ interface TaskRepository : JpaRepository<Task, Long> {
         """
         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<Long>, date: LocalDate): List<Long>
+    fun findMenteeIdsWithIncompletedTasks(menteeIds: List<Long>, date: LocalDate): List<Long>
 
     @Query(
         """