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