Merge branch '현재-로그인한-유저-정보-조회-API-추가' into develop

MaeumGaGym · May 27, 2024 · 2af7152 · 2af7152
2 parents d1462c3 + 62cf1d8
commit 2af7152
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 14 deletions.
diff --git a/src/main/kotlin/com/info/maeumgagym/core/user/port/in/ReadCurrentUserProfileUseCase.kt b/src/main/kotlin/com/info/maeumgagym/core/user/port/in/ReadCurrentUserProfileUseCase.kt
@@ -0,0 +1,8 @@
+package com.info.maeumgagym.core.user.port.`in`
+
+import com.info.maeumgagym.core.user.dto.response.UserProfileResponse
+
+interface ReadCurrentUserProfileUseCase {
+
+    fun readCurrentUserProfile(): UserProfileResponse
+}
diff --git a/...agym/core/user/port/in/ReadUserUseCase.kt → .../in/ReadUserProfileFromNicknameUseCase.kt b/...agym/core/user/port/in/ReadUserUseCase.kt → .../in/ReadUserProfileFromNicknameUseCase.kt
@@ -1,5 +1,5 @@
 package com.info.maeumgagym.core.user.port.`in`
 
-interface ReadUserUseCase {
+interface ReadUserProfileFromNicknameUseCase {
     fun profileFromNickname(nickname: String): com.info.maeumgagym.core.user.dto.response.UserProfileResponse
 }
diff --git a/src/main/kotlin/com/info/maeumgagym/core/user/service/ReadCurrentUserProfileService.kt b/src/main/kotlin/com/info/maeumgagym/core/user/service/ReadCurrentUserProfileService.kt
@@ -0,0 +1,24 @@
+package com.info.maeumgagym.core.user.service
+
+import com.info.maeumgagym.common.annotation.responsibility.ReadOnlyUseCase
+import com.info.maeumgagym.core.auth.port.out.ReadCurrentUserPort
+import com.info.maeumgagym.core.user.dto.response.UserProfileResponse
+import com.info.maeumgagym.core.user.port.`in`.ReadCurrentUserProfileUseCase
+import com.info.maeumgagym.core.wakatime.util.WakatimeUtils
+
+@ReadOnlyUseCase
+class ReadCurrentUserProfileService(
+    private val readCurrentUserPort: ReadCurrentUserPort
+) : ReadCurrentUserProfileUseCase {
+
+    override fun readCurrentUserProfile(): UserProfileResponse {
+        val user = readCurrentUserPort.readCurrentUser()
+
+        return UserProfileResponse(
+            nickname = user.nickname,
+            profileImage = user.profileImage,
+            level = WakatimeUtils.findLevel(user.totalWakaTime),
+            totalWakatime = user.totalWakaTime
+        )
+    }
+}
diff --git a/...agym/core/user/service/ReadUserService.kt → ...ice/ReadUserProfileFromNicknameService.kt b/...agym/core/user/service/ReadUserService.kt → ...ice/ReadUserProfileFromNicknameService.kt
@@ -3,14 +3,14 @@ package com.info.maeumgagym.core.user.service
 import com.info.maeumgagym.common.annotation.responsibility.ReadOnlyUseCase
 import com.info.maeumgagym.common.exception.BusinessLogicException
 import com.info.maeumgagym.core.user.dto.response.UserProfileResponse
-import com.info.maeumgagym.core.user.port.`in`.ReadUserUseCase
+import com.info.maeumgagym.core.user.port.`in`.ReadUserProfileFromNicknameUseCase
 import com.info.maeumgagym.core.user.port.out.ReadUserPort
 import com.info.maeumgagym.core.wakatime.util.WakatimeUtils
 
 @ReadOnlyUseCase
-internal class ReadUserService(
+internal class ReadUserProfileFromNicknameService(
     private val readUserPort: ReadUserPort
-) : ReadUserUseCase {
+) : ReadUserProfileFromNicknameUseCase {
 
     override fun profileFromNickname(nickname: String): UserProfileResponse =
         readUserPort.readByNickname(nickname)?.run {

diff --git a/src/main/kotlin/com/info/maeumgagym/core/user/service/UpdateUserInfoService.kt b/src/main/kotlin/com/info/maeumgagym/core/user/service/UpdateUserInfoService.kt
@@ -1,18 +1,22 @@
 package com.info.maeumgagym.core.user.service
 
 import com.info.maeumgagym.common.annotation.responsibility.UseCase
+import com.info.maeumgagym.common.exception.BusinessLogicException
 import com.info.maeumgagym.core.auth.port.out.ReadCurrentUserPort
 import com.info.maeumgagym.core.auth.service.DuplicatedCheckService
-import com.info.maeumgagym.common.exception.BusinessLogicException
+import com.info.maeumgagym.core.user.dto.request.UpdateUserInfoRequest
+import com.info.maeumgagym.core.user.model.PhysicalInfoModel
+import com.info.maeumgagym.core.user.port.`in`.UpdateUserInfoUseCase
+import com.info.maeumgagym.core.user.port.out.SaveUserPort
 
 @UseCase
 internal class UpdateUserInfoService(
-    private val saveUserPort: com.info.maeumgagym.core.user.port.out.SaveUserPort,
+    private val saveUserPort: SaveUserPort,
     private val duplicatedCheckService: DuplicatedCheckService,
     private val readCurrentUserPort: ReadCurrentUserPort
-) : com.info.maeumgagym.core.user.port.`in`.UpdateUserInfoUseCase {
+) : UpdateUserInfoUseCase {
 
-    override fun update(req: com.info.maeumgagym.core.user.dto.request.UpdateUserInfoRequest) {
+    override fun update(req: UpdateUserInfoRequest) {
         if (duplicatedCheckService.existByNickname(req.nickname)) {
             throw BusinessLogicException.ALREADY_EXIST_USER
         }
@@ -22,7 +26,7 @@ internal class UpdateUserInfoService(
             req.run {
                 user.copy(
                     nickname = nickname,
-                    physicalInfoModel = com.info.maeumgagym.core.user.model.PhysicalInfoModel(
+                    physicalInfoModel = PhysicalInfoModel(
                         weight = weight,
                         height = height,
                         genderModel = genderModel

diff --git a/src/main/kotlin/com/info/maeumgagym/presentation/controller/user/UserController.kt b/src/main/kotlin/com/info/maeumgagym/presentation/controller/user/UserController.kt
@@ -3,7 +3,8 @@ package com.info.maeumgagym.presentation.controller.user
 import com.info.maeumgagym.common.annotation.responsibility.WebAdapter
 import com.info.maeumgagym.common.annotation.security.RequireAuthentication
 import com.info.maeumgagym.core.user.dto.response.UserProfileResponse
-import com.info.maeumgagym.core.user.port.`in`.ReadUserUseCase
+import com.info.maeumgagym.core.user.port.`in`.ReadCurrentUserProfileUseCase
+import com.info.maeumgagym.core.user.port.`in`.ReadUserProfileFromNicknameUseCase
 import com.info.maeumgagym.core.user.port.`in`.UpdateUserInfoUseCase
 import com.info.maeumgagym.presentation.controller.user.dto.UpdateUserInfoWebRequest
 import io.swagger.v3.oas.annotations.Operation
@@ -19,18 +20,23 @@ import javax.validation.constraints.NotBlank
 @WebAdapter
 @RequestMapping("/user")
 private class UserController(
-    private val readUserUseCase: ReadUserUseCase,
+    private val readUserProfileFromNicknameUseCase: ReadUserProfileFromNicknameUseCase,
+    private val readCurrentUserProfileUseCase: ReadCurrentUserProfileUseCase,
     private val updateUserInfoUseCase: UpdateUserInfoUseCase
 ) {
 
-    @Operation(summary = "프로필 보기 API")
+    @Operation(summary = "닉네임으로 프로필 보기 API")
     @RequireAuthentication
     @GetMapping("/{nickname}")
-    fun getProfile(
+    fun readUserProfileFromNickname(
         @PathVariable(name = "nickname")
         @NotBlank(message = "null일 수 없습니다.")
         nickname: String?
-    ): UserProfileResponse = readUserUseCase.profileFromNickname(nickname!!)
+    ): UserProfileResponse = readUserProfileFromNicknameUseCase.profileFromNickname(nickname!!)
+
+    @Operation(summary = "현재 로그인한 유저 프로필 보기 API")
+    @GetMapping
+    fun getCurrentUserProfile(): UserProfileResponse = readCurrentUserProfileUseCase.readCurrentUserProfile()
 
     @Operation(summary = "유저 정보 수정 API")
     @ResponseStatus(HttpStatus.NO_CONTENT)