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

test #136

Merged
klaus merged 2 commits from test into main 2024-02-27 16:16:31 +00:00
Conversation 0 Commits 2 Files Changed 2 +7
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 48d5f1674f - Show all commits

7
src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt
View File

@@ -166,6 +166,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
var where = audioContent.member.id.eq(creatorId) var where = audioContent.member.id.eq(creatorId)
.and( .and(
audioContent.isActive.isTrue audioContent.isActive.isTrue
.and(audioContent.duration.isNotNull)
.or(audioContent.releaseDate.isNotNull.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) var where = audioContent.member.id.eq(creatorId)
.and( .and(
audioContent.isActive.isTrue audioContent.isActive.isTrue
.and(audioContent.duration.isNotNull)
.or(audioContent.releaseDate.isNotNull.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 var where = audioContent.isActive.isTrue
.and(audioContent.duration.isNotNull)
.and( .and(
audioContent.releaseDate.isNull audioContent.releaseDate.isNull
.or(audioContent.releaseDate.loe(LocalDateTime.now())) .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 { override fun totalCountByTheme(memberId: Long, theme: String, isAdult: Boolean): Int {
var where = audioContent.isActive.isTrue var where = audioContent.isActive.isTrue
.and(audioContent.duration.isNotNull)
.and( .and(
audioContent.releaseDate.isNull audioContent.releaseDate.isNull
.or(audioContent.releaseDate.loe(LocalDateTime.now())) .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 { override fun totalCountNewContentFor2Weeks(theme: String, memberId: Long, isAdult: Boolean): Int {
var where = audioContent.isActive.isTrue var where = audioContent.isActive.isTrue
.and(audioContent.duration.isNotNull)
.and(audioContent.releaseDate.goe(LocalDateTime.now().minusWeeks(2))) .and(audioContent.releaseDate.goe(LocalDateTime.now().minusWeeks(2)))
.and( .and(
audioContent.releaseDate.isNull audioContent.releaseDate.isNull
@@ -435,6 +440,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
limit: Long limit: Long
): List<GetAudioContentMainItem> { ): List<GetAudioContentMainItem> {
var where = audioContent.isActive.isTrue var where = audioContent.isActive.isTrue
.and(audioContent.duration.isNotNull)
.and(audioContent.releaseDate.goe(LocalDateTime.now().minusWeeks(2))) .and(audioContent.releaseDate.goe(LocalDateTime.now().minusWeeks(2)))
.and( .and(
audioContent.releaseDate.isNull audioContent.releaseDate.isNull
@@ -479,6 +485,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
): List<GetNewContentUploadCreator> { ): List<GetNewContentUploadCreator> {
var where = audioContent.releaseDate.after(LocalDateTime.now().minusWeeks(2)) var where = audioContent.releaseDate.after(LocalDateTime.now().minusWeeks(2))
.and(audioContent.isActive.isTrue) .and(audioContent.isActive.isTrue)
.and(audioContent.duration.isNotNull)
if (!isAdult) { if (!isAdult) {
where = where.and(audioContent.isAdult.isFalse) where = where.and(audioContent.isAdult.isFalse)