Compare commits
No commits in common. "587b90bd271b261a8c1a3f4ef8d160dfb85a1d35" and "4dc20c5e90e135c9b59ba86680295ca966383f29" have entirely different histories.
587b90bd27
...
4dc20c5e90
|
@ -74,7 +74,7 @@ class AudioContentMainService(
|
||||||
): GetNewContentAllResponse {
|
): GetNewContentAllResponse {
|
||||||
val isAdult = member.auth != null && isAdultContentVisible
|
val isAdult = member.auth != null && isAdultContentVisible
|
||||||
val themeList = if (theme.isBlank()) {
|
val themeList = if (theme.isBlank()) {
|
||||||
audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult, isFree = isFree)
|
audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult)
|
||||||
.filter {
|
.filter {
|
||||||
it != "오디오북" &&
|
it != "오디오북" &&
|
||||||
it != "모닝콜" &&
|
it != "모닝콜" &&
|
||||||
|
|
|
@ -55,21 +55,9 @@ class AudioContentMainTabFreeService(
|
||||||
val recommendSeriesList = recommendSeriesRepository.getRecommendSeriesList(isAdult = isAdult)
|
val recommendSeriesList = recommendSeriesRepository.getRecommendSeriesList(isAdult = isAdult)
|
||||||
|
|
||||||
val themeList = audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult, isFree = true)
|
val themeList = audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult, isFree = true)
|
||||||
.filter {
|
|
||||||
it != "오디오북" &&
|
|
||||||
it != "모닝콜" &&
|
|
||||||
it != "알람" &&
|
|
||||||
it != "슬립콜" &&
|
|
||||||
it != "다시듣기" &&
|
|
||||||
it != "ASMR" &&
|
|
||||||
it != "릴레이" &&
|
|
||||||
it != "챌린지" &&
|
|
||||||
it != "자기소개"
|
|
||||||
}
|
|
||||||
val newFreeContentList = if (themeList.isNotEmpty()) {
|
val newFreeContentList = if (themeList.isNotEmpty()) {
|
||||||
audioContentRepository.findByTheme(
|
audioContentRepository.findByTheme(
|
||||||
memberId = member.id!!,
|
memberId = member.id!!,
|
||||||
theme = themeList,
|
|
||||||
isAdult = member.auth != null,
|
isAdult = member.auth != null,
|
||||||
contentType = ContentType.ALL,
|
contentType = ContentType.ALL,
|
||||||
offset = 0,
|
offset = 0,
|
||||||
|
@ -152,21 +140,7 @@ class AudioContentMainTabFreeService(
|
||||||
theme = if (theme.isNotBlank()) {
|
theme = if (theme.isNotBlank()) {
|
||||||
listOf(theme)
|
listOf(theme)
|
||||||
} else {
|
} else {
|
||||||
audioContentThemeRepository.getActiveThemeOfContent(
|
emptyList()
|
||||||
isAdult = member.auth != null && isAdultContentVisible,
|
|
||||||
isFree = true
|
|
||||||
)
|
|
||||||
.filter {
|
|
||||||
it != "오디오북" &&
|
|
||||||
it != "모닝콜" &&
|
|
||||||
it != "알람" &&
|
|
||||||
it != "슬립콜" &&
|
|
||||||
it != "다시듣기" &&
|
|
||||||
it != "ASMR" &&
|
|
||||||
it != "릴레이" &&
|
|
||||||
it != "챌린지" &&
|
|
||||||
it != "자기소개"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
isAdult = member.auth != null && isAdultContentVisible,
|
isAdult = member.auth != null && isAdultContentVisible,
|
||||||
contentType = contentType,
|
contentType = contentType,
|
||||||
|
|
Loading…
Reference in New Issue