From e0024a52abd6bd922a5959f42ce4cb738f919221 Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 3 Feb 2026 17:27:49 +0900 Subject: [PATCH] =?UTF-8?q?=ED=81=AC=EB=A6=AC=EC=97=90=EC=9D=B4=ED=84=B0?= =?UTF-8?q?=20=ED=9B=84=EC=9B=90=EB=9E=AD=ED=82=B9=20=EA=B8=B0=EA=B0=84=20?= =?UTF-8?q?=EC=9D=91=EB=8B=B5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vividnext/sodalive/explorer/ExplorerService.kt | 13 +++++++++---- .../explorer/MemberDonationRankingResponse.kt | 2 ++ 2 files changed, 11 insertions(+), 4 deletions(-) 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