충전 이벤트 - langContext 문제로 충전이 되지 않는 현상을 langContext를 사용하지 않고 이전 방식으로 기록하도록 롤백하여 임시 해결 #380

Merged
klaus merged 1 commits from test into main 2026-01-21 02:36:22 +00:00

View File

@@ -9,8 +9,6 @@ import kr.co.vividnext.sodalive.can.payment.PaymentStatus
import kr.co.vividnext.sodalive.common.SodaException import kr.co.vividnext.sodalive.common.SodaException
import kr.co.vividnext.sodalive.fcm.FcmEvent import kr.co.vividnext.sodalive.fcm.FcmEvent
import kr.co.vividnext.sodalive.fcm.FcmEventType import kr.co.vividnext.sodalive.fcm.FcmEventType
import kr.co.vividnext.sodalive.i18n.LangContext
import kr.co.vividnext.sodalive.i18n.SodaMessageSource
import kr.co.vividnext.sodalive.member.Member import kr.co.vividnext.sodalive.member.Member
import kr.co.vividnext.sodalive.member.MemberRepository import kr.co.vividnext.sodalive.member.MemberRepository
import kr.co.vividnext.sodalive.member.auth.AuthRepository import kr.co.vividnext.sodalive.member.auth.AuthRepository
@@ -28,9 +26,7 @@ class ChargeEventService(
private val memberRepository: MemberRepository, private val memberRepository: MemberRepository,
private val chargeRepository: ChargeRepository, private val chargeRepository: ChargeRepository,
private val chargeEventRepository: ChargeEventRepository, private val chargeEventRepository: ChargeEventRepository,
private val applicationEventPublisher: ApplicationEventPublisher, private val applicationEventPublisher: ApplicationEventPublisher
private val messageSource: SodaMessageSource,
private val langContext: LangContext
) { ) {
@Transactional @Transactional
fun applyChargeEvent(chargeId: Long, memberId: Long) { fun applyChargeEvent(chargeId: Long, memberId: Long) {
@@ -99,9 +95,7 @@ class ChargeEventService(
additionalCan = additionalCan, additionalCan = additionalCan,
member = member, member = member,
paymentGateway = charge.payment?.paymentGateway!!, paymentGateway = charge.payment?.paymentGateway!!,
method = messageSource method = "첫 충전 이벤트"
.getMessage("can.charge.event.first_title", langContext.lang)
.orEmpty()
) )
applicationEventPublisher.publishEvent( applicationEventPublisher.publishEvent(
@@ -118,7 +112,7 @@ class ChargeEventService(
private fun applyEvent(additionalCan: Int, member: Member, paymentGateway: PaymentGateway, method: String) { private fun applyEvent(additionalCan: Int, member: Member, paymentGateway: PaymentGateway, method: String) {
val eventCharge = Charge(0, additionalCan, status = ChargeStatus.EVENT) val eventCharge = Charge(0, additionalCan, status = ChargeStatus.EVENT)
eventCharge.title = formatMessage("can.charge.title", additionalCan) eventCharge.title = "$additionalCan"
eventCharge.member = member eventCharge.member = member
val payment = Payment( val payment = Payment(
@@ -135,9 +129,4 @@ class ChargeEventService(
else -> member.charge(0, additionalCan, "pg") else -> member.charge(0, additionalCan, "pg")
} }
} }
private fun formatMessage(key: String, vararg args: Any): String {
val template = messageSource.getMessage(key, langContext.lang) ?: return ""
return String.format(template, *args)
}
} }