diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerService.kt index 69a8d013..d0366c4d 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerService.kt @@ -429,7 +429,7 @@ class ExplorerService( ) return GetDonationAllResponse( - accumulatedCansToday = if (creatorId == member.id!!) { + accumulatedCansToday = if (isCreatorSelf) { queryRepository.getDonationCoinsDateRange( creatorId, currentDate, @@ -438,7 +438,7 @@ class ExplorerService( } else { 0 }, - accumulatedCansLastWeek = if (creatorId == member.id!!) { + accumulatedCansLastWeek = if (isCreatorSelf) { queryRepository.getDonationCoinsDateRange( creatorId, firstDayOfLastWeek, @@ -447,7 +447,7 @@ class ExplorerService( } else { 0 }, - accumulatedCansThisMonth = if (creatorId == member.id!!) { + accumulatedCansThisMonth = if (isCreatorSelf) { queryRepository.getDonationCoinsDateRange( creatorId, firstDayOfMonth, @@ -456,11 +456,16 @@ class ExplorerService( } else { 0 }, - isVisibleDonationRank = if (creatorId == member.id!!) { + isVisibleDonationRank = if (isCreatorSelf) { queryRepository.getVisibleDonationRank(creatorId) } else { false }, + donationRankingPeriod = if (isCreatorSelf) { + donationRankingPeriod + } else { + null + }, totalCount = donationMemberTotal, userDonationRanking = donationRanking ) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/explorer/MemberDonationRankingResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/explorer/MemberDonationRankingResponse.kt index 53e7dc69..40d28e7e 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/explorer/MemberDonationRankingResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/explorer/MemberDonationRankingResponse.kt @@ -1,6 +1,7 @@ package kr.co.vividnext.sodalive.explorer import com.fasterxml.jackson.annotation.JsonProperty +import kr.co.vividnext.sodalive.member.DonationRankingPeriod import java.io.Serializable data class GetDonationAllResponse( @@ -8,6 +9,7 @@ data class GetDonationAllResponse( val accumulatedCansLastWeek: Int, val accumulatedCansThisMonth: Int, val isVisibleDonationRank: Boolean, + val donationRankingPeriod: DonationRankingPeriod?, val totalCount: Int, val userDonationRanking: List ) : Serializable