From 464f610041a40cc4eebd871a011e2296806e4f9b Mon Sep 17 00:00:00 2001 From: "Kim, Joon" Date: Wed, 11 Feb 2026 00:51:15 +0900 Subject: [PATCH 1/2] =?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 --- .../mentor/controller/MentorDashboardController.kt | 4 ++-- .../bllsoneshot/mentor/service/MentorDashboardService.kt | 4 ++-- .../bllsoneshot/repository/task/TaskRepository.kt | 8 +++----- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/main/kotlin/goodspace/bllsoneshot/mentor/controller/MentorDashboardController.kt b/src/main/kotlin/goodspace/bllsoneshot/mentor/controller/MentorDashboardController.kt index e2e4fe3..80e3975 100644 --- a/src/main/kotlin/goodspace/bllsoneshot/mentor/controller/MentorDashboardController.kt +++ b/src/main/kotlin/goodspace/bllsoneshot/mentor/controller/MentorDashboardController.kt @@ -54,7 +54,7 @@ class MentorDashboardController( summary = "학습 미이행(업로드 미제출) 멘티 전체 조회", description = """ 멘토가 담당하는 멘티 중, - 오늘에 해당하는 과제는 존재하지만 인증 사진을 아직 업로드하지 않은 멘티를 조회합니다. + 오늘에 해당하는 과제는 존재하지만 아직 완료하지 않은 멘티를 조회합니다. [요청] date: 기준 날짜(yyyy-MM-dd) @@ -70,7 +70,7 @@ class MentorDashboardController( @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) date: LocalDate ): ResponseEntity { val mentorId = principal.userId - val response = mentorDashboardService.getTaskUnfinishedMentees(mentorId, date) + val response = mentorDashboardService.getTaskIncompletedMentees(mentorId, date) return ResponseEntity.ok(response) } diff --git a/src/main/kotlin/goodspace/bllsoneshot/mentor/service/MentorDashboardService.kt b/src/main/kotlin/goodspace/bllsoneshot/mentor/service/MentorDashboardService.kt index d44fd2f..c824be4 100644 --- a/src/main/kotlin/goodspace/bllsoneshot/mentor/service/MentorDashboardService.kt +++ b/src/main/kotlin/goodspace/bllsoneshot/mentor/service/MentorDashboardService.kt @@ -40,7 +40,7 @@ class MentorDashboardService( } @Transactional(readOnly = true) - fun getTaskUnfinishedMentees( + fun getTaskIncompletedMentees( mentorId: Long, date: LocalDate ): TaskUnfinishedSummaryResponse { @@ -48,7 +48,7 @@ class MentorDashboardService( .orElseThrow { IllegalArgumentException(USER_NOT_FOUND.message) } val taskCount = taskRepository.countUnfinishedTasks(mentorId, date) - val mentees = taskRepository.findTaskUnfinishedMentees( + val mentees = taskRepository.findTaskIncompletedMentees( mentorId = mentorId, date = date ) diff --git a/src/main/kotlin/goodspace/bllsoneshot/repository/task/TaskRepository.kt b/src/main/kotlin/goodspace/bllsoneshot/repository/task/TaskRepository.kt index 80c54b3..07b8c12 100644 --- a/src/main/kotlin/goodspace/bllsoneshot/repository/task/TaskRepository.kt +++ b/src/main/kotlin/goodspace/bllsoneshot/repository/task/TaskRepository.kt @@ -120,15 +120,14 @@ interface TaskRepository : JpaRepository { ) FROM Task t JOIN t.mentee m - LEFT JOIN t.proofShots ps WHERE m.mentor.id = :mentorId AND t.date = :date AND t.isResource = false - AND ps.id IS NULL + AND t.completed = false ORDER BY m.name """ ) - fun findTaskUnfinishedMentees( + fun findTaskIncompletedMentees( mentorId: Long, date: LocalDate ): List @@ -137,11 +136,10 @@ interface TaskRepository : JpaRepository { """ SELECT COUNT(DISTINCT t.id) FROM Task t - LEFT JOIN t.proofShots ps WHERE t.mentee.mentor.id = :mentorId AND t.date = :date AND t.isResource = false - AND ps.id IS NULL + AND t.completed = false """ ) fun countUnfinishedTasks(mentorId: Long, date: LocalDate): Long From af1ad69abcf982e13a789525d1fc7b395df79b40 Mon Sep 17 00:00:00 2001 From: "Kim, Joon" Date: Wed, 11 Feb 2026 00:51:26 +0900 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=EC=95=8C=EB=A6=BC=20=EC=9D=91?= =?UTF-8?q?=EB=8B=B5=EC=97=90=20=ED=95=A0=20=EC=9D=BC=20=EA=B4=80=EB=A0=A8?= =?UTF-8?q?=20=EC=A0=95=EB=B3=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../notification/dto/response/NotificationResponse.kt | 3 +++ .../bllsoneshot/notification/mapper/NotificationMapper.kt | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/main/kotlin/goodspace/bllsoneshot/notification/dto/response/NotificationResponse.kt b/src/main/kotlin/goodspace/bllsoneshot/notification/dto/response/NotificationResponse.kt index 2071477..880f40b 100644 --- a/src/main/kotlin/goodspace/bllsoneshot/notification/dto/response/NotificationResponse.kt +++ b/src/main/kotlin/goodspace/bllsoneshot/notification/dto/response/NotificationResponse.kt @@ -2,6 +2,7 @@ package goodspace.bllsoneshot.notification.dto.response import goodspace.bllsoneshot.entity.assignment.NotificationStatus import goodspace.bllsoneshot.entity.assignment.NotificationType +import goodspace.bllsoneshot.entity.assignment.Subject import java.time.LocalDate import java.time.LocalDateTime @@ -12,6 +13,8 @@ data class NotificationResponse( val message: String, val status: NotificationStatus, val taskId: Long?, + val taskSubject: Subject?, + val taskName: String?, val learningReportId: Long?, val learningReportStartDate: LocalDate?, val learningReportEndDate: LocalDate?, diff --git a/src/main/kotlin/goodspace/bllsoneshot/notification/mapper/NotificationMapper.kt b/src/main/kotlin/goodspace/bllsoneshot/notification/mapper/NotificationMapper.kt index 0fea7e8..221ff9a 100644 --- a/src/main/kotlin/goodspace/bllsoneshot/notification/mapper/NotificationMapper.kt +++ b/src/main/kotlin/goodspace/bllsoneshot/notification/mapper/NotificationMapper.kt @@ -15,6 +15,8 @@ class NotificationMapper { message = notification.message, status = notification.status, taskId = notification.task?.id, + taskSubject = notification.task?.subject, + taskName = notification.task?.name, learningReportId = notification.learningReport?.id, learningReportStartDate = notification.learningReport?.startDate, learningReportEndDate = notification.learningReport?.endDate,