GETP-201 refactor: auth 컴포넌트의 application 모듈 분리 (#134)

src/main/java/es/princip/getp/api/controller/auth/AuthController.java

@@ -1,10 +1,10 @@
 package es.princip.getp.api.controller.auth;
 
-import es.princip.getp.api.controller.auth.dto.request.LoginRequest;
-import es.princip.getp.api.controller.auth.dto.response.Token;
 import es.princip.getp.api.controller.ApiResponse;
 import es.princip.getp.api.controller.ApiResponse.ApiSuccessResult;
-import es.princip.getp.domain.auth.application.AuthService;
+import es.princip.getp.api.controller.auth.dto.request.LoginRequest;
+import es.princip.getp.api.controller.auth.dto.response.Token;
+import es.princip.getp.application.auth.service.AuthService;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;

src/main/java/es/princip/getp/api/controller/auth/SignUpCommandMapper.java

@@ -3,7 +3,7 @@
 import es.princip.getp.api.controller.CommandMapper;
 import es.princip.getp.api.controller.auth.dto.request.ServiceTermAgreementRequest;
 import es.princip.getp.api.controller.auth.dto.request.SignUpRequest;
-import es.princip.getp.domain.auth.application.command.SignUpCommand;
+import es.princip.getp.application.auth.command.SignUpCommand;
 import es.princip.getp.domain.member.model.ServiceTermAgreementData;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;

src/main/java/es/princip/getp/api/controller/auth/SignUpController.java

@@ -4,7 +4,7 @@
 import es.princip.getp.api.controller.ApiResponse.ApiSuccessResult;
 import es.princip.getp.api.controller.auth.dto.request.EmailVerificationCodeRequest;
 import es.princip.getp.api.controller.auth.dto.request.SignUpRequest;
-import es.princip.getp.domain.auth.application.SignUpService;
+import es.princip.getp.application.auth.service.SignUpService;
 import es.princip.getp.domain.member.model.Email;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;

src/main/java/es/princip/getp/api/security/filter/AccessTokenAuthorizationFilter.java

@@ -2,7 +2,7 @@
 
 import es.princip.getp.api.security.exception.ExpiredTokenException;
 import es.princip.getp.api.security.exception.InvalidTokenException;
-import es.princip.getp.domain.auth.application.AccessTokenService;
+import es.princip.getp.application.auth.service.AccessTokenService;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;

src/main/java/es/princip/getp/domain/auth/application/command/SignUpCommand.java → src/main/java/es/princip/getp/application/auth/command/SignUpCommand.java

@@ -1,4 +1,4 @@
-package es.princip.getp.domain.auth.application.command;
+package es.princip.getp.application.auth.command;
 
 import es.princip.getp.domain.member.model.Email;
 import es.princip.getp.domain.member.model.MemberType;

src/main/java/es/princip/getp/domain/auth/exception/DuplicatedEmailException.java → src/main/java/es/princip/getp/application/auth/exception/DuplicatedEmailException.java

@@ -1,4 +1,4 @@
-package es.princip.getp.domain.auth.exception;
+package es.princip.getp.application.auth.exception;
 
 import es.princip.getp.common.exception.BusinessLogicException;
 import es.princip.getp.common.exception.ErrorDescription;

src/main/java/es/princip/getp/domain/auth/exception/FailedVerificationCodeSendingException.java → src/main/java/es/princip/getp/application/auth/exception/FailedVerificationCodeSendingException.java

@@ -1,4 +1,4 @@
-package es.princip.getp.domain.auth.exception;
+package es.princip.getp.application.auth.exception;
 
 import es.princip.getp.common.exception.ErrorDescription;
 import es.princip.getp.common.exception.ExternalApiErrorException;

src/main/java/es/princip/getp/domain/auth/exception/IncorrectEmailOrPasswordException.java → src/main/java/es/princip/getp/application/auth/exception/IncorrectEmailOrPasswordException.java

@@ -1,4 +1,4 @@
-package es.princip.getp.domain.auth.exception;
+package es.princip.getp.application.auth.exception;
 
 import es.princip.getp.common.exception.BusinessLogicException;
 import es.princip.getp.common.exception.ErrorDescription;

src/main/java/es/princip/getp/domain/auth/exception/IncorrectVerificationCodeException.java → src/main/java/es/princip/getp/application/auth/exception/IncorrectVerificationCodeException.java

@@ -1,4 +1,4 @@
-package es.princip.getp.domain.auth.exception;
+package es.princip.getp.application.auth.exception;
 
 import es.princip.getp.common.exception.BusinessLogicException;
 import es.princip.getp.common.exception.ErrorDescription;

src/main/java/es/princip/getp/domain/auth/exception/NotFoundVerificationException.java → src/main/java/es/princip/getp/application/auth/exception/NotFoundVerificationException.java

@@ -1,4 +1,4 @@
-package es.princip.getp.domain.auth.exception;
+package es.princip.getp.application.auth.exception;
 
 import es.princip.getp.common.exception.ErrorDescription;
 import es.princip.getp.common.exception.NotFoundException;

src/main/java/es/princip/getp/domain/auth/infra/EmailVerificationCodeSender.java → src/main/java/es/princip/getp/application/auth/infra/EmailVerificationCodeSender.java

@@ -1,7 +1,7 @@
-package es.princip.getp.domain.auth.infra;
+package es.princip.getp.application.auth.infra;
 
-import es.princip.getp.domain.auth.application.VerificationCodeSender;
-import es.princip.getp.domain.auth.exception.FailedVerificationCodeSendingException;
+import es.princip.getp.application.auth.exception.FailedVerificationCodeSendingException;
+import es.princip.getp.application.auth.service.VerificationCodeSender;
 import es.princip.getp.domain.member.model.Email;
 import es.princip.getp.mail.EmailSender;
 import es.princip.getp.mail.command.SendMailCommand;

src/main/java/es/princip/getp/domain/auth/application/AccessTokenService.java → src/main/java/es/princip/getp/application/auth/service/AccessTokenService.java

@@ -1,4 +1,4 @@
-package es.princip.getp.domain.auth.application;
+package es.princip.getp.application.auth.service;
 
 import es.princip.getp.application.member.port.out.LoadMemberPort;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/es/princip/getp/domain/auth/application/AuthService.java → src/main/java/es/princip/getp/application/auth/service/AuthService.java

@@ -1,9 +1,9 @@
-package es.princip.getp.domain.auth.application;
+package es.princip.getp.application.auth.service;
 
 import es.princip.getp.api.controller.auth.dto.request.LoginRequest;
 import es.princip.getp.api.controller.auth.dto.response.Token;
 import es.princip.getp.api.security.details.PrincipalDetails;
-import es.princip.getp.domain.auth.exception.IncorrectEmailOrPasswordException;
+import es.princip.getp.application.auth.exception.IncorrectEmailOrPasswordException;
 import es.princip.getp.domain.member.model.Member;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;

src/main/java/es/princip/getp/domain/auth/domain/EmailVerification.java → src/main/java/es/princip/getp/application/auth/service/EmailVerification.java

@@ -1,18 +1,19 @@
-package es.princip.getp.domain.auth.domain;
+package es.princip.getp.application.auth.service;
 
 import lombok.AccessLevel;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.redis.core.RedisHash;
 import org.springframework.data.redis.core.TimeToLive;
 
 import java.time.LocalDateTime;
-import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 @Getter
 @RedisHash(value = "email_verification")
+@EqualsAndHashCode(exclude = "expiration")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class EmailVerification {
 
@@ -36,22 +37,4 @@ public EmailVerification(String email, String verificationCode, Long expiration)
     public boolean verify(String verificationCode) {
         return this.verificationCode.equals(verificationCode);
     }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof EmailVerification that)) {
-            return false;
-        }
-        return Objects.equals(email, that.email) &&
-            Objects.equals(verificationCode,that.verificationCode) &&
-            Objects.equals(createdAt, that.createdAt);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(email, verificationCode, createdAt);
-    }
 }

