feat(creatorname): 레거시 조회와 검색에 언어별 이름을 적용한다
This commit is contained in:
@@ -29,6 +29,7 @@ import kr.co.vividnext.sodalive.live.room.LiveRoom
|
||||
import kr.co.vividnext.sodalive.live.room.LiveRoomType
|
||||
import kr.co.vividnext.sodalive.live.room.QLiveRoom.liveRoom
|
||||
import kr.co.vividnext.sodalive.live.room.cancel.QLiveRoomCancel.liveRoomCancel
|
||||
import kr.co.vividnext.sodalive.live.room.detail.GetRoomDetailUser
|
||||
import kr.co.vividnext.sodalive.live.room.visit.QLiveRoomVisit.liveRoomVisit
|
||||
import kr.co.vividnext.sodalive.member.Gender
|
||||
import kr.co.vividnext.sodalive.member.Member
|
||||
@@ -40,6 +41,8 @@ import kr.co.vividnext.sodalive.member.block.QBlockMember.blockMember
|
||||
import kr.co.vividnext.sodalive.member.following.QCreatorFollowing.creatorFollowing
|
||||
import kr.co.vividnext.sodalive.member.tag.QCreatorTag.creatorTag
|
||||
import kr.co.vividnext.sodalive.member.tag.QMemberCreatorTag.memberCreatorTag
|
||||
import kr.co.vividnext.sodalive.v2.creatorname.adapter.out.persistence.CreatorNameJoin
|
||||
import kr.co.vividnext.sodalive.v2.creatorname.adapter.out.persistence.creatorNameContains
|
||||
import org.springframework.beans.factory.annotation.Value
|
||||
import org.springframework.stereotype.Repository
|
||||
import java.math.BigDecimal
|
||||
@@ -122,13 +125,16 @@ class ExplorerQueryRepository(
|
||||
creatorId: Long,
|
||||
limit: Long,
|
||||
offset: Long = 0,
|
||||
withDonationCan: Boolean
|
||||
withDonationCan: Boolean,
|
||||
lang: Lang? = null
|
||||
): List<MemberDonationRankingResponse> {
|
||||
val member = QMember("user")
|
||||
val creatorName = lang?.let { CreatorNameJoin(member, it, "legacyDonationRankName") }
|
||||
val displayName = creatorName?.displayName ?: member.nickname
|
||||
|
||||
val donation = useCan.rewardCan.add(useCan.can).sum()
|
||||
return queryFactory
|
||||
.select(member, donation)
|
||||
val query = queryFactory
|
||||
.select(member, donation, displayName)
|
||||
.from(useCanCalculate)
|
||||
.innerJoin(useCanCalculate.useCan, useCan)
|
||||
.innerJoin(useCan.member, member)
|
||||
@@ -144,16 +150,17 @@ class ExplorerQueryRepository(
|
||||
.or(useCan.canUsage.eq(CanUsage.LIVE))
|
||||
)
|
||||
)
|
||||
.groupBy(useCan.member.id)
|
||||
.groupBy(useCan.member.id, member.id, displayName)
|
||||
.orderBy(donation.desc(), member.id.desc())
|
||||
.fetch()
|
||||
if (creatorName != null) query.leftJoin(creatorName.name).on(creatorName.condition)
|
||||
return query.fetch()
|
||||
.asSequence()
|
||||
.map {
|
||||
val account = it.get(member)!!
|
||||
val donationCan = it.get(donation)!!
|
||||
MemberDonationRankingResponse(
|
||||
account.id!!,
|
||||
account.nickname,
|
||||
it.get(displayName)!!,
|
||||
if (account.profileImage != null) {
|
||||
"$cloudFrontHost/${account.profileImage}"
|
||||
} else {
|
||||
@@ -165,9 +172,12 @@ class ExplorerQueryRepository(
|
||||
.toList()
|
||||
}
|
||||
|
||||
fun getNewCreators(): List<Member> {
|
||||
fun getNewCreators(lang: Lang = Lang.KO): List<GetExplorerSectionCreatorResponse> {
|
||||
val creatorName = CreatorNameJoin(member, lang, "newExplorerCreatorName")
|
||||
return queryFactory
|
||||
.selectFrom(member)
|
||||
.select(member, creatorName.displayName)
|
||||
.from(member)
|
||||
.leftJoin(creatorName.name).on(creatorName.condition)
|
||||
.where(
|
||||
member.role.eq(MemberRole.CREATOR)
|
||||
.and(member.createdAt.goe(LocalDateTime.now().minusDays(30)))
|
||||
@@ -176,9 +186,13 @@ class ExplorerQueryRepository(
|
||||
.orderBy(Expressions.numberTemplate(Double::class.java, "function('rand')").asc())
|
||||
.limit(20)
|
||||
.fetch()
|
||||
.map { row ->
|
||||
row.get(member)!!.toExplorerSectionCreator(cloudFrontHost).copy(nickname = row.get(creatorName.displayName)!!)
|
||||
}
|
||||
}
|
||||
|
||||
fun findCreatorByGender(gender: Int): List<Member> {
|
||||
fun findCreatorByGender(gender: Int, lang: Lang = Lang.KO): List<GetExplorerSectionCreatorResponse> {
|
||||
val creatorName = CreatorNameJoin(member, lang, "genderExplorerCreatorName")
|
||||
val today = LocalDate.now()
|
||||
val offset = (today.dayOfMonth - 1) % 26
|
||||
val characters = ('A'..'Z').map { it.toString() }.plus((0..9).map { it.toString() })
|
||||
@@ -192,7 +206,9 @@ class ExplorerQueryRepository(
|
||||
val randomExpression = Expressions.numberTemplate(Double::class.java, "function('rand')").asc()
|
||||
|
||||
return queryFactory
|
||||
.selectFrom(member)
|
||||
.select(member, creatorName.displayName)
|
||||
.from(member)
|
||||
.leftJoin(creatorName.name).on(creatorName.condition)
|
||||
.innerJoin(member.auth, auth)
|
||||
.where(
|
||||
member.role.eq(MemberRole.CREATOR)
|
||||
@@ -204,17 +220,30 @@ class ExplorerQueryRepository(
|
||||
.offset(0)
|
||||
.limit(10)
|
||||
.fetch()
|
||||
.map { row ->
|
||||
row.get(member)!!.toExplorerSectionCreator(cloudFrontHost).copy(nickname = row.get(creatorName.displayName)!!)
|
||||
}
|
||||
}
|
||||
|
||||
fun getSearchChannel(channel: String, memberId: Long): List<Member> {
|
||||
return queryFactory.selectFrom(member)
|
||||
fun getSearchChannel(channel: String, memberId: Long, lang: Lang? = null): List<GetRoomDetailUser> {
|
||||
val creatorName = lang?.let { CreatorNameJoin(member, it, "channelSearchCreatorName") }
|
||||
val displayName = creatorName?.displayName ?: member.nickname
|
||||
val query = queryFactory.select(
|
||||
Projections.constructor(
|
||||
GetRoomDetailUser::class.java,
|
||||
member.id,
|
||||
displayName,
|
||||
member.profileImage.coalesce("profile/default-profile.png").prepend("/").prepend(cloudFrontHost)
|
||||
)
|
||||
).from(member)
|
||||
.where(
|
||||
member.nickname.containsIgnoreCase(channel)
|
||||
creatorNameContains(member, channel)
|
||||
.and(member.isActive.isTrue)
|
||||
.and(member.id.ne(memberId))
|
||||
.and(member.role.eq(MemberRole.CREATOR))
|
||||
)
|
||||
.fetch()
|
||||
if (creatorName != null) query.leftJoin(creatorName.name).on(creatorName.condition)
|
||||
return query.fetch()
|
||||
}
|
||||
|
||||
fun getMember(memberId: Long): Member? {
|
||||
@@ -224,7 +253,8 @@ class ExplorerQueryRepository(
|
||||
.fetchFirst()
|
||||
}
|
||||
|
||||
fun getSimilarCreatorList(creatorId: Long): List<SimilarCreatorResponse> {
|
||||
fun getSimilarCreatorList(creatorId: Long, lang: Lang = Lang.KO): List<SimilarCreatorResponse> {
|
||||
val creatorName = CreatorNameJoin(member, lang, "similarCreatorName")
|
||||
val creator = queryFactory
|
||||
.selectFrom(member)
|
||||
.where(member.id.eq(creatorId))
|
||||
@@ -242,14 +272,15 @@ class ExplorerQueryRepository(
|
||||
.and(member.tags.size().gt(0))
|
||||
.and(memberCreatorTag.tag.isActive.isTrue)
|
||||
|
||||
return getRandomCreatorList(where = where, limit = 3)
|
||||
return getRandomCreatorList(where = where, limit = 3, lang = lang)
|
||||
}
|
||||
|
||||
val cnt = memberCreatorTag.member.count()
|
||||
val similarCreators = queryFactory
|
||||
.select(member, cnt)
|
||||
.select(member, cnt, creatorName.displayName)
|
||||
.from(memberCreatorTag)
|
||||
.innerJoin(memberCreatorTag.member, member)
|
||||
.leftJoin(creatorName.name).on(creatorName.condition)
|
||||
.innerJoin(memberCreatorTag.tag, creatorTag)
|
||||
.leftJoin(member.auth, auth)
|
||||
.where(
|
||||
@@ -265,7 +296,7 @@ class ExplorerQueryRepository(
|
||||
)
|
||||
)
|
||||
)
|
||||
.groupBy(memberCreatorTag.member.id)
|
||||
.groupBy(memberCreatorTag.member.id, member.id, creatorName.name.displayName)
|
||||
.orderBy(cnt.desc())
|
||||
.limit(3)
|
||||
.fetch()
|
||||
@@ -273,7 +304,7 @@ class ExplorerQueryRepository(
|
||||
val account = it.get(member)!!
|
||||
SimilarCreatorResponse(
|
||||
account.id!!,
|
||||
account.nickname,
|
||||
it.get(creatorName.displayName)!!,
|
||||
if (account.profileImage != null) {
|
||||
"$cloudFrontHost/${account.profileImage}"
|
||||
} else {
|
||||
@@ -298,29 +329,32 @@ class ExplorerQueryRepository(
|
||||
where = where.and(member.id.ne(userId))
|
||||
}
|
||||
|
||||
val additionalCreator = getRandomCreatorList(where = where, limit = (3 - similarCreators.size).toLong())
|
||||
val additionalCreator = getRandomCreatorList(where = where, limit = (3 - similarCreators.size).toLong(), lang = lang)
|
||||
return similarCreators + additionalCreator
|
||||
} else {
|
||||
return similarCreators
|
||||
}
|
||||
}
|
||||
|
||||
private fun getRandomCreatorList(where: Predicate, limit: Long): List<SimilarCreatorResponse> {
|
||||
private fun getRandomCreatorList(where: Predicate, limit: Long, lang: Lang): List<SimilarCreatorResponse> {
|
||||
val creatorName = CreatorNameJoin(member, lang, "randomCreatorName")
|
||||
val result = queryFactory
|
||||
.select(member)
|
||||
.select(member, creatorName.displayName)
|
||||
.from(memberCreatorTag)
|
||||
.join(memberCreatorTag.member, member)
|
||||
.leftJoin(creatorName.name).on(creatorName.condition)
|
||||
.innerJoin(memberCreatorTag.tag, creatorTag)
|
||||
.leftJoin(member.auth, auth)
|
||||
.groupBy(memberCreatorTag.member.id)
|
||||
.groupBy(memberCreatorTag.member.id, member.id, creatorName.name.displayName)
|
||||
.where(where)
|
||||
.limit(limit)
|
||||
.orderBy(Expressions.numberTemplate(Double::class.java, "function('rand')").asc())
|
||||
.fetch()
|
||||
.map {
|
||||
.map { row ->
|
||||
val it = row.get(member)!!
|
||||
SimilarCreatorResponse(
|
||||
it.id!!,
|
||||
it.nickname,
|
||||
row.get(creatorName.displayName)!!,
|
||||
if (it.profileImage != null) {
|
||||
"$cloudFrontHost/${it.profileImage}"
|
||||
} else {
|
||||
@@ -474,7 +508,13 @@ class ExplorerQueryRepository(
|
||||
.fetchFirst() ?: ""
|
||||
}
|
||||
|
||||
fun getCheersList(creatorId: Long, memberId: Long, timezone: String, offset: Long, limit: Long): GetCheersResponse {
|
||||
fun getCheersList(
|
||||
creatorId: Long,
|
||||
memberId: Long,
|
||||
timezone: String,
|
||||
offset: Long,
|
||||
limit: Long
|
||||
): GetCheersResponse {
|
||||
val cheersDatePattern = messageSource
|
||||
.getMessage("explorer.date.cheers.format", langContext.lang)
|
||||
?: messageSource.getMessage("explorer.date.cheers.format", Lang.KO).orEmpty()
|
||||
@@ -671,8 +711,10 @@ class ExplorerQueryRepository(
|
||||
fun getFollowerList(
|
||||
creatorId: Long,
|
||||
offset: Long,
|
||||
limit: Long
|
||||
limit: Long,
|
||||
lang: Lang = Lang.KO
|
||||
): List<GetFollowerListDto> {
|
||||
val creatorName = CreatorNameJoin(member, lang, "followerMemberName")
|
||||
val blockMemberCondition = blockMember.member.id.eq(creatorId)
|
||||
.and(blockMember.isActive.isTrue)
|
||||
.and(blockMember.blockedMember.id.eq(member.id))
|
||||
@@ -682,12 +724,13 @@ class ExplorerQueryRepository(
|
||||
QGetFollowerListDto(
|
||||
member.id,
|
||||
member.profileImage.prepend("/").prepend(cloudFrontHost),
|
||||
member.nickname,
|
||||
creatorName.displayName,
|
||||
member.role
|
||||
)
|
||||
)
|
||||
.from(creatorFollowing)
|
||||
.innerJoin(creatorFollowing.member, member)
|
||||
.leftJoin(creatorName.name).on(creatorName.condition)
|
||||
.leftJoin(blockMember).on(blockMemberCondition)
|
||||
.where(
|
||||
member.isActive.isTrue
|
||||
@@ -805,12 +848,17 @@ class ExplorerQueryRepository(
|
||||
.fetchFirst()
|
||||
}
|
||||
|
||||
fun getCreatorRankings(): List<Member> {
|
||||
fun getCreatorRankings(lang: Lang = Lang.KO): List<GetExplorerSectionCreatorResponse> {
|
||||
val creatorName = CreatorNameJoin(member, lang, "explorerRankCreatorName")
|
||||
return queryFactory
|
||||
.select(member)
|
||||
.select(member, creatorName.displayName)
|
||||
.from(creatorRanking)
|
||||
.innerJoin(creatorRanking.member, member)
|
||||
.leftJoin(creatorName.name).on(creatorName.condition)
|
||||
.orderBy(creatorRanking.ranking.asc())
|
||||
.fetch()
|
||||
.map { row ->
|
||||
row.get(member)!!.toExplorerSectionCreator(cloudFrontHost).copy(nickname = row.get(creatorName.displayName)!!)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -32,6 +32,7 @@ import kr.co.vividnext.sodalive.member.MemberRole
|
||||
import kr.co.vividnext.sodalive.member.MemberService
|
||||
import kr.co.vividnext.sodalive.member.contentpreference.MemberContentPreferenceService
|
||||
import kr.co.vividnext.sodalive.v2.api.creator.channel.fantalk.dto.CreatorChannelFanTalkResponse
|
||||
import kr.co.vividnext.sodalive.v2.creatorname.application.CreatorLocalizedNameService
|
||||
import org.springframework.beans.factory.annotation.Value
|
||||
import org.springframework.context.ApplicationEventPublisher
|
||||
import org.springframework.data.domain.Pageable
|
||||
@@ -65,15 +66,15 @@ class ExplorerService(
|
||||
|
||||
private val messageSource: SodaMessageSource,
|
||||
private val langContext: LangContext,
|
||||
private val localizedNameService: CreatorLocalizedNameService,
|
||||
|
||||
@Value("\${cloud.aws.cloud-front.host}")
|
||||
private val cloudFrontHost: String
|
||||
) {
|
||||
fun getCreatorRank(memberId: Long): GetExplorerSectionResponse {
|
||||
val creatorRankings = queryRepository
|
||||
.getCreatorRankings()
|
||||
.getCreatorRankings(langContext.lang)
|
||||
.filter { !isBlockedBetweenMembers(memberId = memberId, otherMemberId = it.id!!) }
|
||||
.map { it.toExplorerSectionCreator(cloudFrontHost) }
|
||||
|
||||
val currentDateTime = LocalDateTime.now()
|
||||
val lastMonday = currentDateTime
|
||||
@@ -107,9 +108,8 @@ class ExplorerService(
|
||||
|
||||
// 인기 크리에이터
|
||||
val creatorRankings = queryRepository
|
||||
.getCreatorRankings()
|
||||
.getCreatorRankings(langContext.lang)
|
||||
.filter { !isBlockedBetweenMembers(memberId = member.id!!, otherMemberId = it.id!!) }
|
||||
.map { it.toExplorerSectionCreator(cloudFrontHost) }
|
||||
|
||||
val currentDateTime = LocalDateTime.now()
|
||||
val lastMonday = currentDateTime
|
||||
@@ -140,9 +140,8 @@ class ExplorerService(
|
||||
|
||||
// 새로 시작 (newCreators)
|
||||
val newCreators = queryRepository
|
||||
.getNewCreators()
|
||||
.getNewCreators(langContext.lang)
|
||||
.filter { !isBlockedBetweenMembers(memberId = member.id!!, otherMemberId = it.id!!) }
|
||||
.map { it.toExplorerSectionCreator(cloudFrontHost) }
|
||||
|
||||
val newCreatorsSection = GetExplorerSectionResponse(
|
||||
title = messageSource.getMessage("explorer.section.new_creators.title", langContext.lang).orEmpty(),
|
||||
@@ -159,9 +158,8 @@ class ExplorerService(
|
||||
.orEmpty(),
|
||||
color = "39abde",
|
||||
creators = queryRepository
|
||||
.findCreatorByGender(1)
|
||||
.findCreatorByGender(1, langContext.lang)
|
||||
.filter { !isBlockedBetweenMembers(memberId = member.id!!, otherMemberId = it.id!!) }
|
||||
.map { it.toExplorerSectionCreator(cloudFrontHost) }
|
||||
)
|
||||
|
||||
val femaleCreatorSection = GetExplorerSectionResponse(
|
||||
@@ -170,9 +168,8 @@ class ExplorerService(
|
||||
.orEmpty(),
|
||||
color = "ffa517",
|
||||
creators = queryRepository
|
||||
.findCreatorByGender(0)
|
||||
.findCreatorByGender(0, langContext.lang)
|
||||
.filter { !isBlockedBetweenMembers(memberId = member.id!!, otherMemberId = it.id!!) }
|
||||
.map { it.toExplorerSectionCreator(cloudFrontHost) }
|
||||
)
|
||||
|
||||
val randomInt = Random.nextInt(0, 2)
|
||||
@@ -192,22 +189,23 @@ class ExplorerService(
|
||||
throw SodaException(messageKey = "explorer.search.channel.min_length")
|
||||
}
|
||||
|
||||
return queryRepository.getSearchChannel(channel, member.id!!)
|
||||
return queryRepository.getSearchChannel(channel, member.id!!, langContext.lang)
|
||||
.asSequence()
|
||||
.filter { !isBlockedBetweenMembers(memberId = member.id!!, otherMemberId = it.id!!) }
|
||||
.map { GetRoomDetailUser(it, cloudFrontHost) }
|
||||
.toList()
|
||||
}
|
||||
|
||||
fun getCreatorDetail(creatorId: Long, memberId: Long): GetCreatorDetailResponse {
|
||||
val creatorAccount = queryRepository.getMember(creatorId)
|
||||
?: throw SodaException(messageKey = "member.validation.user_not_found")
|
||||
val creatorName = localizedNameService.findLocalizedNames(listOf(creatorId), langContext.lang)[creatorId]
|
||||
?: creatorAccount.nickname
|
||||
|
||||
if (isBlockedBetweenMembers(memberId = memberId, otherMemberId = creatorId)) {
|
||||
val messageTemplate = messageSource
|
||||
.getMessage("explorer.creator.blocked_access", langContext.lang)
|
||||
.orEmpty()
|
||||
throw SodaException(message = String.format(messageTemplate, creatorAccount.nickname))
|
||||
throw SodaException(message = String.format(messageTemplate, creatorName))
|
||||
}
|
||||
|
||||
if (creatorAccount.role != MemberRole.CREATOR) {
|
||||
@@ -239,7 +237,7 @@ class ExplorerService(
|
||||
}
|
||||
|
||||
return GetCreatorDetailResponse(
|
||||
nickname = creatorAccount.nickname,
|
||||
nickname = creatorName,
|
||||
profileImageUrl = if (creatorAccount.profileImage != null) {
|
||||
"$cloudFrontHost/${creatorAccount.profileImage}"
|
||||
} else {
|
||||
@@ -266,6 +264,8 @@ class ExplorerService(
|
||||
// 크리에이터(유저) 정보
|
||||
val creatorAccount = queryRepository.getMember(creatorId)
|
||||
?: throw SodaException(messageKey = "member.validation.user_not_found")
|
||||
val creatorName = localizedNameService.findLocalizedNames(listOf(creatorId), langContext.lang)[creatorId]
|
||||
?: creatorAccount.nickname
|
||||
|
||||
// 차단된 사용자 체크
|
||||
val isBlockedByCreator = memberService.isBlocked(blockedMemberId = member.id!!, memberId = creatorId)
|
||||
@@ -274,7 +274,7 @@ class ExplorerService(
|
||||
val messageTemplate = messageSource
|
||||
.getMessage("explorer.creator.blocked_access", langContext.lang)
|
||||
.orEmpty()
|
||||
throw SodaException(message = String.format(messageTemplate, creatorAccount.nickname))
|
||||
throw SodaException(message = String.format(messageTemplate, creatorName))
|
||||
}
|
||||
|
||||
val isCreator = creatorAccount.role == MemberRole.CREATOR
|
||||
@@ -300,7 +300,7 @@ class ExplorerService(
|
||||
|
||||
// 추천 크리에이터
|
||||
val similarCreatorList = if (isCreator) {
|
||||
queryRepository.getSimilarCreatorList(creatorId)
|
||||
queryRepository.getSimilarCreatorList(creatorId, langContext.lang)
|
||||
} else {
|
||||
listOf()
|
||||
}
|
||||
@@ -437,7 +437,7 @@ class ExplorerService(
|
||||
} else {
|
||||
"$cloudFrontHost/profile/default-profile.png"
|
||||
},
|
||||
nickname = creatorAccount.nickname,
|
||||
nickname = creatorName,
|
||||
tags = creatorAccount.tags.asSequence().filter { it.tag.isActive }.map { it.tag.tag }.toList(),
|
||||
introduce = creatorAccount.introduce,
|
||||
instagramUrl = creatorAccount.instagramUrl,
|
||||
@@ -450,9 +450,9 @@ class ExplorerService(
|
||||
isNotification = creatorFollowing?.isFollow ?: false,
|
||||
notificationRecipientCount = notificationRecipientCount
|
||||
),
|
||||
userDonationRanking = memberDonationRanking,
|
||||
userDonationRanking = renderDonationRanking(memberDonationRanking),
|
||||
similarCreatorList = similarCreatorList,
|
||||
liveRoomList = liveRoomList,
|
||||
liveRoomList = liveRoomList.map { it.copy(managerNickname = creatorName) },
|
||||
contentList = translatedContentList,
|
||||
latestContent = latestContent,
|
||||
totalContentCount = totalContentCount,
|
||||
@@ -537,7 +537,7 @@ class ExplorerService(
|
||||
null
|
||||
},
|
||||
totalCount = donationMemberTotal,
|
||||
userDonationRanking = donationRanking
|
||||
userDonationRanking = renderDonationRanking(donationRanking)
|
||||
)
|
||||
}
|
||||
|
||||
@@ -548,7 +548,12 @@ class ExplorerService(
|
||||
): GetFollowerListResponse {
|
||||
val totalCount = queryRepository.getFollowerListTotalCount(creatorId)
|
||||
|
||||
val followerList = queryRepository.getFollowerList(creatorId, pageable.offset, pageable.pageSize.toLong())
|
||||
val followerList = queryRepository.getFollowerList(
|
||||
creatorId,
|
||||
pageable.offset,
|
||||
pageable.pageSize.toLong(),
|
||||
langContext.lang
|
||||
)
|
||||
.map {
|
||||
val creatorFollowing = if (it.role == MemberRole.CREATOR) {
|
||||
queryRepository.getCreatorFollowing(
|
||||
@@ -684,6 +689,7 @@ class ExplorerService(
|
||||
type = FcmEventType.CHANGE_NOTICE,
|
||||
category = PushNotificationCategory.COMMUNITY,
|
||||
title = member.nickname,
|
||||
titleMemberId = member.id,
|
||||
messageKey = "explorer.notice.fcm.message",
|
||||
senderMemberId = member.id,
|
||||
creatorId = member.id!!,
|
||||
@@ -693,6 +699,11 @@ class ExplorerService(
|
||||
)
|
||||
}
|
||||
|
||||
private fun renderDonationRanking(items: List<MemberDonationRankingResponse>): List<MemberDonationRankingResponse> {
|
||||
val names = localizedNameService.findCurrentNames(items.map { it.userId }, langContext.lang)
|
||||
return items.map { it.copy(nickname = names[it.userId] ?: it.nickname) }
|
||||
}
|
||||
|
||||
private fun isBlockedBetweenMembers(memberId: Long, otherMemberId: Long): Boolean {
|
||||
return memberService.isBlocked(blockedMemberId = memberId, memberId = otherMemberId) ||
|
||||
memberService.isBlocked(blockedMemberId = otherMemberId, memberId = memberId)
|
||||
|
||||
+19
-6
@@ -1,7 +1,11 @@
|
||||
package kr.co.vividnext.sodalive.explorer.profile.channelDonation
|
||||
|
||||
import com.querydsl.core.types.dsl.CaseBuilder
|
||||
import com.querydsl.jpa.impl.JPAQueryFactory
|
||||
import kr.co.vividnext.sodalive.explorer.profile.channelDonation.QChannelDonationMessage.channelDonationMessage
|
||||
import kr.co.vividnext.sodalive.i18n.Lang
|
||||
import kr.co.vividnext.sodalive.member.QMember.member
|
||||
import kr.co.vividnext.sodalive.v2.creatorname.adapter.out.persistence.CreatorNameJoin
|
||||
import org.springframework.data.jpa.repository.JpaRepository
|
||||
import org.springframework.stereotype.Repository
|
||||
import java.time.LocalDateTime
|
||||
@@ -18,8 +22,9 @@ interface ChannelDonationMessageQueryRepository {
|
||||
offset: Long,
|
||||
limit: Long,
|
||||
startDateTime: LocalDateTime,
|
||||
endDateTime: LocalDateTime
|
||||
): List<ChannelDonationMessage>
|
||||
endDateTime: LocalDateTime,
|
||||
lang: Lang = Lang.KO
|
||||
): List<Pair<ChannelDonationMessage, String>>
|
||||
|
||||
fun getChannelDonationMessageTotalCount(
|
||||
creatorId: Long,
|
||||
@@ -40,8 +45,13 @@ class ChannelDonationMessageQueryRepositoryImpl(
|
||||
offset: Long,
|
||||
limit: Long,
|
||||
startDateTime: LocalDateTime,
|
||||
endDateTime: LocalDateTime
|
||||
): List<ChannelDonationMessage> {
|
||||
endDateTime: LocalDateTime,
|
||||
lang: Lang
|
||||
): List<Pair<ChannelDonationMessage, String>> {
|
||||
val creatorName = CreatorNameJoin(member, lang, "channelDonorName")
|
||||
val originalName = CaseBuilder().`when`(member.nickname.startsWith("deleted_"))
|
||||
.then(member.nickname.substring(8)).otherwise(member.nickname)
|
||||
val displayName = creatorName.name.displayName.coalesce(originalName)
|
||||
val where = whereCondition(
|
||||
creatorId = creatorId,
|
||||
memberId = memberId,
|
||||
@@ -51,8 +61,10 @@ class ChannelDonationMessageQueryRepositoryImpl(
|
||||
)
|
||||
|
||||
return queryFactory
|
||||
.selectFrom(channelDonationMessage)
|
||||
.leftJoin(channelDonationMessage.member).fetchJoin()
|
||||
.select(channelDonationMessage, displayName)
|
||||
.from(channelDonationMessage)
|
||||
.leftJoin(channelDonationMessage.member, member).fetchJoin()
|
||||
.leftJoin(creatorName.name).on(creatorName.condition)
|
||||
.where(where)
|
||||
.offset(offset)
|
||||
.limit(limit)
|
||||
@@ -61,6 +73,7 @@ class ChannelDonationMessageQueryRepositoryImpl(
|
||||
channelDonationMessage.id.desc()
|
||||
)
|
||||
.fetch()
|
||||
.map { row -> row.get(channelDonationMessage)!! to row.get(displayName)!! }
|
||||
}
|
||||
|
||||
override fun getChannelDonationMessageTotalCount(
|
||||
|
||||
+4
-4
@@ -3,7 +3,6 @@ package kr.co.vividnext.sodalive.explorer.profile.channelDonation
|
||||
import kr.co.vividnext.sodalive.can.payment.CanPaymentService
|
||||
import kr.co.vividnext.sodalive.can.use.CanUsage
|
||||
import kr.co.vividnext.sodalive.common.SodaException
|
||||
import kr.co.vividnext.sodalive.extensions.removeDeletedNicknamePrefix
|
||||
import kr.co.vividnext.sodalive.i18n.LangContext
|
||||
import kr.co.vividnext.sodalive.i18n.SodaMessageSource
|
||||
import kr.co.vividnext.sodalive.member.Member
|
||||
@@ -99,12 +98,13 @@ class ChannelDonationService(
|
||||
offset = offset,
|
||||
limit = limit,
|
||||
startDateTime = startDateTime,
|
||||
endDateTime = endDateTime
|
||||
).map {
|
||||
endDateTime = endDateTime,
|
||||
lang = langContext.lang
|
||||
).map { (it, nickname) ->
|
||||
GetChannelDonationListItem(
|
||||
id = it.id!!,
|
||||
memberId = it.member!!.id!!,
|
||||
nickname = it.member!!.nickname.removeDeletedNicknamePrefix(),
|
||||
nickname = nickname,
|
||||
profileUrl = if (it.member!!.profileImage != null) {
|
||||
"$cloudFrontHost/${it.member!!.profileImage}"
|
||||
} else {
|
||||
|
||||
+2
@@ -140,6 +140,7 @@ class CreatorCommunityService(
|
||||
type = FcmEventType.CHANGE_NOTICE,
|
||||
category = PushNotificationCategory.COMMUNITY,
|
||||
title = member.nickname,
|
||||
titleMemberId = member.id,
|
||||
messageKey = "creator.community.fcm.new_post",
|
||||
senderMemberId = member.id,
|
||||
creatorId = member.id!!,
|
||||
@@ -533,6 +534,7 @@ class CreatorCommunityService(
|
||||
type = FcmEventType.INDIVIDUAL,
|
||||
category = PushNotificationCategory.COMMUNITY,
|
||||
title = member.nickname,
|
||||
titleMemberId = member.id,
|
||||
messageKey = "creator.community.fcm.new_comment",
|
||||
senderMemberId = member.id,
|
||||
recipients = listOf(creatorId),
|
||||
|
||||
Reference in New Issue
Block a user