♻️ refactor(report): report 연결

Author: 5hseok

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

@@ -123,9 +123,9 @@ class UserChallengeCommandService(
     private fun makeReport(userChallenge: UserChallenge) {
         val sendToReportServerRequestDto = SendToReportServerRequestDto.from(
             challengeTitle = userChallenge.challenge.title,
-            progress = userChallenge.totalParticipationDayCount.floorDiv(
-                userChallenge.participantDays.toLong()
-            ).toInt(),
+            progress = (userChallenge.totalParticipationDayCount * 100)
+                .floorDiv(userChallenge.participantDays)
+                .toInt(),
             totalDay = userChallenge.participantDays
         )
 

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

@@ -1,5 +1,6 @@
 package com.app.server.user_challenge.application.service
 
+import com.app.server.rank.application.service.RankService
 import com.app.server.user_challenge.domain.enums.EUserChallengeCertificationStatus
 import com.app.server.user_challenge.domain.enums.EUserChallengeStatus
 import com.app.server.user_challenge.domain.model.UserChallenge
@@ -12,7 +13,8 @@ import java.time.LocalDate
 
 @Service
 class UserChallengeQueryService(
-    private val userChallengeService: UserChallengeService
+    private val userChallengeService: UserChallengeService,
+    private val rankService: RankService
 ) : GetTotalUserChallengeUseCase, GetUserChallengeReportUseCase {
     fun getChallengeCompletedUserPercent(challengeId: Long): Double {
 
@@ -46,7 +48,10 @@ class UserChallengeQueryService(
         val successDays = userChallenge.getUserChallengeHistories()
             .count { it.status != EUserChallengeCertificationStatus.FAILED }
 
-        val userRank = 1L // TODO: UserChallenge에서 랭킹을 가져오는 로직 추가 필요
+        val key = "rank:challenge:${userChallenge.challenge.id}"
+        val value = userChallenge.userId
+
+        val userRank = rankService.getRank(key, value)
 
         updateUserChallengeStatus(userChallenge, todayDate)
 

server/src/main/kotlin/com/app/server/user_challenge/infra/ReportInfraService.kt

@@ -59,21 +59,23 @@ class ReportInfraService {
         )
         val jsonResponseObject = objectMapper.readTree(body.message)
 
-        if (jsonResponseObject.get("status_code").toString() != "200") {
-            return ReceiveReportResponseDto(
-                status = EUserReportResultCode.ERROR_IN_RECEIVE_REPORT_SERVER,
-                message = EUserReportResultCode.ERROR_IN_RECEIVE_REPORT_SERVER.message
-            )
-        } else if (jsonResponseObject.get("success").toString() == "True") {
+        if (jsonResponseObject.get("success").toString().lowercase() == "true") {
             return ReceiveReportResponseDto(
                 status = EUserReportResultCode.RECEIVE_REPORT_SUCCESS,
                 message = jsonResponseObject.get("result_text").toString()
             )
+        } else if (jsonResponseObject.get("success").toString().lowercase() == "false") {
+            return ReceiveReportResponseDto(
+                status = EUserReportResultCode.RECEIVE_REPORT_FAILED,
+                message = EUserReportResultCode.RECEIVE_REPORT_FAILED.message
+            )
+        }
+        else {
+            return ReceiveReportResponseDto(
+                status = EUserReportResultCode.ERROR_IN_RECEIVE_REPORT_SERVER,
+                message = EUserReportResultCode.ERROR_IN_RECEIVE_REPORT_SERVER.message
+            )
         }
-        return ReceiveReportResponseDto(
-            status = EUserReportResultCode.RECEIVE_REPORT_FAILED,
-            message = EUserReportResultCode.RECEIVE_REPORT_FAILED.message
-        )
     }
 
 }

server/src/main/kotlin/com/app/server/user_challenge/ui/dto/SendToReportServerRequestDto.kt

@@ -5,17 +5,17 @@ import com.fasterxml.jackson.annotation.JsonProperty
 data class SendToReportServerRequestDto (
 
     @JsonProperty("challenge_title")
-    val challengeTitle: String,
+    val challenge_title: String,
     @JsonProperty("progress")
     val progress: Int,
     @JsonProperty("total_day")
-    val totalDay: Int
+    val total_day: Int
 ){
     companion object {
         fun from(challengeTitle: String, progress: Int, totalDay: Int) = SendToReportServerRequestDto(
-            challengeTitle = challengeTitle,
-            progress = progress * 100,
-            totalDay = totalDay
+            challengeTitle,
+            progress,
+            totalDay
         )
     }
 }