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

Compare commits

base: klaus:008ee3b4e59c67059d63ef3d796affba2cf14235
Branches Tags
klaus:test klaus:main
...
compare: klaus:main
Branches Tags
klaus:test klaus:main

6 Commits
008ee3b4e5 ... main

Author SHA1 Message Date
klaus
587f3d6b58 Merge pull request 'test' (#368) from test into main 
Reviewed-on: #368
 2025-11-20 16:02:25 +00:00
Klaus
76806e2e90 feat(content-theme): 무료 콘텐츠의 테마를 조회할 때 '자기소개'가 가장 먼저 표시되도록 수정 2025-11-21 00:49:17 +09:00
Klaus
39c51825da feat(content-theme): 무료 콘텐츠의 테마를 조회할 때 '자기소개'가 가장 먼저 표시되도록 수정 2025-11-21 00:37:29 +09:00
klaus
9b6167d46d Merge pull request 'test' (#367) from test into main 
Reviewed-on: #367
 2025-11-20 12:53:00 +00:00
Klaus
9a58b7b95f feat(latest-content-by-creator): 최신 콘텐츠 1개 조회시 오픈 되어 있는 콘텐츠만 조회하도록 수정 2025-11-20 21:19:29 +09:00
Klaus
26eae4b06e feat(latest-content-by-creator): 최신 콘텐츠 1개 조회시 오픈 되어 있는 콘텐츠만 조회하도록 수정 2025-11-20 20:59:09 +09:00
2 changed files with 20 additions and 8 deletions
Expand all files Collapse all files

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

@@ -1453,11 +1453,10 @@ class AudioContentQueryRepositoryImpl(
isAdult: Boolean isAdult: Boolean
): AudioContent? { ): AudioContent? {
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)
.and(audioContent.duration.isNotNull) .and(audioContent.releaseDate.isNotNull)
.or(audioContent.releaseDate.isNotNull.and(audioContent.duration.isNotNull)) .and(audioContent.releaseDate.loe(LocalDateTime.now()))
)
if (!isAdult) { if (!isAdult) {
where = where.and(audioContent.isAdult.isFalse) where = where.and(audioContent.isAdult.isFalse)

19
src/main/kotlin/kr/co/vividnext/sodalive/content/theme/AudioContentThemeQueryRepository.kt
View File

@@ -1,5 +1,6 @@
package kr.co.vividnext.sodalive.content.theme package kr.co.vividnext.sodalive.content.theme
import com.querydsl.core.types.dsl.CaseBuilder
import com.querydsl.jpa.impl.JPAQueryFactory import com.querydsl.jpa.impl.JPAQueryFactory
import kr.co.vividnext.sodalive.content.ContentType import kr.co.vividnext.sodalive.content.ContentType
import kr.co.vividnext.sodalive.content.QAudioContent.audioContent import kr.co.vividnext.sodalive.content.QAudioContent.audioContent
@@ -64,15 +65,27 @@ class AudioContentThemeQueryRepository(
where = where.and(audioContent.isPointAvailable.isTrue) where = where.and(audioContent.isPointAvailable.isTrue)
} }
return queryFactory val query = queryFactory
.select(audioContentTheme.theme) .select(audioContentTheme.theme)
.from(audioContent) .from(audioContent)
.innerJoin(audioContent.member, member) .innerJoin(audioContent.member, member)
.innerJoin(audioContent.theme, audioContentTheme) .innerJoin(audioContent.theme, audioContentTheme)
.where(where) .where(where)
.groupBy(audioContentTheme.id) .groupBy(audioContentTheme.id)
.orderBy(audioContentTheme.orders.asc())
.fetch() if (isFree) {
query.orderBy(
CaseBuilder()
.`when`(audioContentTheme.theme.eq("자기소개")).then(0)
.otherwise(1)
.asc(),
audioContentTheme.orders.asc()
)
} else {
query.orderBy(audioContentTheme.orders.asc())
}
return query.fetch()
} }
fun findThemeByIdAndActive(id: Long): AudioContentTheme? { fun findThemeByIdAndActive(id: Long): AudioContentTheme? {