test #384
@@ -429,7 +429,7 @@ class ExplorerService(
|
|||||||
)
|
)
|
||||||
|
|
||||||
return GetDonationAllResponse(
|
return GetDonationAllResponse(
|
||||||
accumulatedCansToday = if (creatorId == member.id!!) {
|
accumulatedCansToday = if (isCreatorSelf) {
|
||||||
queryRepository.getDonationCoinsDateRange(
|
queryRepository.getDonationCoinsDateRange(
|
||||||
creatorId,
|
creatorId,
|
||||||
currentDate,
|
currentDate,
|
||||||
@@ -438,7 +438,7 @@ class ExplorerService(
|
|||||||
} else {
|
} else {
|
||||||
0
|
0
|
||||||
},
|
},
|
||||||
accumulatedCansLastWeek = if (creatorId == member.id!!) {
|
accumulatedCansLastWeek = if (isCreatorSelf) {
|
||||||
queryRepository.getDonationCoinsDateRange(
|
queryRepository.getDonationCoinsDateRange(
|
||||||
creatorId,
|
creatorId,
|
||||||
firstDayOfLastWeek,
|
firstDayOfLastWeek,
|
||||||
@@ -447,7 +447,7 @@ class ExplorerService(
|
|||||||
} else {
|
} else {
|
||||||
0
|
0
|
||||||
},
|
},
|
||||||
accumulatedCansThisMonth = if (creatorId == member.id!!) {
|
accumulatedCansThisMonth = if (isCreatorSelf) {
|
||||||
queryRepository.getDonationCoinsDateRange(
|
queryRepository.getDonationCoinsDateRange(
|
||||||
creatorId,
|
creatorId,
|
||||||
firstDayOfMonth,
|
firstDayOfMonth,
|
||||||
@@ -456,11 +456,16 @@ class ExplorerService(
|
|||||||
} else {
|
} else {
|
||||||
0
|
0
|
||||||
},
|
},
|
||||||
isVisibleDonationRank = if (creatorId == member.id!!) {
|
isVisibleDonationRank = if (isCreatorSelf) {
|
||||||
queryRepository.getVisibleDonationRank(creatorId)
|
queryRepository.getVisibleDonationRank(creatorId)
|
||||||
} else {
|
} else {
|
||||||
false
|
false
|
||||||
},
|
},
|
||||||
|
donationRankingPeriod = if (isCreatorSelf) {
|
||||||
|
donationRankingPeriod
|
||||||
|
} else {
|
||||||
|
null
|
||||||
|
},
|
||||||
totalCount = donationMemberTotal,
|
totalCount = donationMemberTotal,
|
||||||
userDonationRanking = donationRanking
|
userDonationRanking = donationRanking
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package kr.co.vividnext.sodalive.explorer
|
package kr.co.vividnext.sodalive.explorer
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty
|
import com.fasterxml.jackson.annotation.JsonProperty
|
||||||
|
import kr.co.vividnext.sodalive.member.DonationRankingPeriod
|
||||||
import java.io.Serializable
|
import java.io.Serializable
|
||||||
|
|
||||||
data class GetDonationAllResponse(
|
data class GetDonationAllResponse(
|
||||||
@@ -8,6 +9,7 @@ data class GetDonationAllResponse(
|
|||||||
val accumulatedCansLastWeek: Int,
|
val accumulatedCansLastWeek: Int,
|
||||||
val accumulatedCansThisMonth: Int,
|
val accumulatedCansThisMonth: Int,
|
||||||
val isVisibleDonationRank: Boolean,
|
val isVisibleDonationRank: Boolean,
|
||||||
|
val donationRankingPeriod: DonationRankingPeriod?,
|
||||||
val totalCount: Int,
|
val totalCount: Int,
|
||||||
val userDonationRanking: List<MemberDonationRankingResponse>
|
val userDonationRanking: List<MemberDonationRankingResponse>
|
||||||
) : Serializable
|
) : Serializable
|
||||||
|
|||||||
Reference in New Issue
Block a user