From 48d5f1674fe9dffaa5dc809dbdd4dd9f3bce7f2e Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 27 Feb 2024 17:16:22 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=ED=81=AC=EB=A6=AC=EC=97=90=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=20=EC=BD=98=ED=85=90=EC=B8=A0=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?-=20=EC=9E=AC=EC=83=9D=EC=8B=9C=EA=B0=84=EC=9D=B4=20=EC=9E=88?= =?UTF-8?q?=EB=8A=94=20=EC=BD=98=ED=85=90=EC=B8=A0=EB=A7=8C=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vividnext/sodalive/content/AudioContentRepository.kt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt index f7a02fb..e997e3d 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt @@ -166,6 +166,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) var where = audioContent.member.id.eq(creatorId) .and( audioContent.isActive.isTrue + .and(audioContent.duration.isNotNull) .or(audioContent.releaseDate.isNotNull.and(audioContent.duration.isNotNull)) ) @@ -237,6 +238,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) var where = audioContent.member.id.eq(creatorId) .and( audioContent.isActive.isTrue + .and(audioContent.duration.isNotNull) .or(audioContent.releaseDate.isNotNull.and(audioContent.duration.isNotNull)) ) @@ -336,6 +338,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) } var where = audioContent.isActive.isTrue + .and(audioContent.duration.isNotNull) .and( audioContent.releaseDate.isNull .or(audioContent.releaseDate.loe(LocalDateTime.now())) @@ -375,6 +378,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) override fun totalCountByTheme(memberId: Long, theme: String, isAdult: Boolean): Int { var where = audioContent.isActive.isTrue + .and(audioContent.duration.isNotNull) .and( audioContent.releaseDate.isNull .or(audioContent.releaseDate.loe(LocalDateTime.now())) @@ -401,6 +405,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) override fun totalCountNewContentFor2Weeks(theme: String, memberId: Long, isAdult: Boolean): Int { var where = audioContent.isActive.isTrue + .and(audioContent.duration.isNotNull) .and(audioContent.releaseDate.goe(LocalDateTime.now().minusWeeks(2))) .and( audioContent.releaseDate.isNull @@ -435,6 +440,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) limit: Long ): List { var where = audioContent.isActive.isTrue + .and(audioContent.duration.isNotNull) .and(audioContent.releaseDate.goe(LocalDateTime.now().minusWeeks(2))) .and( audioContent.releaseDate.isNull @@ -479,6 +485,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) ): List { var where = audioContent.releaseDate.after(LocalDateTime.now().minusWeeks(2)) .and(audioContent.isActive.isTrue) + .and(audioContent.duration.isNotNull) if (!isAdult) { where = where.and(audioContent.isAdult.isFalse) From 2f08149e481e72803c60a570205538e625eb47d0 Mon Sep 17 00:00:00 2001 From: Klaus Date: Wed, 28 Feb 2024 01:09:42 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EB=A3=B0=EB=A0=9B=20=EC=A0=95=EB=A0=AC=20?= =?UTF-8?q?=EC=88=9C=EC=84=9C=20=EC=88=98=EC=A0=95=201=EC=88=9C=EC=9C=84?= =?UTF-8?q?=20-=20=ED=99=9C=EC=84=B1=ED=99=94=20=EB=90=9C=20=EC=83=81?= =?UTF-8?q?=ED=83=9C=202=EC=88=9C=EC=9C=84=20-=20id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../co/vividnext/sodalive/live/roulette/NewRouletteService.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRouletteService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRouletteService.kt index fa3ea40..a77eef5 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRouletteService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRouletteService.kt @@ -54,9 +54,9 @@ class NewRouletteService( oldRepository.deleteById(roulette.creatorId) } } - rouletteList.sortedBy { it.id } - return rouletteList.asSequence() + return rouletteList.sortedWith(compareByDescending { it.isActive }.thenBy { it.id }) + .asSequence() .map { GetNewRouletteResponse( it.id,