✨ feat(user_challenge): 나의 챌린지 전체 목록 조회 기능 구현 및 테스트 완료

5hseok · 5hseok · commit d2e9a230ca3e · 2025-04-30T18:19:28.000+09:00
diff --git a/server/src/main/kotlin/com/app/server/challenge_certification/ui/CertificationController.kt b/server/src/main/kotlin/com/app/server/challenge_certification/ui/CertificationController.kt
@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController
 import java.time.LocalDate
 
 @RestController
-@RequestMapping("/api/v1/challenge/user/{userChallengeId}")
+@RequestMapping("/api/v1/challenges/user/{userChallengeId}")
 class CertificationController(
     private val certificationUseCase: CertificationUseCase,
     private val usingIceUseCase: UsingIceUseCase
diff --git a/server/src/main/kotlin/com/app/server/user_challenge/application/repository/UserChallengeRepository.kt b/server/src/main/kotlin/com/app/server/user_challenge/application/repository/UserChallengeRepository.kt
@@ -34,4 +34,9 @@ interface UserChallengeRepository : JpaRepository<UserChallenge, Long> {
             "AND uc.deletedAt IS NULL")
     override fun findById(userChallengeId: Long): Optional<UserChallenge>
 
+    @Query("SELECT uc FROM UserChallenge uc " +
+            "WHERE uc.userId = :userId " +
+            "AND uc.deletedAt IS NULL")
+    fun findAllByUserId(userId: Long): List<UserChallenge>
+
 }
diff --git a/server/src/main/kotlin/com/app/server/user_challenge/application/service/UserChallengeQueryService.kt b/server/src/main/kotlin/com/app/server/user_challenge/application/service/UserChallengeQueryService.kt
@@ -1,11 +1,18 @@
 package com.app.server.user_challenge.application.service
 
