merge: (#281) Common dto 패키지 리팩토링

simtong-application/src/main/kotlin/team/comit/simtong/domain/auth/dto/TokenResponse.kt → simtong-application/src/main/kotlin/team/comit/simtong/domain/auth/dto/response/TokenResponse.kt

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

simtong-application/src/main/kotlin/team/comit/simtong/domain/auth/usecase/ReissueTokenUseCase.kt

@@ -1,6 +1,6 @@
 package team.comit.simtong.domain.auth.usecase
 
-import team.comit.simtong.domain.auth.dto.TokenResponse
+import team.comit.simtong.domain.auth.dto.response.TokenResponse
 import team.comit.simtong.domain.auth.exception.AuthExceptions
 import team.comit.simtong.domain.auth.spi.JwtPort
 import team.comit.simtong.domain.auth.spi.QueryRefreshTokenPort

simtong-presentation/src/main/kotlin/team/comit/simtong/domain/common/dto/response/FindEmployeeNumberWebResponse.kt → simtong-application/src/main/kotlin/team/comit/simtong/domain/user/dto/response/FindEmployeeNumberResponse.kt

@@ -1,13 +1,13 @@
-package team.comit.simtong.domain.common.dto.response
+package team.comit.simtong.domain.user.dto.response
 
 /**
  *
- * 사원 번호 찾기 결과를 전송하는 FindEmployeeNumberWebResponse
+ * 사원 번호 찾기 결과를 전송하는 FindEmployeeNumberResponse
  *
  * @author Chokyunghyeon
  * @date 2022/09/11
- * @version 1.0.0
+ * @version 1.2.5
  **/
-data class FindEmployeeNumberWebResponse(
+data class FindEmployeeNumberResponse(
  val employeeNumber: Int
 )

simtong-application/src/main/kotlin/team/comit/simtong/domain/user/spi/UserJwtPort.kt

@@ -1,6 +1,6 @@
 package team.comit.simtong.domain.user.spi
 
-import team.comit.simtong.domain.auth.dto.TokenResponse
+import team.comit.simtong.domain.auth.dto.response.TokenResponse
 import team.comit.simtong.domain.user.model.Authority
 import java.util.UUID
 

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

@@ -1,6 +1,6 @@
 package team.comit.simtong.domain.user.usecase
 
-import team.comit.simtong.domain.auth.dto.TokenResponse
+import team.comit.simtong.domain.auth.dto.response.TokenResponse
 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

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

@@ -1,6 +1,5 @@
 package team.comit.simtong.domain.user.usecase
 
-import team.comit.simtong.domain.user.dto.request.CheckMatchedAccountData
 import team.comit.simtong.domain.user.exception.UserExceptions
 import team.comit.simtong.domain.user.spi.QueryUserPort
 import team.comit.simtong.global.annotation.ReadOnlyUseCase
@@ -11,16 +10,16 @@ import team.comit.simtong.global.annotation.ReadOnlyUseCase
  *
  * @author Chokyunghyeon
  * @date 2022/10/15
- * @version 1.0.0
+ * @version 1.2.5
  **/
 @ReadOnlyUseCase
 class CheckMatchedAccountUseCase(
  private val queryUserPort: QueryUserPort
 ) {
 
- fun execute(request: CheckMatchedAccountData) {
+ fun execute(employeeNumber: Int, email: String) {
 
- if (!queryUserPort.existsUserByEmployeeNumberAndEmail(request.employeeNumber, request.email)) {
+ if (!queryUserPort.existsUserByEmployeeNumberAndEmail(employeeNumber, email)) {
  throw UserExceptions.NotFound()
  }
  }

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

@@ -1,6 +1,7 @@
 package team.comit.simtong.domain.user.usecase
 
 import team.comit.simtong.domain.user.dto.request.FindEmployeeNumberData
+import team.comit.simtong.domain.user.dto.response.FindEmployeeNumberResponse
 import team.comit.simtong.domain.user.exception.UserExceptions
 import team.comit.simtong.domain.user.spi.QueryUserPort
 import team.comit.simtong.global.annotation.UseCase
@@ -18,10 +19,11 @@ class FindEmployeeNumberUseCase(
  private val queryUserPort: QueryUserPort
 ) {
 
- fun execute(request: FindEmployeeNumberData): Int {
+ fun execute(request: FindEmployeeNumberData): FindEmployeeNumberResponse {
  val user = queryUserPort.queryUserByNameAndSpotAndEmail(request.name, request.spotId, request.email)
  ?: throw UserExceptions.NotFound()
 
  return user.employeeNumber.value
+ .let(::FindEmployeeNumberResponse)
  }
 }

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

@@ -1,6 +1,6 @@
 package team.comit.simtong.domain.user.usecase
 
-import team.comit.simtong.domain.auth.dto.TokenResponse
+import team.comit.simtong.domain.auth.dto.response.TokenResponse
 import team.comit.simtong.domain.user.dto.request.UserSignInData
 import team.comit.simtong.domain.user.exception.UserExceptions
 import team.comit.simtong.domain.user.model.Authority

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

@@ -1,6 +1,6 @@
 package team.comit.simtong.domain.user.usecase
 
-import team.comit.simtong.domain.auth.dto.TokenResponse
+import team.comit.simtong.domain.auth.dto.response.TokenResponse
 import team.comit.simtong.domain.auth.exception.AuthExceptions
 import team.comit.simtong.domain.file.exception.FileExceptions
 import team.comit.simtong.domain.spot.exception.SpotExceptions

simtong-application/src/test/kotlin/team/comit/simtong/domain/auth/usecase/ReissueTokenUseCaseTests.kt

@@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import org.mockito.BDDMockito.given
 import org.springframework.boot.test.mock.mockito.MockBean
-import team.comit.simtong.domain.auth.dto.TokenResponse
+import team.comit.simtong.domain.auth.dto.response.TokenResponse
 import team.comit.simtong.domain.auth.exception.AuthExceptions
 import team.comit.simtong.domain.auth.model.RefreshToken
 import team.comit.simtong.domain.auth.spi.JwtPort

simtong-application/src/test/kotlin/team/comit/simtong/domain/user/usecase/AdminSignInUseCaseTests.kt

@@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import org.mockito.BDDMockito.given
 import org.springframework.boot.test.mock.mockito.MockBean
-import team.comit.simtong.domain.auth.dto.TokenResponse
+import team.comit.simtong.domain.auth.dto.response.TokenResponse
 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

simtong-application/src/test/kotlin/team/comit/simtong/domain/user/usecase/CheckMatchedAccountUseCaseTests.kt

@@ -6,7 +6,6 @@ import org.junit.jupiter.api.assertDoesNotThrow
 import org.junit.jupiter.api.assertThrows
 import org.mockito.kotlin.given
 import org.springframework.boot.test.mock.mockito.MockBean
-import team.comit.simtong.domain.user.dto.request.CheckMatchedAccountData
 import team.comit.simtong.domain.user.exception.UserExceptions
 import team.comit.simtong.domain.user.spi.QueryUserPort
 import team.comit.simtong.global.annotation.SimtongTest
@@ -19,12 +18,9 @@ class CheckMatchedAccountUseCaseTests {
 
  private lateinit var checkMatchedAccountUseCase: CheckMatchedAccountUseCase
 
- private val requestStub: CheckMatchedAccountData by lazy {
- CheckMatchedAccountData(
- employeeNumber = 1234567890,
- email = "test@test.com"
- )
- }
+ private val employeeNumber = 1234567890
+
+ private val email = "test@test.com"
 
  @BeforeEach
  fun setUp() {
@@ -34,24 +30,24 @@ class CheckMatchedAccountUseCaseTests {
  @Test
  fun `계정 확인 성공`() {
  // given
- given(queryUserPort.existsUserByEmployeeNumberAndEmail(requestStub.employeeNumber, requestStub.email))
+ given(queryUserPort.existsUserByEmployeeNumberAndEmail(employeeNumber, email))
  .willReturn(true)
 
  // when & then
  assertDoesNotThrow {
- checkMatchedAccountUseCase.execute(requestStub)
+ checkMatchedAccountUseCase.execute(employeeNumber, email)
  }
  }
 
  @Test
  fun `계정 확인 실패`() {
  // given
- given(queryUserPort.existsUserByEmployeeNumberAndEmail(requestStub.employeeNumber, requestStub.email))
+ given(queryUserPort.existsUserByEmployeeNumberAndEmail(employeeNumber, email))
  .willReturn(false)
 
  // when & then
  assertThrows<UserExceptions.NotFound> {
- checkMatchedAccountUseCase.execute(requestStub)
+ checkMatchedAccountUseCase.execute(employeeNumber, email)
  }
  }
 

simtong-application/src/test/kotlin/team/comit/simtong/domain/user/usecase/FindEmployeeNumberUseCaseTests.kt

@@ -63,8 +63,11 @@ class FindEmployeeNumberUseCaseTests {
  given(queryUserPort.queryUserByNameAndSpotAndEmail(name, spotId, email))
  .willReturn(userStub)
 
+ // when
+ val response = findEmployeeNumberUseCase.execute(requestStub)
+
  // when & then
- assertEquals(findEmployeeNumberUseCase.execute(requestStub), employeeNumber)
+ assertEquals(response.employeeNumber, employeeNumber)
  }
 
  @Test

simtong-application/src/test/kotlin/team/comit/simtong/domain/user/usecase/SignInUseCaseTests.kt

@@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import org.mockito.BDDMockito.given
 import org.springframework.boot.test.mock.mockito.MockBean
-import team.comit.simtong.domain.auth.dto.TokenResponse
+import team.comit.simtong.domain.auth.dto.response.TokenResponse
 import team.comit.simtong.domain.user.dto.request.UserSignInData
 import team.comit.simtong.domain.user.exception.UserExceptions
 import team.comit.simtong.domain.user.model.Authority

simtong-application/src/test/kotlin/team/comit/simtong/domain/user/usecase/SignUpUseCaseTests.kt

@@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import org.mockito.BDDMockito.given
 import org.springframework.boot.test.mock.mockito.MockBean
-import team.comit.simtong.domain.auth.dto.TokenResponse
+import team.comit.simtong.domain.auth.dto.response.TokenResponse
 import team.comit.simtong.domain.auth.exception.AuthExceptions
 import team.comit.simtong.domain.auth.model.AuthCodeLimit
 import team.comit.simtong.domain.file.exception.FileExceptions

simtong-infrastructure/src/main/kotlin/team/comit/simtong/global/security/token/GenerateJwtAdapter.kt

@@ -5,7 +5,7 @@ import io.jsonwebtoken.Jwts
 import io.jsonwebtoken.SignatureAlgorithm
 import org.springframework.stereotype.Component
 import team.comit.simtong.domain.auth.spi.JwtPort
-import team.comit.simtong.domain.auth.dto.TokenResponse
+import team.comit.simtong.domain.auth.dto.response.TokenResponse
 import team.comit.simtong.domain.user.model.Authority
 import team.comit.simtong.global.security.SecurityProperties
 import team.comit.simtong.persistence.auth.entity.RefreshTokenEntity

simtong-presentation/src/main/kotlin/team/comit/simtong/domain/admin/WebAdminAdapter.kt

@@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RestController
 import team.comit.simtong.domain.admin.dto.AdminSignInRequest
-import team.comit.simtong.domain.auth.dto.TokenResponse
+import team.comit.simtong.domain.auth.dto.response.TokenResponse
 import team.comit.simtong.domain.user.dto.response.QueryAdminInfoResponse
 import team.comit.simtong.domain.user.usecase.AdminSignInUseCase
 import team.comit.simtong.domain.user.usecase.QueryAdminInfoUseCase

simtong-presentation/src/main/kotlin/team/comit/simtong/domain/common/WebCommonAdapter.kt

@@ -4,22 +4,17 @@ import org.hibernate.validator.constraints.Range
 import org.springframework.http.HttpStatus
 import org.springframework.validation.annotation.Validated
 import org.springframework.web.bind.annotation.*
-import team.comit.simtong.domain.auth.dto.TokenResponse
+import team.comit.simtong.domain.auth.dto.response.TokenResponse
 import team.comit.simtong.domain.auth.usecase.ReissueTokenUseCase
-import team.comit.simtong.domain.common.dto.request.ChangePasswordWebRequest
-import team.comit.simtong.domain.common.dto.request.FindEmployeeNumberWebRequest
-import team.comit.simtong.domain.common.dto.request.ResetPasswordWebRequest
-import team.comit.simtong.domain.common.dto.response.FindEmployeeNumberWebResponse
+import team.comit.simtong.domain.common.dto.ChangePasswordRequest
+import team.comit.simtong.domain.common.dto.FindEmployeeNumberRequest
+import team.comit.simtong.domain.common.dto.ResetPasswordRequest
 import team.comit.simtong.domain.spot.dto.SpotResponse
 import team.comit.simtong.domain.spot.usecase.ShowSpotListUseCase
 import team.comit.simtong.domain.team.dto.QueryTeamsResponse
 import team.comit.simtong.domain.team.usecase.QueryTeamsUseCase
-import team.comit.simtong.domain.user.dto.request.ChangePasswordData
-import team.comit.simtong.domain.user.dto.request.CheckMatchedAccountData
-import team.comit.simtong.domain.user.dto.request.FindEmployeeNumberData
-import team.comit.simtong.domain.user.dto.request.ResetPasswordData
+import team.comit.simtong.domain.user.dto.response.FindEmployeeNumberResponse
 import team.comit.simtong.domain.user.model.EmployeeNumber
-import team.comit.simtong.domain.user.model.Password
 import team.comit.simtong.domain.user.usecase.ChangePasswordUseCase
 import team.comit.simtong.domain.user.usecase.CheckEmailDuplicationUseCase
 import team.comit.simtong.domain.user.usecase.CheckMatchedAccountUseCase
@@ -37,7 +32,7 @@ import javax.validation.constraints.NotBlank
  *
  * @author Chokyunghyeon
  * @date 2022/09/11
- * @version 1.2.4
+ * @version 1.2.5
  **/
 @Validated
 @RestController
@@ -55,16 +50,8 @@ class WebCommonAdapter(
 ) {
 
  @GetMapping("/employee-number")
- fun findEmployeeNumber(@Valid @ModelAttribute request: FindEmployeeNumberWebRequest): FindEmployeeNumberWebResponse {
- val result = findEmployeeNumberUseCase.execute(
- FindEmployeeNumberData(
- name = request.name,
- spotId = request.spotId,
- email = request.email
- )
- )
-
- return FindEmployeeNumberWebResponse(result)
+ fun findEmployeeNumber(@Valid @ModelAttribute request: FindEmployeeNumberRequest): FindEmployeeNumberResponse {
+ return findEmployeeNumberUseCase.execute(request.toData())
  }
 
  @PutMapping("/token/reissue")
@@ -74,14 +61,8 @@ class WebCommonAdapter(
 
  @PutMapping("/password/initialization")
  @ResponseStatus(HttpStatus.NO_CONTENT)
- fun resetPassword(@Valid @RequestBody request: ResetPasswordWebRequest) {
- resetPasswordUseCase.execute(
- ResetPasswordData(
- email = request.email,
- employeeNumber = request.employeeNumber.value,
- newPassword = request.newPassword.value
- )
- )
+ fun resetPassword(@Valid @RequestBody request: ResetPasswordRequest) {
+ resetPasswordUseCase.execute(request.toData())
  }
 
  @GetMapping("/email/duplication")
@@ -91,28 +72,18 @@ class WebCommonAdapter(
 
  @PutMapping("/password")
  @ResponseStatus(HttpStatus.NO_CONTENT)
- fun changePassword(@Valid @RequestBody request: ChangePasswordWebRequest) {
- changePasswordUseCase.execute(
- ChangePasswordData(
- password = request.password.value,
- newPassword = request.newPassword.value
- )
- )
+ fun changePassword(@Valid @RequestBody request: ChangePasswordRequest) {
+ changePasswordUseCase.execute(request.toData())
  }
 
  @GetMapping("/account/existence")
  fun checkMatchedAccount(
  @Range(min = EmployeeNumber.MIN_VALUE, max = EmployeeNumber.MAX_VALUE)
- @RequestParam employeeNumber: EmployeeNumber,
+ @RequestParam employeeNumber: Int,
  @NotBlank @Email
  @RequestParam email: String
  ) {
- checkMatchedAccountUseCase.execute(
- CheckMatchedAccountData(
- employeeNumber = employeeNumber.value,
- email = email
- )
- )
+ checkMatchedAccountUseCase.execute(employeeNumber, email)
  }
 
  @GetMapping("/spot")
@@ -121,8 +92,8 @@ class WebCommonAdapter(
  }
 
  @GetMapping("/password/compare")
- fun comparePassword(@NotBlank @RequestParam password: Password) {
- comparePasswordUseCase.execute(password.value)
+ fun comparePassword(@NotBlank @RequestParam password: String) {
+ comparePasswordUseCase.execute(password)
  }
 
  @GetMapping("/team/{spot-id}")

simtong-presentation/src/main/kotlin/team/comit/simtong/domain/common/dto/ChangePasswordRequest.kt

@@ -0,0 +1,27 @@
+package team.comit.simtong.domain.common.dto
+
+import team.comit.simtong.domain.user.dto.request.ChangePasswordData
+import team.comit.simtong.domain.user.model.Password
+import javax.validation.constraints.Pattern
+
+/**
+ *
+ * 비밀번호 변경을 요청하는 ChangePasswordRequest
+ *
+ * @author Chokyunghyeon
+ * @date 2022/10/14
+ * @version 1.2.5
+ **/
+data class ChangePasswordRequest(
+ @field:Pattern(regexp = Password.PATTERN)
+ val password: String,
+
+ @field:Pattern(regexp = Password.PATTERN)
+ val newPassword: String
+) {
+
+ fun toData() = ChangePasswordData(
+ password = password,
+ newPassword = newPassword
+ )
+}