Merge branch 'develop' into fix/add-studentClubsDto-engName

wafflestudio · Mar 12, 2024 · f61b158 · f61b158
2 parents 179e035 + 39ce4b7
commit f61b158
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/academics/dto/DegreeRequirementsDto.kt b/src/main/kotlin/com/wafflestudio/csereal/core/academics/dto/DegreeRequirementsDto.kt
@@ -1,16 +1,20 @@
 package com.wafflestudio.csereal.core.academics.dto
 
 import com.wafflestudio.csereal.core.academics.database.AcademicsEntity
+import com.wafflestudio.csereal.core.resource.attachment.dto.AttachmentResponse
 
 class DegreeRequirementsDto(
     val year: Int,
-    val description: String
+    val description: String,
+    val attachments: List<AttachmentResponse>
+
 ) {
     companion object {
-        fun of(entity: AcademicsEntity) = entity.run {
+        fun of(entity: AcademicsEntity, attachments: List<AttachmentResponse>) = entity.run {
             DegreeRequirementsDto(
                 year = this.year!!,
-                description = this.description
+                description = this.description,
+                attachments = attachments
             )
         }
     }

diff --git a/...main/kotlin/com/wafflestudio/csereal/core/academics/dto/DegreeRequirementsPageResponse.kt b/...main/kotlin/com/wafflestudio/csereal/core/academics/dto/DegreeRequirementsPageResponse.kt
@@ -7,10 +7,10 @@ class DegreeRequirementsPageResponse(
     val yearList: List<DegreeRequirementsDto>
 ) {
     companion object {
-        fun of(entity: AcademicsEntity, yearList: List<AcademicsEntity>) = entity.run {
+        fun of(entity: AcademicsEntity, yearList: List<DegreeRequirementsDto>) = entity.run {
             DegreeRequirementsPageResponse(
                 description = this.description,
-                yearList = yearList.map { DegreeRequirementsDto.of(it) }
+                yearList = yearList
             )
         }
     }

diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/academics/service/AcademicsService.kt b/src/main/kotlin/com/wafflestudio/csereal/core/academics/service/AcademicsService.kt
@@ -153,7 +153,10 @@ class AcademicsServiceImpl(
                 enumLanguageType,
                 AcademicsStudentType.UNDERGRADUATE,
                 AcademicsPostType.DEGREE_REQUIREMENTS_YEAR_LIST
-            )
+            ).map {
+                val attachments = attachmentService.createAttachmentResponses(it.attachments)
+                DegreeRequirementsDto.of(it, attachments)
+            }
 
         return DegreeRequirementsPageResponse.of(academicsEntity, yearList)
     }