✅ test(report): 인증, 레포트 관련 테스트 완료

Author: 5hseok

server/src/main/kotlin/com/app/server/challenge_certification/application/service/CertificationService.kt

@@ -23,7 +23,6 @@ class CertificationService(
 ) : CertificationUseCase {
 
     override fun certificateChallengeWithDate(
-        userId: Long,
         certificationRequestDto: CertificationRequestDto,
         certificationDate: LocalDate
     ): UserChallenge {
@@ -45,7 +44,6 @@ class CertificationService(
 
         eventPublisher.publishEvent(
             CertificationSucceededEvent(
-                userId = userId,
                 userChallengeId = userChallenge.id!!,
                 imageUrl = certificationRequestDto.imageUrl,
                 certificatedDate = certificationDate,

server/src/main/kotlin/com/app/server/challenge_certification/event/CertificationSucceededEvent.kt

@@ -3,7 +3,6 @@ package com.app.server.challenge_certification.event
 import java.time.LocalDate
 
 data class CertificationSucceededEvent(
-    val userId : Long,
     val userChallengeId: Long,
     val imageUrl: String,
     val certificatedDate: LocalDate

server/src/main/kotlin/com/app/server/challenge_certification/ui/controller/CertificationController.kt

@@ -23,11 +23,9 @@ class CertificationController(
 
     @PostMapping("/certification")
     fun certificateDailyUserChallenge(
-        @UserId userId: Long,
         @RequestBody certificationRequestDto: CertificationRequestDto
     ): ApiResponse<ResultCode> {
         certificationUseCase.certificateChallengeWithDate(
-            userId = userId,
             certificationRequestDto = certificationRequestDto,
             certificationDate = LocalDate.now()
         )

server/src/main/kotlin/com/app/server/challenge_certification/ui/usecase/CertificationUseCase.kt

@@ -7,7 +7,6 @@ import java.time.LocalDate
 interface CertificationUseCase {
 
     fun certificateChallengeWithDate(
-        userId: Long,
         certificationRequestDto: CertificationRequestDto,
         certificationDate: LocalDate
     ): UserChallenge

server/src/main/kotlin/com/app/server/common/config/SchedulerConfig.kt

@@ -6,4 +6,5 @@ import org.springframework.scheduling.annotation.EnableScheduling
 @Configuration
 @EnableScheduling
 class SchedulerConfig {
+    // TODO : Pending 상태인 챌린지들도 시간 보고 COMPLETED 상태로 변경해줘야 함
 }

server/src/main/kotlin/com/app/server/user_challenge/application/service/UserChallengeCommandService.kt

@@ -15,6 +15,7 @@ import com.app.server.user_challenge.domain.enums.EUserChallengeStatus
 import com.app.server.user_challenge.domain.exception.UserChallengeException
 import com.app.server.user_challenge.domain.model.UserChallenge
 import com.app.server.user_challenge.domain.model.UserChallengeHistory
+import com.app.server.user_challenge.enums.EUserChallengeParticipantState
 import com.app.server.user_challenge.enums.EUserReportResultCode
 import com.app.server.user_challenge.event.ReportCreatedEvent
 import com.app.server.user_challenge.infra.ReportInfraService
@@ -25,26 +26,62 @@ import org.springframework.stereotype.Service
 import java.time.LocalDate
 
 @Service
-@Transactional
-class UserChallengeCommandService (
+class UserChallengeCommandService(
     private val userChallengeService: UserChallengeService,
     private val challengeService: ChallengeService,
     private val userChallengeHistoryCommandService: UserChallengeHistoryCommandService,
     private val reportInfraService: ReportInfraService,
-    private val eventPublisher : ApplicationEventPublisher
+    private val eventPublisher: ApplicationEventPublisher
 ) : ParticipantChallengeUseCase, UsingIceUseCase {
 
     override fun execute(
         challengeParticipantDto: ChallengeParticipantDto,
-    ) : UserChallenge {
-        validateUserCanParticipateInChallenge(challengeParticipantDto)
-        val userChallenge = createUserChallenge(challengeParticipantDto)
-        saveUserChallengeWithHistory(userChallenge, challengeParticipantDto.participantsTotalDays)
+    ): UserChallenge {
+        val userCanParticipantInChallenge: EUserChallengeParticipantState? =
+            validateUserCanParticipateInChallenge(challengeParticipantDto)
+
+        if (userCanParticipantInChallenge == null ||
+            userCanParticipantInChallenge == EUserChallengeParticipantState.NEW_CHALLENGE_START
+        ) {
+            val userChallenge = createUserChallenge(challengeParticipantDto)
+
+            saveUserChallengeWithHistory(
+                userChallenge,
+                challengeParticipantDto.participantsTotalDays,
+                challengeParticipantDto.participantsStartDate
+            )
+
+            return userChallenge
+        }
+        // 이미 참여 중인 챌린지인 경우
+        // if (userCanParticipantInChallenge == EUserChallengeParticipantState.EXISTING_CHALLENGE_CONTINUE)
+        val userChallenge = userChallengeService.findByUserIdAndChallengeId(
+            userId = challengeParticipantDto.userId,
+            challengeId = challengeParticipantDto.challengeId
+        )
+
+        userChallenge!!.plusParticipatedDays(
+            participantsDate = challengeParticipantDto.participantsTotalDays,
+        )
+
+        saveUserChallengeWithHistory(
+            userChallenge,
+            challengeParticipantDto.participantsTotalDays,
+            participantsStartDay = challengeParticipantDto.participantsStartDate
+        )
+
+        userChallenge.increaseIceCountWhenUserChallengeContinues()
+
+        userChallenge.updateReportMessage(null)
+
+        userChallenge.updateStatus(EUserChallengeStatus.RUNNING)
+
         return userChallenge
+
     }
 
     fun processAfterCertificateSuccess(
-        userId : Long, userChallengeId : Long, certificationDto: CertificationDataDto
+        userChallengeId: Long, certificationDto: CertificationDataDto
     ): UserChallenge {
         val userChallenge = userChallengeService.findById(userChallengeId)
 
@@ -66,16 +103,15 @@ class UserChallengeCommandService (
         userChallenge.validateIncreaseIceCount()
 
         // 챌린지 종료 여부 확인
-        if (userChallenge.checkIsDone(certificationDto.certificationDate)){
-            makeReport(userId, userChallenge)
+        if (userChallenge.checkIsDone(certificationDto.certificationDate)) {
+            makeReport(userChallenge)
         }
 
         return userChallenge
     }
 
-    private fun makeReport(userId: Long, userChallenge: UserChallenge) {
+    private fun makeReport(userChallenge: UserChallenge) {
         val sendToReportServerRequestDto = SendToReportServerRequestDto.from(
-            userId = userId,
             challengeTitle = userChallenge.challenge.title,
             progress = userChallenge.totalParticipationDayCount.floorDiv(
                 userChallenge.participantDays.toLong()
@@ -134,7 +170,7 @@ class UserChallengeCommandService (
         val userChallenge = userChallengeService.findById(userChallengeId = iceDto.userChallengeId)
 
         // 얼리기 가능 여부 판단
-        userChallenge.validateCanIceAndUse()
+        userChallenge.useIce()
         // 날짜 인증 상태 Ice로 변경
         userChallenge.updateCertificationStateIsIce(certificationDate)
         // 연속 참여 일수 증가
@@ -163,27 +199,27 @@ class UserChallengeCommandService (
         pastUserChallengeHistory: UserChallengeHistory?,
         userChallengeHistory: UserChallengeHistory
     ) {
-        // 첫 날인 경우
-        val nowCount : Long = userChallenge.nowConsecutiveParticipationDayCount
+        val nowCount: Long = userChallenge.nowConsecutiveParticipationDayCount
         var consecutiveState: EConsecutiveState
 
+        // 첫 날인 경우
         if (pastUserChallengeHistory == null && userChallengeHistory.status != EUserChallengeCertificationStatus.FAILED) {
             consecutiveState = EConsecutiveState.FIRST_DAY
         }
         // 연속 일자 증가
-        else if (userChallengeHistory.status != EUserChallengeCertificationStatus.FAILED &&
-            pastUserChallengeHistory!!.status != EUserChallengeCertificationStatus.FAILED
-        ) {
-
-            consecutiveState = EConsecutiveState.CONSECUTIVE_ONLY
-
-        } else if (
+        else if (
             userChallengeHistory.status != EUserChallengeCertificationStatus.FAILED &&
             pastUserChallengeHistory!!.status != EUserChallengeCertificationStatus.FAILED &&
             userChallenge.nowConsecutiveParticipationDayCount == userChallenge.maxConsecutiveParticipationDayCount
         ) {
             consecutiveState = EConsecutiveState.CONSECUTIVE_MAX
         }
+        else if (
+            userChallengeHistory.status != EUserChallengeCertificationStatus.FAILED &&
+            pastUserChallengeHistory!!.status != EUserChallengeCertificationStatus.FAILED
+        ) {
+            consecutiveState = EConsecutiveState.CONSECUTIVE_ONLY
+        }
         // 연속 일자 초기화
         else if (userChallengeHistory.status != EUserChallengeCertificationStatus.FAILED && pastUserChallengeHistory!!.status == EUserChallengeCertificationStatus.FAILED) {
             consecutiveState = EConsecutiveState.CONSECUTIVE_RESET
@@ -224,13 +260,14 @@ class UserChallengeCommandService (
         }
     }
 
-    private fun validateUserCanParticipateInChallenge(challengeParticipantDto: ChallengeParticipantDto) {
-        val existingUserChallenge = userChallengeService.findByUserIdAndChallengeId(
+    private fun validateUserCanParticipateInChallenge(challengeParticipantDto: ChallengeParticipantDto)
+            : EUserChallengeParticipantState? {
+        val existingUserChallenge: UserChallenge? = userChallengeService.findByUserIdAndChallengeId(
             userId = challengeParticipantDto.userId,
             challengeId = challengeParticipantDto.challengeId
         )
 
-        existingUserChallenge?.validateCanParticipants()
+        return existingUserChallenge?.validateCanParticipants()
     }
 
     private fun createUserChallenge(
@@ -242,16 +279,21 @@ class UserChallengeCommandService (
                 userId = challengeParticipantDto.userId,
                 challenge = challenge,
                 participantsDate = challengeParticipantDto.participantsTotalDays,
-                status =challengeParticipantDto.status
+                status = challengeParticipantDto.status
             )
         )
     }
 
-    private fun saveUserChallengeWithHistory(userChallenge: UserChallenge, participantsDate: Int) {
+    private fun saveUserChallengeWithHistory(
+        userChallenge: UserChallenge,
+        participantsDate: Int,
+        participantsStartDay: LocalDate
+    ) {
         // UserChallengeHistory를 생성하고 UserChallenge에 연결
         userChallengeHistoryCommandService.createUserChallengeHistory(
             userChallenge = userChallenge,
-            participantsDate = participantsDate
+            participantsDate = participantsDate,
+            startDay = participantsStartDay
         )
 
         // UserChallenge와 연결된 모든 히스토리가 함께 저장됨

server/src/main/kotlin/com/app/server/user_challenge/application/service/UserChallengeEventListener.kt

@@ -34,7 +34,6 @@ class UserChallengeEventListener(
 
     private fun processWhenReceive(event: CertificationSucceededEvent) {
         userChallengeCommandService.processAfterCertificateSuccess(
-            userId = event.userId,
             userChallengeId = event.userChallengeId,
             certificationDto = CertificationDataDto(
                 imageUrl = event.imageUrl,
@@ -63,6 +62,7 @@ class UserChallengeEventListener(
         val reportDto = ReportDto(
             userChallengeId = userChallenge.id!!,
             totalDays = userChallenge.participantDays,
+            userChallengeStatus = userChallenge.status,
             successDays = userChallenge.totalParticipationDayCount.toInt(),
             reportMessage = userChallenge.reportMessage!!,
             maxConsecutiveParticipationDays = userChallenge.maxConsecutiveParticipationDayCount,

server/src/main/kotlin/com/app/server/user_challenge/application/service/UserChallengeHistoryCommandService.kt

@@ -9,22 +9,30 @@ import java.time.LocalDate
 
 @Service
 @Transactional
-class UserChallengeHistoryCommandService (
+class UserChallengeHistoryCommandService(
 ) {
 
-    fun createUserChallengeHistory(userChallenge: UserChallenge, participantsDate: Int) {
+    fun createUserChallengeHistory(
+        userChallenge: UserChallenge,
+        participantsDate: Int,
+        startDay: LocalDate
+    ) {
         val userChallengeHistoryList = mutableListOf<UserChallengeHistory>()
 
         for (i in 0..participantsDate.minus(1)) {
-            val history = createUserChallengeHistory(i, userChallenge)
+            val history = createUserChallengeHistory(i, userChallenge, startDay)
             userChallengeHistoryList.add(history)
         }
         userChallenge.addUserChallengeHistories(userChallengeHistoryList)
 
     }
 
-    private fun createUserChallengeHistory(i: Int, userChallenge: UserChallenge): UserChallengeHistory {
-        val challengeDate = LocalDate.now().plusDays(i.toLong())
+    private fun createUserChallengeHistory(
+        i: Int,
+        userChallenge: UserChallenge,
+        startDay: LocalDate
+    ): UserChallengeHistory {
+        val challengeDate = startDay.plusDays(i.toLong())
         return UserChallengeHistory(
             id = null,
             userChallenge = userChallenge,

server/src/main/kotlin/com/app/server/user_challenge/application/service/UserChallengeQueryService.kt

@@ -1,18 +1,12 @@
 package com.app.server.user_challenge.application.service
 
-import com.app.server.user_challenge.ui.controller.ReportWaiter
-import com.app.server.user_challenge.ui.dto.CertificationReportDataDto
-import com.app.server.user_challenge.ui.dto.ReportDto
 import com.app.server.user_challenge.domain.enums.EUserChallengeCertificationStatus
 import com.app.server.user_challenge.domain.enums.EUserChallengeStatus
-import com.app.server.user_challenge.ui.usecase.GetTotalUserChallengeUseCase
 import com.app.server.user_challenge.domain.model.UserChallenge
 import com.app.server.user_challenge.domain.model.UserChallengeHistory
-import com.app.server.user_challenge.ui.dto.CertificationData
-import com.app.server.user_challenge.ui.dto.GetTotalUserChallengeResponseDto
-import com.app.server.user_challenge.ui.dto.UserChallengeQuery
+import com.app.server.user_challenge.ui.dto.*
+import com.app.server.user_challenge.ui.usecase.GetTotalUserChallengeUseCase
 import com.app.server.user_challenge.ui.usecase.GetUserChallengeReportUseCase
-import org.springframework.cglib.core.Local
 import org.springframework.stereotype.Service
 import java.time.LocalDate
 
@@ -59,6 +53,7 @@ class UserChallengeQueryService(
         return ReportDto(
             userChallengeId = userChallenge.id!!,
             totalDays = userChallenge.participantDays,
+            userChallengeStatus = userChallenge.status,
             successDays = successDays,
             reportMessage = userChallenge.reportMessage!!,
             maxConsecutiveParticipationDays = userChallenge.maxConsecutiveParticipationDayCount,
@@ -73,7 +68,7 @@ class UserChallengeQueryService(
         todayDate: LocalDate
     ) {
         val endDate : LocalDate = userChallenge.createdAt!!.toLocalDate()
-            .plusDays(userChallenge.participantDays.toLong())
+            .plusDays(userChallenge.participantDays-1L)
 
         if (userChallenge.status == EUserChallengeStatus.PENDING &&
             todayDate.isBefore(endDate.plusDays(2))

server/src/main/kotlin/com/app/server/user_challenge/application/service/UserChallengeService.kt

@@ -18,6 +18,10 @@ class UserChallengeService (
         return userChallengeRepository.save(userChallenge)
     }
 
+    fun saveAll(userChallenges: List<UserChallenge>) : List<UserChallenge> {
+        return userChallengeRepository.saveAll(userChallenges)
+    }
+
     fun findById(userChallengeId: Long) : UserChallenge =
         userChallengeRepository.findById(userChallengeId)
             .orElseThrow { NotFoundException(CommonResultCode.NOT_FOUND, "해당 챌린지를 참여하고 있지 않습니다.")