From 82b109e3bd52c8158b71586addc957095e99a2e1 Mon Sep 17 00:00:00 2001 From: Klaus Date: Fri, 3 Jan 2025 00:42:54 +0900 Subject: [PATCH] =?UTF-8?q?=EC=98=A4=EB=94=94=EC=85=98=20=ED=88=AC?= =?UTF-8?q?=ED=91=9C=20API=20-=20=ED=88=AC=ED=91=9C=EC=8B=9C=20=EC=96=B4?= =?UTF-8?q?=EB=96=A4=20=EC=98=A4=EB=94=94=EC=85=98=20=EC=A7=80=EC=9B=90?= =?UTF-8?q?=EC=97=90=20=ED=88=AC=ED=91=9C=ED=96=88=EB=8A=94=EC=A7=80=20?= =?UTF-8?q?=EA=B8=B0=EB=A1=9D=20-=20=EC=BA=94=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EB=82=B4=EC=97=AD=EC=97=90=20"[=EC=98=A4=EB=94=94=EC=85=98=20?= =?UTF-8?q?=ED=88=AC=ED=91=9C]=20=EB=8B=89=EB=84=A4=EC=9E=84"=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vividnext/sodalive/audition/vote/AuditionVoteService.kt | 1 + src/main/kotlin/kr/co/vividnext/sodalive/can/CanService.kt | 1 + .../co/vividnext/sodalive/can/payment/CanPaymentService.kt | 4 ++++ src/main/kotlin/kr/co/vividnext/sodalive/can/use/UseCan.kt | 5 +++++ 4 files changed, 11 insertions(+) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/audition/vote/AuditionVoteService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/audition/vote/AuditionVoteService.kt index 4496ead..a897527 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/audition/vote/AuditionVoteService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/audition/vote/AuditionVoteService.kt @@ -52,6 +52,7 @@ class AuditionVoteService( memberId = member.id!!, needCan = 1, canUsage = CanUsage.AUDITION_VOTE, + auditionApplicant = applicant, container = container ) } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/can/CanService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/can/CanService.kt index 87025af..988cee3 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/can/CanService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/can/CanService.kt @@ -71,6 +71,7 @@ class CanService(private val repository: CanRepository) { CanUsage.ALARM_SLOT -> "알람 슬롯 구매" CanUsage.ORDER_CONTENT -> "[콘텐츠 구매] ${it.audioContent!!.title}" CanUsage.PAID_COMMUNITY_POST -> "[게시글 보기] ${it.communityPost?.member?.nickname ?: ""}" + CanUsage.AUDITION_VOTE -> "[오디션 투표] ${it.auditionApplicant?.member?.nickname ?: ""}" } val createdAt = it.createdAt!! diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/can/payment/CanPaymentService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/can/payment/CanPaymentService.kt index c50f823..a90f74a 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/can/payment/CanPaymentService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/can/payment/CanPaymentService.kt @@ -1,5 +1,6 @@ package kr.co.vividnext.sodalive.can.payment +import kr.co.vividnext.sodalive.audition.AuditionApplicant import kr.co.vividnext.sodalive.can.CanRepository import kr.co.vividnext.sodalive.can.charge.Charge import kr.co.vividnext.sodalive.can.charge.ChargeRepository @@ -41,6 +42,7 @@ class CanPaymentService( order: Order? = null, audioContent: AudioContent? = null, communityPost: CreatorCommunity? = null, + auditionApplicant: AuditionApplicant? = null, container: String ) { val member = memberRepository.findByIdOrNull(id = memberId) @@ -100,6 +102,8 @@ class CanPaymentService( useCan.member = member } else if (canUsage == CanUsage.ALARM_SLOT) { useCan.member = member + } else if (canUsage == CanUsage.AUDITION_VOTE && auditionApplicant != null) { + useCan.member = member } else if (canUsage == CanUsage.HEART && liveRoom != null) { recipientId = liveRoom.member!!.id!! useCan.room = liveRoom diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/can/use/UseCan.kt b/src/main/kotlin/kr/co/vividnext/sodalive/can/use/UseCan.kt index 31ac687..5a879f4 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/can/use/UseCan.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/can/use/UseCan.kt @@ -1,5 +1,6 @@ package kr.co.vividnext.sodalive.can.use +import kr.co.vividnext.sodalive.audition.AuditionApplicant import kr.co.vividnext.sodalive.common.BaseEntity import kr.co.vividnext.sodalive.content.AudioContent import kr.co.vividnext.sodalive.content.order.Order @@ -53,6 +54,10 @@ data class UseCan( @JoinColumn(name = "creator_community_id", nullable = true) var communityPost: CreatorCommunity? = null + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "audition_applicant_id", nullable = true) + var auditionApplicant: AuditionApplicant? = null + @OneToMany(mappedBy = "useCan", cascade = [CascadeType.ALL]) val useCanCalculates: MutableList = mutableListOf() }