From edf16a6021d373c1f6bd468cb614de1f933a9677 Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 15 Jul 2025 01:10:00 +0900 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=EB=A9=94=EC=9D=B8=20=ED=99=88=20API?= =?UTF-8?q?=20-=20=EA=B8=B0=EC=A1=B4=20=ED=99=88=20=ED=83=AD=20=EC=83=81?= =?UTF-8?q?=EB=8B=A8=EC=97=90=20=EC=9E=88=EB=8A=94=20=EB=B0=B0=EB=84=88=20?= =?UTF-8?q?=EC=9E=84=EC=8B=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/api/home/GetHomeResponse.kt | 2 ++ .../co/vividnext/sodalive/api/home/HomeService.kt | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/api/home/GetHomeResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/api/home/GetHomeResponse.kt index 671ae98..6db81ca 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/api/home/GetHomeResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/api/home/GetHomeResponse.kt @@ -3,6 +3,7 @@ package kr.co.vividnext.sodalive.api.home import kr.co.vividnext.sodalive.audition.GetAuditionListItem import kr.co.vividnext.sodalive.content.AudioContentMainItem import kr.co.vividnext.sodalive.content.main.GetAudioContentRankingItem +import kr.co.vividnext.sodalive.content.main.banner.GetAudioContentBannerResponse import kr.co.vividnext.sodalive.content.main.tab.GetContentCurationResponse import kr.co.vividnext.sodalive.content.series.GetSeriesListResponse import kr.co.vividnext.sodalive.event.GetEventResponse @@ -15,6 +16,7 @@ data class GetHomeResponse( val creatorRanking: List, val latestContentThemeList: List, val latestContentList: List, + val bannerList: List, val eventBannerList: GetEventResponse, val originalAudioDramaList: List, val auditionList: List, diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/api/home/HomeService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/api/home/HomeService.kt index 10cb898..ecee20e 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/api/home/HomeService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/api/home/HomeService.kt @@ -4,12 +4,14 @@ import kr.co.vividnext.sodalive.audition.AuditionService import kr.co.vividnext.sodalive.content.AudioContentMainItem import kr.co.vividnext.sodalive.content.AudioContentService import kr.co.vividnext.sodalive.content.ContentType +import kr.co.vividnext.sodalive.content.main.banner.AudioContentBannerService import kr.co.vividnext.sodalive.content.main.curation.AudioContentCurationService import kr.co.vividnext.sodalive.content.series.ContentSeriesService import kr.co.vividnext.sodalive.content.series.GetSeriesListResponse import kr.co.vividnext.sodalive.content.theme.AudioContentThemeService import kr.co.vividnext.sodalive.creator.admin.content.series.SeriesPublishedDaysOfWeek import kr.co.vividnext.sodalive.event.EventService +import kr.co.vividnext.sodalive.event.GetEventResponse import kr.co.vividnext.sodalive.explorer.ExplorerQueryRepository import kr.co.vividnext.sodalive.live.room.LiveRoomService import kr.co.vividnext.sodalive.live.room.LiveRoomStatus @@ -34,6 +36,7 @@ class HomeService( private val auditionService: AuditionService, private val seriesService: ContentSeriesService, private val contentService: AudioContentService, + private val bannerService: AudioContentBannerService, private val curationService: AudioContentCurationService, private val contentThemeService: AudioContentThemeService, private val recommendChannelService: RecommendChannelQueryService, @@ -95,7 +98,16 @@ class HomeService( } } - val eventBannerList = eventService.getEventList(isAdult = isAdult) + val eventBannerList = GetEventResponse( + totalCount = 0, + eventList = emptyList() + ) + + val bannerList = bannerService.getBannerList( + tabId = 1, + memberId = member?.id, + isAdult = isAdult + ) val originalAudioDramaList = seriesService.getOriginalAudioDramaList( isAdult = isAdult, @@ -167,6 +179,7 @@ class HomeService( creatorRanking = creatorRanking, latestContentThemeList = latestContentThemeList, latestContentList = latestContentList, + bannerList = bannerList, eventBannerList = eventBannerList, originalAudioDramaList = originalAudioDramaList, auditionList = auditionList, -- 2.40.1 From 0d2daf4d2c18c3e2a3a740a2121bde8885bac447 Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 15 Jul 2025 01:28:42 +0900 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=EB=A9=94=EC=9D=B8=20=ED=99=88=20API?= =?UTF-8?q?=20-=20=EC=B6=94=EC=B2=9C=20=EC=B1=84=EB=84=90=20-=20=EB=AF=B8?= =?UTF-8?q?=EC=9D=B8=EC=A6=9D=20=EA=B3=84=EC=A0=95=EC=97=90=EC=84=9C=2019?= =?UTF-8?q?=EA=B8=88=20=EC=BD=98=ED=85=90=EC=B8=A0=EA=B0=80=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/co/vividnext/sodalive/api/home/HomeService.kt | 2 -- .../query/recommend/RecommendChannelQueryRepository.kt | 10 ++++++++-- .../query/recommend/RecommendChannelQueryService.kt | 6 +++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/api/home/HomeService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/api/home/HomeService.kt index ecee20e..fb30d96 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/api/home/HomeService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/api/home/HomeService.kt @@ -10,7 +10,6 @@ import kr.co.vividnext.sodalive.content.series.ContentSeriesService import kr.co.vividnext.sodalive.content.series.GetSeriesListResponse import kr.co.vividnext.sodalive.content.theme.AudioContentThemeService import kr.co.vividnext.sodalive.creator.admin.content.series.SeriesPublishedDaysOfWeek -import kr.co.vividnext.sodalive.event.EventService import kr.co.vividnext.sodalive.event.GetEventResponse import kr.co.vividnext.sodalive.explorer.ExplorerQueryRepository import kr.co.vividnext.sodalive.live.room.LiveRoomService @@ -30,7 +29,6 @@ import java.time.temporal.TemporalAdjusters @Service class HomeService( - private val eventService: EventService, private val memberService: MemberService, private val liveRoomService: LiveRoomService, private val auditionService: AuditionService, diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/query/recommend/RecommendChannelQueryRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/query/recommend/RecommendChannelQueryRepository.kt index fadfdc2..295ed6a 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/query/recommend/RecommendChannelQueryRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/query/recommend/RecommendChannelQueryRepository.kt @@ -60,7 +60,13 @@ class RecommendChannelQueryRepository( .fetch() } - fun getContentsByCreatorIdLikeDesc(creatorId: Long): List { + fun getContentsByCreatorIdLikeDesc(creatorId: Long, isAdult: Boolean): List { + var where = audioContent.member.id.eq(creatorId) + + if (!isAdult) { + where = where.and(audioContent.isAdult.isFalse) + } + return queryFactory .select( QRecommendChannelContentItem( @@ -82,7 +88,7 @@ class RecommendChannelQueryRepository( audioContentComment.audioContent.id.eq(audioContent.id) .and(audioContentComment.isActive.isTrue) ) - .where(audioContent.member.id.eq(creatorId)) + .where(where) .groupBy(audioContent.id) .orderBy(audioContentLike.id.countDistinct().desc()) .limit(3) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/query/recommend/RecommendChannelQueryService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/query/recommend/RecommendChannelQueryService.kt index 716ec47..2ad1bc8 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/query/recommend/RecommendChannelQueryService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/query/recommend/RecommendChannelQueryService.kt @@ -23,7 +23,11 @@ class RecommendChannelQueryService(private val repository: RecommendChannelQuery ) return recommendChannelList.map { - it.contentList = repository.getContentsByCreatorIdLikeDesc(it.channelId) + it.contentList = repository.getContentsByCreatorIdLikeDesc( + creatorId = it.channelId, + isAdult = isAdult + ) + it } } -- 2.40.1 From 9ad6b6ea480d1afdd89491bc5005c32508fa03de Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 15 Jul 2025 01:32:45 +0900 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=EB=A9=94=EC=9D=B8=20=ED=99=88=20API?= =?UTF-8?q?=20-=20=EC=B5=9C=EC=8B=A0=20=EC=BD=98=ED=85=90=EC=B8=A0=20-=20?= =?UTF-8?q?=EB=AC=B4=EB=A3=8C/=EC=9C=A0=EB=A3=8C=20=EC=BD=98=ED=85=90?= =?UTF-8?q?=EC=B8=A0=20=EB=AA=A8=EB=91=90=20=EC=A1=B0=ED=9A=8C=20=EB=90=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../co/vividnext/sodalive/content/AudioContentRepository.kt | 6 ++---- .../content/theme/AudioContentThemeQueryRepository.kt | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt index 7b046e4..1ee6a50 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt @@ -1336,10 +1336,8 @@ class AudioContentQueryRepositoryImpl( where = where.and(audioContentTheme.theme.`in`(theme)) } - where = if (isFree) { - where.and(audioContent.price.loe(0)) - } else { - where.and(audioContent.price.gt(0)) + if (isFree) { + where = where.and(audioContent.price.loe(0)) } return queryFactory diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/theme/AudioContentThemeQueryRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/theme/AudioContentThemeQueryRepository.kt index d637431..2eeb2ad 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/theme/AudioContentThemeQueryRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/theme/AudioContentThemeQueryRepository.kt @@ -55,10 +55,8 @@ class AudioContentThemeQueryRepository( } } - where = if (isFree) { - where.and(audioContent.price.loe(0)) - } else { - where.and(audioContent.price.gt(0)) + if (isFree) { + where = where.and(audioContent.price.loe(0)) } return queryFactory -- 2.40.1 From ecbe9b2e930fe23e00f8aadfaa496105f7e572e0 Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 15 Jul 2025 02:38:29 +0900 Subject: [PATCH 4/5] . --- .../kr/co/vividnext/sodalive/api/home/GetHomeResponse.kt | 2 -- .../kr/co/vividnext/sodalive/api/home/HomeService.kt | 9 --------- 2 files changed, 11 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/api/home/GetHomeResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/api/home/GetHomeResponse.kt index 6db81ca..671ae98 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/api/home/GetHomeResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/api/home/GetHomeResponse.kt @@ -3,7 +3,6 @@ package kr.co.vividnext.sodalive.api.home import kr.co.vividnext.sodalive.audition.GetAuditionListItem import kr.co.vividnext.sodalive.content.AudioContentMainItem import kr.co.vividnext.sodalive.content.main.GetAudioContentRankingItem -import kr.co.vividnext.sodalive.content.main.banner.GetAudioContentBannerResponse import kr.co.vividnext.sodalive.content.main.tab.GetContentCurationResponse import kr.co.vividnext.sodalive.content.series.GetSeriesListResponse import kr.co.vividnext.sodalive.event.GetEventResponse @@ -16,7 +15,6 @@ data class GetHomeResponse( val creatorRanking: List, val latestContentThemeList: List, val latestContentList: List, - val bannerList: List, val eventBannerList: GetEventResponse, val originalAudioDramaList: List, val auditionList: List, diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/api/home/HomeService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/api/home/HomeService.kt index fb30d96..a007527 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/api/home/HomeService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/api/home/HomeService.kt @@ -4,7 +4,6 @@ import kr.co.vividnext.sodalive.audition.AuditionService import kr.co.vividnext.sodalive.content.AudioContentMainItem import kr.co.vividnext.sodalive.content.AudioContentService import kr.co.vividnext.sodalive.content.ContentType -import kr.co.vividnext.sodalive.content.main.banner.AudioContentBannerService import kr.co.vividnext.sodalive.content.main.curation.AudioContentCurationService import kr.co.vividnext.sodalive.content.series.ContentSeriesService import kr.co.vividnext.sodalive.content.series.GetSeriesListResponse @@ -34,7 +33,6 @@ class HomeService( private val auditionService: AuditionService, private val seriesService: ContentSeriesService, private val contentService: AudioContentService, - private val bannerService: AudioContentBannerService, private val curationService: AudioContentCurationService, private val contentThemeService: AudioContentThemeService, private val recommendChannelService: RecommendChannelQueryService, @@ -101,12 +99,6 @@ class HomeService( eventList = emptyList() ) - val bannerList = bannerService.getBannerList( - tabId = 1, - memberId = member?.id, - isAdult = isAdult - ) - val originalAudioDramaList = seriesService.getOriginalAudioDramaList( isAdult = isAdult, contentType = contentType @@ -177,7 +169,6 @@ class HomeService( creatorRanking = creatorRanking, latestContentThemeList = latestContentThemeList, latestContentList = latestContentList, - bannerList = bannerList, eventBannerList = eventBannerList, originalAudioDramaList = originalAudioDramaList, auditionList = auditionList, -- 2.40.1 From 3cedd36e1586b0c3552e36e10e327048fac0272a Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 15 Jul 2025 02:46:14 +0900 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=EB=A9=94=EC=9D=B8=20=ED=99=88=20API?= =?UTF-8?q?=20-=20=EA=B8=B0=EC=A1=B4=20=ED=99=88=20=ED=83=AD=20=EC=83=81?= =?UTF-8?q?=EB=8B=A8=EC=97=90=20=EC=9E=88=EB=8A=94=20=EB=B0=B0=EB=84=88=20?= =?UTF-8?q?=EC=9E=84=EC=8B=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/co/vividnext/sodalive/api/home/GetHomeResponse.kt | 2 ++ .../kr/co/vividnext/sodalive/api/home/HomeService.kt | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/api/home/GetHomeResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/api/home/GetHomeResponse.kt index 671ae98..6db81ca 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/api/home/GetHomeResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/api/home/GetHomeResponse.kt @@ -3,6 +3,7 @@ package kr.co.vividnext.sodalive.api.home import kr.co.vividnext.sodalive.audition.GetAuditionListItem import kr.co.vividnext.sodalive.content.AudioContentMainItem import kr.co.vividnext.sodalive.content.main.GetAudioContentRankingItem +import kr.co.vividnext.sodalive.content.main.banner.GetAudioContentBannerResponse import kr.co.vividnext.sodalive.content.main.tab.GetContentCurationResponse import kr.co.vividnext.sodalive.content.series.GetSeriesListResponse import kr.co.vividnext.sodalive.event.GetEventResponse @@ -15,6 +16,7 @@ data class GetHomeResponse( val creatorRanking: List, val latestContentThemeList: List, val latestContentList: List, + val bannerList: List, val eventBannerList: GetEventResponse, val originalAudioDramaList: List, val auditionList: List, diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/api/home/HomeService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/api/home/HomeService.kt index a007527..fb30d96 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/api/home/HomeService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/api/home/HomeService.kt @@ -4,6 +4,7 @@ import kr.co.vividnext.sodalive.audition.AuditionService import kr.co.vividnext.sodalive.content.AudioContentMainItem import kr.co.vividnext.sodalive.content.AudioContentService import kr.co.vividnext.sodalive.content.ContentType +import kr.co.vividnext.sodalive.content.main.banner.AudioContentBannerService import kr.co.vividnext.sodalive.content.main.curation.AudioContentCurationService import kr.co.vividnext.sodalive.content.series.ContentSeriesService import kr.co.vividnext.sodalive.content.series.GetSeriesListResponse @@ -33,6 +34,7 @@ class HomeService( private val auditionService: AuditionService, private val seriesService: ContentSeriesService, private val contentService: AudioContentService, + private val bannerService: AudioContentBannerService, private val curationService: AudioContentCurationService, private val contentThemeService: AudioContentThemeService, private val recommendChannelService: RecommendChannelQueryService, @@ -99,6 +101,12 @@ class HomeService( eventList = emptyList() ) + val bannerList = bannerService.getBannerList( + tabId = 1, + memberId = member?.id, + isAdult = isAdult + ) + val originalAudioDramaList = seriesService.getOriginalAudioDramaList( isAdult = isAdult, contentType = contentType @@ -169,6 +177,7 @@ class HomeService( creatorRanking = creatorRanking, latestContentThemeList = latestContentThemeList, latestContentList = latestContentList, + bannerList = bannerList, eventBannerList = eventBannerList, originalAudioDramaList = originalAudioDramaList, auditionList = auditionList, -- 2.40.1