Compare commits

..

No commits in common. "51fd5408dcf63ed83eca25813eab87ce36388623" and "3fae40fbefc92dad700ff1aad83d016f40eb1518" have entirely different histories.

7 changed files with 14 additions and 43 deletions

View File

@ -628,12 +628,4 @@ class ExplorerQueryRepository(
)
.fetchFirst()
}
fun getVisibleDonationRank(creatorId: Long): Boolean {
return queryFactory
.select(member.isVisibleDonationRank)
.from(member)
.where(member.id.eq(creatorId))
.fetchFirst()
}
}

View File

@ -178,15 +178,11 @@ class ExplorerService(
val notificationRecipientCount = notificationUserIds.size
// 후원랭킹
val memberDonationRanking = if (creatorId == member.id!! || creatorAccount.isVisibleDonationRank) {
queryRepository.getMemberDonationRanking(
val memberDonationRanking = queryRepository.getMemberDonationRanking(
creatorId,
10,
withDonationCan = creatorId == member.id!!
)
} else {
listOf()
}
// 추천 크리에이터
val similarCreatorList = queryRepository.getSimilarCreatorList(creatorId)
@ -294,11 +290,6 @@ class ExplorerService(
} else {
0
},
isVisibleDonationRank = if (creatorId == member.id!!) {
queryRepository.getVisibleDonationRank(creatorId)
} else {
false
},
totalCount = queryRepository.getMemberDonationRankingTotal(creatorId),
userDonationRanking = queryRepository.getMemberDonationRanking(
creatorId,

View File

@ -4,7 +4,6 @@ data class GetDonationAllResponse(
val accumulatedCansToday: Int,
val accumulatedCansLastWeek: Int,
val accumulatedCansThisMonth: Int,
val isVisibleDonationRank: Boolean,
val totalCount: Int,
val userDonationRanking: List<MemberDonationRankingResponse>
)

View File

@ -653,8 +653,7 @@ class LiveRoomService(
.getNotificationUserIds(room.member!!.id!!)
.contains(member.id)
val donationRankingTop3UserIds = if (room.member!!.isVisibleDonationRank) {
explorerQueryRepository
val donationRankingTop3UserIds = explorerQueryRepository
.getMemberDonationRanking(
room.member!!.id!!,
3,
@ -663,9 +662,6 @@ class LiveRoomService(
.asSequence()
.map { it.userId }
.toList()
} else {
listOf()
}
return GetRoomInfoResponse(
roomId = roomId,

View File

@ -28,8 +28,6 @@ data class Member(
@Enumerated(value = EnumType.STRING)
var role: MemberRole = MemberRole.USER,
var isVisibleDonationRank: Boolean = true,
var isActive: Boolean = true,
var container: String = "web"

View File

@ -547,10 +547,6 @@ class MemberService(
member.blogUrl = profileUpdateRequest.blogUrl
}
if (profileUpdateRequest.isVisibleDonationRank != null) {
member.isVisibleDonationRank = profileUpdateRequest.isVisibleDonationRank
}
return ProfileResponse(member, cloudFrontHost, profileUpdateRequest.container)
}

View File

@ -13,6 +13,5 @@ data class ProfileUpdateRequest(
val instagramUrl: String? = null,
val websiteUrl: String? = null,
val blogUrl: String? = null,
val isVisibleDonationRank: Boolean? = null,
val container: String
)