From 49a5e47f9dd2a76204e30ab51997f70a6a364801 Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 21 Jan 2025 18:54:06 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EC=BD=98?= =?UTF-8?q?=ED=85=90=EC=B8=A0=20=EB=B0=B0=EB=84=88=20API=20-=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C,=20=EB=93=B1=EB=A1=9D,=20=EC=88=98=EC=A0=95=EC=8B=9C?= =?UTF-8?q?=20=ED=83=AD=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../content/banner/AdminContentBannerRepository.kt | 1 + .../content/banner/AdminContentBannerService.kt | 13 +++++++++++++ .../content/banner/GetAdminContentBannerResponse.kt | 1 + 3 files changed, 15 insertions(+) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/banner/AdminContentBannerRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/banner/AdminContentBannerRepository.kt index 77b1014..00933fc 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/banner/AdminContentBannerRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/banner/AdminContentBannerRepository.kt @@ -36,6 +36,7 @@ class AdminContentBannerQueryRepositoryImpl( .select( QGetAdminContentBannerResponse( audioContentBanner.id, + audioContentBanner.tab.id.coalesce(1), audioContentBanner.type, audioContentBanner.thumbnailImage.prepend("/").prepend(cloudFrontHost), audioContentBanner.event.id, diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/banner/AdminContentBannerService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/banner/AdminContentBannerService.kt index 10a723e..3811632 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/banner/AdminContentBannerService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/banner/AdminContentBannerService.kt @@ -2,6 +2,7 @@ package kr.co.vividnext.sodalive.admin.content.banner import com.fasterxml.jackson.databind.ObjectMapper import kr.co.vividnext.sodalive.admin.content.series.AdminContentSeriesRepository +import kr.co.vividnext.sodalive.admin.content.tab.AdminContentMainTabRepository import kr.co.vividnext.sodalive.aws.s3.S3Uploader import kr.co.vividnext.sodalive.common.SodaException import kr.co.vividnext.sodalive.content.main.banner.AudioContentBanner @@ -22,6 +23,7 @@ class AdminContentBannerService( private val memberRepository: MemberRepository, private val seriesRepository: AdminContentSeriesRepository, private val eventRepository: EventRepository, + private val contentMainTabRepository: AdminContentMainTabRepository, private val objectMapper: ObjectMapper, @Value("\${cloud.aws.s3.bucket}") @@ -64,12 +66,19 @@ class AdminContentBannerService( null } + val tab = if (request.tabId !== null) { + contentMainTabRepository.findByIdOrNull(request.tabId) + } else { + null + } + val audioContentBanner = AudioContentBanner(type = request.type) audioContentBanner.link = request.link audioContentBanner.isAdult = request.isAdult audioContentBanner.event = event audioContentBanner.creator = creator audioContentBanner.series = series + audioContentBanner.tab = tab repository.save(audioContentBanner) val fileName = generateFileName() @@ -156,6 +165,10 @@ class AdminContentBannerService( audioContentBanner.type = request.type } + + if (request.tabId !== null) { + audioContentBanner.tab = contentMainTabRepository.findByIdOrNull(request.tabId) + } } @Transactional diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/banner/GetAdminContentBannerResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/banner/GetAdminContentBannerResponse.kt index bfd21d1..2ba9348 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/banner/GetAdminContentBannerResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/banner/GetAdminContentBannerResponse.kt @@ -5,6 +5,7 @@ import kr.co.vividnext.sodalive.content.main.banner.AudioContentBannerType data class GetAdminContentBannerResponse @QueryProjection constructor( val id: Long, + val tabId: Long?, val type: AudioContentBannerType, val thumbnailImageUrl: String, val eventId: Long?,