기존 콘텐츠 메인 - 새로운 콘텐츠
- 전체 테마를 선택시 데이터가 나오지 않는 버그 수정
This commit is contained in:
		| @@ -28,17 +28,6 @@ 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) | ||||||
| @@ -51,7 +40,11 @@ class AudioContentMainService( | |||||||
|     ): List<GetAudioContentMainItem> { |     ): List<GetAudioContentMainItem> { | ||||||
|         return repository.findByTheme( |         return repository.findByTheme( | ||||||
|             memberId = member.id!!, |             memberId = member.id!!, | ||||||
|             theme = listOf(theme), |             theme = if (theme.isNotBlank()) { | ||||||
|  |                 listOf(theme) | ||||||
|  |             } else { | ||||||
|  |                 emptyList() | ||||||
|  |             }, | ||||||
|             isAdult = member.auth != null && isAdultContentVisible, |             isAdult = member.auth != null && isAdultContentVisible, | ||||||
|             contentType = contentType, |             contentType = contentType, | ||||||
|             offset = pageable.offset, |             offset = pageable.offset, | ||||||
| @@ -69,19 +62,8 @@ 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()) { |         val themeList = if (theme.isBlank() || theme.trim() == "전체") { | ||||||
|             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) | ||||||
|         } |         } | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user