fix(series-banner): 배너 응답 생성을 서비스로 옮긴다

This commit is contained in:
2026-06-29 16:35:58 +09:00
parent 5f45decf80
commit 6d371bb356
4 changed files with 179 additions and 24 deletions

View File

@@ -3,9 +3,7 @@ package kr.co.vividnext.sodalive.admin.content.series.banner
import com.amazonaws.services.s3.model.ObjectMetadata
import com.fasterxml.jackson.databind.ObjectMapper
import kr.co.vividnext.sodalive.admin.content.banner.UpdateBannerOrdersRequest
import kr.co.vividnext.sodalive.admin.content.series.banner.dto.SeriesBannerListPageResponse
import kr.co.vividnext.sodalive.admin.content.series.banner.dto.SeriesBannerRegisterRequest
import kr.co.vividnext.sodalive.admin.content.series.banner.dto.SeriesBannerResponse
import kr.co.vividnext.sodalive.admin.content.series.banner.dto.SeriesBannerUpdateRequest
import kr.co.vividnext.sodalive.aws.s3.S3Uploader
import kr.co.vividnext.sodalive.common.ApiResponse
@@ -53,13 +51,7 @@ class AdminContentSeriesBannerController(
@RequestParam(defaultValue = "20") size: Int
) = run {
val pageable = PageRequest.of(page, size)
val banners = bannerService.getActiveBanners(pageable)
val response = SeriesBannerListPageResponse(
totalCount = banners.totalElements,
content = banners.content.map {
SeriesBannerResponse.from(it, imageHost, appendLanguageToSeriesTitle = true)
}
)
val response = bannerService.getActiveBanners(pageable, imageHost)
ApiResponse.ok(response)
}
@@ -68,8 +60,7 @@ class AdminContentSeriesBannerController(
*/
@GetMapping("/{bannerId}")
fun getBannerDetail(@PathVariable bannerId: Long) = run {
val banner = bannerService.getBannerById(bannerId)
val response = SeriesBannerResponse.from(banner, imageHost)
val response = bannerService.getBannerDetailResponse(bannerId, imageHost)
ApiResponse.ok(response)
}
@@ -86,8 +77,7 @@ class AdminContentSeriesBannerController(
val banner = bannerService.registerBanner(seriesId = request.seriesId, imagePath = "", lang = request.lang)
val imagePath = saveImage(banner.id!!, image)
val updatedBanner = bannerService.updateBanner(banner.id!!, imagePath)
val response = SeriesBannerResponse.from(updatedBanner, imageHost)
val response = bannerService.updateBannerResponse(banner.id!!, imagePath, imageHost = imageHost)
ApiResponse.ok(response)
}
@@ -104,12 +94,12 @@ class AdminContentSeriesBannerController(
// 배너 존재 확인
bannerService.getBannerById(request.bannerId)
val imagePath = saveImage(request.bannerId, image)
val updated = bannerService.updateBanner(
val response = bannerService.updateBannerResponse(
bannerId = request.bannerId,
imagePath = imagePath,
seriesId = request.seriesId
seriesId = request.seriesId,
imageHost = imageHost
)
val response = SeriesBannerResponse.from(updated, imageHost)
ApiResponse.ok(response)
}

View File

@@ -1,6 +1,5 @@
package kr.co.vividnext.sodalive.content.series.main
import kr.co.vividnext.sodalive.admin.content.series.banner.dto.SeriesBannerResponse
import kr.co.vividnext.sodalive.common.ApiResponse
import kr.co.vividnext.sodalive.common.SodaException
import kr.co.vividnext.sodalive.content.series.ContentSeriesService
@@ -35,11 +34,7 @@ class SeriesMainController(
if (member == null) throw SodaException(messageKey = "common.error.bad_credentials")
val preference = resolvePreference(member)
val banners = bannerService.getDisplayBanners(PageRequest.of(0, 10), langContext.lang)
.content
.map {
SeriesBannerResponse.from(it, imageHost)
}
val banners = bannerService.getDisplayBannerResponses(PageRequest.of(0, 10), langContext.lang, imageHost)
val completedSeriesList = contentSeriesService.getSeriesList(
creatorId = null,

View File

@@ -1,6 +1,8 @@
package kr.co.vividnext.sodalive.content.series.main.banner
import kr.co.vividnext.sodalive.admin.content.series.AdminContentSeriesRepository
import kr.co.vividnext.sodalive.admin.content.series.banner.dto.SeriesBannerListPageResponse
import kr.co.vividnext.sodalive.admin.content.series.banner.dto.SeriesBannerResponse
import kr.co.vividnext.sodalive.common.SodaException
import kr.co.vividnext.sodalive.i18n.Lang
import org.springframework.data.domain.Page
@@ -9,23 +11,54 @@ import org.springframework.stereotype.Service
import org.springframework.transaction.annotation.Transactional
@Service
@Transactional(readOnly = true)
class ContentSeriesBannerService(
private val bannerRepository: SeriesBannerRepository,
private val seriesRepository: AdminContentSeriesRepository
) {
fun getActiveBanners(pageable: Pageable): Page<SeriesBanner> {
return bannerRepository.findByIsActiveTrueOrderBySortOrderAsc(pageable)
fun getActiveBanners(pageable: Pageable, imageHost: String): SeriesBannerListPageResponse {
val banners = bannerRepository.findByIsActiveTrueOrderBySortOrderAsc(pageable)
return SeriesBannerListPageResponse(
totalCount = banners.totalElements,
content = banners.content.map {
SeriesBannerResponse.from(
banner = it,
imageHost = imageHost,
appendLanguageToSeriesTitle = true
)
}
)
}
fun getDisplayBanners(pageable: Pageable, lang: Lang): Page<SeriesBanner> {
return bannerRepository.findByIsActiveTrueAndLangOrderBySortOrderAsc(lang, pageable)
}
fun getDisplayBannerResponses(pageable: Pageable, lang: Lang, imageHost: String): List<SeriesBannerResponse> {
return getDisplayBanners(pageable, lang).content.map {
SeriesBannerResponse.from(it, imageHost)
}
}
fun getBannerById(bannerId: Long): SeriesBanner {
return bannerRepository.findById(bannerId)
.orElseThrow { SodaException(messageKey = "series.banner.error.not_found") }
}
fun getBannerDetailResponse(bannerId: Long, imageHost: String): SeriesBannerResponse {
return SeriesBannerResponse.from(getBannerById(bannerId), imageHost)
}
@Transactional
fun updateBannerResponse(
bannerId: Long,
imagePath: String? = null,
seriesId: Long? = null,
imageHost: String
): SeriesBannerResponse {
return SeriesBannerResponse.from(updateBanner(bannerId, imagePath, seriesId), imageHost)
}
@Transactional
fun registerBanner(seriesId: Long, imagePath: String, lang: Lang? = null): SeriesBanner {
val series = seriesRepository.findByIdAndActiveTrue(seriesId)