diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt index 0564d82..5a4f0e3 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt @@ -42,6 +42,7 @@ import kr.co.vividnext.sodalive.member.stipulation.StipulationRepository import kr.co.vividnext.sodalive.member.tag.MemberCreatorTag import kr.co.vividnext.sodalive.member.tag.MemberTagRepository import kr.co.vividnext.sodalive.member.token.MemberTokenRepository +import kr.co.vividnext.sodalive.point.MemberPointRepository import kr.co.vividnext.sodalive.utils.generateFileName import kr.co.vividnext.sodalive.utils.generatePassword import org.springframework.beans.factory.annotation.Value @@ -77,6 +78,7 @@ class MemberService( private val memberTagRepository: MemberTagRepository, private val liveReservationRepository: LiveReservationRepository, private val chargeRepository: ChargeRepository, + private val memberPointRepository: MemberPointRepository, private val orderService: OrderService, private val emailService: SendEmailService, @@ -262,6 +264,11 @@ class MemberService( limit = 4 ) + val totalPoint = memberPointRepository.findByMemberIdAndExpiresAtAfterOrderByExpiresAtAsc( + memberId = member.id!!, + expiresAt = LocalDateTime.now() + ).sumOf { it.point } + return MyPageResponse( nickname = member.nickname, profileUrl = if (member.profileImage != null) { @@ -271,6 +278,7 @@ class MemberService( }, chargeCan = member.getChargeCan(container = container), rewardCan = member.getRewardCan(container = container), + point = totalPoint, youtubeUrl = member.youtubeUrl, instagramUrl = member.instagramUrl, websiteUrl = member.websiteUrl, diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/member/myPage/MyPageResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/member/myPage/MyPageResponse.kt index 54d7a33..5bf0481 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/member/myPage/MyPageResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/myPage/MyPageResponse.kt @@ -7,6 +7,7 @@ data class MyPageResponse( val profileUrl: String, val chargeCan: Int, val rewardCan: Int, + val point: Int, val youtubeUrl: String?, val instagramUrl: String?, val websiteUrl: String? = null,