feat: 인터렉션 조회 응답값에 Progress 값을 추가한다

depromeet · Jul 1, 2023 · d706bc5 · d706bc5
1 parent 8570384
commit d706bc5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/Whatnow-Api/src/main/kotlin/com/depromeet/whatnow/api/interaction/dto/InteractionResponse.kt b/Whatnow-Api/src/main/kotlin/com/depromeet/whatnow/api/interaction/dto/InteractionResponse.kt
@@ -1,5 +1,8 @@
 package com.depromeet.whatnow.api.interaction.dto
 
+import com.depromeet.whatnow.api.promiseprogress.dto.response.UserProgressResponse
+
 data class InteractionResponse(
+    val userProgressResponse: UserProgressResponse,
     val interactionDtoList: List<InteractionDto>,
 )
diff --git a/...i/src/main/kotlin/com/depromeet/whatnow/api/interaction/usecase/InteractionReadUseCase.kt b/...i/src/main/kotlin/com/depromeet/whatnow/api/interaction/usecase/InteractionReadUseCase.kt
@@ -3,17 +3,29 @@ package com.depromeet.whatnow.api.interaction.usecase
 import com.depromeet.whatnow.annotation.UseCase
 import com.depromeet.whatnow.api.interaction.dto.InteractionDto
 import com.depromeet.whatnow.api.interaction.dto.InteractionResponse
+import com.depromeet.whatnow.api.promiseprogress.dto.response.UserProgressResponse
 import com.depromeet.whatnow.config.security.SecurityUtils
 import com.depromeet.whatnow.domains.interaction.service.InteractionDomainService
+import com.depromeet.whatnow.domains.progresshistory.adapter.ProgressHistoryAdapter
+import com.depromeet.whatnow.domains.user.adapter.UserAdapter
 
 @UseCase
 class InteractionReadUseCase(
     val interactionDomainService: InteractionDomainService,
+    val progressHistoryAdapter: ProgressHistoryAdapter,
+    val userAdapter: UserAdapter,
 ) {
 
     fun findMyInteraction(promiseId: Long): InteractionResponse {
         val userId: Long = SecurityUtils.currentUserId
+        val history = progressHistoryAdapter.findByPromiseIdAndUserId(promiseId, userId)
+        val userProgressResponse = UserProgressResponse(
+            userAdapter.queryUser(userId).toUserInfoVo(),
+            history.currentPromiseProgress,
+            history.prePromiseProgress,
+        )
         return InteractionResponse(
+            userProgressResponse,
             interactionDomainService.queryAllInteraction(promiseId, userId).map { InteractionDto.from(it) },
         )
     }