From d4318cc48cdd2048ecc61cfa56905514fbe5de81 Mon Sep 17 00:00:00 2001 From: Klaus Date: Mon, 24 Feb 2025 12:17:07 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EB=8C=80?= =?UTF-8?q?=EC=97=AC=EA=B8=B0=EA=B0=84=20-=2015=20->=205=EC=9D=BC=EB=A1=9C?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/kotlin/kr/co/vividnext/sodalive/content/order/Order.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/order/Order.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/order/Order.kt index 52a00af..eb59754 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/order/Order.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/order/Order.kt @@ -52,7 +52,7 @@ data class Order( override fun prePersist() { super.prePersist() if (type == OrderType.RENTAL) { - endDate = startDate.plusDays(15) + endDate = startDate.plusDays(5) } } } From 2e05b25c415e9f5791ac7f2e0a7060d617173ad2 Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 25 Feb 2025 22:52:33 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20-=20=ED=85=8C=EB=A7=88=EC=97=90=20=EC=98=A4?= =?UTF-8?q?=EB=94=94=EC=98=A4=EB=B6=81=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/content/main/AudioContentMainService.kt | 6 ++---- .../main/tab/content/AudioContentMainTabContentService.kt | 6 ++---- .../content/main/tab/free/AudioContentMainTabFreeService.kt | 6 ++---- 3 files changed, 6 insertions(+), 12 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 bd22aea..f704c00 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 @@ -29,8 +29,7 @@ class AudioContentMainService( fun getThemeList(isAdult: Boolean): List { 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 != "다시듣기" && diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/content/AudioContentMainTabContentService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/content/AudioContentMainTabContentService.kt index b5b321e..12da8e8 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/content/AudioContentMainTabContentService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/content/AudioContentMainTabContentService.kt @@ -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 != "다시듣기" && diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/free/AudioContentMainTabFreeService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/free/AudioContentMainTabFreeService.kt index a9552f5..e9386b8 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/free/AudioContentMainTabFreeService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/free/AudioContentMainTabFreeService.kt @@ -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 != "다시듣기" &&