BookmarkLectureDto 변환에 별도 함수 사용하도록 변경

wafflestudio · Jul 28, 2024 · 4ce52e4 · 4ce52e4
1 parent 07ec3c6
commit 4ce52e4
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 18 deletions.
diff --git a/api/src/main/kotlin/handler/BookmarkHandler.kt b/api/src/main/kotlin/handler/BookmarkHandler.kt
@@ -1,6 +1,7 @@
 package com.wafflestudio.snu4t.handler
 
 import com.wafflestudio.snu4t.bookmark.dto.BookmarkLectureModifyRequest
+import com.wafflestudio.snu4t.bookmark.dto.BookmarkResponse
 import com.wafflestudio.snu4t.bookmark.service.BookmarkService
 import com.wafflestudio.snu4t.common.dto.ExistenceResponse
 import com.wafflestudio.snu4t.common.enum.Semester
@@ -19,7 +20,14 @@ class BookmarkHandler(
         val userId: String = req.userId
         val year: Int = req.parseRequiredQueryParam("year")
         val semester: Semester = req.parseRequiredQueryParam("semester") { Semester.getOfValue(it.toInt()) }
-        bookmarkService.getBookmark(userId, year, semester)
+        val bookmark = bookmarkService.getBookmark(userId, year, semester)
+        val bookmarkLectureDtos = bookmarkService.convertBookmarkLecturesToBookmarkLectureDtos(bookmark.lectures)
+
+        BookmarkResponse(
+            year = bookmark.year,
+            semester = bookmark.semester.value,
+            lectures = bookmarkLectureDtos
+        )
     }
 
     suspend fun existsBookmarkLecture(req: ServerRequest) = handle(req) {

diff --git a/core/src/main/kotlin/bookmark/dto/BookmarkResponse.kt b/core/src/main/kotlin/bookmark/dto/BookmarkResponse.kt
@@ -1,17 +1,9 @@
 package com.wafflestudio.snu4t.bookmark.dto
 
-import com.wafflestudio.snu4t.bookmark.data.Bookmark
-import com.wafflestudio.snu4t.evaluation.dto.SnuttEvLectureSummaryDto
 import com.wafflestudio.snu4t.lectures.dto.BookmarkLectureDto
 
 class BookmarkResponse(
     val year: Int,
     val semester: Int,
     val lectures: List<BookmarkLectureDto>,
 )
-
-fun BookmarkResponse(bookmark: Bookmark, snuttIdToEvLectureMap: Map<String, SnuttEvLectureSummaryDto> = mapOf()): BookmarkResponse = BookmarkResponse(
-    year = bookmark.year,
-    semester = bookmark.semester.value,
-    lectures = bookmark.lectures.map { BookmarkLectureDto(it, snuttIdToEvLectureMap[it.id]) },
-)
diff --git a/core/src/main/kotlin/bookmark/service/BookmarkService.kt b/core/src/main/kotlin/bookmark/service/BookmarkService.kt
@@ -1,20 +1,21 @@
 package com.wafflestudio.snu4t.bookmark.service
 
 import com.wafflestudio.snu4t.bookmark.data.Bookmark
-import com.wafflestudio.snu4t.bookmark.dto.BookmarkResponse
 import com.wafflestudio.snu4t.bookmark.repository.BookmarkRepository
 import com.wafflestudio.snu4t.common.enum.Semester
 import com.wafflestudio.snu4t.common.exception.LectureNotFoundException
 import com.wafflestudio.snu4t.evaluation.repository.SnuttEvRepository
 import com.wafflestudio.snu4t.lectures.data.BookmarkLecture
+import com.wafflestudio.snu4t.lectures.dto.BookmarkLectureDto
 import com.wafflestudio.snu4t.lectures.service.LectureService
 import org.springframework.stereotype.Service
 
 interface BookmarkService {
-    suspend fun getBookmark(userId: String, year: Int, semester: Semester): BookmarkResponse
+    suspend fun getBookmark(userId: String, year: Int, semester: Semester): Bookmark
     suspend fun existsBookmarkLecture(userId: String, lectureId: String): Boolean
     suspend fun addLecture(userId: String, lectureId: String): Bookmark
     suspend fun deleteLecture(userId: String, lectureId: String): Bookmark
+    suspend fun convertBookmarkLecturesToBookmarkLectureDtos(bookmarkLectures: List<BookmarkLecture>): List<BookmarkLectureDto>
 }
 
 @Service
@@ -27,13 +28,8 @@ class BookmarkServiceImpl(
         userId: String,
         year: Int,
         semester: Semester
-    ): BookmarkResponse {
-        val bookmark = bookmarkRepository.findFirstByUserIdAndYearAndSemester(userId, year, semester)
-            ?: Bookmark(userId = userId, year = year, semester = semester)
-        val snuttIdToEvLectureMap =
-            snuttEvRepository.getSummariesByIds(bookmark.lectures.map { it.id!! }).associateBy { it.snuttId }
-        return BookmarkResponse(bookmark, snuttIdToEvLectureMap)
-    }
+    ): Bookmark = bookmarkRepository.findFirstByUserIdAndYearAndSemester(userId, year, semester)
+        ?: Bookmark(userId = userId, year = year, semester = semester)
 
     override suspend fun existsBookmarkLecture(userId: String, lectureId: String): Boolean {
         val lecture = lectureService.getByIdOrNull(lectureId) ?: throw LectureNotFoundException
@@ -60,4 +56,13 @@ class BookmarkServiceImpl(
             lectureId
         )
     }
+
+    override suspend fun convertBookmarkLecturesToBookmarkLectureDtos(bookmarkLectures: List<BookmarkLecture>): List<BookmarkLectureDto> {
+        val snuttIdtoLectureMap =
+            snuttEvRepository.getSummariesByIds(bookmarkLectures.map { it.id!! }).associateBy { it.snuttId }
+        return bookmarkLectures.map { bookmarkLecture ->
+            val snuttEvLecture = snuttIdtoLectureMap[bookmarkLecture.id]
+            BookmarkLectureDto(bookmarkLecture, snuttEvLecture)
+        }
+    }
 }