refactor: 디렉토리 변경

clients/client-auth/build.gradle

@@ -12,7 +12,7 @@ dependencies {
     implementation 'io.github.openfeign:feign-hc5' // Open Feign의 클라이언트로 Apache HttpClient5를 사용합니다
 
     // Fault Tolerance
-    implementation 'org.springframework.cloud:spring-cloud-starter-circuitbreaker-resilience4j'
+
 
     // JWT
     implementation 'io.jsonwebtoken:jjwt-api:0.11.2'
@@ -24,3 +24,4 @@ dependencies {
 
     testImplementation "org.springframework.cloud:spring-cloud-starter-contract-stub-runner"
 }
+

clients/client-auth/src/main/resources/client-auth.yml

@@ -18,27 +18,27 @@ spring.cloud.openfeign:
     max-connections: 2000 # 전체 커넥션 수
     max-connections-per-route: 500 # Route당 할당되는 최대 커넥션 수
 
-  circuitbreaker:
-    enabled: true
-
-resilience4j.circuitbreaker:
-  configs:
-    default:
-      slidingWindowType: COUNT_BASED
-      minimumNumberOfCalls: 3 # Circuit Open 여부를 판단하기 위해 실행해야 하는 최소 요청 횟수
-      slidingWindowSize: 5 # Circuit Open 여부를 체크하는 윈도우 크기
-      waitDurationInOpenState: 5s # Circuit이 Open 상태에 머무는 시간
-
-      failureRateThreshold: 80 # 슬라이딩 윈도우 내에서 몇 %이상되면 Circuit을 Open할지 결정하는 비율
-
-      slowCallDurationThreshold: 2000 # 몇초동안 요청이 지속되면 슬로우 콜로 판별되는지 기준
-      slowCallRateThreshold: 80 # 슬라이딩 윈도우 내 요청 중 몇 %이상 슬로우 콜이 발생하면 Circuit을 Open할지 결정하는 비율
-
-      permittedNumberOfCallsInHalfOpenState: 5 # Half Open 상태에서 상태 변화를 위해 테스트 해보는 요청 횟수
-      automaticTransitionFromOpenToHalfOpenEnabled: true # Half Open으로 자동으로 변경시킬지 여부
-
-      eventConsumerBufferSize: 10 # Actuator에서 CircuitBreaker 상태를 보여줄때 이벤트를 몇개까지 버퍼에 쌓을지 결정
-
-  instances:
-    default: # Circuit Breaker 인스턴스 이름
-      baseConfig: default # 어떤 설정을 사용할지 결정. default라면 상단의 default config를 그대로 사용함
+#  circuitbreaker:
+#    enabled: true
+#
+#resilience4j.circuitbreaker:
+#  configs:
+#    default:
+#      slidingWindowType: COUNT_BASED
+#      minimumNumberOfCalls: 3 # Circuit Open 여부를 판단하기 위해 실행해야 하는 최소 요청 횟수
+#      slidingWindowSize: 5 # Circuit Open 여부를 체크하는 윈도우 크기
+#      waitDurationInOpenState: 5s # Circuit이 Open 상태에 머무는 시간
+#
+#      failureRateThreshold: 80 # 슬라이딩 윈도우 내에서 몇 %이상되면 Circuit을 Open할지 결정하는 비율
+#
+#      slowCallDurationThreshold: 2000 # 몇초동안 요청이 지속되면 슬로우 콜로 판별되는지 기준
+#      slowCallRateThreshold: 80 # 슬라이딩 윈도우 내 요청 중 몇 %이상 슬로우 콜이 발생하면 Circuit을 Open할지 결정하는 비율
+#
+#      permittedNumberOfCallsInHalfOpenState: 5 # Half Open 상태에서 상태 변화를 위해 테스트 해보는 요청 횟수
+#      automaticTransitionFromOpenToHalfOpenEnabled: true # Half Open으로 자동으로 변경시킬지 여부
+#
+#      eventConsumerBufferSize: 10 # Actuator에서 CircuitBreaker 상태를 보여줄때 이벤트를 몇개까지 버퍼에 쌓을지 결정
+#
+#  instances:
+#    default: # Circuit Breaker 인스턴스 이름
+#      baseConfig: default # 어떤 설정을 사용할지 결정. default라면 상단의 default config를 그대로 사용함

core/core-api/src/main/java/cmc/mellyserver/auth/certificate/CertificateConstants.java

@@ -0,0 +1,10 @@
+package cmc.mellyserver.auth.certificate;
+
+public abstract class CertificateConstants {
+
+    public static final String TITLE_CERTIFICATION = "Melly 인증번호 안내";
+
+    public static final String PREFIX_CERTIFICATION = "email certification:";
+
+    public static final int LIMIT_TIME_CERTIFICATION_NUMBER = 60 * 3;
+}

core/core-api/src/main/java/cmc/mellyserver/common/event/CertificationCompletedEvent.java → core/core-api/src/main/java/cmc/mellyserver/auth/certificate/CertificationCompletedEvent.java

@@ -1,4 +1,4 @@
-package cmc.mellyserver.common.event;
+package cmc.mellyserver.auth.certificate;
 
 public record CertificationCompletedEvent(String email, String content) {
 

core/core-api/src/main/java/cmc/mellyserver/auth/certificate/CertificationNumberRepository.java

@@ -1,6 +1,6 @@
 package cmc.mellyserver.auth.certificate;
 
-import static cmc.mellyserver.mail.EmailConstants.*;
+import static cmc.mellyserver.auth.certificate.CertificateConstants.*;
 
 import java.time.Duration;
 
@@ -15,9 +15,7 @@ class CertificationNumberRepository {
 
     private final StringRedisTemplate redisTemplate;
 
-    /*
-    인증번호 유효기간 : 3분
-     */
+    // 인증번호 유효기간 : 3분
     public void save(String email, String certificationNumber) {
 
         redisTemplate.opsForValue()

core/core-api/src/main/java/cmc/mellyserver/auth/certificate/CertificationService.java

@@ -1,6 +1,6 @@
 package cmc.mellyserver.auth.certificate;
 
-import cmc.mellyserver.auth.dto.request.EmailCertificationRequest;
+import cmc.mellyserver.auth.service.dto.request.EmailCertificationRequest;
 
 public interface CertificationService {
 

core/core-api/src/main/java/cmc/mellyserver/auth/certificate/EmailCertificationService.java

@@ -4,8 +4,7 @@
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Repository;
 
-import cmc.mellyserver.auth.dto.request.EmailCertificationRequest;
-import cmc.mellyserver.common.event.CertificationCompletedEvent;
+import cmc.mellyserver.auth.service.dto.request.EmailCertificationRequest;
 import lombok.RequiredArgsConstructor;
 
 @Profile({"local", "prod"})

core/core-api/src/main/java/cmc/mellyserver/auth/common/constant/AuthConstants.java

@@ -0,0 +1,6 @@
+package cmc.mellyserver.auth.common.constant;
+
+public abstract class AuthConstants {
+
+    public static final String SIGNUP_CELEBRATION_MAIL = "회원가입 축하드립니다!";
+}

core/core-api/src/main/java/cmc/mellyserver/auth/common/filter/TokenAuthenticationFilter.java

@@ -10,8 +10,8 @@
 import org.springframework.util.StringUtils;
 import org.springframework.web.filter.OncePerRequestFilter;
 
+import cmc.mellyserver.auth.common.util.HeaderUtil;
 import cmc.mellyserver.auth.token.TokenProvider;
-import cmc.mellyserver.common.util.HeaderUtil;
 import cmc.mellyserver.support.exception.LogoutOrWithdrawException;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;

core/core-api/src/main/java/cmc/mellyserver/auth/common/resolver/LoginUserIdArgumentResolver.java

@@ -7,8 +7,8 @@
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
+import cmc.mellyserver.auth.common.util.HeaderUtil;
 import cmc.mellyserver.auth.token.TokenProvider;
-import cmc.mellyserver.common.util.HeaderUtil;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 

core/core-api/src/main/java/cmc/mellyserver/common/util/HeaderUtil.java → core/core-api/src/main/java/cmc/mellyserver/auth/common/util/HeaderUtil.java

@@ -1,4 +1,4 @@
-package cmc.mellyserver.common.util;
+package cmc.mellyserver.auth.common.util;
 
 import java.util.Objects;
 

core/core-api/src/main/java/cmc/mellyserver/auth/controller/AuthController.java

@@ -13,18 +13,18 @@
 import cmc.mellyserver.auth.certificate.CertificationService;
 import cmc.mellyserver.auth.common.resolver.CurrentUser;
 import cmc.mellyserver.auth.common.resolver.LoginUser;
+import cmc.mellyserver.auth.common.util.HeaderUtil;
 import cmc.mellyserver.auth.controller.dto.request.AuthLoginRequest;
 import cmc.mellyserver.auth.controller.dto.request.ChangePasswordRequest;
 import cmc.mellyserver.auth.controller.dto.request.OAuthLoginRequest;
 import cmc.mellyserver.auth.controller.dto.request.OAuthSignupRequest;
 import cmc.mellyserver.auth.controller.dto.request.ReIssueAccessTokenRequest;
 import cmc.mellyserver.auth.controller.dto.request.SignupRequest;
-import cmc.mellyserver.auth.dto.request.EmailCertificationRequest;
-import cmc.mellyserver.auth.dto.response.OAuthResponseDto;
-import cmc.mellyserver.auth.dto.response.TokenResponseDto;
 import cmc.mellyserver.auth.service.AuthService;
 import cmc.mellyserver.auth.service.OAuthService;
-import cmc.mellyserver.common.util.HeaderUtil;
+import cmc.mellyserver.auth.service.dto.request.EmailCertificationRequest;
+import cmc.mellyserver.auth.service.dto.response.OAuthResponseDto;
+import cmc.mellyserver.auth.service.dto.response.TokenResponseDto;
 import cmc.mellyserver.support.response.ApiResponse;
 import cmc.mellyserver.support.response.SuccessCode;
 import jakarta.servlet.http.HttpServletRequest;

core/core-api/src/main/java/cmc/mellyserver/auth/controller/dto/request/AuthLoginRequest.java

@@ -1,6 +1,6 @@
 package cmc.mellyserver.auth.controller.dto.request;
 
-import cmc.mellyserver.auth.dto.request.AuthLoginRequestDto;
+import cmc.mellyserver.auth.service.dto.request.AuthLoginRequestDto;
 import jakarta.validation.constraints.Email;
 
 public record AuthLoginRequest(

core/core-api/src/main/java/cmc/mellyserver/auth/controller/dto/request/OAuthLoginRequest.java

@@ -1,6 +1,6 @@
 package cmc.mellyserver.auth.controller.dto.request;
 
-import cmc.mellyserver.auth.dto.request.OAuthLoginRequestDto;
+import cmc.mellyserver.auth.service.dto.request.OAuthLoginRequestDto;
 import cmc.mellyserver.dbcore.user.enums.Provider;
 import lombok.Builder;
 

core/core-api/src/main/java/cmc/mellyserver/auth/controller/dto/request/OAuthSignupRequest.java

@@ -2,7 +2,7 @@
 
 import org.hibernate.validator.constraints.Length;
 
-import cmc.mellyserver.auth.dto.request.OAuthSignupRequestDto;
+import cmc.mellyserver.auth.service.dto.request.OAuthSignupRequestDto;
 import cmc.mellyserver.dbcore.user.enums.AgeGroup;
 import cmc.mellyserver.dbcore.user.enums.Gender;
 import cmc.mellyserver.dbcore.user.enums.Provider;

core/core-api/src/main/java/cmc/mellyserver/auth/controller/dto/request/SignupRequest.java

@@ -2,7 +2,7 @@
 
 import org.hibernate.validator.constraints.Length;
 
-import cmc.mellyserver.auth.dto.request.AuthSignupRequestDto;
+import cmc.mellyserver.auth.service.dto.request.AuthSignupRequestDto;
 import cmc.mellyserver.dbcore.user.enums.AgeGroup;
 import cmc.mellyserver.dbcore.user.enums.Gender;
 import jakarta.validation.constraints.Email;

core/core-api/src/main/java/cmc/mellyserver/auth/service/AuthService.java

@@ -6,9 +6,9 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import cmc.mellyserver.auth.controller.dto.request.ChangePasswordRequest;
-import cmc.mellyserver.auth.dto.request.AuthLoginRequestDto;
-import cmc.mellyserver.auth.dto.request.AuthSignupRequestDto;
-import cmc.mellyserver.auth.dto.response.TokenResponseDto;
+import cmc.mellyserver.auth.service.dto.request.AuthLoginRequestDto;
+import cmc.mellyserver.auth.service.dto.request.AuthSignupRequestDto;
+import cmc.mellyserver.auth.service.dto.response.TokenResponseDto;
 import cmc.mellyserver.auth.token.RefreshToken;
 import cmc.mellyserver.auth.token.TokenDto;
 import cmc.mellyserver.auth.token.TokenService;

core/core-api/src/main/java/cmc/mellyserver/auth/service/OAuthService.java

@@ -5,10 +5,10 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import cmc.mellyserver.auth.dto.request.OAuthLoginRequestDto;
-import cmc.mellyserver.auth.dto.request.OAuthSignupRequestDto;
-import cmc.mellyserver.auth.dto.response.OAuthResponseDto;
-import cmc.mellyserver.auth.dto.response.TokenResponseDto;
+import cmc.mellyserver.auth.service.dto.request.OAuthLoginRequestDto;
+import cmc.mellyserver.auth.service.dto.request.OAuthSignupRequestDto;
+import cmc.mellyserver.auth.service.dto.response.OAuthResponseDto;
+import cmc.mellyserver.auth.service.dto.response.TokenResponseDto;
 import cmc.mellyserver.auth.token.TokenDto;
 import cmc.mellyserver.auth.token.TokenService;
 import cmc.mellyserver.clientauth.LoginClient;

core/core-api/src/main/java/cmc/mellyserver/auth/dto/request/AuthLoginRequestDto.java → core/core-api/src/main/java/cmc/mellyserver/auth/service/dto/request/AuthLoginRequestDto.java

@@ -1,4 +1,4 @@
-package cmc.mellyserver.auth.dto.request;
+package cmc.mellyserver.auth.service.dto.request;
 
 import lombok.Builder;
 

core/core-api/src/main/java/cmc/mellyserver/auth/dto/request/AuthSignupRequestDto.java → core/core-api/src/main/java/cmc/mellyserver/auth/service/dto/request/AuthSignupRequestDto.java

@@ -1,4 +1,4 @@
-package cmc.mellyserver.auth.dto.request;
+package cmc.mellyserver.auth.service.dto.request;
 
 import org.hibernate.validator.constraints.Length;
 
@@ -35,7 +35,7 @@ public record AuthSignupRequestDto(
     public User toEntity() {
         return User.builder()
             .email(email)
-            .password("passowrd")
+            .password(password)
             .nickname(nickname)
             .ageGroup(ageGroup)
             .gender(gender)

core/core-api/src/main/java/cmc/mellyserver/auth/dto/request/EmailCertificationRequest.java → core/core-api/src/main/java/cmc/mellyserver/auth/service/dto/request/EmailCertificationRequest.java

@@ -1,4 +1,4 @@
-package cmc.mellyserver.auth.dto.request;
+package cmc.mellyserver.auth.service.dto.request;
 
 public record EmailCertificationRequest(String email, String certificationNumber) {
 

core/core-api/src/main/java/cmc/mellyserver/auth/dto/request/OAuthLoginRequestDto.java → core/core-api/src/main/java/cmc/mellyserver/auth/service/dto/request/OAuthLoginRequestDto.java

@@ -1,4 +1,4 @@
-package cmc.mellyserver.auth.dto.request;
+package cmc.mellyserver.auth.service.dto.request;
 
 import cmc.mellyserver.dbcore.user.enums.Provider;
 import lombok.Builder;

core/core-api/src/main/java/cmc/mellyserver/auth/dto/request/OAuthSignupRequestDto.java → core/core-api/src/main/java/cmc/mellyserver/auth/service/dto/request/OAuthSignupRequestDto.java

@@ -1,4 +1,4 @@
-package cmc.mellyserver.auth.dto.request;
+package cmc.mellyserver.auth.service.dto.request;
 
 import cmc.mellyserver.dbcore.user.User;
 import cmc.mellyserver.dbcore.user.enums.AgeGroup;

core/core-api/src/main/java/cmc/mellyserver/auth/dto/response/OAuthLoginResponseDto.java → core/core-api/src/main/java/cmc/mellyserver/auth/service/dto/response/OAuthLoginResponseDto.java

@@ -1,4 +1,4 @@
-package cmc.mellyserver.auth.dto.response;
+package cmc.mellyserver.auth.service.dto.response;
 
 import cmc.mellyserver.dbcore.user.enums.UserStatus;
 

core/core-api/src/main/java/cmc/mellyserver/auth/dto/response/OAuthResponseDto.java → core/core-api/src/main/java/cmc/mellyserver/auth/service/dto/response/OAuthResponseDto.java

@@ -1,4 +1,4 @@
-package cmc.mellyserver.auth.dto.response;
+package cmc.mellyserver.auth.service.dto.response;
 
 public record OAuthResponseDto(TokenResponseDto tokenInfo, OAuthSignupResponseDto data) {
 

core/core-api/src/main/java/cmc/mellyserver/auth/dto/response/OAuthSignupResponseDto.java → core/core-api/src/main/java/cmc/mellyserver/auth/service/dto/response/OAuthSignupResponseDto.java

@@ -1,4 +1,4 @@
-package cmc.mellyserver.auth.dto.response;
+package cmc.mellyserver.auth.service.dto.response;
 
 public record OAuthSignupResponseDto(String socialId, String provider) {
 

core/core-api/src/main/java/cmc/mellyserver/auth/dto/response/RefreshTokenDto.java → core/core-api/src/main/java/cmc/mellyserver/auth/service/dto/response/RefreshTokenDto.java

@@ -1,4 +1,4 @@
-package cmc.mellyserver.auth.dto.response;
+package cmc.mellyserver.auth.service.dto.response;
 
 public record RefreshTokenDto(String token, long expiredAt) {
 }

core/core-api/src/main/java/cmc/mellyserver/auth/dto/response/TokenResponseDto.java → core/core-api/src/main/java/cmc/mellyserver/auth/service/dto/response/TokenResponseDto.java

@@ -1,4 +1,4 @@
-package cmc.mellyserver.auth.dto.response;
+package cmc.mellyserver.auth.service.dto.response;
 
 public record TokenResponseDto(String accessToken, String refreshToken) {
 

core/core-api/src/main/java/cmc/mellyserver/auth/token/JwtTokenProvider.java

@@ -14,7 +14,7 @@
 import org.springframework.security.core.userdetails.User;
 import org.springframework.stereotype.Component;
 
-import cmc.mellyserver.auth.dto.response.RefreshTokenDto;
+import cmc.mellyserver.auth.service.dto.response.RefreshTokenDto;
 import cmc.mellyserver.dbcore.user.enums.RoleType;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.ExpiredJwtException;

core/core-api/src/main/java/cmc/mellyserver/auth/token/TokenDto.java

@@ -1,6 +1,6 @@
 package cmc.mellyserver.auth.token;
 
-import cmc.mellyserver.auth.dto.response.RefreshTokenDto;
+import cmc.mellyserver.auth.service.dto.response.RefreshTokenDto;
 
 public record TokenDto(String accessToken, RefreshTokenDto refreshToken) {
 

core/core-api/src/main/java/cmc/mellyserver/auth/token/TokenProvider.java

@@ -2,7 +2,7 @@
 
 import org.springframework.security.core.Authentication;
 
-import cmc.mellyserver.auth.dto.response.RefreshTokenDto;
+import cmc.mellyserver.auth.service.dto.response.RefreshTokenDto;
 import cmc.mellyserver.dbcore.user.enums.RoleType;
 
 public interface TokenProvider {

core/core-api/src/main/java/cmc/mellyserver/auth/token/TokenService.java

@@ -2,7 +2,7 @@
 
 import org.springframework.stereotype.Component;
 
-import cmc.mellyserver.auth.dto.response.RefreshTokenDto;
+import cmc.mellyserver.auth.service.dto.response.RefreshTokenDto;
 import cmc.mellyserver.dbcore.user.User;
 import cmc.mellyserver.support.exception.BusinessException;
 import cmc.mellyserver.support.exception.ErrorCode;

core/core-api/src/main/java/cmc/mellyserver/common/aop/lock/annotation/DistributedLock.java → core/core-api/src/main/java/cmc/mellyserver/common/aspect/lock/DistributedLock.java

@@ -1,4 +1,4 @@
-package cmc.mellyserver.common.aop.lock.annotation;
+package cmc.mellyserver.common.aspect.lock;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

core/core-api/src/main/java/cmc/mellyserver/common/aop/lock/DistributedLockAop.java → core/core-api/src/main/java/cmc/mellyserver/common/aspect/lock/DistributedLockAop.java

@@ -1,4 +1,4 @@
-package cmc.mellyserver.common.aop.lock;
+package cmc.mellyserver.common.aspect.lock;
 
 import java.lang.reflect.Method;
 
@@ -10,7 +10,6 @@
 import org.redisson.api.RedissonClient;
 import org.springframework.stereotype.Component;
 
-import cmc.mellyserver.common.aop.lock.annotation.DistributedLock;
 import cmc.mellyserver.support.exception.BusinessException;
 import cmc.mellyserver.support.exception.ErrorCode;
 import lombok.RequiredArgsConstructor;
@@ -22,7 +21,7 @@ public class DistributedLockAop {
 
     private final RedissonClient redissonClient;
 
-    @Around("@annotation(cmc.mellyserver.common.aop.lock.annotation.DistributedLock)")
+    @Around("@annotation(cmc.mellyserver.common.aspect.lock.DistributedLock)")
     public Object lock(final ProceedingJoinPoint joinPoint) throws Throwable {
 
         MethodSignature signature = (MethodSignature)joinPoint.getSignature();

core/core-api/src/main/java/cmc/mellyserver/common/aop/lock/LockKeyParser.java → core/core-api/src/main/java/cmc/mellyserver/common/aspect/lock/LockKeyParser.java

@@ -1,4 +1,4 @@
-package cmc.mellyserver.common.aop.lock;
+package cmc.mellyserver.common.aspect.lock;
 
 import org.springframework.expression.Expression;
 import org.springframework.expression.ExpressionParser;

core/core-api/src/main/java/cmc/mellyserver/common/aop/place/ValidatePlaceExisted.java → core/core-api/src/main/java/cmc/mellyserver/common/aspect/place/CheckPlaceExist.java

@@ -1,4 +1,4 @@
-package cmc.mellyserver.common.aop.place;
+package cmc.mellyserver.common.aspect.place;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -7,6 +7,6 @@
 
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface ValidatePlaceExisted {
+public @interface CheckPlaceExist {
 
 }