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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@@ -56,7 +56,6 @@ class AudioContentMainTabFreeService(
val themeList = audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult, isFree = true) val themeList = audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult, isFree = true)
.filter { .filter {
it != "오디오북" &&
it != "모닝콜" && it != "모닝콜" &&
it != "알람" && it != "알람" &&
it != "슬립콜" && it != "슬립콜" &&
@@ -157,7 +156,6 @@ class AudioContentMainTabFreeService(
isFree = true isFree = true
) )
.filter { .filter {
it != "오디오북" &&
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() { override fun prePersist() {
super.prePersist() super.prePersist()
if (type == OrderType.RENTAL) { if (type == OrderType.RENTAL) {
endDate = startDate.plusDays(15) endDate = startDate.plusDays(5)
} }
} }
} }