From ddb49f6215bef9e2486963717e2aac06a0c2cdb9 Mon Sep 17 00:00:00 2001 From: Klaus Date: Fri, 17 Jan 2025 14:00:09 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EC=8B=9C?= =?UTF-8?q?=EB=A6=AC=EC=A6=88=20=EA=B2=80=EC=83=89=20API=20-=20=EA=B2=80?= =?UTF-8?q?=EC=83=89=EC=96=B4=20=EC=B6=94=EA=B0=80=20=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=EC=9E=90/=EC=95=B1=20=EC=BD=98=ED=85=90=EC=B8=A0=20=EB=B0=B0?= =?UTF-8?q?=EB=84=88=20API=20-=20=EC=8B=9C=EB=A6=AC=EC=A6=88=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/content/banner/AdminContentBannerRepository.kt | 4 ++++ .../admin/content/banner/GetAdminContentBannerResponse.kt | 2 ++ .../admin/content/series/AdminContentSeriesRepository.kt | 1 + .../sodalive/content/main/AudioContentMainService.kt | 7 +++++++ .../content/main/banner/GetAudioContentBannerResponse.kt | 1 + 5 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 aa654dd..14c1f25 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 @@ -3,6 +3,7 @@ package kr.co.vividnext.sodalive.admin.content.banner import com.querydsl.jpa.impl.JPAQueryFactory import kr.co.vividnext.sodalive.content.main.banner.AudioContentBanner import kr.co.vividnext.sodalive.content.main.banner.QAudioContentBanner.audioContentBanner +import kr.co.vividnext.sodalive.creator.admin.content.series.QSeries.series import kr.co.vividnext.sodalive.event.QEvent.event import kr.co.vividnext.sodalive.member.QMember.member import org.springframework.beans.factory.annotation.Value @@ -32,6 +33,8 @@ class AdminContentBannerQueryRepositoryImpl( audioContentBanner.event.thumbnailImage, audioContentBanner.creator.id, audioContentBanner.creator.nickname, + audioContentBanner.series.id, + audioContentBanner.series.title, audioContentBanner.link, audioContentBanner.isAdult ) @@ -39,6 +42,7 @@ class AdminContentBannerQueryRepositoryImpl( .from(audioContentBanner) .leftJoin(audioContentBanner.event, event) .leftJoin(audioContentBanner.creator, member) + .leftJoin(audioContentBanner.series, series) .where(audioContentBanner.isActive.isTrue) .orderBy(audioContentBanner.orders.asc()) .fetch() 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 6618f2b..bfd21d1 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 @@ -11,6 +11,8 @@ data class GetAdminContentBannerResponse @QueryProjection constructor( val eventThumbnailImage: String?, val creatorId: Long?, val creatorNickname: String?, + val seriesId: Long?, + val seriesTitle: String?, val link: String?, val isAdult: Boolean ) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/series/AdminContentSeriesRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/series/AdminContentSeriesRepository.kt index 58a6259..c251e5b 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/series/AdminContentSeriesRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/series/AdminContentSeriesRepository.kt @@ -80,6 +80,7 @@ class AdminContentSeriesQueryRepositoryImpl( override fun searchSeriesList(searchWord: String): List { val where = series.isActive.isTrue + .and(series.title.contains(searchWord)) .and(series.member.isNotNull) .and(series.member.isActive.isTrue) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt index 047147b..3e32d6d 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt @@ -97,6 +97,8 @@ class AudioContentMainService( .filter { if (it.type == AudioContentBannerType.CREATOR && it.creator != null) { !blockMemberRepository.isBlocked(blockedMemberId = memberId, memberId = it.creator!!.id!!) + } else if (it.type == AudioContentBannerType.SERIES && it.series != null) { + !blockMemberRepository.isBlocked(blockedMemberId = memberId, memberId = it.series!!.member!!.id!!) } else { true } @@ -132,6 +134,11 @@ class AudioContentMainService( } else { null }, + seriesId = if (it.type == AudioContentBannerType.SERIES && it.series != null) { + it.series!!.id + } else { + null + }, link = it.link ) } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/banner/GetAudioContentBannerResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/banner/GetAudioContentBannerResponse.kt index 14210e9..6ba7ddb 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/banner/GetAudioContentBannerResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/banner/GetAudioContentBannerResponse.kt @@ -8,5 +8,6 @@ data class GetAudioContentBannerResponse( @JsonProperty("thumbnailImageUrl") val thumbnailImageUrl: String, @JsonProperty("eventItem") val eventItem: EventItem?, @JsonProperty("creatorId") val creatorId: Long?, + @JsonProperty("seriesId") val seriesId: Long?, @JsonProperty("link") val link: String? )