Merge pull request #262 from swm-standard/rin/swm-201

Fix: readExamHistoryList 본인 시험만 조회하도록 수정
swm-standard · Oct 24, 2024 · 0a0116e · 0a0116e
2 parents 16f9bd1 + a112c9d
commit 0a0116e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/main/kotlin/com/swm_standard/phote/controller/ExamController.kt b/src/main/kotlin/com/swm_standard/phote/controller/ExamController.kt
@@ -52,8 +52,9 @@ class ExamController(
         @PathVariable(
             required = true,
         ) workbookId: UUID,
+        @MemberId memberId: UUID,
     ): BaseResponse<List<ReadExamHistoryListResponse>> =
-        BaseResponse(msg = "문제풀이 기록 리스트 조회 성공", data = examService.readExamHistoryList(workbookId))
+        BaseResponse(msg = "문제풀이 기록 리스트 조회 성공", data = examService.readExamHistoryList(workbookId, memberId))
 
     @Operation(summary = "readExamResults", description = "(강사가) 학생들의 시험 결과 목록을 조회")
     @SecurityRequirement(name = "bearer Auth")

diff --git a/src/main/kotlin/com/swm_standard/phote/service/ExamService.kt b/src/main/kotlin/com/swm_standard/phote/service/ExamService.kt
@@ -108,12 +108,14 @@ class ExamService(
         )
     }
 
-    fun readExamHistoryList(workbookId: UUID): List<ReadExamHistoryListResponse> {
+    fun readExamHistoryList(workbookId: UUID, memberId: UUID): List<ReadExamHistoryListResponse> {
         val exams = examRepository.findAllByWorkbookId(workbookId)
-        return exams.map { exam ->
-            // FIXME: exam 마다 examResult 를 또 조회해야함 쿼리 개선 필요
-            val examResult =
-                examResultRepository.findByExamId(exam.id!!) ?: throw NotFoundException(fieldName = "examResult")
+
+        return exams.filter { exam ->
+            !sharedExamRepository.findById(exam.id!!).isPresent
+        }.map { exam ->
+            val examResult = examResultRepository.findByExamIdAndMemberId(exam.id!!, memberId)
+                ?: throw NotFoundException(fieldName = "examResult")
 
             ReadExamHistoryListResponse(
                 examId = exam.id!!,