Test #451
+5
-4
@@ -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.content.main.tab.GetContentCurationResponse
|
||||||
import kr.co.vividnext.sodalive.event.EventService
|
import kr.co.vividnext.sodalive.event.EventService
|
||||||
import kr.co.vividnext.sodalive.member.Member
|
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 kr.co.vividnext.sodalive.rank.RankingService
|
||||||
import org.springframework.stereotype.Service
|
import org.springframework.stereotype.Service
|
||||||
import java.time.DayOfWeek
|
import java.time.DayOfWeek
|
||||||
@@ -21,14 +21,15 @@ class AudioContentMainTabAlarmService(
|
|||||||
private val contentRepository: AudioContentRepository,
|
private val contentRepository: AudioContentRepository,
|
||||||
private val rankingService: RankingService,
|
private val rankingService: RankingService,
|
||||||
private val eventService: EventService,
|
private val eventService: EventService,
|
||||||
private val curationRepository: AudioContentCurationQueryRepository
|
private val curationRepository: AudioContentCurationQueryRepository,
|
||||||
|
private val memberContentPreferenceService: MemberContentPreferenceService
|
||||||
) {
|
) {
|
||||||
fun fetchData(
|
fun fetchData(
|
||||||
isAdultContentVisible: Boolean,
|
isAdultContentVisible: Boolean,
|
||||||
contentType: ContentType,
|
contentType: ContentType,
|
||||||
member: Member
|
member: Member
|
||||||
): GetContentMainTabAlarmResponse {
|
): GetContentMainTabAlarmResponse {
|
||||||
val isAdult = isAdultVisibleByPolicy(member, isAdultContentVisible)
|
val isAdult = memberContentPreferenceService.isAdultVisibleForQuery(member, isAdultContentVisible)
|
||||||
val memberId = member.id!!
|
val memberId = member.id!!
|
||||||
|
|
||||||
val contentBannerList = bannerService.getBannerList(
|
val contentBannerList = bannerService.getBannerList(
|
||||||
@@ -106,7 +107,7 @@ class AudioContentMainTabAlarmService(
|
|||||||
}
|
}
|
||||||
|
|
||||||
val memberId = member.id!!
|
val memberId = member.id!!
|
||||||
val isAdult = isAdultVisibleByPolicy(member, isAdultContentVisible)
|
val isAdult = memberContentPreferenceService.isAdultVisibleForQuery(member, isAdultContentVisible)
|
||||||
|
|
||||||
val totalCount = contentRepository.totalAlarmCountByTheme(
|
val totalCount = contentRepository.totalAlarmCountByTheme(
|
||||||
memberId = memberId,
|
memberId = memberId,
|
||||||
|
|||||||
+4
-3
@@ -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.content.main.tab.GetContentCurationResponse
|
||||||
import kr.co.vividnext.sodalive.event.EventService
|
import kr.co.vividnext.sodalive.event.EventService
|
||||||
import kr.co.vividnext.sodalive.member.Member
|
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 kr.co.vividnext.sodalive.rank.RankingService
|
||||||
import org.springframework.stereotype.Service
|
import org.springframework.stereotype.Service
|
||||||
|
|
||||||
@@ -20,14 +20,15 @@ class AudioContentMainTabAsmrService(
|
|||||||
private val contentRepository: AudioContentRepository,
|
private val contentRepository: AudioContentRepository,
|
||||||
private val rankingService: RankingService,
|
private val rankingService: RankingService,
|
||||||
private val eventService: EventService,
|
private val eventService: EventService,
|
||||||
private val curationRepository: AudioContentCurationQueryRepository
|
private val curationRepository: AudioContentCurationQueryRepository,
|
||||||
|
private val memberContentPreferenceService: MemberContentPreferenceService
|
||||||
) {
|
) {
|
||||||
fun fetchData(
|
fun fetchData(
|
||||||
isAdultContentVisible: Boolean,
|
isAdultContentVisible: Boolean,
|
||||||
contentType: ContentType,
|
contentType: ContentType,
|
||||||
member: Member
|
member: Member
|
||||||
): GetContentMainTabAsmrResponse {
|
): GetContentMainTabAsmrResponse {
|
||||||
val isAdult = isAdultVisibleByPolicy(member, isAdultContentVisible)
|
val isAdult = memberContentPreferenceService.isAdultVisibleForQuery(member, isAdultContentVisible)
|
||||||
val memberId = member.id!!
|
val memberId = member.id!!
|
||||||
val theme = "ASMR"
|
val theme = "ASMR"
|
||||||
val tabId = 5L
|
val tabId = 5L
|
||||||
|
|||||||
+5
-4
@@ -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.content.theme.AudioContentThemeQueryRepository
|
||||||
import kr.co.vividnext.sodalive.event.EventService
|
import kr.co.vividnext.sodalive.event.EventService
|
||||||
import kr.co.vividnext.sodalive.member.Member
|
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 kr.co.vividnext.sodalive.rank.RankingService
|
||||||
import org.springframework.stereotype.Service
|
import org.springframework.stereotype.Service
|
||||||
import java.time.LocalDateTime
|
import java.time.LocalDateTime
|
||||||
@@ -23,7 +23,8 @@ class AudioContentMainTabContentService(
|
|||||||
private val rankingService: RankingService,
|
private val rankingService: RankingService,
|
||||||
private val eventService: EventService,
|
private val eventService: EventService,
|
||||||
private val tagCurationService: ContentMainTabTagCurationService,
|
private val tagCurationService: ContentMainTabTagCurationService,
|
||||||
private val curationRepository: AudioContentCurationQueryRepository
|
private val curationRepository: AudioContentCurationQueryRepository,
|
||||||
|
private val memberContentPreferenceService: MemberContentPreferenceService
|
||||||
) {
|
) {
|
||||||
fun fetchData(
|
fun fetchData(
|
||||||
isAdultContentVisible: Boolean,
|
isAdultContentVisible: Boolean,
|
||||||
@@ -31,7 +32,7 @@ class AudioContentMainTabContentService(
|
|||||||
member: Member
|
member: Member
|
||||||
): GetContentMainTabContentResponse {
|
): GetContentMainTabContentResponse {
|
||||||
val memberId = member.id!!
|
val memberId = member.id!!
|
||||||
val isAdult = isAdultVisibleByPolicy(member, isAdultContentVisible)
|
val isAdult = memberContentPreferenceService.isAdultVisibleForQuery(member, isAdultContentVisible)
|
||||||
val tabId = 3L
|
val tabId = 3L
|
||||||
|
|
||||||
// 단편 배너
|
// 단편 배너
|
||||||
@@ -191,7 +192,7 @@ class AudioContentMainTabContentService(
|
|||||||
contentType: ContentType,
|
contentType: ContentType,
|
||||||
member: Member
|
member: Member
|
||||||
): List<GetAudioContentMainItem> {
|
): List<GetAudioContentMainItem> {
|
||||||
val isAdult = isAdultVisibleByPolicy(member, isAdultContentVisible)
|
val isAdult = memberContentPreferenceService.isAdultVisibleForQuery(member, isAdultContentVisible)
|
||||||
|
|
||||||
val themeList = if (theme.isBlank()) {
|
val themeList = if (theme.isBlank()) {
|
||||||
audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult, contentType = contentType)
|
audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult, contentType = contentType)
|
||||||
|
|||||||
+7
-6
@@ -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.main.tab.RecommendSeriesRepository
|
||||||
import kr.co.vividnext.sodalive.content.theme.AudioContentThemeQueryRepository
|
import kr.co.vividnext.sodalive.content.theme.AudioContentThemeQueryRepository
|
||||||
import kr.co.vividnext.sodalive.member.Member
|
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 kr.co.vividnext.sodalive.rank.RankingService
|
||||||
import org.springframework.stereotype.Service
|
import org.springframework.stereotype.Service
|
||||||
|
|
||||||
@@ -24,14 +24,15 @@ class AudioContentMainTabFreeService(
|
|||||||
private val contentRepository: AudioContentRepository,
|
private val contentRepository: AudioContentRepository,
|
||||||
private val rankingService: RankingService,
|
private val rankingService: RankingService,
|
||||||
private val audioContentRepository: AudioContentRepository,
|
private val audioContentRepository: AudioContentRepository,
|
||||||
private val audioContentThemeRepository: AudioContentThemeQueryRepository
|
private val audioContentThemeRepository: AudioContentThemeQueryRepository,
|
||||||
|
private val memberContentPreferenceService: MemberContentPreferenceService
|
||||||
) {
|
) {
|
||||||
fun fetchData(
|
fun fetchData(
|
||||||
isAdultContentVisible: Boolean,
|
isAdultContentVisible: Boolean,
|
||||||
contentType: ContentType,
|
contentType: ContentType,
|
||||||
member: Member
|
member: Member
|
||||||
): GetContentMainTabFreeResponse {
|
): GetContentMainTabFreeResponse {
|
||||||
val isAdult = isAdultVisibleByPolicy(member, isAdultContentVisible)
|
val isAdult = memberContentPreferenceService.isAdultVisibleForQuery(member, isAdultContentVisible)
|
||||||
val memberId = member.id!!
|
val memberId = member.id!!
|
||||||
val tabId = 7L
|
val tabId = 7L
|
||||||
|
|
||||||
@@ -135,7 +136,7 @@ class AudioContentMainTabFreeService(
|
|||||||
offset: Long,
|
offset: Long,
|
||||||
limit: Long
|
limit: Long
|
||||||
): List<GetAudioContentMainItem> {
|
): List<GetAudioContentMainItem> {
|
||||||
val isAdult = isAdultVisibleByPolicy(member, isAdultContentVisible)
|
val isAdult = memberContentPreferenceService.isAdultVisibleForQuery(member, isAdultContentVisible)
|
||||||
val memberId = member.id!!
|
val memberId = member.id!!
|
||||||
|
|
||||||
val introduceCreatorCuration = curationRepository.findByContentMainTabIdAndTitle(
|
val introduceCreatorCuration = curationRepository.findByContentMainTabIdAndTitle(
|
||||||
@@ -172,7 +173,7 @@ class AudioContentMainTabFreeService(
|
|||||||
listOf(theme)
|
listOf(theme)
|
||||||
} else {
|
} else {
|
||||||
audioContentThemeRepository.getActiveThemeOfContent(
|
audioContentThemeRepository.getActiveThemeOfContent(
|
||||||
isAdult = isAdultVisibleByPolicy(member, isAdultContentVisible),
|
isAdult = memberContentPreferenceService.isAdultVisibleForQuery(member, isAdultContentVisible),
|
||||||
isFree = true,
|
isFree = true,
|
||||||
contentType = contentType
|
contentType = contentType
|
||||||
).filter {
|
).filter {
|
||||||
@@ -186,7 +187,7 @@ class AudioContentMainTabFreeService(
|
|||||||
it != "자기소개"
|
it != "자기소개"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
isAdult = isAdultVisibleByPolicy(member, isAdultContentVisible),
|
isAdult = memberContentPreferenceService.isAdultVisibleForQuery(member, isAdultContentVisible),
|
||||||
contentType = contentType,
|
contentType = contentType,
|
||||||
offset = offset,
|
offset = offset,
|
||||||
limit = limit,
|
limit = limit,
|
||||||
|
|||||||
Reference in New Issue
Block a user