+import com.app.server.user_challenge.application.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 org.springframework.stereotype.Service
+import java.time.LocalDate
 
 @Service
 class UserChallengeQueryService(
     private val userChallengeService: UserChallengeService
-) {
+) : GetTotalUserChallengeUseCase {
     fun getChallengeCompletedUserPercent(challengeId: Long): Double {
 
         val countCompletedUser : Long = userChallengeService.countCompletedUserBy(challengeId)
@@ -20,4 +27,43 @@ class UserChallengeQueryService(
 
         return String.format("%.2f", countCompletedUser.toDouble() / countAllUser.toDouble()).toDouble()
     }
+
+    override fun execute(userId: Long): GetTotalUserChallengeResponseDto {
+        val todayDate = LocalDate.now()
+        val userTotalChallengeList: List<UserChallenge> = userChallengeService.findAllByUserId(userId)
+
+        val mappedList = userTotalChallengeList.map { mapToUserChallengeQuery(it, todayDate) }
+
+        return GetTotalUserChallengeResponseDto(userChallenges = mappedList)
+    }
+
+    private fun mapToUserChallengeQuery(userChallenge: UserChallenge, todayDate: LocalDate): UserChallengeQuery {
+        val histories = userChallenge.getUserChallengeHistoriesBeforeToday(todayDate)
+        val elapsedDays = userChallenge.calculateElapsedDays(todayDate)
+        val progress = userChallenge.calculateProgress(todayDate)
+        val certificationToday = userChallenge.isCertificatedToday(todayDate)
+        val certificationDataList = mapCertificationDataList(histories)
+
+        return UserChallengeQuery(
+            id = userChallenge.id!!,
+            title = userChallenge.challenge.title,
+            category = userChallenge.challenge.challengeCategory.title, // TODO: 캐싱 필요
+            status = userChallenge.status.content,
+            totalDays = userChallenge.participantDays,
+            iceCount = userChallenge.iceCount,
+            elapsedDays = elapsedDays,
+            progress = progress,
+            isCertificatedInToday = certificationToday,
+            certificationDataList = certificationDataList
+        )
+    }
+
+    private fun mapCertificationDataList(histories: List<UserChallengeHistory>): List<CertificationData> {
+        return histories.map {
+            CertificationData(
+                date = it.date,
+                isCertificated = it.status.name
+            )
+        }
+    }
 }
diff --git a/server/src/main/kotlin/com/app/server/user_challenge/application/service/UserChallengeService.kt b/server/src/main/kotlin/com/app/server/user_challenge/application/service/UserChallengeService.kt
@@ -22,6 +22,8 @@ class UserChallengeService (
         userChallengeRepository.findById(userChallengeId)
             .orElseThrow { NotFoundException(CommonResultCode.NOT_FOUND, "해당 챌린지를 참여하고 있지 않습니다.")
             }
+    fun findAllByUserId(userId: Long): List<UserChallenge> =
+        userChallengeRepository.findAllByUserId(userId)
 
     fun countCompletedUserBy(challengeId: Long): Long =
         userChallengeRepository.countByChallengeIdAndStatusIsCompleted(
diff --git a/server/src/main/kotlin/com/app/server/user_challenge/application/usecase/GetTotalUserChallengeUseCase.kt b/server/src/main/kotlin/com/app/server/user_challenge/application/usecase/GetTotalUserChallengeUseCase.kt
@@ -0,0 +1,8 @@
+package com.app.server.user_challenge.application.usecase
+
+import com.app.server.user_challenge.ui.dto.GetTotalUserChallengeResponseDto
+
+interface GetTotalUserChallengeUseCase {
+
+    fun execute(userId : Long) : GetTotalUserChallengeResponseDto
+}
diff --git a/server/src/main/kotlin/com/app/server/user_challenge/domain/enums/EUserChallengeCertificationStatus.kt b/server/src/main/kotlin/com/app/server/user_challenge/domain/enums/EUserChallengeCertificationStatus.kt
@@ -1,7 +1,7 @@
 package com.app.server.user_challenge.domain.enums
 
 enum class EUserChallengeCertificationStatus(
-    private val content: String
+    val content: String
 ) {
     FAILED("챌린지 인증 실패"),
     SUCCESS("챌린지 인증 성공"),
diff --git a/server/src/main/kotlin/com/app/server/user_challenge/domain/enums/EUserChallengeStatus.kt b/server/src/main/kotlin/com/app/server/user_challenge/domain/enums/EUserChallengeStatus.kt
@@ -1,11 +1,11 @@
 package com.app.server.user_challenge.domain.enums
 
 enum class EUserChallengeStatus(
-    private val content: String
+    val content: String
 ) {
     RUNNING("챌린지 진행 중"),
     PENDING("리포트 확인 대기 중"),
-    WAITING("챌린지 이어하기 / 종료 결정 기다리는 중"),
+    WAITING("챌린지 이어하기 또는 종료 결정을 기다리는 중"),
     COMPLETED("챌린지 완료"),
     DEAD("리포트 발급 실패")
 }
diff --git a/server/src/main/kotlin/com/app/server/user_challenge/domain/model/UserChallenge.kt b/server/src/main/kotlin/com/app/server/user_challenge/domain/model/UserChallenge.kt
@@ -157,4 +157,20 @@ class UserChallenge(
         this.maxConsecutiveParticipationDayCount = day
     }
 
+    fun calculateElapsedDays(todayDate: LocalDate): Long {
+        return todayDate.toEpochDay() - userChallengeHistories.first().date.toEpochDay()
+    }
+
+    fun calculateProgress(todayDate: LocalDate): Int {
+        return ((calculateElapsedDays(todayDate).toDouble() / totalParticipationDayCount) * 100).toInt().coerceIn(0, 100)
+    }
+
+    fun isCertificatedToday(todayDate: LocalDate): Boolean {
+        return userChallengeHistories.find { it.date.isEqual(todayDate) }?.status!! != EUserChallengeCertificationStatus.FAILED
+    }
+
+    fun getUserChallengeHistoriesBeforeToday(todayDate: LocalDate) : List<UserChallengeHistory> {
+        return userChallengeHistories.filter { it.date.isBefore(todayDate.plusDays(1)) }
+    }
+
 }
diff --git a/server/src/main/kotlin/com/app/server/user_challenge/ui/UserChallengeController.kt b/server/src/main/kotlin/com/app/server/user_challenge/ui/UserChallengeController.kt
@@ -4,8 +4,11 @@ import com.app.server.common.annotation.UserId
 import com.app.server.common.enums.CommonResultCode
 import com.app.server.common.enums.ResultCode
 import com.app.server.common.response.ApiResponse
+import com.app.server.user_challenge.application.usecase.GetTotalUserChallengeUseCase
 import com.app.server.user_challenge.application.usecase.ParticipantChallengeUseCase
 import com.app.server.user_challenge.ui.dto.ChallengeParticipantRequestDto
+import com.app.server.user_challenge.ui.dto.GetTotalUserChallengeResponseDto
+import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestMapping
@@ -14,13 +17,20 @@ import org.springframework.web.bind.annotation.RestController
 @RestController
 @RequestMapping("/api/v1")
 class UserChallengeController (
-    private val participantChallengeUseCase: ParticipantChallengeUseCase
+    private val participantChallengeUseCase: ParticipantChallengeUseCase,
+    private val getTotalUserChallengeUseCase: GetTotalUserChallengeUseCase
 ) {
 
-    @PostMapping("/challenge")
+    @PostMapping("/challenges")
     fun participateChallenge(@UserId userId: Long, @RequestBody requestBody: ChallengeParticipantRequestDto) : ApiResponse<ResultCode> {
         val challengeParticipantDto = requestBody.toChallengeParticipantDto(userId)
         participantChallengeUseCase.execute(challengeParticipantDto)
         return ApiResponse.success(CommonResultCode.SUCCESS)
     }
+
+    @GetMapping("/challenges/user")
+    fun getTotalUserChallenge(@UserId userId: Long) : ApiResponse<GetTotalUserChallengeResponseDto> {
+        val totalUserChallenge : GetTotalUserChallengeResponseDto = getTotalUserChallengeUseCase.execute(userId)
+        return ApiResponse.success(totalUserChallenge)
+    }
 }
diff --git a/server/src/main/kotlin/com/app/server/user_challenge/ui/dto/GetTotalUserChallengeResponseDto.kt b/server/src/main/kotlin/com/app/server/user_challenge/ui/dto/GetTotalUserChallengeResponseDto.kt
@@ -0,0 +1,33 @@
+package com.app.server.user_challenge.ui.dto
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import java.time.LocalDate
+
+data class GetTotalUserChallengeResponseDto (
+    @JsonProperty("user_challenges")
+    val userChallenges: List<UserChallengeQuery>
+)
+
+data class UserChallengeQuery(
+    var id: Long,
+    var title: String,
+    val category: String,
+    val status: String,
+    @JsonProperty("total_days")
+    val totalDays: Int,
+    @JsonProperty("elapsed_days")
+    val elapsedDays: Long,
+    val progress: Int,
+    @JsonProperty("ice_count")
+    val iceCount: Int,
+    @JsonProperty("is_certificated_in_today")
+    val isCertificatedInToday: Boolean,
+    @JsonProperty("certification_data_list")
+    val certificationDataList: List<CertificationData>
+)
+
+data class CertificationData(
+    val date: LocalDate,
+    @JsonProperty("is_certificated")
+    val isCertificated: String
+)
diff --git a/server/src/test/kotlin/com/app/server/HelloTest.kt b/server/src/test/kotlin/com/app/server/HelloTest.kt
diff --git a/server/src/test/kotlin/com/app/server/challenge_certification/application/service/CertificateServiceTest.kt b/server/src/test/kotlin/com/app/server/challenge_certification/application/service/CertificateServiceTest.kt
@@ -0,0 +1,73 @@
+package com.app.server.challenge_certification.application.service
+
+import com.app.server.IntegrationTestContainer
+import jakarta.transaction.Transactional
+import org.junit.jupiter.api.Disabled
+import org.junit.jupiter.api.DisplayName
+import org.junit.jupiter.api.extension.ExtendWith
+import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.test.annotation.Rollback
+import org.springframework.test.context.junit.jupiter.SpringExtension
+import kotlin.test.Test
+
+@SpringBootTest
+@Transactional
+@Rollback
+@ExtendWith(SpringExtension::class)
+class CertificateServiceTest : IntegrationTestContainer() {
+
+
+    @Test
+    @Disabled
+    @DisplayName("챌린지 인증에 실패했다면, 인증에 실패하였음을 클라이언트에게 전달한다.")
+    fun failChallenge() {
+        // given
+        // when
+        // then
+    }
+
+    @Test
+    @Disabled
+    @DisplayName("챌린지 인증에 성공했다면, 인증 사진을 저장한다.")
+    fun saveChallengeImage() {
+        // given
+        // when
+        // then
+    }
+
+    @Test
+    @Disabled
+    @DisplayName("챌린지 인증에 성공하여 사진까지 저장했다면, 인증 성공 이벤트를 게시한다.")
+    fun publishChallengeImage() {
+        // given
+        // when
+        // then
+    }
+
+    @Test
+    @Disabled
+    @DisplayName("챌린지 인증에 성공한 날짜가 챌린지 종료일자와 같다면, 리포트 메시지를 AI 서버로부터 받아온다.")
+    fun getReportMessage() {
+        // given
+        // when
+        // then
+    }
+
+    @Test
+    @Disabled
+    @DisplayName("챌린지 리포트 메시지를 받아왔다면 저장하고, 챌린지의 상태를 Pending으로 변경한다.")
+    fun saveReportMessage() {
+        // given
+        // when
+        // then
+    }
+
+    @Test
+    @Disabled
+    @DisplayName("마지막 날짜의 챌린지 인증에는 성공하였으나, 리포트 메시지를 받아오지 못했다면, 챌린지의 상태를 Dead으로 변경한다.")
+    fun getReportMessageWithFail() {
+        // given
+        // when
+        // then
+    }
+}
diff --git a/server/src/test/kotlin/com/app/server/challenge_certification/ui/CertificationControllerTest.kt b/server/src/test/kotlin/com/app/server/challenge_certification/ui/CertificationControllerTest.kt
@@ -16,7 +16,7 @@ class CertificationControllerTest : IntegrationTestContainer() {
     @Disabled
     fun participateChallenge() {
         // when
-        mockMvc.post("/api/v1/challenge/user/$userChallengeId/certification") {
+        mockMvc.post("/api/v1/challenges/user/$userChallengeId/certification") {
             contentType = MediaType.APPLICATION_JSON
             header("Authorization", "Bearer $token")
             content = """
diff --git a/server/src/test/kotlin/com/app/server/user_challenge/application/service/UserChallengeCommandServiceTest.kt b/server/src/test/kotlin/com/app/server/user_challenge/application/service/UserChallengeCommandServiceTest.kt
@@ -33,15 +33,6 @@ import kotlin.test.Test
 @ExtendWith(SpringExtension::class)
 class UserChallengeCommandServiceTest : IntegrationTestContainer() {
 
-    @Test
-    @Disabled
-    @DisplayName("해당 챌린지에서 가장 오래 연속으로 참여한 일수를 확인할 수 있다.")
-    fun getMaxConsecutiveParticipationDays() {
-        // given
-        // when
-        // then
-    }
-
     @Test
     @Disabled
     @DisplayName("챌린지 종료 일자와 오늘 일자가 같고 오늘 인증에 성공했다면, 챌린지 상태를 Pending으로 변경한다.")
@@ -177,60 +168,6 @@ class UserChallengeCommandServiceTest : IntegrationTestContainer() {
          // then
     }
 
-    @Test
-    @Disabled
-    @DisplayName("챌린지 인증에 실패했다면, 인증에 실패하였음을 클라이언트에게 전달한다.")
-    fun failChallenge() {
-        // given
-        // when
-        // then
-    }
-
-    @Test
-    @Disabled
-    @DisplayName("챌린지 인증에 성공했다면, 인증 사진을 저장한다.")
-    fun saveChallengeImage() {
-        // given
-        // when
-        // then
-    }
-
-    @Test
-    @Disabled
-    @DisplayName("챌린지 인증에 성공하여 사진까지 저장했다면, 인증 성공 이벤트를 게시한다.")
-    fun publishChallengeImage() {
-        // given
-        // when
-        // then
-    }
-
-    @Test
-    @Disabled
-    @DisplayName("챌린지 인증에 성공한 날짜가 챌린지 종료일자와 같다면, 리포트 메시지를 AI 서버로부터 받아온다.")
-    fun getReportMessage() {
-        // given
-        // when
-        // then
-    }
-
-    @Test
-    @Disabled
-    @DisplayName("챌린지 리포트 메시지를 받아왔다면 저장하고, 챌린지의 상태를 Pending으로 변경한다.")
-    fun saveReportMessage() {
-        // given
-        // when
-        // then
-    }
-
-    @Test
-    @Disabled
-    @DisplayName("마지막 날짜의 챌린지 인증에는 성공하였으나, 리포트 메시지를 받아오지 못했다면, 챌린지의 상태를 Dead으로 변경한다.")
-    fun getReportMessageWithFail() {
-        // given
-        // when
-        // then
-    }
-
     @Test
     @Disabled
     @DisplayName("챌린지의 상태가 Dead인 챌린지들을 모아 다시 리포트 메시지를 요청할 수 있다. 이 요청은 주기적으로 이루어지거나, Dead 상태의 챌린지들의 개수가 10개 이상 일 때 이루어진다.")
diff --git a/server/src/test/kotlin/com/app/server/user_challenge/application/usecase/GetTotalUserChallengeUseCaseTest.kt b/server/src/test/kotlin/com/app/server/user_challenge/application/usecase/GetTotalUserChallengeUseCaseTest.kt
diff --git a/server/src/test/kotlin/com/app/server/user_challenge/ui/UserChallengeControllerTest.kt b/server/src/test/kotlin/com/app/server/user_challenge/ui/UserChallengeControllerTest.kt

Original file line number	Diff line number	Diff line change
`@@ -34,4 +34,9 @@ interface UserChallengeRepository : JpaRepository<UserChallenge, Long> {`
`34`	`34`	`"AND uc.deletedAt IS NULL")`
`35`	`35`	`override fun findById(userChallengeId: Long): Optional<UserChallenge>`
`36`	`36`
	`37`	`+ @Query("SELECT uc FROM UserChallenge uc " +`
	`38`	`+ "WHERE uc.userId = :userId " +`
	`39`	`+ "AND uc.deletedAt IS NULL")`
	`40`	`+ fun findAllByUserId(userId: Long): List<UserChallenge>`
	`41`	`+`
`37`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@ class UserChallengeService (`
`22`	`22`	`userChallengeRepository.findById(userChallengeId)`
`23`	`23`	`.orElseThrow { NotFoundException(CommonResultCode.NOT_FOUND, "해당 챌린지를 참여하고 있지 않습니다.")`
`24`	`24`	`}`
	`25`	`+ fun findAllByUserId(userId: Long): List<UserChallenge> =`
	`26`	`+ userChallengeRepository.findAllByUserId(userId)`
`25`	`27`
`26`	`28`	`fun countCompletedUserBy(challengeId: Long): Long =`
`27`	`29`	`userChallengeRepository.countByChallengeIdAndStatusIsCompleted(`