fix: 코루틴 내 트랜잭션 간 조회 안 되는 문제 해결 #318
|
@ -1,8 +1,11 @@
|
||||||
package kr.co.vividnext.sodalive.useraction
|
package kr.co.vividnext.sodalive.useraction
|
||||||
|
|
||||||
|
import kotlinx.coroutines.CoroutineExceptionHandler
|
||||||
import kotlinx.coroutines.CoroutineScope
|
import kotlinx.coroutines.CoroutineScope
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.cancel
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
|
import kotlinx.coroutines.withContext
|
||||||
import kr.co.vividnext.sodalive.content.order.OrderRepository
|
import kr.co.vividnext.sodalive.content.order.OrderRepository
|
||||||
import kr.co.vividnext.sodalive.fcm.FcmService
|
import kr.co.vividnext.sodalive.fcm.FcmService
|
||||||
import kr.co.vividnext.sodalive.point.MemberPoint
|
import kr.co.vividnext.sodalive.point.MemberPoint
|
||||||
|
@ -14,6 +17,8 @@ import org.slf4j.LoggerFactory
|
||||||
import org.springframework.stereotype.Service
|
import org.springframework.stereotype.Service
|
||||||
import org.springframework.transaction.support.TransactionTemplate
|
import org.springframework.transaction.support.TransactionTemplate
|
||||||
import java.time.LocalDateTime
|
import java.time.LocalDateTime
|
||||||
|
import javax.annotation.PreDestroy
|
||||||
|
import javax.persistence.EntityManager
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
class UserActionService(
|
class UserActionService(
|
||||||
|
@ -24,10 +29,15 @@ class UserActionService(
|
||||||
private val memberPointRepository: MemberPointRepository,
|
private val memberPointRepository: MemberPointRepository,
|
||||||
private val transactionTemplate: TransactionTemplate,
|
private val transactionTemplate: TransactionTemplate,
|
||||||
|
|
||||||
private val fcmService: FcmService
|
private val fcmService: FcmService,
|
||||||
|
private val entityManager: EntityManager
|
||||||
) {
|
) {
|
||||||
|
|
||||||
private val coroutineScope = CoroutineScope(Dispatchers.IO)
|
private val coroutineScope = CoroutineScope(
|
||||||
|
Dispatchers.IO + CoroutineExceptionHandler { _, e ->
|
||||||
|
logger.error("포인트 지급 또는 알림 실패: ${e.message}")
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
fun recordAction(
|
fun recordAction(
|
||||||
memberId: Long,
|
memberId: Long,
|
||||||
|
@ -39,6 +49,35 @@ class UserActionService(
|
||||||
) {
|
) {
|
||||||
coroutineScope.launch {
|
coroutineScope.launch {
|
||||||
val now = LocalDateTime.now()
|
val now = LocalDateTime.now()
|
||||||
|
val policy = policyRepository.findByActionTypeAndIsActiveTrue(actionType, now)
|
||||||
|
if (policy != null) {
|
||||||
|
val policyType = policy.policyType
|
||||||
|
val todayAt15 = now.toLocalDate().atTime(15, 0)
|
||||||
|
val policyTypeDailyStartDate = if (now.toLocalTime().isBefore(todayAt15.toLocalTime())) {
|
||||||
|
now.toLocalDate().minusDays(1).atTime(15, 0)
|
||||||
|
} else {
|
||||||
|
todayAt15
|
||||||
|
}
|
||||||
|
|
||||||
|
val isValidPolicyTypeDailyAndDailyStartDateAfterPolicyStartDate =
|
||||||
|
policyType == PolicyType.DAILY && policyTypeDailyStartDate >= policy.startDate
|
||||||
|
val order = if (contentId != null) {
|
||||||
|
orderRepository.findByMemberIdAndContentId(
|
||||||
|
memberId = memberId,
|
||||||
|
contentId = contentId,
|
||||||
|
createdAt = if (isValidPolicyTypeDailyAndDailyStartDateAfterPolicyStartDate) {
|
||||||
|
policyTypeDailyStartDate
|
||||||
|
} else {
|
||||||
|
policy.startDate
|
||||||
|
}
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
null
|
||||||
|
}
|
||||||
|
if (actionType == ActionType.ORDER_CONTENT_COMMENT && order == null) return@launch
|
||||||
|
}
|
||||||
|
|
||||||
|
withContext(Dispatchers.IO) {
|
||||||
transactionTemplate.execute {
|
transactionTemplate.execute {
|
||||||
repository.save(
|
repository.save(
|
||||||
UserActionLog(
|
UserActionLog(
|
||||||
|
@ -49,15 +88,18 @@ class UserActionService(
|
||||||
)
|
)
|
||||||
repository.flush()
|
repository.flush()
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
withContext(Dispatchers.IO) {
|
||||||
if (isAuth) {
|
if (isAuth) {
|
||||||
try {
|
try {
|
||||||
transactionTemplate.execute {
|
transactionTemplate.execute {
|
||||||
val policy = policyRepository.findByActionTypeAndIsActiveTrue(actionType, now)
|
entityManager.clear()
|
||||||
if (policy != null) {
|
if (policy != null) {
|
||||||
val policyType = policy.policyType
|
val policyType = policy.policyType
|
||||||
val todayAt15 = now.toLocalDate().atTime(15, 0)
|
val todayAt15 = now.toLocalDate().atTime(15, 0)
|
||||||
val policyTypeDailyStartDate = if (now.toLocalTime().isBefore(todayAt15.toLocalTime())) {
|
val policyTypeDailyStartDate =
|
||||||
|
if (now.toLocalTime().isBefore(todayAt15.toLocalTime())) {
|
||||||
now.toLocalDate().minusDays(1).atTime(15, 0)
|
now.toLocalDate().minusDays(1).atTime(15, 0)
|
||||||
} else {
|
} else {
|
||||||
todayAt15
|
todayAt15
|
||||||
|
@ -88,7 +130,7 @@ class UserActionService(
|
||||||
} else {
|
} else {
|
||||||
policy.startDate
|
policy.startDate
|
||||||
},
|
},
|
||||||
endDate = policy.endDate ?: now
|
endDate = policy.endDate ?: LocalDateTime.now()
|
||||||
)
|
)
|
||||||
if (actionCount < policy.threshold) return@execute
|
if (actionCount < policy.threshold) return@execute
|
||||||
|
|
||||||
|
@ -145,6 +187,12 @@ class UserActionService(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@PreDestroy
|
||||||
|
fun onDestroy() {
|
||||||
|
coroutineScope.cancel("UserActionService 종료")
|
||||||
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
private val logger = LoggerFactory.getLogger(UserActionService::class.java)
|
private val logger = LoggerFactory.getLogger(UserActionService::class.java)
|
||||||
|
|
Loading…
Reference in New Issue