diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventService.kt index 46038b7a..b1fc20cf 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventService.kt @@ -9,8 +9,6 @@ import kr.co.vividnext.sodalive.can.payment.PaymentStatus import kr.co.vividnext.sodalive.common.SodaException import kr.co.vividnext.sodalive.fcm.FcmEvent 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.MemberRepository import kr.co.vividnext.sodalive.member.auth.AuthRepository @@ -28,9 +26,7 @@ class ChargeEventService( private val memberRepository: MemberRepository, private val chargeRepository: ChargeRepository, private val chargeEventRepository: ChargeEventRepository, - private val applicationEventPublisher: ApplicationEventPublisher, - private val messageSource: SodaMessageSource, - private val langContext: LangContext + private val applicationEventPublisher: ApplicationEventPublisher ) { @Transactional fun applyChargeEvent(chargeId: Long, memberId: Long) { @@ -99,9 +95,7 @@ class ChargeEventService( additionalCan = additionalCan, member = member, paymentGateway = charge.payment?.paymentGateway!!, - method = messageSource - .getMessage("can.charge.event.first_title", langContext.lang) - .orEmpty() + method = "첫 충전 이벤트" ) applicationEventPublisher.publishEvent( @@ -118,7 +112,7 @@ class ChargeEventService( private fun applyEvent(additionalCan: Int, member: Member, paymentGateway: PaymentGateway, method: String) { val eventCharge = Charge(0, additionalCan, status = ChargeStatus.EVENT) - eventCharge.title = formatMessage("can.charge.title", additionalCan) + eventCharge.title = "$additionalCan 캔" eventCharge.member = member val payment = Payment( @@ -135,9 +129,4 @@ class ChargeEventService( 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) - } }