Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kjoon418 merged 1 commit into from
Feb 10, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/kotlin/goodspace/bllsoneshot/mentor/service/MentorDashboardService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
)
}

Expand Down
5 changes: 2 additions & 3 deletions src/main/kotlin/goodspace/bllsoneshot/repository/task/TaskRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
"""
Expand Down