🔧 Delete userId from User

wafflestudio · Jan 6, 2025 · 4659c5b · 4659c5b
1 parent 2c087dc
commit 4659c5b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 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
@@ -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
@@ -12,15 +12,15 @@ 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> {
         val user = userService.signUp(request.nickname, request.userId, request.password, request.email)
         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
@@ -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()
+    }
 }