klaus
/
sodalive-backend-spring-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '콘텐츠 대여기간' (#273) from test into main 

Reviewed-on: #273
This commit is contained in:
klaus 2025-02-25 14:02:18 +00:00
parent 587b90bd27 2e05b25c41
commit 827333108d
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt
View File

@ -29,8 +29,7 @@ class AudioContentMainService(
fun getThemeList(isAdult: Boolean): List<String> {
return audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult)
.filter {
it != "오디오북" &&
it != "모닝콜" &&
it != "모닝콜" &&
it != "알람" &&
it != "슬립콜" &&
it != "다시듣기" &&
@ -76,8 +75,7 @@ class AudioContentMainService(
val themeList = if (theme.isBlank()) {
audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult, isFree = isFree)
.filter {
it != "오디오북" &&
it != "모닝콜" &&
it != "모닝콜" &&
it != "알람" &&
it != "슬립콜" &&
it != "다시듣기" &&

6
src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/content/AudioContentMainTabContentService.kt
View File

@ -43,8 +43,7 @@ class AudioContentMainTabContentService(
// 새로운 단편 테마
val themeOfContentList = audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult)
.filter {
it != "오디오북" &&
it != "모닝콜" &&
it != "모닝콜" &&
it != "알람" &&
it != "슬립콜" &&
it != "다시듣기" &&
@ -172,8 +171,7 @@ class AudioContentMainTabContentService(
val themeList = if (theme.isBlank()) {
audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult)
.filter {
it != "오디오북" &&
it != "모닝콜" &&
it != "모닝콜" &&
it != "알람" &&
it != "슬립콜" &&
it != "다시듣기" &&

6
src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/free/AudioContentMainTabFreeService.kt
View File

@ -56,8 +56,7 @@ class AudioContentMainTabFreeService(
val themeList = audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult, isFree = true)
.filter {
it != "오디오북" &&
it != "모닝콜" &&
it != "모닝콜" &&
it != "알람" &&
it != "슬립콜" &&
it != "다시듣기" &&
@ -157,8 +156,7 @@ class AudioContentMainTabFreeService(
isFree = true
)
.filter {
it != "오디오북" &&
it != "모닝콜" &&
it != "모닝콜" &&
it != "알람" &&
it != "슬립콜" &&
it != "다시듣기" &&

2
src/main/kotlin/kr/co/vividnext/sodalive/content/order/Order.kt
View File

@ -52,7 +52,7 @@ data class Order(
override fun prePersist() {
super.prePersist()
if (type == OrderType.RENTAL) {
endDate = startDate.plusDays(15)
endDate = startDate.plusDays(5)
}
}
}