merge: (#111) 회원 가입 리팩토링 (#114)

Team-ComIT · Oct 14, 2022 · 17dc102 · 17dc102
2 parents d85853e + 4dd0332
commit 17dc102
Show file tree

Hide file tree

Showing 5 changed files with 133 additions and 134 deletions.
diff --git a/simtong-application/src/main/kotlin/team/comit/simtong/domain/user/usecase/SignUpUseCase.kt b/simtong-application/src/main/kotlin/team/comit/simtong/domain/user/usecase/SignUpUseCase.kt
@@ -1,10 +1,21 @@
 package team.comit.simtong.domain.user.usecase
 
 import team.comit.simtong.domain.auth.dto.TokenResponse
-import team.comit.simtong.domain.user.policy.SignUpPolicy
+import team.comit.simtong.domain.auth.exception.RequiredNewEmailAuthenticationException
+import team.comit.simtong.domain.auth.exception.UncertifiedEmailException
+import team.comit.simtong.domain.auth.exception.UsedEmailException
+import team.comit.simtong.domain.spot.exception.SpotNotFoundException
+import team.comit.simtong.domain.team.exception.TeamNotFoundException
+import team.comit.simtong.domain.user.dto.SignUpRequest
+import team.comit.simtong.domain.user.model.Authority
+import team.comit.simtong.domain.user.model.User
 import team.comit.simtong.domain.user.spi.CommandUserPort
+import team.comit.simtong.domain.user.spi.QueryUserPort
 import team.comit.simtong.domain.user.spi.UserJwtPort
-import team.comit.simtong.domain.user.dto.SignUpRequest
+import team.comit.simtong.domain.user.spi.UserQueryAuthCodeLimitPort
+import team.comit.simtong.domain.user.spi.UserQuerySpotPort
+import team.comit.simtong.domain.user.spi.UserQueryTeamPort
+import team.comit.simtong.domain.user.spi.UserSecurityPort
 import team.comit.simtong.global.annotation.UseCase
 
 /**
@@ -20,18 +31,48 @@ import team.comit.simtong.global.annotation.UseCase
 class SignUpUseCase(
     private val userJwtPort: UserJwtPort,
     private val commandUserPort: CommandUserPort,
-    private val signUpPolicy: SignUpPolicy
+    private val queryUserPort: QueryUserPort,
+    private val userQueryAuthCodeLimitPort: UserQueryAuthCodeLimitPort,
+    private val userQuerySpotPort: UserQuerySpotPort,
+    private val userQueryTeamPort: UserQueryTeamPort,
+    //    private val nickNamePort: NickNamePort,
+    private val userSecurityPort: UserSecurityPort
 ) {
 
     fun execute(request: SignUpRequest): TokenResponse {
+        val (name, email, password, nickname, employeeNumber, profileImagePath) = request
+
+        if (queryUserPort.existsUserByEmail(email)) {
+            throw UsedEmailException.EXCEPTION
+        }
+
+        val authCodeLimit = userQueryAuthCodeLimitPort.queryAuthCodeLimitByEmail(email)
+            ?: throw RequiredNewEmailAuthenticationException.EXCEPTION
+
+        if (!authCodeLimit.isVerified) {
+            throw UncertifiedEmailException.EXCEPTION
+        }
+
+        // TODO 비즈니스 로직 직접 구현
+        // 임직원 확인
+
+        val spot = userQuerySpotPort.querySpotByName("test spotName")
+            ?: throw SpotNotFoundException.EXCEPTION
+
+        val team = userQueryTeamPort.queryTeamByName("test teamName")
+            ?: throw TeamNotFoundException.EXCEPTION
+
         val user = commandUserPort.save(
-            signUpPolicy.implement(
-                nickname = request.nickname,
-                name = request.name,
-                email = request.email,
-                password = request.password,
-                employeeNumber = request.employeeNumber,
-                profileImagePath = request.profileImagePath
+            User(
+                nickname = nickname ?: "", // nickNamePort.random()
+                name = name,
+                email = email,
+                password = userSecurityPort.encode(password),
+                employeeNumber = employeeNumber,
+                authority = Authority.ROLE_COMMON,
+                spotId = spot.id,
+                teamId = team.id,
+                profileImagePath = profileImagePath ?: User.defaultImage
             )
         )
 

diff --git a/...-application/src/test/kotlin/team/comit/simtong/domain/user/usecase/SignUpUseCaseTests.kt b/...-application/src/test/kotlin/team/comit/simtong/domain/user/usecase/SignUpUseCaseTests.kt
@@ -8,25 +8,25 @@ import org.junit.jupiter.api.extension.ExtendWith
 import org.mockito.BDDMockito.given
 import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.test.context.junit.jupiter.SpringExtension
+import team.comit.simtong.domain.auth.dto.TokenResponse
+import team.comit.simtong.domain.auth.exception.RequiredNewEmailAuthenticationException
 import team.comit.simtong.domain.auth.exception.UncertifiedEmailException
 import team.comit.simtong.domain.auth.exception.UsedEmailException
 import team.comit.simtong.domain.auth.model.AuthCodeLimit
-import team.comit.simtong.domain.auth.dto.TokenResponse
 import team.comit.simtong.domain.spot.exception.SpotNotFoundException
 import team.comit.simtong.domain.spot.model.Spot
 import team.comit.simtong.domain.team.exception.TeamNotFoundException
 import team.comit.simtong.domain.team.model.Team
+import team.comit.simtong.domain.user.dto.SignUpRequest
 import team.comit.simtong.domain.user.model.Authority
 import team.comit.simtong.domain.user.model.User
-import team.comit.simtong.domain.user.policy.SignUpPolicy
 import team.comit.simtong.domain.user.spi.CommandUserPort
 import team.comit.simtong.domain.user.spi.QueryUserPort
 import team.comit.simtong.domain.user.spi.UserJwtPort
 import team.comit.simtong.domain.user.spi.UserQueryAuthCodeLimitPort
 import team.comit.simtong.domain.user.spi.UserQuerySpotPort
 import team.comit.simtong.domain.user.spi.UserQueryTeamPort
 import team.comit.simtong.domain.user.spi.UserSecurityPort
-import team.comit.simtong.domain.user.dto.SignUpRequest
 import java.util.*
 
 @ExtendWith(SpringExtension::class)
@@ -53,8 +53,6 @@ class SignUpUseCaseTests {
     @MockBean
     private lateinit var userQueryAuthCodeLimitPort: UserQueryAuthCodeLimitPort
 
-    private lateinit var signUpPolicy: SignUpPolicy
-
     private lateinit var signUpUseCase: SignUpUseCase
 
     private val employeeNumber: Int = 1234567891
@@ -102,20 +100,6 @@ class SignUpUseCaseTests {
         )
     }
 
-    private val userStub: User by lazy {
-        User(
-            nickname = nickname,
-            name = name,
-            email = email,
-            password = "encode test password",
-            employeeNumber = employeeNumber,
-            authority = Authority.ROLE_COMMON,
-            spotId = spotStub.id,
-            teamId = teamStub.id,
-            profileImagePath = profileImagePath
-        )
-    }
-
     private val authCodeLimitStub: AuthCodeLimit by lazy {
         AuthCodeLimit(
             key = email,
@@ -125,15 +109,6 @@ class SignUpUseCaseTests {
         )
     }
 
-    private val unVerifiedAuthCodeLimitStub: AuthCodeLimit by lazy {
-        AuthCodeLimit(
-            key = email,
-            expirationTime = 12345,
-            attemptCount = 5,
-            isVerified = false
-        )
-    }
-
     private val requestStub: SignUpRequest by lazy {
         SignUpRequest(
             nickname = nickname,
@@ -155,19 +130,84 @@ class SignUpUseCaseTests {
 
     @BeforeEach
     fun setUp() {
-        signUpPolicy = SignUpPolicy(
-            userQueryTeamPort,
-            userQuerySpotPort,
-            userQueryAuthCodeLimitPort,
+        signUpUseCase = SignUpUseCase(
+            userJwtPort,
+            commandUserPort,
             queryUserPort,
+            userQueryAuthCodeLimitPort,
+            userQuerySpotPort,
+            userQueryTeamPort,
             userSecurityPort
         )
-        signUpUseCase = SignUpUseCase(userJwtPort, commandUserPort, signUpPolicy)
     }
 
     @Test
     fun `회원가입 성공`() {
         // given
+        val userStub = User(
+            nickname = nickname,
+            name = name,
+            email = email,
+            password = "encode test password",
+            employeeNumber = employeeNumber,
+            authority = Authority.ROLE_COMMON,
+            spotId = spotStub.id,
+            teamId = teamStub.id,
+            profileImagePath = profileImagePath
+        )
+
+        given(userQueryAuthCodeLimitPort.queryAuthCodeLimitByEmail(requestStub.email))
+            .willReturn(authCodeLimitStub)
+
+        given(queryUserPort.existsUserByEmail(requestStub.email))
+            .willReturn(false)
+
+        given(userSecurityPort.encode(requestStub.password))
+            .willReturn(userStub.password)
+
+        given(userQuerySpotPort.querySpotByName(spotName))
+            .willReturn(spotStub)
+
+        given(userQueryTeamPort.queryTeamByName(teamName))
+            .willReturn(teamStub)
+
+        given(commandUserPort.save(userStub))
+            .willReturn(saveUserStub)
+
+        given(userJwtPort.receiveToken(saveUserStub.id, saveUserStub.authority))
+            .willReturn(responseStub)
+
+        // when
+        val result = signUpUseCase.execute(requestStub)
+
+        // then
+        assertThat(result).isEqualTo(responseStub)
+    }
+
+    @Test
+    fun `회원가입 성공 OPTINAL`() {
+        // given
+        val requestStub = SignUpRequest(
+            nickname = null,
+            name = name,
+            email = email,
+            password = "test password",
+            employeeNumber = employeeNumber,
+            profileImagePath = null
+        )
+
+        val userStub = User(
+            nickname = "",
+            name = name,
+            email = email,
+            password = "encode test password",
+            employeeNumber = employeeNumber,
+            authority = Authority.ROLE_COMMON,
+            spotId = spotStub.id,
+            teamId = teamStub.id,
+            profileImagePath = User.defaultImage
+        )
+
         given(userQueryAuthCodeLimitPort.queryAuthCodeLimitByEmail(requestStub.email))
             .willReturn(authCodeLimitStub)
 
@@ -199,6 +239,13 @@ class SignUpUseCaseTests {
     @Test
     fun `인증되지 않은 이메일`() {
         // given
+        val unVerifiedAuthCodeLimitStub = AuthCodeLimit(
+            key = email,
+            expirationTime = 12345,
+            attemptCount = 5,
+            isVerified = false
+        )
+
         given(userQueryAuthCodeLimitPort.queryAuthCodeLimitByEmail(requestStub.email))
             .willReturn(unVerifiedAuthCodeLimitStub)
 
@@ -209,13 +256,13 @@ class SignUpUseCaseTests {
     }
 
     @Test
-    fun `이메일 인증 객체 찾기 실패`() {
+    fun `인증되지 못한 이메일`() {
         // given
         given(userQueryAuthCodeLimitPort.queryAuthCodeLimitByEmail(requestStub.email))
             .willReturn(null)
 
         // when & then
-        assertThrows<UncertifiedEmailException> {
+        assertThrows<RequiredNewEmailAuthenticationException> {
             signUpUseCase.execute(requestStub)
         }
     }

diff --git a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/user/policy/SignUpPolicy.kt b/simtong-domain/src/main/kotlin/team/comit/simtong/domain/user/policy/SignUpPolicy.kt
diff --git a/simtong-domain/src/main/kotlin/team/comit/simtong/global/annotation/Policy.kt b/simtong-domain/src/main/kotlin/team/comit/simtong/global/annotation/Policy.kt
diff --git a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/global/aop/GlobalComponentScan.kt b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/global/aop/GlobalComponentScan.kt
@@ -5,7 +5,6 @@ import org.springframework.context.annotation.ComponentScan.Filter
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.FilterType
 import team.comit.simtong.global.annotation.DomainService
-import team.comit.simtong.global.annotation.Policy
 import team.comit.simtong.global.annotation.ReadOnlyUseCase
 import team.comit.simtong.global.annotation.UseCase
 
@@ -26,7 +25,6 @@ import team.comit.simtong.global.annotation.UseCase
             classes = [
                 UseCase::class,
                 ReadOnlyUseCase::class,
-                Policy::class,
                 DomainService::class
             ]
         )