Merge pull request #115 from TwooTwoo/feat/mentee-info

TwooTwoo · web-flow · commit fdb5297243cc · 2026-02-09T02:30:03.000+09:00
feat: 자료 상세 조회 기능 구현
diff --git a/src/main/kotlin/goodspace/bllsoneshot/mypage/dto/response/LearningHistoryResponse.kt b/src/main/kotlin/goodspace/bllsoneshot/mypage/dto/response/LearningHistoryResponse.kt
@@ -1,6 +1,6 @@
 package goodspace.bllsoneshot.mypage.dto.response
 
-import goodspace.bllsoneshot.task.dto.response.TaskResponse
+import goodspace.bllsoneshot.task.dto.response.task.TaskResponse
 
 data class LearningHistoryResponse(
     val todayTasks: List<TaskResponse>,
diff --git a/src/main/kotlin/goodspace/bllsoneshot/task/controller/ResourceController.kt b/src/main/kotlin/goodspace/bllsoneshot/task/controller/ResourceController.kt
@@ -3,8 +3,8 @@ package goodspace.bllsoneshot.task.controller
 import goodspace.bllsoneshot.global.security.userId
 import goodspace.bllsoneshot.task.dto.request.ResourceCreateRequest
 import goodspace.bllsoneshot.task.dto.request.ResourceUpdateRequest
-import goodspace.bllsoneshot.task.dto.response.ResourceResponse
-import goodspace.bllsoneshot.task.dto.response.ResourcesResponse
+import goodspace.bllsoneshot.task.dto.response.submit.ResourceResponse
+import goodspace.bllsoneshot.task.dto.response.resource.ResourceSummaryResponse
 import goodspace.bllsoneshot.task.service.ResourceService
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.tags.Tag
@@ -41,19 +41,48 @@ class ResourceController(
 
             [응답]
             resourceId: 자료 ID
-            subject: 과목(KOREAN, ENGLISH, MATH)
+            resourceName: 자료 이름
             registeredDate: 등록일
+            subject: 과목(KOREAN, ENGLISH, MATH)
         """
     )
     fun getResources(
         principal: Principal,
         @RequestParam menteeId: Long
-    ): ResponseEntity<ResourcesResponse> {
+    ): ResponseEntity<List<ResourceSummaryResponse>> {
         val mentorId = principal.userId
         val response = resourceService.getResources(mentorId, menteeId)
         return ResponseEntity.ok(response)
     }
 
+    @GetMapping("/{resourceId}")
+    @Operation(
+        summary = "자료 상세 조회",
+        description = """
+            특정 멘티의 자료 하나를 상세 조회합니다.
+            
+            [요청]
+            resourceId: 자료 ID
+
+            [응답]
+            resourceId: 자료 ID
+            subject: 과목(KOREAN, ENGLISH, MATH)
+            resourceName: 자료 이름
+            registeredDate: 등록일
+            worksheets: 학습 자료(워크시트) 목록
+            columnLinks: 학습 자료(칼럼 링크) 목록
+        """
+    )
+    fun getResourceDetail(
+        principal: Principal,
+        @RequestParam resourceId: Long
+    ): ResponseEntity<ResourceResponse> {
+        val mentorId = principal.userId
+        val response = resourceService.getResourceDetail(mentorId, resourceId)
+
+        return ResponseEntity.ok(response)
+    }
+
     @PostMapping
     @Operation(
         summary = "자료 등록",
diff --git a/src/main/kotlin/goodspace/bllsoneshot/task/controller/TaskController.kt b/src/main/kotlin/goodspace/bllsoneshot/task/controller/TaskController.kt
@@ -7,10 +7,10 @@ import goodspace.bllsoneshot.task.dto.request.MenteeTaskUpdateRequest
 import goodspace.bllsoneshot.task.dto.request.MentorTaskCreateRequest
 import goodspace.bllsoneshot.task.dto.request.TaskCompleteRequest
 import goodspace.bllsoneshot.task.dto.request.TaskSubmitRequest
-import goodspace.bllsoneshot.task.dto.response.TaskByDateResponse
-import goodspace.bllsoneshot.task.dto.response.TaskDetailResponse
-import goodspace.bllsoneshot.task.dto.response.TaskResponse
-import goodspace.bllsoneshot.task.dto.response.TasksResponse
+import goodspace.bllsoneshot.task.dto.response.task.TaskByDateResponse
+import goodspace.bllsoneshot.task.dto.response.task.TaskDetailResponse
+import goodspace.bllsoneshot.task.dto.response.task.TaskResponse
+import goodspace.bllsoneshot.task.dto.response.task.TasksResponse
 import goodspace.bllsoneshot.task.dto.response.feedback.TaskFeedbackResponse
 import goodspace.bllsoneshot.task.dto.response.submit.TaskSubmitResponse
 import goodspace.bllsoneshot.task.service.TaskService
diff --git a/src/main/kotlin/goodspace/bllsoneshot/task/dto/response/ResourcesResponse.kt b/src/main/kotlin/goodspace/bllsoneshot/task/dto/response/ResourcesResponse.kt
diff --git a/src/main/kotlin/goodspace/bllsoneshot/task/dto/response/resource/ResourceSummaryResponse.kt b/src/main/kotlin/goodspace/bllsoneshot/task/dto/response/resource/ResourceSummaryResponse.kt
@@ -0,0 +1,11 @@
+package goodspace.bllsoneshot.task.dto.response.resource
+
+import goodspace.bllsoneshot.entity.assignment.Subject
+import java.time.LocalDate
+
+data class ResourceSummaryResponse(
+    val resourceId: Long,
+    val subject: Subject,
+    val resourceName: String,
+    val registeredDate: LocalDate
+)
diff --git a/src/main/kotlin/goodspace/bllsoneshot/task/dto/response/submit/ResourceResponse.kt b/src/main/kotlin/goodspace/bllsoneshot/task/dto/response/submit/ResourceResponse.kt
@@ -1,4 +1,4 @@
-package goodspace.bllsoneshot.task.dto.response
+package goodspace.bllsoneshot.task.dto.response.submit
 
 import goodspace.bllsoneshot.entity.assignment.Subject
 import goodspace.bllsoneshot.task.dto.response.feedback.ColumnLinkResponse
diff --git a/src/main/kotlin/goodspace/bllsoneshot/task/dto/response/task/TaskByDateResponse.kt b/src/main/kotlin/goodspace/bllsoneshot/task/dto/response/task/TaskByDateResponse.kt
@@ -1,4 +1,4 @@
-package goodspace.bllsoneshot.task.dto.response
+package goodspace.bllsoneshot.task.dto.response.task
 
 import java.time.LocalDate
 
diff --git a/src/main/kotlin/goodspace/bllsoneshot/task/dto/response/task/TaskDetailResponse.kt b/src/main/kotlin/goodspace/bllsoneshot/task/dto/response/task/TaskDetailResponse.kt
@@ -1,4 +1,4 @@
-package goodspace.bllsoneshot.task.dto.response
+package goodspace.bllsoneshot.task.dto.response.task
 
 import goodspace.bllsoneshot.entity.assignment.Subject
 import goodspace.bllsoneshot.entity.user.UserRole
diff --git a/src/main/kotlin/goodspace/bllsoneshot/task/dto/response/task/TaskResponse.kt b/src/main/kotlin/goodspace/bllsoneshot/task/dto/response/task/TaskResponse.kt
@@ -1,4 +1,4 @@
-package goodspace.bllsoneshot.task.dto.response
+package goodspace.bllsoneshot.task.dto.response.task
 
 import goodspace.bllsoneshot.entity.assignment.Subject
 import goodspace.bllsoneshot.entity.user.UserRole
diff --git a/src/main/kotlin/goodspace/bllsoneshot/task/dto/response/task/TasksResponse.kt b/src/main/kotlin/goodspace/bllsoneshot/task/dto/response/task/TasksResponse.kt
@@ -1,4 +1,4 @@
-package goodspace.bllsoneshot.task.dto.response
+package goodspace.bllsoneshot.task.dto.response.task
 
 data class TasksResponse(
     val completedTaskAmount: Int,
diff --git a/src/main/kotlin/goodspace/bllsoneshot/task/mapper/ResourceMapper.kt b/src/main/kotlin/goodspace/bllsoneshot/task/mapper/ResourceMapper.kt
@@ -1,8 +1,10 @@
 package goodspace.bllsoneshot.task.mapper
 
 import goodspace.bllsoneshot.entity.assignment.Task
-import goodspace.bllsoneshot.task.dto.response.ResourceResponse
+import goodspace.bllsoneshot.task.dto.response.submit.ResourceResponse
+import goodspace.bllsoneshot.task.dto.response.resource.ResourceSummaryResponse
 import org.springframework.stereotype.Component
+import java.time.LocalDate
 
 @Component
 class ResourceMapper(
@@ -15,12 +17,21 @@ class ResourceMapper(
             resourceId = task.id!!,
             subject = task.subject,
             resourceName = task.name,
-            registeredDate = task.date ?: java.time.LocalDate.now(),
+            registeredDate = task.date ?: LocalDate.now(),
             worksheets = task.worksheets.map { worksheetMapper.map(it) },
             columnLinks = task.columnLinks.map { columnLinkMapper.map(it) }
         )
     }
 
-    fun map(tasks: List<Task>): List<ResourceResponse> =
-        tasks.map { map(it) }
+    fun mapToSummary(task: Task): ResourceSummaryResponse {
+        return ResourceSummaryResponse(
+            resourceId = task.id!!,
+            subject = task.subject,
+            resourceName = task.name,
+            registeredDate = task.date ?: LocalDate.now()
+        )
+    }
+
+    fun mapToSummaries(tasks: List<Task>): List<ResourceSummaryResponse> =
+        tasks.map { mapToSummary(it) }
 }
diff --git a/src/main/kotlin/goodspace/bllsoneshot/task/mapper/TaskDetailMapper.kt b/src/main/kotlin/goodspace/bllsoneshot/task/mapper/TaskDetailMapper.kt
@@ -1,7 +1,7 @@
 package goodspace.bllsoneshot.task.mapper
 
 import goodspace.bllsoneshot.entity.assignment.Task
-import goodspace.bllsoneshot.task.dto.response.TaskDetailResponse
+import goodspace.bllsoneshot.task.dto.response.task.TaskDetailResponse
 import org.springframework.stereotype.Component
 
 @Component
diff --git a/src/main/kotlin/goodspace/bllsoneshot/task/mapper/TaskMapper.kt b/src/main/kotlin/goodspace/bllsoneshot/task/mapper/TaskMapper.kt
@@ -1,8 +1,8 @@
 package goodspace.bllsoneshot.task.mapper
 
 import goodspace.bllsoneshot.entity.assignment.Task
-import goodspace.bllsoneshot.task.dto.response.TaskByDateResponse
-import goodspace.bllsoneshot.task.dto.response.TaskResponse
+import goodspace.bllsoneshot.task.dto.response.task.TaskByDateResponse
+import goodspace.bllsoneshot.task.dto.response.task.TaskResponse
 import org.springframework.stereotype.Component
 
 @Component
diff --git a/src/main/kotlin/goodspace/bllsoneshot/task/mapper/TasksMapper.kt b/src/main/kotlin/goodspace/bllsoneshot/task/mapper/TasksMapper.kt
@@ -1,7 +1,7 @@
 package goodspace.bllsoneshot.task.mapper
 
 import goodspace.bllsoneshot.entity.assignment.Task
-import goodspace.bllsoneshot.task.dto.response.TasksResponse
+import goodspace.bllsoneshot.task.dto.response.task.TasksResponse
 import org.springframework.stereotype.Component
 
 @Component
diff --git a/src/main/kotlin/goodspace/bllsoneshot/task/service/ResourceService.kt b/src/main/kotlin/goodspace/bllsoneshot/task/service/ResourceService.kt
@@ -16,8 +16,8 @@ import goodspace.bllsoneshot.repository.task.TaskRepository
 import goodspace.bllsoneshot.repository.user.UserRepository
 import goodspace.bllsoneshot.task.dto.request.ResourceCreateRequest
 import goodspace.bllsoneshot.task.dto.request.ResourceUpdateRequest
-import goodspace.bllsoneshot.task.dto.response.ResourceResponse
-import goodspace.bllsoneshot.task.dto.response.ResourcesResponse
+import goodspace.bllsoneshot.task.dto.response.submit.ResourceResponse
+import goodspace.bllsoneshot.task.dto.response.resource.ResourceSummaryResponse
 import goodspace.bllsoneshot.task.mapper.ResourceMapper
 import java.time.LocalDate
 import org.springframework.stereotype.Service
@@ -32,15 +32,24 @@ class ResourceService(
 ) {
 
     @Transactional(readOnly = true)
-    fun getResources(mentorId: Long, menteeId: Long): ResourcesResponse {
+    fun getResources(mentorId: Long, menteeId: Long): List<ResourceSummaryResponse> {
         val mentee = userRepository.findById(menteeId)
             .orElseThrow { IllegalArgumentException(USER_NOT_FOUND.message) }
 
         validateMentorAccess(mentorId, mentee)
 
         val resources = taskRepository.findResourcesByMenteeId(menteeId)
 
-        return ResourcesResponse(resourceMapper.map(resources))
+        return resourceMapper.mapToSummaries(resources)
+    }
+
+    @Transactional(readOnly = true)
+    fun getResourceDetail(mentorId: Long, resourceId: Long): ResourceResponse {
+        val resource = findResourceOrThrow(resourceId)
+
+        validateMentorAccess(mentorId, resource.mentee)
+
+        return resourceMapper.map(resource)
     }
 
     @Transactional
diff --git a/src/main/kotlin/goodspace/bllsoneshot/task/service/TaskService.kt b/src/main/kotlin/goodspace/bllsoneshot/task/service/TaskService.kt
@@ -8,11 +8,11 @@ import goodspace.bllsoneshot.repository.file.FileRepository
 import goodspace.bllsoneshot.repository.task.TaskRepository
 import goodspace.bllsoneshot.repository.user.UserRepository
 import goodspace.bllsoneshot.task.dto.request.*
-import goodspace.bllsoneshot.task.dto.response.TaskByDateResponse
-import goodspace.bllsoneshot.task.dto.response.TaskDetailResponse
+import goodspace.bllsoneshot.task.dto.response.task.TaskByDateResponse
+import goodspace.bllsoneshot.task.dto.response.task.TaskDetailResponse
 import goodspace.bllsoneshot.task.dto.response.submit.TaskSubmitResponse
-import goodspace.bllsoneshot.task.dto.response.TasksResponse
-import goodspace.bllsoneshot.task.dto.response.TaskResponse
+import goodspace.bllsoneshot.task.dto.response.task.TasksResponse
+import goodspace.bllsoneshot.task.dto.response.task.TaskResponse
 import goodspace.bllsoneshot.task.dto.response.feedback.TaskFeedbackResponse
 import goodspace.bllsoneshot.task.mapper.TaskDetailMapper
 import goodspace.bllsoneshot.task.mapper.TaskFeedbackMapper

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package goodspace.bllsoneshot.task.dto.response`
	`1`	`+package goodspace.bllsoneshot.task.dto.response.submit`
`2`	`2`
`3`	`3`	`import goodspace.bllsoneshot.entity.assignment.Subject`
`4`	`4`	`import goodspace.bllsoneshot.task.dto.response.feedback.ColumnLinkResponse`