refactor :: conflict dto

team-boheom · Jan 24, 2024 · 2947880 · 2947880
1 parent f41fd08
commit 2947880
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/src/main/kotlin/com/example/boheom/domain/user/presentation/UserController.kt b/src/main/kotlin/com/example/boheom/domain/user/presentation/UserController.kt
@@ -4,7 +4,7 @@ import com.example.boheom.domain.user.presentation.dto.request.SignInRequest
 import com.example.boheom.domain.user.presentation.dto.request.SignUpRequest
 import com.example.boheom.domain.user.presentation.dto.response.TokenResponse
 import com.example.boheom.domain.user.presentation.dto.response.UploadProfileResponse
-import com.example.boheom.domain.user.presentation.dto.response.UserInfoResponse
+import com.example.boheom.domain.user.presentation.dto.response.UserElement
 import com.example.boheom.domain.user.service.SignInService
 import com.example.boheom.domain.user.service.SignUpService
 import com.example.boheom.domain.user.service.UploadProfileService
@@ -45,7 +45,7 @@ class UserController(
     }
 
     @GetMapping
-    fun getUserInfo(): UserInfoResponse {
+    fun getUserInfo(): UserElement {
         return userInfoService.execute()
     }
 }
diff --git a/src/main/kotlin/com/example/boheom/domain/user/presentation/dto/response/UserInfoResponse.kt b/src/main/kotlin/com/example/boheom/domain/user/presentation/dto/response/UserInfoResponse.kt
diff --git a/src/main/kotlin/com/example/boheom/domain/user/service/UserInfoService.kt b/src/main/kotlin/com/example/boheom/domain/user/service/UserInfoService.kt
@@ -1,7 +1,7 @@
 package com.example.boheom.domain.user.service
 
 import com.example.boheom.domain.user.facade.UserFacade
-import com.example.boheom.domain.user.presentation.dto.response.UserInfoResponse
+import com.example.boheom.domain.user.presentation.dto.response.UserElement
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 
@@ -10,8 +10,8 @@ class UserInfoService(
     private val userFacade: UserFacade,
 ) {
     @Transactional(readOnly = true)
-    fun execute(): UserInfoResponse {
+    fun execute(): UserElement {
         val user = userFacade.getCurrentUser()
-        return UserInfoResponse(user.nickname, user.accountId, user.profile)
+        return UserElement(user.profile, user.nickname, user.accountId)
     }
 }