Merge pull request #149 from kjoon418/main

feat: 바텀시트에서 자료를 별도로 표시할 수 있도록 정보 추가

Author: kjoon418

src/main/kotlin/goodspace/bllsoneshot/entity/assignment/Task.kt

@@ -4,10 +4,19 @@ import goodspace.bllsoneshot.entity.BaseEntity
 import goodspace.bllsoneshot.entity.user.User
 import goodspace.bllsoneshot.entity.user.UserRole
 import goodspace.bllsoneshot.global.exception.ExceptionMessage.NEGATIVE_ACTUAL_MINUTES
-import jakarta.persistence.*
-import org.hibernate.annotations.BatchSize
+import jakarta.persistence.CascadeType
+import jakarta.persistence.Column
+import jakarta.persistence.Entity
+import jakarta.persistence.EnumType
+import jakarta.persistence.Enumerated
+import jakarta.persistence.FetchType
+import jakarta.persistence.JoinColumn
+import jakarta.persistence.ManyToOne
+import jakarta.persistence.OneToMany
+import jakarta.persistence.OneToOne
+import jakarta.persistence.Transient
 import java.time.LocalDate
-import java.time.LocalDateTime
+import org.hibernate.annotations.BatchSize
 
 @Entity
 class Task(
@@ -21,6 +30,8 @@ class Task(
 
     var date: LocalDate? = null,
 
+    val uploadedAt: LocalDate? = null,
+
     @Column(nullable = false)
     var name: String,
 

src/main/kotlin/goodspace/bllsoneshot/task/controller/ResourceController.kt

@@ -95,6 +95,7 @@ class ResourceController(
             resourceName: 자료 이름
             fileId: PDF 파일 ID (선택)
             columnLink: 칼럼 링크 (선택)
+            uploadedAt: 업로드 날자 (안넣으면 오늘)
             
             [응답]
             생성된 자료 정보

src/main/kotlin/goodspace/bllsoneshot/task/dto/request/ResourceCreateRequest.kt

@@ -2,12 +2,14 @@ package goodspace.bllsoneshot.task.dto.request
 
 import goodspace.bllsoneshot.entity.assignment.Subject
 import jakarta.validation.constraints.NotBlank
+import java.time.LocalDate
 
 data class ResourceCreateRequest(
     val menteeId: Long,
     val subject: Subject,
     @field:NotBlank(message = "자료 이름이 비어 있습니다.")
     val resourceName: String,
     val fileId: Long? = null,
-    val columnLink: String? = null
+    val columnLink: String? = null,
+    val uploadedAt: LocalDate = LocalDate.now()
 )

src/main/kotlin/goodspace/bllsoneshot/task/dto/response/submit/ResourceResponse.kt

@@ -11,5 +11,6 @@ data class ResourceResponse(
     val resourceName: String,
     val registeredDate: LocalDate,
     val worksheets: List<WorksheetResponse>,
-    val columnLinks: List<ColumnLinkResponse>
+    val columnLinks: List<ColumnLinkResponse>,
+    val uploadedAt: LocalDate?
 )

src/main/kotlin/goodspace/bllsoneshot/task/dto/response/task/TaskDetailResponse.kt

@@ -4,6 +4,7 @@ import goodspace.bllsoneshot.entity.assignment.Subject
 import goodspace.bllsoneshot.entity.user.UserRole
 import goodspace.bllsoneshot.task.dto.response.feedback.ColumnLinkResponse
 import goodspace.bllsoneshot.task.dto.response.feedback.WorksheetResponse
+import java.time.LocalDate
 
 data class TaskDetailResponse(
     val taskId: Long,
@@ -14,6 +15,9 @@ data class TaskDetailResponse(
     val goalMinutes: Int,
     val actualMinutes: Int?,
 
+    val isResource: Boolean,
+    val uploadedAt: LocalDate?,
+
     val hasFeedback: Boolean,
     val generalComment: String?,
     val mentorName: String,

src/main/kotlin/goodspace/bllsoneshot/task/mapper/ResourceMapper.kt

@@ -19,7 +19,8 @@ class ResourceMapper(
             resourceName = task.name,
             registeredDate = task.date ?: LocalDate.now(),
             worksheets = task.worksheets.map { worksheetMapper.map(it) },
-            columnLinks = task.columnLinks.map { columnLinkMapper.map(it) }
+            columnLinks = task.columnLinks.map { columnLinkMapper.map(it) },
+            uploadedAt = task.uploadedAt
         )
     }
 

src/main/kotlin/goodspace/bllsoneshot/task/mapper/TaskDetailMapper.kt

@@ -30,6 +30,8 @@ class TaskDetailMapper(
             subject = task.subject,
             goalMinutes = task.goalMinutes,
             actualMinutes = task.actualMinutes,
+            isResource = task.isResource,
+            uploadedAt = task.uploadedAt,
             hasFeedback = task.hasFeedback(),
             generalComment = task.generalComment?.content,
             mentorName = task.mentee.mentor?.name ?: "",

src/main/kotlin/goodspace/bllsoneshot/task/service/ResourceService.kt

@@ -67,7 +67,8 @@ class ResourceService(
             name = request.resourceName,
             goalMinutes = 0,
             createdBy = UserRole.ROLE_MENTOR,
-            isResource = true
+            isResource = true,
+            uploadedAt = request.uploadedAt
         )
 
         request.fileId?.let { fileId ->