From 656fd9a1fa6515d3d85bf41c945a5a932f069d2d Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Wed, 16 Oct 2024 12:12:21 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20-=20=EC=BD=98?=
 =?UTF-8?q?=ED=85=90=EC=B8=A0=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EB=A6=AC?=
 =?UTF-8?q?=ED=8C=A9=ED=86=A0=EB=A7=81=20-=20imageHost=20=EA=B0=92=20repos?=
 =?UTF-8?q?itory=EB=A1=9C=20=EC=9D=B4=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sodalive/admin/content/AdminContentRepository.kt   |  8 +++++---
 .../sodalive/admin/content/AdminContentService.kt      | 10 +---------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/AdminContentRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/AdminContentRepository.kt
index f9819d9..d01218d 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/AdminContentRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/AdminContentRepository.kt
@@ -10,6 +10,7 @@ import kr.co.vividnext.sodalive.content.hashtag.QAudioContentHashTag.audioConten
 import kr.co.vividnext.sodalive.content.hashtag.QHashTag.hashTag
 import kr.co.vividnext.sodalive.content.main.curation.QAudioContentCuration.audioContentCuration
 import kr.co.vividnext.sodalive.content.theme.QAudioContentTheme.audioContentTheme
+import org.springframework.beans.factory.annotation.Value
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.stereotype.Repository
 import java.time.LocalDateTime
@@ -25,7 +26,6 @@ interface AdminAudioContentQueryRepository {
 
     fun getAudioContentList(
         status: ContentReleaseStatus = ContentReleaseStatus.OPEN,
-        imageHost: String,
         offset: Long,
         limit: Long,
         searchWord: String = ""
@@ -35,7 +35,10 @@ interface AdminAudioContentQueryRepository {
 }
 
 class AdminAudioContentQueryRepositoryImpl(
-    private val queryFactory: JPAQueryFactory
+    private val queryFactory: JPAQueryFactory,
+
+    @Value("\${cloud.aws.cloud-front.host}")
+    private val imageHost: String
 ) : AdminAudioContentQueryRepository {
     override fun getAudioContentTotalCount(
         searchWord: String,
@@ -70,7 +73,6 @@ class AdminAudioContentQueryRepositoryImpl(
 
     override fun getAudioContentList(
         status: ContentReleaseStatus,
-        imageHost: String,
         offset: Long,
         limit: Long,
         searchWord: String
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/AdminContentService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/AdminContentService.kt
index d3ec4ac..83ffd5b 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/AdminContentService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/AdminContentService.kt
@@ -4,7 +4,6 @@ import kr.co.vividnext.sodalive.admin.content.curation.AdminContentCurationRepos
 import kr.co.vividnext.sodalive.admin.content.theme.AdminContentThemeRepository
 import kr.co.vividnext.sodalive.aws.cloudfront.AudioContentCloudFront
 import kr.co.vividnext.sodalive.common.SodaException
-import org.springframework.beans.factory.annotation.Value
 import org.springframework.data.domain.Pageable
 import org.springframework.data.repository.findByIdOrNull
 import org.springframework.stereotype.Service
@@ -15,16 +14,12 @@ class AdminContentService(
     private val repository: AdminContentRepository,
     private val themeRepository: AdminContentThemeRepository,
     private val audioContentCloudFront: AudioContentCloudFront,
-    private val curationRepository: AdminContentCurationRepository,
-
-    @Value("\${cloud.aws.cloud-front.host}")
-    private val coverImageHost: String
+    private val curationRepository: AdminContentCurationRepository
 ) {
     fun getAudioContentList(status: ContentReleaseStatus, pageable: Pageable): GetAdminContentListResponse {
         val totalCount = repository.getAudioContentTotalCount()
         val audioContentAndThemeList = repository.getAudioContentList(
             status = status,
-            imageHost = coverImageHost,
             offset = pageable.offset,
             limit = pageable.pageSize.toLong()
         )
@@ -52,14 +47,12 @@ class AdminContentService(
         if (searchWord.length < 2) throw SodaException("2글자 이상 입력하세요.")
         val totalCount = repository.getAudioContentTotalCount(searchWord)
         val audioContentAndThemeList = repository.getAudioContentList(
-            imageHost = coverImageHost,
             offset = pageable.offset,
             limit = pageable.pageSize.toLong(),
             searchWord = searchWord
         )
 
         val audioContentList = audioContentAndThemeList
-            .asSequence()
             .map {
                 val tags = repository
                     .getHashTagList(audioContentId = it.audioContentId)
@@ -74,7 +67,6 @@ class AdminContentService(
                 )
                 it
             }
-            .toList()
 
         return GetAdminContentListResponse(totalCount, audioContentList)
     }