test #1

Merged
klaus merged 94 commits from test into main 2023-08-16 02:30:37 +00:00
1 changed files with 14 additions and 8 deletions
Showing only changes of commit c9a9c8c310 - Show all commits

View File

@ -7,7 +7,6 @@ import kr.co.vividnext.sodalive.content.QBundleAudioContent.bundleAudioContent
import kr.co.vividnext.sodalive.content.main.GetAudioContentMainItem import kr.co.vividnext.sodalive.content.main.GetAudioContentMainItem
import kr.co.vividnext.sodalive.content.main.GetNewContentUploadCreator import kr.co.vividnext.sodalive.content.main.GetNewContentUploadCreator
import kr.co.vividnext.sodalive.content.main.QGetAudioContentMainItem import kr.co.vividnext.sodalive.content.main.QGetAudioContentMainItem
import kr.co.vividnext.sodalive.content.main.QGetNewContentUploadCreator
import kr.co.vividnext.sodalive.content.main.banner.AudioContentBanner import kr.co.vividnext.sodalive.content.main.banner.AudioContentBanner
import kr.co.vividnext.sodalive.content.main.banner.QAudioContentBanner.audioContentBanner import kr.co.vividnext.sodalive.content.main.banner.QAudioContentBanner.audioContentBanner
import kr.co.vividnext.sodalive.content.main.curation.AudioContentCuration import kr.co.vividnext.sodalive.content.main.curation.AudioContentCuration
@ -261,13 +260,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
} }
return queryFactory return queryFactory
.select( .select(member)
QGetNewContentUploadCreator(
member.id,
member.nickname,
member.profileImage.nullif("profile/default-profile.png").prepend("$cloudfrontHost/")
)
)
.from(audioContent) .from(audioContent)
.innerJoin(audioContent.member, member) .innerJoin(audioContent.member, member)
.where(where) .where(where)
@ -275,6 +268,19 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
.orderBy(Expressions.numberTemplate(Double::class.java, "function('rand')").asc()) .orderBy(Expressions.numberTemplate(Double::class.java, "function('rand')").asc())
.limit(20) .limit(20)
.fetch() .fetch()
.asSequence()
.map {
GetNewContentUploadCreator(
it.id!!,
it.nickname,
creatorProfileImageUrl = if (it.profileImage != null) {
"$cloudfrontHost/${it.profileImage}"
} else {
"$cloudfrontHost/profile/default-profile.png"
}
)
}
.toList()
} }
override fun getAudioContentMainBannerList(isAdult: Boolean): List<AudioContentBanner> { override fun getAudioContentMainBannerList(isAdult: Boolean): List<AudioContentBanner> {