From 1bca1b27ed97c2d69f39f6df61112bc442bc7776 Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Sat, 17 May 2025 18:07:02 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=EA=B5=AC=EB=A7=A4=ED=95=9C=20=EC=BD=98?=
 =?UTF-8?q?=ED=85=90=EC=B8=A0=20=EB=8C=93=EA=B8=80=20=EC=9D=B4=EB=B2=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../comment/AudioContentCommentController.kt    |  7 +++++++
 .../sodalive/content/order/OrderRepository.kt   | 13 +++++++++++++
 .../sodalive/useraction/UserActionService.kt    | 17 +++++++++++++++--
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentController.kt
index c7b5834..b3e4ad3 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentController.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentController.kt
@@ -46,6 +46,13 @@ class AudioContentCommentController(
                 actionType = ActionType.CONTENT_COMMENT,
                 pushTokenList = pushTokenList
             )
+
+            userActionService.recordAction(
+                memberId = member.id!!,
+                actionType = ActionType.ORDER_CONTENT_COMMENT,
+                contentId = request.contentId,
+                pushTokenList = pushTokenList
+            )
         } catch (_: Exception) {
         }
 
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/order/OrderRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/order/OrderRepository.kt
index 566cc27..d66760d 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/order/OrderRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/order/OrderRepository.kt
@@ -44,6 +44,7 @@ interface OrderQueryRepository {
     fun findOrderedContent(contentIdList: List<Long>, memberId: Long): List<Long>
     fun findEndDateByContentId(contentIdList: List<Long>, memberId: Long): List<ContentIdAndEndDateData>
     fun findBuyerListByContentId(contentId: Long): List<ContentBuyer>
+    fun findByMemberIdAndContentId(memberId: Long, contentId: Long, createdAt: LocalDateTime): Order?
 }
 
 @Repository
@@ -280,4 +281,16 @@ class OrderQueryRepositoryImpl(
             )
             .fetch()
     }
+
+    override fun findByMemberIdAndContentId(memberId: Long, contentId: Long, createdAt: LocalDateTime): Order? {
+        return queryFactory
+            .selectFrom(order)
+            .where(
+                order.isActive.isTrue,
+                order.member.id.eq(memberId),
+                order.audioContent.id.eq(contentId),
+                order.createdAt.after(createdAt)
+            )
+            .fetchFirst()
+    }
 }
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/useraction/UserActionService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/useraction/UserActionService.kt
index f6919ac..f9d3143 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/useraction/UserActionService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/useraction/UserActionService.kt
@@ -3,6 +3,7 @@ package kr.co.vividnext.sodalive.useraction
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kr.co.vividnext.sodalive.content.order.OrderRepository
 import kr.co.vividnext.sodalive.fcm.FcmService
 import kr.co.vividnext.sodalive.point.MemberPoint
 import kr.co.vividnext.sodalive.point.MemberPointRepository
@@ -15,6 +16,7 @@ import java.time.LocalDateTime
 @Service
 class UserActionService(
     private val repository: UserActionLogRepository,
+    private val orderRepository: OrderRepository,
     private val policyRepository: PointRewardPolicyRepository,
     private val grantLogRepository: PointGrantLogRepository,
     private val memberPointRepository: MemberPointRepository,
@@ -27,7 +29,7 @@ class UserActionService(
     fun recordAction(
         memberId: Long,
         actionType: ActionType,
-        orderId: Long? = null,
+        contentId: Long? = null,
         pushTokenList: List<String> = emptyList()
     ) {
         coroutineScope.launch {
@@ -44,6 +46,17 @@ class UserActionService(
                     todayAt15
                 }
 
+                val order = if (contentId != null) {
+                    orderRepository.findByMemberIdAndContentId(
+                        memberId = memberId,
+                        contentId = contentId,
+                        createdAt = if (policyType == PolicyType.DAILY) policyTypeDailyStartDate else policy.startDate
+                    )
+                } else {
+                    null
+                }
+                if (actionType == ActionType.ORDER_CONTENT_COMMENT && order == null) return@launch
+
                 val actionCount = repository.countByMemberIdAndActionTypeAndCreatedAtBetween(
                     memberId = memberId,
                     actionType = actionType,
@@ -65,7 +78,7 @@ class UserActionService(
                         point = policy.pointAmount,
                         actionType = actionType,
                         policyId = policy.id!!,
-                        orderId = orderId
+                        orderId = order?.id
                     )
                 )