Merge pull request '기존 콘텐츠 메인 - 새로운 콘텐츠' (#265) from test into main
Reviewed-on: #265
This commit is contained in:
commit
a2b39466c2
|
@ -28,6 +28,17 @@ class AudioContentMainService(
|
||||||
@Cacheable(cacheNames = ["default"], key = "'themeList:' + ':' + #isAdult")
|
@Cacheable(cacheNames = ["default"], key = "'themeList:' + ':' + #isAdult")
|
||||||
fun getThemeList(isAdult: Boolean): List<String> {
|
fun getThemeList(isAdult: Boolean): List<String> {
|
||||||
return audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult)
|
return audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult)
|
||||||
|
.filter {
|
||||||
|
it != "오디오북" &&
|
||||||
|
it != "모닝콜" &&
|
||||||
|
it != "알람" &&
|
||||||
|
it != "슬립콜" &&
|
||||||
|
it != "다시듣기" &&
|
||||||
|
it != "ASMR" &&
|
||||||
|
it != "릴레이" &&
|
||||||
|
it != "챌린지" &&
|
||||||
|
it != "자기소개"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Transactional(readOnly = true)
|
@Transactional(readOnly = true)
|
||||||
|
@ -62,8 +73,19 @@ class AudioContentMainService(
|
||||||
pageable: Pageable
|
pageable: Pageable
|
||||||
): GetNewContentAllResponse {
|
): GetNewContentAllResponse {
|
||||||
val isAdult = member.auth != null && isAdultContentVisible
|
val isAdult = member.auth != null && isAdultContentVisible
|
||||||
val themeList = if (theme.isBlank() || theme.trim() == "전체") {
|
val themeList = if (theme.isBlank()) {
|
||||||
audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult)
|
audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult)
|
||||||
|
.filter {
|
||||||
|
it != "오디오북" &&
|
||||||
|
it != "모닝콜" &&
|
||||||
|
it != "알람" &&
|
||||||
|
it != "슬립콜" &&
|
||||||
|
it != "다시듣기" &&
|
||||||
|
it != "ASMR" &&
|
||||||
|
it != "릴레이" &&
|
||||||
|
it != "챌린지" &&
|
||||||
|
it != "자기소개"
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
listOf(theme)
|
listOf(theme)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue