merge: (#281) 유저 dto 관련 리팩토링 (#303)

simtong-application/src/main/kotlin/team/comit/simtong/domain/user/dto/request/AdminSignInData.kt

@@ -0,0 +1,16 @@
+package team.comit.simtong.domain.user.dto.request
+
+/**
+ *
+ * 관리자의 로그인 정보를 전달하는 AdminSignInData
+ *
+ * @author kimbeomjin
+ * @author Chokyunghyeon
+ * @date 2023/01/01
+ * @version 1.2.5
+ **/
+data class AdminSignInData(
+    val employeeNumber: Int,
+
+    val password: String
+)

simtong-application/src/main/kotlin/team/comit/simtong/domain/user/dto/request/ChangeEmailData.kt

@@ -0,0 +1,13 @@
+package team.comit.simtong.domain.user.dto.request
+
+/**
+ *
+ * 이메일 변경 정보를 전달하는 ChangeEmailData
+ *
+ * @author Chokyunghyeon
+ * @date 2022/10/03
+ * @version 1.2.5
+ **/
+data class ChangeEmailData(
+    val email: String
+)

simtong-application/src/main/kotlin/team/comit/simtong/domain/user/dto/ChangeNicknameRequest.kt → simtong-application/src/main/kotlin/team/comit/simtong/domain/user/dto/request/ChangeNicknameData.kt

@@ -1,13 +1,13 @@
-package team.comit.simtong.domain.user.dto
+package team.comit.simtong.domain.user.dto.request
 
 /**
  *
  * 닉네임 변경 요청 정보를 전달하는 ChangeNicknameRequest
  *
  * @author Chokyunghyeon
  * @date 2022/10/03
- * @version 1.0.0
+ * @version 1.2.5
  **/
-data class ChangeNicknameRequest(
+data class ChangeNicknameData(
     val nickname: String
 )

simtong-application/src/main/kotlin/team/comit/simtong/domain/user/dto/request/ChangePasswordData.kt

@@ -0,0 +1,15 @@
+package team.comit.simtong.domain.user.dto.request
+
+/**
+ *
+ * 사용자의 비밀번호 변경 요청 정보를 전달하는 ChangePasswordData
+ *
+ * @author Chokyunghyeon
+ * @date 2022/10/14
+ * @version 1.2.5
+ **/
+data class ChangePasswordData(
+    val password: String,
+
+    val newPassword: String
+)

simtong-application/src/main/kotlin/team/comit/simtong/domain/user/dto/ChangeProfileImageRequest.kt → simtong-application/src/main/kotlin/team/comit/simtong/domain/user/dto/request/ChangeProfileImageData.kt

@@ -1,13 +1,13 @@
-package team.comit.simtong.domain.user.dto
+package team.comit.simtong.domain.user.dto.request
 
 /**
  *
- * 프로필 사진 변경 요청 정보를 전달하는 ChangeProfileImageRequest
+ * 프로필 사진 변경 요청 정보를 전달하는 ChangeProfileImageData
  *
  * @author Chokyunghyeon
  * @date 2022/10/03
- * @version 1.0.0
+ * @version 1.2.5
  **/
-data class ChangeProfileImageRequest(
+data class ChangeProfileImageData(
     val profileImagePath: String
 )

simtong-application/src/main/kotlin/team/comit/simtong/domain/user/dto/request/ChangeSpotData.kt

@@ -0,0 +1,15 @@
+package team.comit.simtong.domain.user.dto.request
+
+import java.util.UUID
+
+/**
+ *
+ * 지점 변경 요청 정보를 전달하는 ChangeSpotData
+ *
+ * @author Chokyunghyeon
+ * @date 2023/01/12
+ * @version 1.2.5
+ **/
+data class ChangeSpotData(
+    val spotId: UUID
+)

simtong-application/src/main/kotlin/team/comit/simtong/domain/user/dto/CheckMatchedAccountRequest.kt → simtong-application/src/main/kotlin/team/comit/simtong/domain/user/dto/request/CheckMatchedAccountData.kt

@@ -1,14 +1,15 @@
-package team.comit.simtong.domain.user.dto
+package team.comit.simtong.domain.user.dto.request
 
 /**
  *
- * 해당 사원번호와 이메일을 가진 계정 여부 확인을 요청하는 CheckMatchedAccountRequest
+ * 해당 사원번호와 이메일을 가진 계정 여부 확인 요청 정보를 전달하는 CheckMatchedAccountData
  *
  * @author Chokyunghyeon
  * @date 2022/10/15
- * @version 1.0.0
+ * @version 1.2.5
  **/
-data class CheckMatchedAccountRequest(
+data class CheckMatchedAccountData(
     val employeeNumber: Int,
+
     val email: String
 )

simtong-application/src/main/kotlin/team/comit/simtong/domain/user/dto/FindEmployeeNumberRequest.kt → simtong-application/src/main/kotlin/team/comit/simtong/domain/user/dto/request/FindEmployeeNumberData.kt

@@ -1,16 +1,16 @@
-package team.comit.simtong.domain.user.dto
+package team.comit.simtong.domain.user.dto.request
 
-import java.util.*
+import java.util.UUID
 
 /**
  *
- * 사원 번호 찾기 정보를 전달하는 FindEmployeeNumberRequest
+ * 사원 번호 찾기 정보를 전달하는 FindEmployeeNumberData
  *
  * @author Chokyunghyeon
  * @date 2022/09/11
- * @version 1.0.0
+ * @version 1.2.5
  **/
-data class FindEmployeeNumberRequest(
+data class FindEmployeeNumberData(
     val name: String,
 
     val spotId: UUID,

simtong-application/src/main/kotlin/team/comit/simtong/domain/user/dto/request/ResetPasswordData.kt

@@ -0,0 +1,17 @@
+package team.comit.simtong.domain.user.dto.request
+
+/**
+ *
+ * 비밀번호 초기화 요청 정보를 전달하는 ResetPasswordData
+ *
+ * @author Chokyunghyeon
+ * @date 2022/09/27
+ * @version 1.2.5
+ **/
+data class ResetPasswordData(
+    val email: String,
+
+    val employeeNumber: Int,
+
+    val newPassword: String
+)

simtong-application/src/main/kotlin/team/comit/simtong/domain/user/dto/SignUpRequest.kt → simtong-application/src/main/kotlin/team/comit/simtong/domain/user/dto/request/SignUpData.kt

@@ -1,15 +1,15 @@
-package team.comit.simtong.domain.user.dto
+package team.comit.simtong.domain.user.dto.request
 
 /**
  *
- * 회원 가입 정보를 전달하는 SignUpRequest
+ * 회원 가입 정보를 전달하는 SignUpData
  *
  * @author Chokyunghyeon
  * @author kimbeomjin
  * @date 2022/09/04
- * @version 1.2.1
+ * @version 1.2.5
  **/
-data class SignUpRequest(
+data class SignUpData(
     val name: String,
 
     val email: String,

simtong-application/src/main/kotlin/team/comit/simtong/domain/user/dto/request/UserSignInData.kt

@@ -0,0 +1,17 @@
+package team.comit.simtong.domain.user.dto.request
+
+/**
+ *
+ * 일반 사용자의 로그인 정보를 전달하는 UserSignInData
+ *
+ * @author kimbeomjin
+ * @date 2022/09/08
+ * @version 1.2.5
+ **/
+data class UserSignInData(
+    val employeeNumber: Int,
+
+    val password: String,
+
+    val deviceToken: String
+)

simtong-application/src/main/kotlin/team/comit/simtong/domain/user/dto/QueryAdminInfoResponse.kt → simtong-application/src/main/kotlin/team/comit/simtong/domain/user/dto/response/QueryAdminInfoResponse.kt

@@ -1,4 +1,4 @@
-package team.comit.simtong.domain.user.dto
+package team.comit.simtong.domain.user.dto.response
 
 import java.util.UUID
 

simtong-application/src/main/kotlin/team/comit/simtong/domain/user/dto/QueryUserInfoResponse.kt → simtong-application/src/main/kotlin/team/comit/simtong/domain/user/dto/response/QueryUserInfoResponse.kt

@@ -1,4 +1,4 @@
-package team.comit.simtong.domain.user.dto
+package team.comit.simtong.domain.user.dto.response
 
 /**
  *

simtong-application/src/main/kotlin/team/comit/simtong/domain/user/usecase/AdminSignInUseCase.kt

@@ -1,7 +1,7 @@
 package team.comit.simtong.domain.user.usecase
 
 import team.comit.simtong.domain.auth.dto.TokenResponse
-import team.comit.simtong.domain.user.dto.AdminSignInRequest
+import team.comit.simtong.domain.user.dto.request.AdminSignInData
 import team.comit.simtong.domain.user.exception.UserExceptions
 import team.comit.simtong.domain.user.model.Authority
 import team.comit.simtong.domain.user.spi.QueryUserPort
@@ -25,7 +25,7 @@ class AdminSignInUseCase(
     private val securityPort: UserSecurityPort
 ) {
 
-    fun execute(request: AdminSignInRequest): TokenResponse {
+    fun execute(request: AdminSignInData): TokenResponse {
         val admin = queryUserPort.queryUserByEmployeeNumber(request.employeeNumber)
             ?.apply { this.checkAuthority(Authority.ROLE_ADMIN) }
             ?: throw UserExceptions.NotFound("관리자가 존재하지 않습니다.")

simtong-application/src/main/kotlin/team/comit/simtong/domain/user/usecase/ChangeEmailUseCase.kt

@@ -2,7 +2,7 @@ package team.comit.simtong.domain.user.usecase
 
 import team.comit.simtong.domain.auth.exception.AuthExceptions
 import team.comit.simtong.domain.auth.spi.QueryAuthCodeLimitPort
-import team.comit.simtong.domain.user.dto.ChangeEmailRequest
+import team.comit.simtong.domain.user.dto.request.ChangeEmailData
 import team.comit.simtong.domain.user.exception.UserExceptions
 import team.comit.simtong.domain.user.spi.CommandUserPort
 import team.comit.simtong.domain.user.spi.QueryUserPort
@@ -25,7 +25,7 @@ class ChangeEmailUseCase(
     private val commandUserPort: CommandUserPort
 ) {
 
-    fun execute(request: ChangeEmailRequest) {
+    fun execute(request: ChangeEmailData) {
         if (queryUserPort.existsUserByEmail(request.email)) {
             throw AuthExceptions.AlreadyUsedEmail()
         }

simtong-application/src/main/kotlin/team/comit/simtong/domain/user/usecase/ChangeNicknameUseCase.kt

@@ -1,6 +1,6 @@
 package team.comit.simtong.domain.user.usecase
 
-import team.comit.simtong.domain.user.dto.ChangeNicknameRequest
+import team.comit.simtong.domain.user.dto.request.ChangeNicknameData
 import team.comit.simtong.domain.user.exception.UserExceptions
 import team.comit.simtong.domain.user.spi.CommandUserPort
 import team.comit.simtong.domain.user.spi.QueryUserPort
@@ -22,7 +22,7 @@ class ChangeNicknameUseCase(
     private val commandUserPort: CommandUserPort
 ) {
 
-    fun execute(request: ChangeNicknameRequest) {
+    fun execute(request: ChangeNicknameData) {
         if (queryUserPort.existsUserByNickname(request.nickname)) {
             throw UserExceptions.AlreadyUsedNickname()
         }

simtong-application/src/main/kotlin/team/comit/simtong/domain/user/usecase/ChangePasswordUseCase.kt

@@ -1,6 +1,6 @@
 package team.comit.simtong.domain.user.usecase
 
-import team.comit.simtong.domain.user.dto.ChangePasswordRequest
+import team.comit.simtong.domain.user.dto.request.ChangePasswordData
 import team.comit.simtong.domain.user.exception.UserExceptions
 import team.comit.simtong.domain.user.spi.CommandUserPort
 import team.comit.simtong.domain.user.spi.QueryUserPort
@@ -22,8 +22,9 @@ class ChangePasswordUseCase(
     private val commandUserPort: CommandUserPort
 ) {
 
-    fun execute(request: ChangePasswordRequest) {
+    fun execute(request: ChangePasswordData) {
         val currentUserId = securityPort.getCurrentUserId()
+
         val user = queryUserPort.queryUserById(currentUserId) ?: throw UserExceptions.NotFound()
 
         if (!securityPort.compare(request.password, user.password.value)) {

simtong-application/src/main/kotlin/team/comit/simtong/domain/user/usecase/ChangeProfileImageUseCase.kt

@@ -2,7 +2,7 @@ package team.comit.simtong.domain.user.usecase
 
 import team.comit.simtong.domain.file.exception.FileExceptions
 import team.comit.simtong.domain.file.spi.CheckFilePort
-import team.comit.simtong.domain.user.dto.ChangeProfileImageRequest
+import team.comit.simtong.domain.user.dto.request.ChangeProfileImageData
 import team.comit.simtong.domain.user.exception.UserExceptions
 import team.comit.simtong.domain.user.spi.CommandUserPort
 import team.comit.simtong.domain.user.spi.QueryUserPort
@@ -25,7 +25,7 @@ class ChangeProfileImageUseCase(
     private val checkFilePort: CheckFilePort
 ) {
 
-    fun execute(request: ChangeProfileImageRequest) {
+    fun execute(request: ChangeProfileImageData) {
         if (!checkFilePort.existsPath(request.profileImagePath)) {
             throw FileExceptions.PathNotFound()
         }