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

test #316

Merged
klaus merged 20 commits from test into main 2025-05-20 06:03:11 +00:00
Conversation 0 Commits 20 Files Changed 29 +5 -3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fe84292483 - Show all commits

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

@ -54,11 +54,13 @@ class UserActionService(
todayAt15 todayAt15
} }
val isValidPolicyTypeDailyAndDailyStartDateAfterPolicyStartDate =
policyType == PolicyType.DAILY && policyTypeDailyStartDate >= policy.startDate
val order = if (contentId != null) { val order = if (contentId != null) {
orderRepository.findByMemberIdAndContentId( orderRepository.findByMemberIdAndContentId(
memberId = memberId, memberId = memberId,
contentId = contentId, contentId = contentId,
createdAt = if (policyType == PolicyType.DAILY) { createdAt = if (isValidPolicyTypeDailyAndDailyStartDateAfterPolicyStartDate) {
policyTypeDailyStartDate policyTypeDailyStartDate
} else { } else {
policy.startDate policy.startDate
@ -72,7 +74,7 @@ class UserActionService(
val actionCount = repository.countByMemberIdAndActionTypeAndCreatedAtBetween( val actionCount = repository.countByMemberIdAndActionTypeAndCreatedAtBetween(
memberId = memberId, memberId = memberId,
actionType = actionType, actionType = actionType,
startDate = if (policyType == PolicyType.DAILY) { startDate = if (isValidPolicyTypeDailyAndDailyStartDateAfterPolicyStartDate) {
policyTypeDailyStartDate policyTypeDailyStartDate
} else { } else {
policy.startDate policy.startDate
@ -84,7 +86,7 @@ class UserActionService(
val grantedCount = grantLogRepository.countByMemberIdAndPolicyIdAndStartDate( val grantedCount = grantLogRepository.countByMemberIdAndPolicyIdAndStartDate(
memberId, memberId,
policy.id!!, policy.id!!,
startDate = if (policyType == PolicyType.DAILY) { startDate = if (isValidPolicyTypeDailyAndDailyStartDateAfterPolicyStartDate) {
policyTypeDailyStartDate policyTypeDailyStartDate
} else { } else {
policy.startDate policy.startDate