From 4659c5b56ee34d9036c6542e927e205a36f3daee Mon Sep 17 00:00:00 2001
From: Junyong Lee <leejunyong02@snu.ac.kr>
Date: Mon, 6 Jan 2025 22:20:11 +0900
Subject: [PATCH] :wrench: Delete userId from User

---
 .../kotlin/com/toyProject7/karrot/user/controller/User.kt | 2 --
 .../toyProject7/karrot/user/controller/UserController.kt  | 8 ++++----
 .../com/toyProject7/karrot/user/service/UserService.kt    | 5 +++++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/kotlin/com/toyProject7/karrot/user/controller/User.kt b/src/main/kotlin/com/toyProject7/karrot/user/controller/User.kt
index 6f46d57..9011c87 100644
--- a/src/main/kotlin/com/toyProject7/karrot/user/controller/User.kt
+++ b/src/main/kotlin/com/toyProject7/karrot/user/controller/User.kt
@@ -5,7 +5,6 @@ import com.toyProject7.karrot.user.persistence.UserEntity
 data class User(
     val id: String,
     val nickname: String,
-    val userId: String,
     val location: String,
     val temperature: Double,
     val email: String,
@@ -15,7 +14,6 @@ data class User(
             return User(
                 id = entity.id!!,
                 nickname = entity.nickname,
-                userId = entity.userId,
                 location = entity.location,
                 temperature = entity.temperature,
                 email = entity.email,
diff --git a/src/main/kotlin/com/toyProject7/karrot/user/controller/UserController.kt b/src/main/kotlin/com/toyProject7/karrot/user/controller/UserController.kt
index 115c2c7..e04c110 100644
--- a/src/main/kotlin/com/toyProject7/karrot/user/controller/UserController.kt
+++ b/src/main/kotlin/com/toyProject7/karrot/user/controller/UserController.kt
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController
 class UserController(
     private val userService: UserService,
 ) {
-    @PostMapping("/auth/register")
+    @PostMapping("/auth/sign/up")
     fun signUp(
         @RequestBody request: SignUpRequest,
     ): ResponseEntity<SignUpResponse> {
@@ -20,7 +20,7 @@ class UserController(
         return ResponseEntity.ok(SignUpResponse(user))
     }
 
-    @PostMapping("/auth/login")
+    @PostMapping("/auth/sign/in")
     fun signIn(
         @RequestBody request: SignInRequest,
     ): ResponseEntity<SignInResponse> {
@@ -32,7 +32,7 @@ class UserController(
     fun me(
         @AuthUser user: User,
     ): ResponseEntity<UserMeResponse> {
-        return ResponseEntity.ok(UserMeResponse(user.userId, user.nickname))
+        return ResponseEntity.ok(UserMeResponse(user.id, user.nickname))
     }
 }
 
@@ -57,6 +57,6 @@ data class SignInResponse(
 )
 
 data class UserMeResponse(
-    val userId: String,
+    val id: String,
     val nickname: String,
 )
diff --git a/src/main/kotlin/com/toyProject7/karrot/user/service/UserService.kt b/src/main/kotlin/com/toyProject7/karrot/user/service/UserService.kt
index 8c4b5c5..cd1aba1 100644
--- a/src/main/kotlin/com/toyProject7/karrot/user/service/UserService.kt
+++ b/src/main/kotlin/com/toyProject7/karrot/user/service/UserService.kt
@@ -83,4 +83,9 @@ class UserService(
         val user = userRepository.findByIdOrNull(id) ?: throw AuthenticateException()
         return User.fromEntity(user)
     }
+
+    @Transactional
+    fun getUserEntityById(id: String): UserEntity {
+        return userRepository.findByIdOrNull(id) ?: throw AuthenticateException()
+    }
 }