From 10a65294cea15931064ef3d66dad465e3e99db95 Mon Sep 17 00:00:00 2001 From: Klaus Date: Wed, 27 Nov 2024 17:37:22 +0900 Subject: [PATCH] =?UTF-8?q?=ED=94=8C=EB=A0=88=EC=9D=B4=20=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=83=9D=EC=84=B1=20API=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20-=20=EA=B8=B0=EC=A1=B4:=20=ED=94=8C=EB=A0=88?= =?UTF-8?q?=EC=9D=B4=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=EC=97=90=20=EC=BD=98?= =?UTF-8?q?=ED=85=90=EC=B8=A0=20ID=EC=99=80=20=EC=A0=95=EB=A0=AC=EC=88=9C?= =?UTF-8?q?=EC=84=9C=EB=8F=84=20=EA=B0=99=EC=9D=B4=20=EC=A0=80=EC=9E=A5?= =?UTF-8?q?=EB=90=A8=20-=20=EB=B3=80=EA=B2=BD:=20=EC=BD=98=ED=85=90?= =?UTF-8?q?=EC=B8=A0=20ID=EB=A7=8C=20=EC=A0=80=EC=9E=A5=EB=90=A8=20-=20?= =?UTF-8?q?=EC=9D=B4=EC=9C=A0:=20List=20=EC=82=AC=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EA=B8=B0=EC=97=90=20=EC=A0=95=EB=A0=AC=EC=88=9C=EC=84=9C?= =?UTF-8?q?=EB=A5=BC=20=EB=B3=84=EB=8F=84=EB=A1=9C=20=EC=A0=80=EC=9E=A5?= =?UTF-8?q?=ED=95=A0=20=ED=95=84=EC=9A=94=EA=B0=80=20=EC=97=86=EB=8B=A4?= =?UTF-8?q?=EA=B3=A0=20=ED=8C=90=EB=8B=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../content/playlist/AudioContentPlaylist.kt | 2 +- .../content/playlist/AudioContentPlaylistService.kt | 12 ++++++------ .../content/playlist/CreatePlaylistRequest.kt | 2 +- .../content/playlist/PlaylistContentIdAndOrder.kt | 6 ------ 4 files changed, 8 insertions(+), 14 deletions(-) delete mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/content/playlist/PlaylistContentIdAndOrder.kt diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/playlist/AudioContentPlaylist.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/playlist/AudioContentPlaylist.kt index d33247a..aac2ee7 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/playlist/AudioContentPlaylist.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/playlist/AudioContentPlaylist.kt @@ -15,7 +15,7 @@ data class AudioContentPlaylist( val memberId: Long, var title: String, var desc: String? = null, - var contentIdAndOrderList: MutableList = mutableListOf(), + var contentIdList: List, // ISO 8601 형식의 String private val _createdAt: String = LocalDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/playlist/AudioContentPlaylistService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/playlist/AudioContentPlaylistService.kt index 65fce07..64c2504 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/playlist/AudioContentPlaylistService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/playlist/AudioContentPlaylistService.kt @@ -16,7 +16,7 @@ class AudioContentPlaylistService( private val redisRepository: AudioContentPlaylistRedisRepository ) { fun createPlaylist(request: CreatePlaylistRequest, member: Member) { - if (request.contentIdAndOrderList.size >= 30) { + if (request.contentIdList.size >= 30) { throw SodaException("플레이 리스트에는 최대 30개의 콘텐츠를 저장할 수 있습니다.") } @@ -27,7 +27,7 @@ class AudioContentPlaylistService( // 콘텐츠 유효성 검사 (소장으로 구매한 콘텐츠 인가?) checkOrderedContent( - contentIdList = request.contentIdAndOrderList.map { it.contentId }, + contentIdList = request.contentIdList, memberId = member.id!! ) @@ -35,9 +35,9 @@ class AudioContentPlaylistService( id = idGenerator.generateId(SEQUENCE_NAME), memberId = member.id!!, title = request.title, - desc = request.desc + desc = request.desc, + contentIdList = request.contentIdList ) - playlist.contentIdAndOrderList.addAll(request.contentIdAndOrderList) redisRepository.save(playlist) } @@ -58,9 +58,9 @@ class AudioContentPlaylistService( return GetPlaylistsResponse( totalCount = playlists.size, items = playlists.map { - val contentCount = it.contentIdAndOrderList.size + val contentCount = it.contentIdList.size val coverImageUrl = if (contentCount > 0) { - audioContentRepository.getCoverImageById(id = it.contentIdAndOrderList[0].contentId) + audioContentRepository.getCoverImageById(id = it.contentIdList[0]) ?: "" } else { "" diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/playlist/CreatePlaylistRequest.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/playlist/CreatePlaylistRequest.kt index 1cdc09e..914cb90 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/playlist/CreatePlaylistRequest.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/playlist/CreatePlaylistRequest.kt @@ -3,5 +3,5 @@ package kr.co.vividnext.sodalive.content.playlist data class CreatePlaylistRequest( val title: String, val desc: String? = null, - val contentIdAndOrderList: List = emptyList() + val contentIdList: List = emptyList() ) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/playlist/PlaylistContentIdAndOrder.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/playlist/PlaylistContentIdAndOrder.kt deleted file mode 100644 index 2e0d558..0000000 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/playlist/PlaylistContentIdAndOrder.kt +++ /dev/null @@ -1,6 +0,0 @@ -package kr.co.vividnext.sodalive.content.playlist - -data class PlaylistContentIdAndOrder( - val contentId: Long, - val order: Int -)