From 8ae225f4344bbdf504847c89a5ad1a9347f283b3 Mon Sep 17 00:00:00 2001 From: Klaus Date: Wed, 19 Feb 2025 18:43:48 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B8=B0=EC=A1=B4=20=EC=BD=98=ED=85=90?= =?UTF-8?q?=EC=B8=A0=20=EB=A9=94=EC=9D=B8=20-=20=EC=83=88=EB=A1=9C?= =?UTF-8?q?=EC=9A=B4=20=EC=BD=98=ED=85=90=EC=B8=A0=20-=20=EC=A0=84?= =?UTF-8?q?=EC=B2=B4=20=ED=85=8C=EB=A7=88=EB=A5=BC=20=EC=84=A0=ED=83=9D?= =?UTF-8?q?=EC=8B=9C=20=EB=8D=B0=EC=9D=B4=ED=84=B0=EA=B0=80=20=EB=82=98?= =?UTF-8?q?=EC=98=A4=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EB=B2=84=EA=B7=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../content/main/AudioContentMainService.kt | 30 ++++--------------- 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt index 4d68aa0..8928a44 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt @@ -28,17 +28,6 @@ class AudioContentMainService( @Cacheable(cacheNames = ["default"], key = "'themeList:' + ':' + #isAdult") fun getThemeList(isAdult: Boolean): List { 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 { 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) } -- 2.40.1