[User] user모듈 DTO core모듈로 이동

user/src/main/kotlin/kpring/user/dto/request/AddFriendRequest.kt → core/src/main/kotlin/kpring/core/user/dto/request/AddFriendRequest.kt

@@ -1,4 +1,4 @@
-package kpring.user.dto.request
+package kpring.core.user.dto.request
 
 data class AddFriendRequest(
   val friendId: Long,

core/src/main/kotlin/kpring/core/user/dto/request/CreateUserRequest.kt

@@ -0,0 +1,25 @@
+package kpring.core.user.dto.request
+
+import jakarta.validation.constraints.Email
+import jakarta.validation.constraints.NotBlank
+import jakarta.validation.constraints.Pattern
+
+data class CreateUserRequest(
+  @NotBlank(message = "이메일이 누락되었습니다.")
+  @Email(message = "invalid email")
+  val email: String,
+  @NotBlank(message = "비밀번호이(가) 누락되었습니다.")
+  @Pattern(
+    regexp = "^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])[a-zA-Z0-9!@#$]{8,15}$",
+    message =
+      "비밀번호는 최소 8자에서 15자 사이, 대문자와 소문자, 숫자가 포함되어야 하며, " +
+        "특수문자 (!, @, #, $)도 사용할 수 있습니다.",
+  )
+  val password: String,
+  @NotBlank(message = "유저 이름이 누락되었습니다.")
+  @Pattern(
+    regexp = "^[a-zA-Z0-9가-힣]{1,32}$",
+    message = "닉네임은 영문 대소문자, 숫자, 한글로 구성되어야 하며, 1자 이상 32자 이하여야 합니다.",
+  )
+  val username: String,
+)

core/src/main/kotlin/kpring/core/user/dto/request/LoginRequest.kt

@@ -0,0 +1,6 @@
+package kpring.core.user.dto.request
+
+data class LoginRequest(
+  val email: String,
+  val password: String,
+)

core/src/main/kotlin/kpring/core/user/dto/request/LogoutRequest.kt

@@ -0,0 +1,6 @@
+package kpring.core.user.dto.request
+
+data class LogoutRequest(
+  val accessToken: String,
+  val refreshToken: String,
+)

user/src/main/kotlin/kpring/user/dto/request/SearchUserRequest.kt → core/src/main/kotlin/kpring/core/user/dto/request/SearchUserRequest.kt

@@ -1,4 +1,4 @@
-package kpring.user.dto.request
+package kpring.core.user.dto.request
 
 data class SearchUserRequest(
   val search: String?,

core/src/main/kotlin/kpring/core/user/dto/request/UpdateUserProfileRequest.kt

@@ -0,0 +1,22 @@
+package kpring.core.user.dto.request
+
+import jakarta.validation.constraints.Email
+import jakarta.validation.constraints.Pattern
+
+data class UpdateUserProfileRequest(
+  @Email(message = "invalid email")
+  val email: String,
+  @Pattern(
+    regexp = "^[a-zA-Z0-9가-힣]{1,32}$",
+    message = "닉네임은 영문 대소문자, 숫자, 한글로 구성되어야 하며, 1자 이상 32자 이하여야 합니다.",
+  )
+  val username: String,
+  val password: String,
+  @Pattern(
+    regexp = "^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])[a-zA-Z0-9!@#$]{8,15}$",
+    message =
+      "비밀번호는 최소 8자에서 15자 사이, 대문자와 소문자, 숫자가 포함되어야 하며, " +
+        "특수문자 (!, @, #, $)도 사용할 수 있습니다.",
+  )
+  val newPassword: String,
+)

user/src/main/kotlin/kpring/user/dto/response/AddFriendResponse.kt → core/src/main/kotlin/kpring/core/user/dto/response/AddFriendResponse.kt

@@ -1,4 +1,4 @@
-package kpring.user.dto.response
+package kpring.core.user.dto.response
 
 data class AddFriendResponse(
   val friendId: Long,

core/src/main/kotlin/kpring/core/user/dto/response/CreateUserResponse.kt

@@ -0,0 +1,6 @@
+package kpring.core.user.dto.response
+
+data class CreateUserResponse(
+  val id: Long,
+  val email: String,
+)

user/src/main/kotlin/kpring/user/dto/response/DeleteFriendResponse.kt → core/src/main/kotlin/kpring/core/user/dto/response/DeleteFriendResponse.kt

@@ -1,4 +1,4 @@
-package kpring.user.dto.response
+package kpring.core.user.dto.response
 
 data class DeleteFriendResponse(
   val friendId: Long,

core/src/main/kotlin/kpring/core/user/dto/response/FailMessageResponse.kt

@@ -0,0 +1,9 @@
+package kpring.core.user.dto.response
+
+data class FailMessageResponse(
+  val message: String,
+) {
+  companion object {
+    val serverError = FailMessageResponse(message = "서버 오류")
+  }
+}

user/src/main/kotlin/kpring/user/dto/response/GetFriendRequestResponse.kt → core/src/main/kotlin/kpring/core/user/dto/response/GetFriendRequestResponse.kt

@@ -1,4 +1,4 @@
-package kpring.user.dto.response
+package kpring.core.user.dto.response
 
 data class GetFriendRequestResponse(
   val friendId: Long,

user/src/main/kotlin/kpring/user/dto/response/GetFriendRequestsResponse.kt → core/src/main/kotlin/kpring/core/user/dto/response/GetFriendRequestsResponse.kt

@@ -1,4 +1,4 @@
-package kpring.user.dto.response
+package kpring.core.user.dto.response
 
 data class GetFriendRequestsResponse(
   val userId: Long,

user/src/main/kotlin/kpring/user/dto/response/GetFriendResponse.kt → core/src/main/kotlin/kpring/core/user/dto/response/GetFriendResponse.kt

@@ -1,4 +1,4 @@
-package kpring.user.dto.response
+package kpring.core.user.dto.response
 
 import java.nio.file.Path
 

user/src/main/kotlin/kpring/user/dto/response/GetFriendsResponse.kt → core/src/main/kotlin/kpring/core/user/dto/response/GetFriendsResponse.kt

@@ -1,4 +1,4 @@
-package kpring.user.dto.response
+package kpring.core.user.dto.response
 
 data class GetFriendsResponse(
   val userId: Long,

core/src/main/kotlin/kpring/core/user/dto/response/GetUserProfileResponse.kt

@@ -0,0 +1,8 @@
+package kpring.core.user.dto.response
+
+data class GetUserProfileResponse(
+  val userId: Long,
+  val email: String,
+  val username: String,
+  val filename: String?,
+)

core/src/main/kotlin/kpring/core/user/dto/response/LoginResponse.kt

@@ -0,0 +1,6 @@
+package kpring.core.user.dto.response
+
+data class LoginResponse(
+  val accessToken: String,
+  val refreshToken: String,
+)

core/src/main/kotlin/kpring/core/user/dto/response/UpdateUserProfileResponse.kt

@@ -0,0 +1,6 @@
+package kpring.core.user.dto.response
+
+data class UpdateUserProfileResponse(
+  val email: String,
+  val username: String,
+)

user/src/main/kotlin/kpring/user/dto/response/UserSearchResultResponse.kt → core/src/main/kotlin/kpring/core/user/dto/response/UserSearchResultResponse.kt

@@ -1,4 +1,4 @@
-package kpring.user.dto.response
+package kpring.core.user.dto.response
 
 data class UserSearchResultResponse(
   val userId: Long,

user/src/main/kotlin/kpring/user/dto/response/UserSearchResultsResponse.kt → core/src/main/kotlin/kpring/core/user/dto/response/UserSearchResultsResponse.kt

@@ -1,4 +1,4 @@
-package kpring.user.dto.response
+package kpring.core.user.dto.response
 
 data class UserSearchResultsResponse(
   val users: Set<UserSearchResultResponse>,

user/src/main/kotlin/kpring/user/controller/FriendController.kt

@@ -2,10 +2,10 @@ package kpring.user.controller
 
 import kpring.core.auth.client.AuthClient
 import kpring.core.global.dto.response.ApiResponse
-import kpring.user.dto.response.AddFriendResponse
-import kpring.user.dto.response.DeleteFriendResponse
-import kpring.user.dto.response.GetFriendRequestsResponse
-import kpring.user.dto.response.GetFriendsResponse
+import kpring.core.user.dto.response.AddFriendResponse
+import kpring.core.user.dto.response.DeleteFriendResponse
+import kpring.core.user.dto.response.GetFriendRequestsResponse
+import kpring.core.user.dto.response.GetFriendsResponse
 import kpring.user.global.AuthValidator
 import kpring.user.service.FriendService
 import org.springframework.http.ResponseEntity

user/src/main/kotlin/kpring/user/controller/LoginController.kt

@@ -1,8 +1,8 @@
 package kpring.user.controller
 
 import kpring.core.global.dto.response.ApiResponse
-import kpring.user.dto.request.LoginRequest
-import kpring.user.dto.request.LogoutRequest
+import kpring.core.user.dto.request.LoginRequest
+import kpring.core.user.dto.request.LogoutRequest
 import kpring.user.service.LoginService
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*

user/src/main/kotlin/kpring/user/controller/UserController.kt

@@ -4,12 +4,12 @@ import kpring.core.auth.client.AuthClient
 import kpring.core.global.dto.response.ApiResponse
 import kpring.core.global.exception.ServiceException
 import kpring.core.server.client.ServerClient
-import kpring.user.dto.request.CreateUserRequest
-import kpring.user.dto.request.SearchUserRequest
-import kpring.user.dto.request.UpdateUserProfileRequest
-import kpring.user.dto.response.CreateUserResponse
-import kpring.user.dto.response.GetUserProfileResponse
-import kpring.user.dto.response.UpdateUserProfileResponse
+import kpring.core.user.dto.request.CreateUserRequest
+import kpring.core.user.dto.request.SearchUserRequest
+import kpring.core.user.dto.request.UpdateUserProfileRequest
+import kpring.core.user.dto.response.CreateUserResponse
+import kpring.core.user.dto.response.GetUserProfileResponse
+import kpring.core.user.dto.response.UpdateUserProfileResponse
 import kpring.user.exception.UserErrorCode
 import kpring.user.global.AuthValidator
 import kpring.user.service.UserService

user/src/main/kotlin/kpring/user/entity/User.kt

@@ -1,7 +1,7 @@
 package kpring.user.entity
 
 import jakarta.persistence.*
-import kpring.user.dto.request.UpdateUserProfileRequest
+import kpring.core.user.dto.request.UpdateUserProfileRequest
 
 @Entity
 @Table(name = "tb_user")

user/src/main/kotlin/kpring/user/exception/ExceptionController.kt

@@ -1,7 +1,7 @@
 package kpring.user.exception
 
 import kpring.core.global.exception.ServiceException
-import kpring.user.dto.response.FailMessageResponse
+import kpring.core.user.dto.response.FailMessageResponse
 import org.slf4j.LoggerFactory
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.MethodArgumentNotValidException
@@ -30,7 +30,7 @@ class ExceptionController {
 
   @ExceptionHandler(MethodArgumentNotValidException::class)
   fun handleMethodArgumentNotValidException(e: MethodArgumentNotValidException): ResponseEntity<FailMessageResponse> {
-    val response = FailMessageResponse(e.bindingResult.allErrors[0].defaultMessage)
+    val response = FailMessageResponse(e.bindingResult.allErrors[0].defaultMessage!!)
     return ResponseEntity.badRequest().body(response)
   }
 

user/src/main/kotlin/kpring/user/service/FriendService.kt

@@ -1,9 +1,9 @@
 package kpring.user.service
 
-import kpring.user.dto.response.AddFriendResponse
-import kpring.user.dto.response.DeleteFriendResponse
-import kpring.user.dto.response.GetFriendRequestsResponse
-import kpring.user.dto.response.GetFriendsResponse
+import kpring.core.user.dto.response.AddFriendResponse
+import kpring.core.user.dto.response.DeleteFriendResponse
+import kpring.core.user.dto.response.GetFriendRequestsResponse
+import kpring.core.user.dto.response.GetFriendsResponse
 
 interface FriendService {
   /**

user/src/main/kotlin/kpring/user/service/FriendServiceImpl.kt

@@ -1,7 +1,7 @@
 package kpring.user.service
 
 import kpring.core.global.exception.ServiceException
-import kpring.user.dto.response.*
+import kpring.core.user.dto.response.*
 import kpring.user.entity.Friend
 import kpring.user.entity.FriendRequestStatus
 import kpring.user.entity.User