🔖 Release: v2.1.10 버전 릴리즈

src/main/java/kr/modusplant/domains/account/email/adapter/EmailIdentityTokenHelper.java

@@ -4,12 +4,13 @@
 import io.jsonwebtoken.ExpiredJwtException;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.security.Keys;
+import kr.modusplant.domains.account.email.domain.exception.enums.EmailIdentityErrorCode;
 import kr.modusplant.domains.account.email.usecase.request.EmailValidationRequest;
 import kr.modusplant.infrastructure.jwt.enums.TokenScope;
 import kr.modusplant.infrastructure.jwt.exception.InvalidTokenException;
 import kr.modusplant.infrastructure.jwt.exception.TokenExpiredException;
-import kr.modusplant.shared.exception.InvalidDataException;
-import kr.modusplant.shared.exception.enums.ErrorCode;
+import kr.modusplant.shared.exception.InvalidValueException;
+import kr.modusplant.shared.kernel.enums.KernelErrorCode;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -76,10 +77,10 @@ public void validateAuthCodeAccessToken(EmailValidationRequest verifyEmailReques
 
             // 인증코드, 이메일 일치 검증
             if (!verifyCode.equals(payloadVerifyCode)) {
-                throw new InvalidDataException(ErrorCode.INVALID_EMAIL_VERIFY_CODE, "verifyCode");
+                throw new InvalidValueException(EmailIdentityErrorCode.INVALID_EMAIL_VERIFY_CODE, "verifyCode");
             }
             if (!email.equals(claims.get("email", String.class))) {
-                throw new InvalidDataException(ErrorCode.FORBIDDEN_EMAIL, "email");
+                throw new InvalidValueException(EmailIdentityErrorCode.FORBIDDEN_EMAIL, "email");
             }
         } catch (ExpiredJwtException e) {
             throw new TokenExpiredException();
@@ -121,7 +122,7 @@ public void validateResetPasswordEmailAccessToken(String email, String jwtToken)
 
             // 이메일 일치 검증
             if (!email.equals(claims.get("email", String.class))) {
-                throw new InvalidDataException(ErrorCode.FORBIDDEN_EMAIL, "email");
+                throw new InvalidValueException(EmailIdentityErrorCode.FORBIDDEN_EMAIL, "email");
             }
         } catch (ExpiredJwtException e) {
             throw new TokenExpiredException();

src/main/java/kr/modusplant/domains/account/email/adapter/controller/EmailIdentityController.java

@@ -9,9 +9,9 @@
 import kr.modusplant.domains.account.email.usecase.request.EmailValidationRequest;
 import kr.modusplant.domains.account.email.usecase.request.InputValidationRequest;
 import kr.modusplant.domains.account.normal.domain.exception.InvalidValueException;
+import kr.modusplant.framework.jpa.exception.NotFoundEntityException;
 import kr.modusplant.framework.redis.RedisHelper;
 import kr.modusplant.framework.redis.RedisKeys;
-import kr.modusplant.shared.exception.EntityNotFoundException;
 import kr.modusplant.shared.kernel.Email;
 import kr.modusplant.shared.kernel.Password;
 import lombok.RequiredArgsConstructor;
@@ -23,7 +23,6 @@
 
 import static kr.modusplant.framework.redis.RedisKeys.RESET_PASSWORD_PREFIX;
 import static kr.modusplant.infrastructure.jwt.enums.TokenScope.RESET_PASSWORD_INPUT;
-import static kr.modusplant.shared.exception.enums.ErrorCode.PASSWORD_RESET_EMAIL_VERIFY_FAIL;
 
 @Slf4j
 @RequiredArgsConstructor
@@ -49,7 +48,7 @@ public void sendResetPasswordEmail(EmailIdentityRequest request) {
         String email = request.email();
 
         if (!repository.existsByEmailAndProvider(Email.create(email))) {
-            throw new EntityNotFoundException(EmailIdentityErrorCode.MEMBER_NOT_FOUND_WITH_EMAIL, "email");
+            throw new NotFoundEntityException(EmailIdentityErrorCode.MEMBER_NOT_FOUND_WITH_EMAIL, "email");
         }
 
         UUID uuid = UUID.randomUUID();
@@ -69,7 +68,7 @@ public String verifyResetPasswordEmail(UUID uuid) {
         String stringUuid = String.valueOf(uuid);
         String redisKey = RedisKeys.generateRedisKey(RESET_PASSWORD_PREFIX, stringUuid);
         String storedEmail = redisHelper.getString(redisKey)
-                .orElseThrow(() -> new InvalidValueException(PASSWORD_RESET_EMAIL_VERIFY_FAIL));
+                .orElseThrow(() -> new InvalidValueException(EmailIdentityErrorCode.INVALID_EMAIL_VERIFY_LINK));
         return tokenHelper.generateResetPasswordAccessToken(storedEmail, stringUuid, RESET_PASSWORD_INPUT);
     }
 

src/main/java/kr/modusplant/domains/account/email/domain/exception/enums/EmailIdentityErrorCode.java

@@ -10,7 +10,11 @@
 public enum EmailIdentityErrorCode implements ErrorCode {
 
     NOT_SENDABLE_EMAIL(HttpStatus.INTERNAL_SERVER_ERROR.value(), "not_sendable_email", "서버에서 이메일을 보낼 수 없습니다"),
-    MEMBER_NOT_FOUND_WITH_EMAIL(HttpStatus.BAD_REQUEST.value(), "member_not_found_with_email", "해당 이메일을 가진 사용자가 존재하지 않습니다");
+    MEMBER_NOT_FOUND_WITH_EMAIL(HttpStatus.BAD_REQUEST.value(), "member_not_found_with_email", "해당 이메일을 가진 사용자가 존재하지 않습니다"),
+    FORBIDDEN_EMAIL(HttpStatus.FORBIDDEN.value(), "forbidden_email", "해당 이메일에 접근할 수 없습니다"),
+    INVALID_EMAIL_VERIFY_CODE(HttpStatus.FORBIDDEN.value(), "invalid_email_verify_code", "이메일의 검증 코드가 올바르지 않습니다"),
+    INVALID_EMAIL_VERIFY_LINK(HttpStatus.BAD_REQUEST.value(), "invalid_email_verify_link","유효하지 않거나 만료된 링크입니다")
+    ;
 
     private final int httpStatus;
     private final String code;

src/main/java/kr/modusplant/domains/account/email/domain/vo/MailjetEmail.java

@@ -1,7 +1,8 @@
 package kr.modusplant.domains.account.email.domain.vo;
 
-import kr.modusplant.shared.exception.EmptyEmailException;
-import kr.modusplant.shared.exception.InvalidEmailException;
+import kr.modusplant.shared.exception.EmptyValueException;
+import kr.modusplant.shared.exception.InvalidValueException;
+import kr.modusplant.shared.kernel.enums.KernelErrorCode;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -17,9 +18,9 @@ public class MailjetEmail {
 
     public static MailjetEmail create(String email) {
         if (email == null || email.isBlank()) {
-            throw new EmptyEmailException();
+            throw new EmptyValueException(KernelErrorCode.EMPTY_EMAIL, "email");
         } else if (!PATTERN_EMAIL.matcher(email).matches()) {
-            throw new InvalidEmailException();
+            throw new InvalidValueException(KernelErrorCode.INVALID_EMAIL_FORMAT, "email");
         }
         return new MailjetEmail(email);
     }

src/main/java/kr/modusplant/domains/account/normal/adapter/controller/NormalIdentityController.java

@@ -9,19 +9,22 @@
 import kr.modusplant.domains.account.normal.usecase.request.NormalSignUpRequest;
 import kr.modusplant.domains.account.normal.usecase.request.PasswordModificationRequest;
 import kr.modusplant.domains.account.shared.kernel.AccountId;
-import kr.modusplant.shared.exception.EntityNotFoundException;
-import kr.modusplant.shared.exception.InvalidDataException;
-import kr.modusplant.shared.exception.enums.ErrorCode;
+import kr.modusplant.framework.jpa.exception.NotFoundEntityException;
+import kr.modusplant.framework.jpa.exception.enums.EntityErrorCode;
+import kr.modusplant.shared.exception.InvalidValueException;
 import kr.modusplant.shared.kernel.Email;
 import kr.modusplant.shared.kernel.Nickname;
 import kr.modusplant.shared.kernel.Password;
+import kr.modusplant.shared.kernel.enums.KernelErrorCode;
 import kr.modusplant.shared.persistence.constant.TableName;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
 import java.util.UUID;
 
+import static kr.modusplant.framework.jpa.exception.enums.EntityErrorCode.EXISTS_MEMBER;
+
 @Service
 public class NormalIdentityController {
 
@@ -46,27 +49,27 @@ public NormalIdentityController(NormalIdentityMapper mapper,
 
     public void registerNormalMember(NormalSignUpRequest request) {
         if(readRepository.existsByEmail(Email.create(request.email()))) {
-            throw new DataAlreadyExistsException(ErrorCode.MEMBER_EXISTS);
+            throw new DataAlreadyExistsException(EXISTS_MEMBER);
         } else if(readRepository.existsByNickname(Nickname.create(request.nickname()))) {
-            throw new DataAlreadyExistsException(ErrorCode.NICKNAME_EXISTS);
+            throw new DataAlreadyExistsException(KernelErrorCode.EXISTS_NICKNAME);
         }  else {
             createRepository.save(mapper.toSignUpData(request));
         }
     }
 
     public void modifyEmail(UUID memberActiveUuid, EmailModificationRequest request) {
         if(!readRepository.existsByEmail(Email.create(request.currentEmail()))) {
-            throw new EntityNotFoundException(ErrorCode.MEMBER_NOT_FOUND, TableName.SITE_MEMBER_AUTH);
+            throw new NotFoundEntityException(EntityErrorCode.NOT_FOUND_MEMBER, TableName.SITE_MEMBER_AUTH);
         } else {
             updateRepository.updateEmail(AccountId.create(memberActiveUuid), Email.create(request.newEmail()));
         }
     }
 
     public void modifyPassword(UUID memberActiveUuid, PasswordModificationRequest request) {
         if(!readRepository.existsByMemberId(AccountId.create(memberActiveUuid))) {
-            throw new EntityNotFoundException(ErrorCode.MEMBER_NOT_FOUND, TableName.SITE_MEMBER_AUTH);
+            throw new NotFoundEntityException(EntityErrorCode.NOT_FOUND_MEMBER, TableName.SITE_MEMBER_AUTH);
         } else if(!isPasswordsMatch(AccountId.create(memberActiveUuid), Password.create(request.currentPw()))) {
-            throw new InvalidDataException(ErrorCode.INVALID_PASSWORD, request.currentPw());
+            throw new InvalidValueException(KernelErrorCode.INVALID_PASSWORD_FORMAT, request.currentPw());
         } else {
             updateRepository.updatePassword(AccountId.create(memberActiveUuid), Password.create(request.newPw()));
         }

src/main/java/kr/modusplant/domains/account/social/domain/exception/enums/SocialIdentityErrorCode.java

@@ -11,7 +11,10 @@ public enum SocialIdentityErrorCode implements ErrorCode {
     EMPTY_PROVIDER(HttpStatus.BAD_REQUEST.value(), "empty_provider", "제공자가 비어 있습니다. "),
     INVALID_PROVIDER(HttpStatus.BAD_REQUEST.value(), "invalid_provider", "제공자가 유효하지 않습니다. "),
     EMPTY_PROVIDER_ID(HttpStatus.BAD_REQUEST.value(), "empty_provider_id", "제공자 id가 비어 있습니다. "),
-    INVALID_PROVIDER_ID(HttpStatus.BAD_REQUEST.value(), "invalid_provider_id", "제공자 id가 유효하지 않습니다. ");
+    INVALID_PROVIDER_ID(HttpStatus.BAD_REQUEST.value(), "invalid_provider_id", "제공자 id가 유효하지 않습니다. "),
+    UNSUPPORTED_SOCIAL_PROVIDER(HttpStatus.FORBIDDEN.value(), "unsupported_social_provider", "지원되지 않는 소셜 로그인 방식입니다"),
+    GOOGLE_LOGIN_FAIL(HttpStatus.INTERNAL_SERVER_ERROR.value(), "google_login_fail", "구글 로그인 요청에 실패했습니다"),
+    KAKAO_LOGIN_FAIL(HttpStatus.INTERNAL_SERVER_ERROR.value(), "kakao_login_fail","카카오 로그인 요청에 실패했습니다");
 
     private final int httpStatus;
     private final String code;

src/main/java/kr/modusplant/domains/account/social/framework/out/client/GoogleAuthClient.java

@@ -1,9 +1,9 @@
 package kr.modusplant.domains.account.social.framework.out.client;
 
+import kr.modusplant.domains.account.social.domain.exception.enums.SocialIdentityErrorCode;
 import kr.modusplant.domains.account.social.framework.out.client.dto.GoogleUserInfo;
 import kr.modusplant.domains.account.social.framework.out.exception.OAuthRequestFailException;
 import kr.modusplant.domains.account.social.usecase.port.client.SocialAuthClient;
-import kr.modusplant.shared.exception.enums.ErrorCode;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
@@ -50,7 +50,7 @@ public String getAccessToken(String code) {
                 .body(formData)
                 .retrieve()
                 .onStatus(this::isErrorStatus, (request, response) -> {
-                    throw new OAuthRequestFailException(ErrorCode.GOOGLE_LOGIN_FAIL, "google");
+                    throw new OAuthRequestFailException(SocialIdentityErrorCode.GOOGLE_LOGIN_FAIL, "google");
                 })
                 .body(Map.class)
                 .get("access_token").toString();
@@ -67,7 +67,7 @@ public GoogleUserInfo getUserInfo(String accessToken) {
                 .uri("/userinfo/v2/me")
                 .retrieve()
                 .onStatus(this::isErrorStatus, (request, response) -> {
-                    throw new OAuthRequestFailException(ErrorCode.GOOGLE_LOGIN_FAIL, "google");
+                    throw new OAuthRequestFailException(SocialIdentityErrorCode.GOOGLE_LOGIN_FAIL, "google");
                 })
                 .body(GoogleUserInfo.class);
     }

src/main/java/kr/modusplant/domains/account/social/framework/out/client/KakaoAuthClient.java

@@ -1,9 +1,9 @@
 package kr.modusplant.domains.account.social.framework.out.client;
 
+import kr.modusplant.domains.account.social.domain.exception.enums.SocialIdentityErrorCode;
 import kr.modusplant.domains.account.social.framework.out.client.dto.KakaoUserInfo;
 import kr.modusplant.domains.account.social.framework.out.exception.OAuthRequestFailException;
 import kr.modusplant.domains.account.social.usecase.port.client.SocialAuthClient;
-import kr.modusplant.shared.exception.enums.ErrorCode;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
@@ -47,7 +47,7 @@ public String getAccessToken(String code) {
                 .body(formData)
                 .retrieve()
                 .onStatus(this::isErrorStatus, (request, response) -> {
-                    throw new OAuthRequestFailException(ErrorCode.KAKAO_LOGIN_FAIL, "kakao");
+                    throw new OAuthRequestFailException(SocialIdentityErrorCode.KAKAO_LOGIN_FAIL, "kakao");
                 })
                 .body(Map.class)
                 .get("access_token").toString();
@@ -64,7 +64,7 @@ public KakaoUserInfo getUserInfo(String accessToken) {
                 .uri("/v2/user/me")
                 .retrieve()
                 .onStatus(this::isErrorStatus, (request, response) -> {
-                    throw new OAuthRequestFailException(ErrorCode.KAKAO_LOGIN_FAIL, "kakao");
+                    throw new OAuthRequestFailException(SocialIdentityErrorCode.KAKAO_LOGIN_FAIL, "kakao");
                 })
                 .body(KakaoUserInfo.class);
     }

src/main/java/kr/modusplant/domains/account/social/framework/out/exception/OAuthRequestFailException.java

@@ -1,7 +1,7 @@
 package kr.modusplant.domains.account.social.framework.out.exception;
 
 import kr.modusplant.shared.exception.BusinessException;
-import kr.modusplant.shared.exception.enums.ErrorCode;
+import kr.modusplant.shared.exception.supers.ErrorCode;
 import lombok.Getter;
 
 @Getter

src/main/java/kr/modusplant/domains/account/social/framework/out/exception/UnsupportedSocialProviderException.java

@@ -1,10 +1,10 @@
 package kr.modusplant.domains.account.social.framework.out.exception;
 
+import kr.modusplant.domains.account.social.domain.exception.enums.SocialIdentityErrorCode;
 import kr.modusplant.shared.exception.BusinessException;
-import kr.modusplant.shared.exception.enums.ErrorCode;
 
 public class UnsupportedSocialProviderException extends BusinessException {
     public UnsupportedSocialProviderException() {
-        super(ErrorCode.UNSUPPORTED_SOCIAL_PROVIDER);
+        super(SocialIdentityErrorCode.UNSUPPORTED_SOCIAL_PROVIDER);
     }
 }

src/main/java/kr/modusplant/domains/account/social/framework/out/jpa/repository/SocialIdentityRepositoryJpaAdapter.java

@@ -9,12 +9,12 @@
 import kr.modusplant.framework.jpa.entity.SiteMemberAuthEntity;
 import kr.modusplant.framework.jpa.entity.SiteMemberEntity;
 import kr.modusplant.framework.jpa.entity.SiteMemberRoleEntity;
+import kr.modusplant.framework.jpa.exception.NotFoundEntityException;
+import kr.modusplant.framework.jpa.exception.enums.EntityErrorCode;
 import kr.modusplant.framework.jpa.repository.SiteMemberAuthJpaRepository;
 import kr.modusplant.framework.jpa.repository.SiteMemberJpaRepository;
 import kr.modusplant.framework.jpa.repository.SiteMemberRoleJpaRepository;
 import kr.modusplant.infrastructure.security.enums.Role;
-import kr.modusplant.shared.exception.EntityNotFoundException;
-import kr.modusplant.shared.exception.enums.ErrorCode;
 import kr.modusplant.shared.persistence.constant.TableName;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
@@ -39,10 +39,10 @@ public Optional<AccountId> getMemberIdBySocialCredentials(SocialCredentials soci
     @Override
     public SocialAccountPayload getUserPayloadByMemberId(AccountId accountId) {
         SiteMemberEntity memberEntity = memberJpaRepository.findByUuid(accountId.getValue())
-                .orElseThrow(() -> new EntityNotFoundException(ErrorCode.MEMBER_NOT_FOUND, TableName.SITE_MEMBER));
+                .orElseThrow(() -> new NotFoundEntityException(EntityErrorCode.NOT_FOUND_MEMBER, TableName.SITE_MEMBER));
         SiteMemberAuthEntity memberAuthEntity = memberAuthJpaRepository.findByActiveMember(memberEntity).getFirst();
         SiteMemberRoleEntity memberRoleEntity = memberRoleJpaRepository.findByMember(memberEntity)
-                .orElseThrow(() -> new EntityNotFoundException(ErrorCode.MEMBER_ROLE_NOT_FOUND, TableName.SITE_MEMBER_ROLE));
+                .orElseThrow(() -> new NotFoundEntityException(EntityErrorCode.NOT_FOUND_MEMBER_ROLE, TableName.SITE_MEMBER_ROLE));
         return socialIdentityJpaMapper.toUserPayload(memberEntity,memberAuthEntity,memberRoleEntity);
     }
 

src/main/java/kr/modusplant/domains/comment/adapter/controller/CommentController.java

@@ -17,11 +17,11 @@
 import kr.modusplant.domains.comment.usecase.response.CommentOfPostResponse;
 import kr.modusplant.domains.comment.usecase.response.CommentPageResponse;
 import kr.modusplant.domains.member.domain.vo.MemberId;
+import kr.modusplant.framework.jpa.exception.NotFoundEntityException;
+import kr.modusplant.framework.jpa.exception.enums.EntityErrorCode;
 import kr.modusplant.framework.jpa.repository.CommPostJpaRepository;
 import kr.modusplant.framework.jpa.repository.SiteMemberJpaRepository;
 import kr.modusplant.infrastructure.swear.service.SwearService;
-import kr.modusplant.shared.exception.EntityNotFoundException;
-import kr.modusplant.shared.exception.enums.ErrorCode;
 import kr.modusplant.shared.persistence.compositekey.CommCommentId;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -58,7 +58,7 @@ public CommentCacheData getCacheData(UUID memberUuid, String ifNoneMatch, String
 
     public List<CommentOfPostResponse> gatherByPost(String postUlid) {
         if(!postJpaRepository.existsByUlid(postUlid)) {
-            throw new EntityNotFoundException(ErrorCode.POST_NOT_FOUND, "post");
+            throw new NotFoundEntityException(EntityErrorCode.NOT_FOUND_POST, "post");
         }
 
         return jooqRepository.findByPost(PostId.create(postUlid))
@@ -68,7 +68,7 @@ public List<CommentOfPostResponse> gatherByPost(String postUlid) {
 
     public CommentPageResponse<CommentOfAuthorPageModel> gatherByAuthor(UUID memberUuid, Pageable pageable) {
         if(!memberJpaRepository.existsById(memberUuid)) {
-            throw new EntityNotFoundException(ErrorCode.MEMBER_NOT_FOUND, "member");
+            throw new NotFoundEntityException(EntityErrorCode.NOT_FOUND_MEMBER, "member");
         }
         PageImpl<CommentOfAuthorPageModel> result = jooqRepository.findByAuthor(Author.create(memberUuid), pageable);