src/main/java/es/princip/getp/domain/auth/domain/EmailVerificationRepository.java → src/main/java/es/princip/getp/application/auth/service/EmailVerificationRepository.java

@@ -1,4 +1,4 @@
-package es.princip.getp.domain.auth.domain;
+package es.princip.getp.application.auth.service;
 
 import org.springframework.data.keyvalue.repository.KeyValueRepository;
 

src/main/java/es/princip/getp/domain/auth/application/JwtTokenService.java → src/main/java/es/princip/getp/application/auth/service/JwtTokenService.java

@@ -1,4 +1,4 @@
-package es.princip.getp.domain.auth.application;
+package es.princip.getp.application.auth.service;
 
 import es.princip.getp.api.security.details.PrincipalDetails;
 import es.princip.getp.api.security.exception.ExpiredTokenException;

src/main/java/es/princip/getp/domain/auth/domain/RefreshToken.java → src/main/java/es/princip/getp/application/auth/service/RefreshToken.java

@@ -1,4 +1,4 @@
-package es.princip.getp.domain.auth.domain;
+package es.princip.getp.application.auth.service;
 
 import lombok.Getter;
 import org.springframework.data.annotation.Id;
@@ -11,6 +11,7 @@
 @Getter
 @RedisHash(value = "token_verification")
 public class RefreshToken {
+
     @Id
     private Long memberId;
 

src/main/java/es/princip/getp/domain/auth/domain/RefreshTokenRepository.java → src/main/java/es/princip/getp/application/auth/service/RefreshTokenRepository.java

@@ -1,4 +1,4 @@
-package es.princip.getp.domain.auth.domain;
+package es.princip.getp.application.auth.service;
 
 import org.springframework.data.keyvalue.repository.KeyValueRepository;
 

src/main/java/es/princip/getp/domain/auth/application/RefreshTokenService.java → src/main/java/es/princip/getp/application/auth/service/RefreshTokenService.java

@@ -1,9 +1,7 @@
-package es.princip.getp.domain.auth.application;
+package es.princip.getp.application.auth.service;
 
 import es.princip.getp.api.security.exception.InvalidTokenException;
 import es.princip.getp.application.member.port.out.LoadMemberPort;
-import es.princip.getp.domain.auth.domain.RefreshToken;
-import es.princip.getp.domain.auth.domain.RefreshTokenRepository;
 import io.jsonwebtoken.Claims;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/es/princip/getp/domain/auth/application/SignUpService.java → src/main/java/es/princip/getp/application/auth/service/SignUpService.java

@@ -1,11 +1,11 @@
-package es.princip.getp.domain.auth.application;
+package es.princip.getp.application.auth.service;
 
+import es.princip.getp.application.auth.command.SignUpCommand;
+import es.princip.getp.application.auth.exception.DuplicatedEmailException;
 import es.princip.getp.application.member.port.out.CheckMemberPort;
 import es.princip.getp.application.member.port.out.SaveMemberPort;
 import es.princip.getp.application.serviceTerm.port.out.CheckServiceTermPort;
 import es.princip.getp.application.serviceTerm.port.out.LoadServiceTermPort;
-import es.princip.getp.domain.auth.application.command.SignUpCommand;
-import es.princip.getp.domain.auth.exception.DuplicatedEmailException;
 import es.princip.getp.domain.member.model.Email;
 import es.princip.getp.domain.member.model.Member;
 import es.princip.getp.domain.member.model.ServiceTermAgreementData;
@@ -24,7 +24,7 @@
 @RequiredArgsConstructor
 public class SignUpService {
 
-    private final VerificationService emailVerificationService;
+    private final VerificationService verificationService;
 
     private final LoadServiceTermPort loadServiceTermPort;
     private final CheckServiceTermPort checkServiceTermPort;
@@ -38,12 +38,12 @@ public void sendEmailVerificationCodeForSignUp(final Email email) {
         if (checkMemberPort.existsByEmail(email)) {
             throw new DuplicatedEmailException();
         }
-        emailVerificationService.sendVerificationCode(email);
+        verificationService.sendVerificationCode(email);
     }
 
     @Transactional
     public void signUp(final SignUpCommand command) {
-        emailVerificationService.verifyEmail(command.email(), command.verificationCode());
+        verificationService.verifyEmail(command.email(), command.verificationCode());
         if (checkMemberPort.existsByEmail(command.email())) {
             throw new DuplicatedEmailException();
         }

src/main/java/es/princip/getp/domain/auth/application/TokenFactory.java → src/main/java/es/princip/getp/application/auth/service/TokenFactory.java

@@ -1,4 +1,4 @@
-package es.princip.getp.domain.auth.application;
+package es.princip.getp.application.auth.service;
 
 import es.princip.getp.api.controller.auth.dto.response.Token;
 import es.princip.getp.domain.member.model.Member;

src/main/java/es/princip/getp/domain/auth/application/VerificationCodeSender.java → src/main/java/es/princip/getp/application/auth/service/VerificationCodeSender.java

@@ -1,7 +1,8 @@
-package es.princip.getp.domain.auth.application;
+package es.princip.getp.application.auth.service;
 
 import es.princip.getp.domain.member.model.Email;
 
 public interface VerificationCodeSender {
+
     void send(Email email, String verificationCode);
 }

src/main/java/es/princip/getp/domain/auth/application/VerificationService.java → src/main/java/es/princip/getp/application/auth/service/VerificationService.java

@@ -1,10 +1,8 @@
-package es.princip.getp.domain.auth.application;
+package es.princip.getp.application.auth.service;
 
+import es.princip.getp.application.auth.exception.IncorrectVerificationCodeException;
+import es.princip.getp.application.auth.exception.NotFoundVerificationException;
 import es.princip.getp.common.util.RandomUtil;
-import es.princip.getp.domain.auth.domain.EmailVerification;
-import es.princip.getp.domain.auth.domain.EmailVerificationRepository;
-import es.princip.getp.domain.auth.exception.IncorrectVerificationCodeException;
-import es.princip.getp.domain.auth.exception.NotFoundVerificationException;
 import es.princip.getp.domain.member.model.Email;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;

src/test/java/es/princip/getp/api/controller/auth/AuthControllerTest.java

@@ -3,7 +3,7 @@
 import es.princip.getp.api.controller.ControllerTest;
 import es.princip.getp.api.controller.auth.dto.request.LoginRequest;
 import es.princip.getp.api.controller.auth.dto.response.Token;
-import es.princip.getp.domain.auth.application.AuthService;
+import es.princip.getp.application.auth.service.AuthService;
 import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
@@ -28,13 +28,12 @@ class AuthControllerTest extends ControllerTest {
     @Autowired
     private AuthService authService;
 
-    @DisplayName("사용자는")
     @Nested
     class Login {
 
         final LoginRequest request = new LoginRequest(EMAIL, PASSWORD);
 
-        @DisplayName("로그인을 할 수 있다.")
+        @DisplayName("사용자는 로그인을 할 수 있다.")
         @Test
         void login() throws Exception {
             final Token token = new Token("Bearer", "${ACCESS_TOKEN}", "${REFRESH_TOKEN}");
@@ -61,11 +60,10 @@ void login() throws Exception {
         }
     }
 
-    @DisplayName("사용자는")
     @Nested
     class ReissueAccessToken {
 
-        @DisplayName("로그인 유지를 할 수 있다.")
+        @DisplayName("사용자는 로그인 유지를 할 수 있다.")
         @Test
         void reissueAccessToken() throws Exception {
             final Token token = new Token("Bearer", "${ACCESS_TOKEN}", "${REFRESH_TOKEN}");

src/test/java/es/princip/getp/api/controller/auth/SignUpControllerTest.java

@@ -4,8 +4,8 @@
 import es.princip.getp.api.controller.auth.dto.request.EmailVerificationCodeRequest;
 import es.princip.getp.api.controller.auth.dto.request.ServiceTermAgreementRequest;
 import es.princip.getp.api.controller.auth.dto.request.SignUpRequest;
-import es.princip.getp.domain.auth.application.SignUpService;
-import es.princip.getp.domain.auth.application.command.SignUpCommand;
+import es.princip.getp.application.auth.command.SignUpCommand;
+import es.princip.getp.application.auth.service.SignUpService;
 import es.princip.getp.domain.member.model.MemberType;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
@@ -38,33 +38,31 @@ class SignUpControllerTest extends ControllerTest {
     private SignUpService signUpService;
 
     @Nested
-    @DisplayName("사용자는")
     class SendEmailVerificationCodeForSignUp {
 
         private final EmailVerificationCodeRequest request = new EmailVerificationCodeRequest(EMAIL);
 
-        @DisplayName("회원 가입 시 이메일 인증을 해야 한다.")
+        @DisplayName("사용자는 회원 가입 시 이메일 인증을 해야 한다.")
         @Test
         void sendEmailVerificationCodeForSignUp() throws Exception {
             mockMvc.perform(post("/auth/signup/email/send")
-            .content(objectMapper.writeValueAsString(request)))
-            .andExpect(status().isOk())
-            .andDo(
-                restDocs.document(
-                    requestFields(
-                        getDescriptor("email", "이메일", EmailVerificationCodeRequest.class)
+                .content(objectMapper.writeValueAsString(request)))
+                .andExpect(status().isOk())
+                .andDo(
+                    restDocs.document(
+                        requestFields(
+                            getDescriptor("email", "이메일", EmailVerificationCodeRequest.class)
+                        )
                     )
                 )
-            )
-            .andDo(print());
+                .andDo(print());
         }
     }
 
     @Nested
-    @DisplayName("사용자는")
     class SignUp {
 
-        @DisplayName("회원 가입을 할 수 있다.")
+        @DisplayName("사용자는 회원 가입을 할 수 있다.")
         @ParameterizedTest
         @EnumSource(value = MemberType.class, names = { "ROLE_PEOPLE", "ROLE_CLIENT" })
         void signUp(MemberType memberType) throws Exception {

src/test/java/es/princip/getp/domain/auth/application/VerificationServiceTest.java

@@ -1,9 +1,11 @@
 package es.princip.getp.domain.auth.application;
 
-import es.princip.getp.domain.auth.domain.EmailVerification;
-import es.princip.getp.domain.auth.domain.EmailVerificationRepository;
-import es.princip.getp.domain.auth.exception.IncorrectVerificationCodeException;
-import es.princip.getp.domain.auth.exception.NotFoundVerificationException;
+import es.princip.getp.application.auth.exception.IncorrectVerificationCodeException;
+import es.princip.getp.application.auth.exception.NotFoundVerificationException;
+import es.princip.getp.application.auth.service.EmailVerification;
+import es.princip.getp.application.auth.service.EmailVerificationRepository;
+import es.princip.getp.application.auth.service.VerificationCodeSender;
+import es.princip.getp.application.auth.service.VerificationService;
 import es.princip.getp.domain.member.model.Email;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;