refactor : 유저 정보조회 수정

Central-MakeUs · Nov 25, 2023 · 913cffb · 913cffb
1 parent 521918a
commit 913cffb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/src/main/kotlin/com/example/cmc_be/user/controller/UserController.kt b/src/main/kotlin/com/example/cmc_be/user/controller/UserController.kt
@@ -22,7 +22,7 @@ class UserController(
 ) {
     @GetMapping("")
     @ApiErrorCodeExample(UserAuthErrorCode::class)
-    @Operation(summary = "01-01 내 정보 조회")
+    @Operation(summary = "01-01 내 정보 조회 홈화면과 마이페이지 용")
     fun getUserInfo(@AuthenticationPrincipal user: User) : CommonResponse<UserRes.UserInfoDto>{
         return CommonResponse.onSuccess(userService.getUserInfo(user))
     }
@@ -34,11 +34,4 @@ class UserController(
         userService.deleteUser(user)
         return CommonResponse.onSuccess("탈퇴 성공")
     }
-
-    @GetMapping("/my-page")
-    @Operation(summary = "01-03 마이페이지 조회")
-    @ApiErrorCodeExample(UserAuthErrorCode::class)
-    fun getMyPage(@AuthenticationPrincipal user: User) : CommonResponse<UserRes.MyPageUserInfoDto>{
-        return CommonResponse.onSuccess(userService.getMyPage(user))
-    }
 }
diff --git a/src/main/kotlin/com/example/cmc_be/user/convertor/UserConvertor.kt b/src/main/kotlin/com/example/cmc_be/user/convertor/UserConvertor.kt
@@ -50,6 +50,8 @@ class UserConvertor {
         return UserRes.UserInfoDto(
             nickname =  user.nickname,
             generation = userPart.get().generation,
+            name = user.name,
+            email = user.username,
             part = userPart.get().part
         )
     }

diff --git a/src/main/kotlin/com/example/cmc_be/user/dto/UserRes.kt b/src/main/kotlin/com/example/cmc_be/user/dto/UserRes.kt
@@ -4,6 +4,8 @@ import com.example.cmc_be.domain.user.enums.Part
 
 class UserRes {
     data class UserInfoDto(
+        val name : String,
+        val email : String,
         val nickname : String,
         val generation : Int,
         val part : Part