From fe84292483b72c7e422775acd8cdf61b1f1974f1 Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Mon, 19 May 2025 14:43:50 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EC=A7=80?=
 =?UTF-8?q?=EA=B8=89=20=EC=9A=94=EC=86=8C=20=EA=B3=84=EC=82=B0=EC=8B=9C=20?=
 =?UTF-8?q?=EC=A0=95=EC=B1=85=20=EC=8B=9C=EC=9E=91=20=EB=82=A0=EC=A7=9C=20?=
 =?UTF-8?q?=EC=9D=B4=ED=9B=84=EC=9D=98=20=EC=9C=A0=EC=A0=80=20=ED=96=89?=
 =?UTF-8?q?=EB=8F=99=EB=93=A4=EB=A7=8C=20=EB=B0=98=EC=98=81=ED=95=98?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../co/vividnext/sodalive/useraction/UserActionService.kt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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 240c8a7..0efefc5 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/useraction/UserActionService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/useraction/UserActionService.kt
@@ -54,11 +54,13 @@ class UserActionService(
                             todayAt15
                         }
 
+                        val isValidPolicyTypeDailyAndDailyStartDateAfterPolicyStartDate =
+                            policyType == PolicyType.DAILY && policyTypeDailyStartDate >= policy.startDate
                         val order = if (contentId != null) {
                             orderRepository.findByMemberIdAndContentId(
                                 memberId = memberId,
                                 contentId = contentId,
-                                createdAt = if (policyType == PolicyType.DAILY) {
+                                createdAt = if (isValidPolicyTypeDailyAndDailyStartDateAfterPolicyStartDate) {
                                     policyTypeDailyStartDate
                                 } else {
                                     policy.startDate
@@ -72,7 +74,7 @@ class UserActionService(
                         val actionCount = repository.countByMemberIdAndActionTypeAndCreatedAtBetween(
                             memberId = memberId,
                             actionType = actionType,
-                            startDate = if (policyType == PolicyType.DAILY) {
+                            startDate = if (isValidPolicyTypeDailyAndDailyStartDateAfterPolicyStartDate) {
                                 policyTypeDailyStartDate
                             } else {
                                 policy.startDate
@@ -84,7 +86,7 @@ class UserActionService(
                         val grantedCount = grantLogRepository.countByMemberIdAndPolicyIdAndStartDate(
                             memberId,
                             policy.id!!,
-                            startDate = if (policyType == PolicyType.DAILY) {
+                            startDate = if (isValidPolicyTypeDailyAndDailyStartDateAfterPolicyStartDate) {
                                 policyTypeDailyStartDate
                             } else {
                                 policy.startDate