Test #451

Merged
klaus merged 15 commits from test into main 2026-09-18 02:15:25 +00:00
4 changed files with 21 additions and 17 deletions
Showing only changes of commit 13821a33ea - Show all commits
@@ -8,7 +8,7 @@ import kr.co.vividnext.sodalive.content.main.curation.AudioContentCurationQueryR
import kr.co.vividnext.sodalive.content.main.tab.GetContentCurationResponse
import kr.co.vividnext.sodalive.event.EventService
import kr.co.vividnext.sodalive.member.Member
import kr.co.vividnext.sodalive.member.contentpreference.isAdultVisibleByPolicy
import kr.co.vividnext.sodalive.member.contentpreference.MemberContentPreferenceService
import kr.co.vividnext.sodalive.rank.RankingService
import org.springframework.stereotype.Service
import java.time.DayOfWeek
@@ -21,14 +21,15 @@ class AudioContentMainTabAlarmService(
private val contentRepository: AudioContentRepository,
private val rankingService: RankingService,
private val eventService: EventService,
private val curationRepository: AudioContentCurationQueryRepository
private val curationRepository: AudioContentCurationQueryRepository,
private val memberContentPreferenceService: MemberContentPreferenceService
) {
fun fetchData(
isAdultContentVisible: Boolean,
contentType: ContentType,
member: Member
): GetContentMainTabAlarmResponse {
val isAdult = isAdultVisibleByPolicy(member, isAdultContentVisible)
val isAdult = memberContentPreferenceService.isAdultVisibleForQuery(member, isAdultContentVisible)
val memberId = member.id!!
val contentBannerList = bannerService.getBannerList(
@@ -106,7 +107,7 @@ class AudioContentMainTabAlarmService(
}
val memberId = member.id!!
val isAdult = isAdultVisibleByPolicy(member, isAdultContentVisible)
val isAdult = memberContentPreferenceService.isAdultVisibleForQuery(member, isAdultContentVisible)
val totalCount = contentRepository.totalAlarmCountByTheme(
memberId = memberId,
@@ -9,7 +9,7 @@ import kr.co.vividnext.sodalive.content.main.tab.AudioContentMainTabRepository
import kr.co.vividnext.sodalive.content.main.tab.GetContentCurationResponse
import kr.co.vividnext.sodalive.event.EventService
import kr.co.vividnext.sodalive.member.Member
import kr.co.vividnext.sodalive.member.contentpreference.isAdultVisibleByPolicy
import kr.co.vividnext.sodalive.member.contentpreference.MemberContentPreferenceService
import kr.co.vividnext.sodalive.rank.RankingService
import org.springframework.stereotype.Service
@@ -20,14 +20,15 @@ class AudioContentMainTabAsmrService(
private val contentRepository: AudioContentRepository,
private val rankingService: RankingService,
private val eventService: EventService,
private val curationRepository: AudioContentCurationQueryRepository
private val curationRepository: AudioContentCurationQueryRepository,
private val memberContentPreferenceService: MemberContentPreferenceService
) {
fun fetchData(
isAdultContentVisible: Boolean,
contentType: ContentType,
member: Member
): GetContentMainTabAsmrResponse {
val isAdult = isAdultVisibleByPolicy(member, isAdultContentVisible)
val isAdult = memberContentPreferenceService.isAdultVisibleForQuery(member, isAdultContentVisible)
val memberId = member.id!!
val theme = "ASMR"
val tabId = 5L
@@ -10,7 +10,7 @@ import kr.co.vividnext.sodalive.content.main.tab.GetContentCurationResponse
import kr.co.vividnext.sodalive.content.theme.AudioContentThemeQueryRepository
import kr.co.vividnext.sodalive.event.EventService
import kr.co.vividnext.sodalive.member.Member
import kr.co.vividnext.sodalive.member.contentpreference.isAdultVisibleByPolicy
import kr.co.vividnext.sodalive.member.contentpreference.MemberContentPreferenceService
import kr.co.vividnext.sodalive.rank.RankingService
import org.springframework.stereotype.Service
import java.time.LocalDateTime
@@ -23,7 +23,8 @@ class AudioContentMainTabContentService(
private val rankingService: RankingService,
private val eventService: EventService,
private val tagCurationService: ContentMainTabTagCurationService,
private val curationRepository: AudioContentCurationQueryRepository
private val curationRepository: AudioContentCurationQueryRepository,
private val memberContentPreferenceService: MemberContentPreferenceService
) {
fun fetchData(
isAdultContentVisible: Boolean,
@@ -31,7 +32,7 @@ class AudioContentMainTabContentService(
member: Member
): GetContentMainTabContentResponse {
val memberId = member.id!!
val isAdult = isAdultVisibleByPolicy(member, isAdultContentVisible)
val isAdult = memberContentPreferenceService.isAdultVisibleForQuery(member, isAdultContentVisible)
val tabId = 3L
// 단편 배너
@@ -191,7 +192,7 @@ class AudioContentMainTabContentService(
contentType: ContentType,
member: Member
): List<GetAudioContentMainItem> {
val isAdult = isAdultVisibleByPolicy(member, isAdultContentVisible)
val isAdult = memberContentPreferenceService.isAdultVisibleForQuery(member, isAdultContentVisible)
val themeList = if (theme.isBlank()) {
audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult, contentType = contentType)
@@ -11,7 +11,7 @@ import kr.co.vividnext.sodalive.content.main.tab.GetContentCurationResponse
import kr.co.vividnext.sodalive.content.main.tab.RecommendSeriesRepository
import kr.co.vividnext.sodalive.content.theme.AudioContentThemeQueryRepository
import kr.co.vividnext.sodalive.member.Member
import kr.co.vividnext.sodalive.member.contentpreference.isAdultVisibleByPolicy
import kr.co.vividnext.sodalive.member.contentpreference.MemberContentPreferenceService
import kr.co.vividnext.sodalive.rank.RankingService
import org.springframework.stereotype.Service
@@ -24,14 +24,15 @@ class AudioContentMainTabFreeService(
private val contentRepository: AudioContentRepository,
private val rankingService: RankingService,
private val audioContentRepository: AudioContentRepository,
private val audioContentThemeRepository: AudioContentThemeQueryRepository
private val audioContentThemeRepository: AudioContentThemeQueryRepository,
private val memberContentPreferenceService: MemberContentPreferenceService
) {
fun fetchData(
isAdultContentVisible: Boolean,
contentType: ContentType,
member: Member
): GetContentMainTabFreeResponse {
val isAdult = isAdultVisibleByPolicy(member, isAdultContentVisible)
val isAdult = memberContentPreferenceService.isAdultVisibleForQuery(member, isAdultContentVisible)
val memberId = member.id!!
val tabId = 7L
@@ -135,7 +136,7 @@ class AudioContentMainTabFreeService(
offset: Long,
limit: Long
): List<GetAudioContentMainItem> {
val isAdult = isAdultVisibleByPolicy(member, isAdultContentVisible)
val isAdult = memberContentPreferenceService.isAdultVisibleForQuery(member, isAdultContentVisible)
val memberId = member.id!!
val introduceCreatorCuration = curationRepository.findByContentMainTabIdAndTitle(
@@ -172,7 +173,7 @@ class AudioContentMainTabFreeService(
listOf(theme)
} else {
audioContentThemeRepository.getActiveThemeOfContent(
isAdult = isAdultVisibleByPolicy(member, isAdultContentVisible),
isAdult = memberContentPreferenceService.isAdultVisibleForQuery(member, isAdultContentVisible),
isFree = true,
contentType = contentType
).filter {
@@ -186,7 +187,7 @@ class AudioContentMainTabFreeService(
it != "자기소개"
}
},
isAdult = isAdultVisibleByPolicy(member, isAdultContentVisible),
isAdult = memberContentPreferenceService.isAdultVisibleForQuery(member, isAdultContentVisible),
contentType = contentType,
offset = offset,
limit = limit,