klaus
/
sodalive-backend-spring-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: klaus:24841b9850b9e8aec8581526b721f1b6aba5c2a3
Branches Tags
klaus:test
klaus:main
..
compare: klaus:d35a3d1a8c5742e6722c39191bedbe1c3172f058
Branches Tags
klaus:main
klaus:test

No commits in common. "24841b9850b9e8aec8581526b721f1b6aba5c2a3" and "d35a3d1a8c5742e6722c39191bedbe1c3172f058" have entirely different histories.
24841b9850 ... d35a3d1a8c

1 changed files with 90 additions and 138 deletions
Show Stats Expand all files Collapse all files

58
src/main/kotlin/kr/co/vividnext/sodalive/useraction/UserActionService.kt
View File

@ -1,11 +1,8 @@
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
@ -17,8 +14,6 @@ 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(
@ -29,15 +24,10 @@ 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( private val coroutineScope = CoroutineScope(Dispatchers.IO)
Dispatchers.IO + CoroutineExceptionHandler { _, e ->
logger.error("포인트 지급 또는 알림 실패: ${e.message}")
}
)
fun recordAction( fun recordAction(
memberId: Long, memberId: Long,
@ -49,35 +39,6 @@ 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(
@ -88,18 +49,15 @@ class UserActionService(
) )
repository.flush() repository.flush()
} }
}
withContext(Dispatchers.IO) {
if (isAuth) { if (isAuth) {
try { try {
transactionTemplate.execute { transactionTemplate.execute {
entityManager.clear() val policy = policyRepository.findByActionTypeAndIsActiveTrue(actionType, now)
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 = val policyTypeDailyStartDate = if (now.toLocalTime().isBefore(todayAt15.toLocalTime())) {
if (now.toLocalTime().isBefore(todayAt15.toLocalTime())) {
now.toLocalDate().minusDays(1).atTime(15, 0) now.toLocalDate().minusDays(1).atTime(15, 0)
} else { } else {
todayAt15 todayAt15
@ -130,7 +88,7 @@ class UserActionService(
} else { } else {
policy.startDate policy.startDate
}, },
endDate = policy.endDate ?: LocalDateTime.now() endDate = policy.endDate ?: now
) )
if (actionCount < policy.threshold) return@execute if (actionCount < policy.threshold) return@execute
@ -187,12 +145,6 @@ 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)