From a80dead485783bbe7afa163e536766b1cfa93ceb Mon Sep 17 00:00:00 2001 From: Jeyong Date: Thu, 4 Dec 2025 15:51:30 +0900 Subject: [PATCH 1/3] =?UTF-8?q?style:=20domain=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80=20=EB=82=B4=EB=B6=80=EB=A1=9C=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80=20=EA=B5=AC=EC=A1=B0=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/OAuth2ClientInitializer.java | 6 ++-- ...ertificateGrantAuthenticationProvider.java | 6 ++-- .../config/AuthorizationServerConfig.java | 2 +- .../auth/jwt/CertificateJwtCustomizer.java | 4 +-- .../token/service/RefreshTokenService.java | 4 +-- .../controller/CertificateController.java | 10 +++---- .../dto/CertificateIssueRequest.java | 2 +- .../dto/CertificateIssueResponse.java | 4 +-- .../dto/CertificateSerialRequest.java | 2 +- .../certificate/entity/Certificate.java | 6 ++-- .../entity/CertificateUsageHistory.java | 4 +-- .../certificate/enums/CertificateStatus.java | 2 +- .../certificate/enums/HistoryAction.java | 2 +- .../repository/CertificateRepository.java | 8 +++--- .../CertificateUsageHistoryRepository.java | 4 +-- .../service/CertificateService.java | 24 ++++++++-------- .../entity/OAuth2AuthorizationEntity.java | 2 +- .../client/entity/OAuth2RegisteredClient.java | 3 +- .../client/entity/RegisteredClientMapper.java | 3 +- .../sub/AuthorizationGrantTypeEntity.java | 4 +-- .../sub/ClientAuthenticationMethodEntity.java | 4 +-- .../client/entity/sub/ClientScope.java | 4 +-- .../sub/PostLogoutRedirectUriEntity.java | 4 +-- .../client/entity/sub/RedirectUriEntity.java | 4 +-- .../JpaRegisteredClientRepositoryService.java | 6 ++-- .../OAuth2RegisteredClientRepository.java | 4 +-- .../RedisOAuth2AuthorizationService.java | 4 +-- .../user/controller/UserController.java | 8 +++--- .../user/dto/UserRegisterRequest.java | 2 +- .../{ => domain}/user/dto/UserResponse.java | 4 +-- .../{ => domain}/user/entity/User.java | 6 ++-- .../{ => domain}/user/enums/UserRoles.java | 2 +- .../user/repository/UserRepository.java | 4 +-- .../user/service/UserService.java | 10 +++---- .../redis/AuthorizationEntityMapper.java | 2 +- .../redis/AuthorizationRedisRepository.java | 2 +- .../service/CertificateServiceTest.java | 28 ++++++++++--------- ...RegisteredClientRepositoryServiceTest.java | 6 ++-- .../RedisOAuth2AuthorizationServiceTest.java | 1 + .../user/service/UserServiceTest.java | 9 +++--- 40 files changed, 112 insertions(+), 104 deletions(-) rename src/main/java/org/creditto/authserver/{ => domain}/certificate/controller/CertificateController.java (80%) rename src/main/java/org/creditto/authserver/{ => domain}/certificate/dto/CertificateIssueRequest.java (94%) rename src/main/java/org/creditto/authserver/{ => domain}/certificate/dto/CertificateIssueResponse.java (82%) rename src/main/java/org/creditto/authserver/{ => domain}/certificate/dto/CertificateSerialRequest.java (88%) rename src/main/java/org/creditto/authserver/{ => domain}/certificate/entity/Certificate.java (93%) rename src/main/java/org/creditto/authserver/{ => domain}/certificate/entity/CertificateUsageHistory.java (92%) rename src/main/java/org/creditto/authserver/{ => domain}/certificate/enums/CertificateStatus.java (81%) rename src/main/java/org/creditto/authserver/{ => domain}/certificate/enums/HistoryAction.java (80%) rename src/main/java/org/creditto/authserver/{ => domain}/certificate/repository/CertificateRepository.java (72%) rename src/main/java/org/creditto/authserver/{ => domain}/certificate/repository/CertificateUsageHistoryRepository.java (61%) rename src/main/java/org/creditto/authserver/{ => domain}/certificate/service/CertificateService.java (92%) rename src/main/java/org/creditto/authserver/{ => domain}/client/entity/OAuth2AuthorizationEntity.java (98%) rename src/main/java/org/creditto/authserver/{ => domain}/client/entity/OAuth2RegisteredClient.java (97%) rename src/main/java/org/creditto/authserver/{ => domain}/client/entity/RegisteredClientMapper.java (98%) rename src/main/java/org/creditto/authserver/{ => domain}/client/entity/sub/AuthorizationGrantTypeEntity.java (87%) rename src/main/java/org/creditto/authserver/{ => domain}/client/entity/sub/ClientAuthenticationMethodEntity.java (87%) rename src/main/java/org/creditto/authserver/{ => domain}/client/entity/sub/ClientScope.java (85%) rename src/main/java/org/creditto/authserver/{ => domain}/client/entity/sub/PostLogoutRedirectUriEntity.java (87%) rename src/main/java/org/creditto/authserver/{ => domain}/client/entity/sub/RedirectUriEntity.java (86%) rename src/main/java/org/creditto/authserver/{ => domain}/client/repository/JpaRegisteredClientRepositoryService.java (86%) rename src/main/java/org/creditto/authserver/{ => domain}/client/repository/OAuth2RegisteredClientRepository.java (90%) rename src/main/java/org/creditto/authserver/{ => domain}/client/service/RedisOAuth2AuthorizationService.java (98%) rename src/main/java/org/creditto/authserver/{ => domain}/user/controller/UserController.java (88%) rename src/main/java/org/creditto/authserver/{ => domain}/user/dto/UserRegisterRequest.java (94%) rename src/main/java/org/creditto/authserver/{ => domain}/user/dto/UserResponse.java (85%) rename src/main/java/org/creditto/authserver/{ => domain}/user/entity/User.java (92%) rename src/main/java/org/creditto/authserver/{ => domain}/user/enums/UserRoles.java (50%) rename src/main/java/org/creditto/authserver/{ => domain}/user/repository/UserRepository.java (75%) rename src/main/java/org/creditto/authserver/{ => domain}/user/service/UserService.java (86%) diff --git a/src/main/java/org/creditto/authserver/auth/OAuth2ClientInitializer.java b/src/main/java/org/creditto/authserver/auth/OAuth2ClientInitializer.java index ea05861..c79d3a4 100644 --- a/src/main/java/org/creditto/authserver/auth/OAuth2ClientInitializer.java +++ b/src/main/java/org/creditto/authserver/auth/OAuth2ClientInitializer.java @@ -3,9 +3,9 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.creditto.authserver.auth.constants.CustomGrantType; -import org.creditto.authserver.client.entity.OAuth2RegisteredClient; -import org.creditto.authserver.client.entity.RegisteredClientMapper; -import org.creditto.authserver.client.repository.OAuth2RegisteredClientRepository; +import org.creditto.authserver.domain.client.entity.OAuth2RegisteredClient; +import org.creditto.authserver.domain.client.entity.RegisteredClientMapper; +import org.creditto.authserver.domain.client.repository.OAuth2RegisteredClientRepository; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.CommandLineRunner; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/org/creditto/authserver/auth/authentication/CertificateGrantAuthenticationProvider.java b/src/main/java/org/creditto/authserver/auth/authentication/CertificateGrantAuthenticationProvider.java index 4b78102..796eb27 100644 --- a/src/main/java/org/creditto/authserver/auth/authentication/CertificateGrantAuthenticationProvider.java +++ b/src/main/java/org/creditto/authserver/auth/authentication/CertificateGrantAuthenticationProvider.java @@ -5,9 +5,9 @@ import org.creditto.authserver.auth.constants.ClaimConstants; import org.creditto.authserver.auth.jwt.CertificateOAuth2TokenGenerator; import org.creditto.authserver.auth.token.service.RefreshTokenService; -import org.creditto.authserver.certificate.entity.Certificate; -import org.creditto.authserver.certificate.service.CertificateService; -import org.creditto.authserver.user.entity.User; +import org.creditto.authserver.domain.certificate.entity.Certificate; +import org.creditto.authserver.domain.certificate.service.CertificateService; +import org.creditto.authserver.domain.user.entity.User; import org.springframework.security.authentication.AuthenticationProvider; import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; diff --git a/src/main/java/org/creditto/authserver/auth/config/AuthorizationServerConfig.java b/src/main/java/org/creditto/authserver/auth/config/AuthorizationServerConfig.java index b8c4862..4d3c533 100644 --- a/src/main/java/org/creditto/authserver/auth/config/AuthorizationServerConfig.java +++ b/src/main/java/org/creditto/authserver/auth/config/AuthorizationServerConfig.java @@ -14,7 +14,7 @@ import org.creditto.authserver.auth.jwt.RsaKeyProperties; import org.creditto.authserver.auth.jwt.RsaKeyUtil; import org.creditto.authserver.auth.token.service.RefreshTokenService; -import org.creditto.authserver.certificate.service.CertificateService; +import org.creditto.authserver.domain.certificate.service.CertificateService; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.web.servlet.FilterRegistrationBean; diff --git a/src/main/java/org/creditto/authserver/auth/jwt/CertificateJwtCustomizer.java b/src/main/java/org/creditto/authserver/auth/jwt/CertificateJwtCustomizer.java index f7b5d0c..6aeb21c 100644 --- a/src/main/java/org/creditto/authserver/auth/jwt/CertificateJwtCustomizer.java +++ b/src/main/java/org/creditto/authserver/auth/jwt/CertificateJwtCustomizer.java @@ -4,8 +4,8 @@ import org.creditto.authserver.auth.authentication.CertificateAuthenticationToken; import org.creditto.authserver.auth.constants.ClaimConstants; import org.creditto.authserver.auth.constants.Constants; -import org.creditto.authserver.certificate.repository.CertificateRepository; -import org.creditto.authserver.user.entity.User; +import org.creditto.authserver.domain.certificate.repository.CertificateRepository; +import org.creditto.authserver.domain.user.entity.User; import org.springframework.security.oauth2.server.authorization.OAuth2Authorization; import org.springframework.security.oauth2.server.authorization.token.JwtEncodingContext; import org.springframework.security.oauth2.server.authorization.token.OAuth2TokenCustomizer; diff --git a/src/main/java/org/creditto/authserver/auth/token/service/RefreshTokenService.java b/src/main/java/org/creditto/authserver/auth/token/service/RefreshTokenService.java index 8f6070e..a82e6ea 100644 --- a/src/main/java/org/creditto/authserver/auth/token/service/RefreshTokenService.java +++ b/src/main/java/org/creditto/authserver/auth/token/service/RefreshTokenService.java @@ -6,8 +6,8 @@ import org.creditto.authserver.auth.token.domain.RefreshTokenSession; import org.creditto.authserver.auth.token.exception.InvalidRefreshTokenException; import org.creditto.authserver.auth.token.repository.RefreshTokenRepository; -import org.creditto.authserver.certificate.entity.Certificate; -import org.creditto.authserver.user.entity.User; +import org.creditto.authserver.domain.certificate.entity.Certificate; +import org.creditto.authserver.domain.user.entity.User; import org.springframework.security.oauth2.core.OAuth2RefreshToken; import org.springframework.security.oauth2.server.authorization.client.RegisteredClient; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/creditto/authserver/certificate/controller/CertificateController.java b/src/main/java/org/creditto/authserver/domain/certificate/controller/CertificateController.java similarity index 80% rename from src/main/java/org/creditto/authserver/certificate/controller/CertificateController.java rename to src/main/java/org/creditto/authserver/domain/certificate/controller/CertificateController.java index 8f1bd2d..db2d370 100644 --- a/src/main/java/org/creditto/authserver/certificate/controller/CertificateController.java +++ b/src/main/java/org/creditto/authserver/domain/certificate/controller/CertificateController.java @@ -1,12 +1,12 @@ -package org.creditto.authserver.certificate.controller; +package org.creditto.authserver.domain.certificate.controller; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.creditto.authserver.certificate.dto.CertificateIssueRequest; -import org.creditto.authserver.certificate.dto.CertificateIssueResponse; -import org.creditto.authserver.certificate.dto.CertificateSerialRequest; -import org.creditto.authserver.certificate.service.CertificateService; +import org.creditto.authserver.domain.certificate.dto.CertificateIssueRequest; +import org.creditto.authserver.domain.certificate.dto.CertificateIssueResponse; +import org.creditto.authserver.domain.certificate.dto.CertificateSerialRequest; +import org.creditto.authserver.domain.certificate.service.CertificateService; import org.creditto.authserver.global.response.ApiResponseUtil; import org.creditto.authserver.global.response.BaseResponse; import org.creditto.authserver.global.response.SuccessCode; diff --git a/src/main/java/org/creditto/authserver/certificate/dto/CertificateIssueRequest.java b/src/main/java/org/creditto/authserver/domain/certificate/dto/CertificateIssueRequest.java similarity index 94% rename from src/main/java/org/creditto/authserver/certificate/dto/CertificateIssueRequest.java rename to src/main/java/org/creditto/authserver/domain/certificate/dto/CertificateIssueRequest.java index 88bf336..c96ef3a 100644 --- a/src/main/java/org/creditto/authserver/certificate/dto/CertificateIssueRequest.java +++ b/src/main/java/org/creditto/authserver/domain/certificate/dto/CertificateIssueRequest.java @@ -1,4 +1,4 @@ -package org.creditto.authserver.certificate.dto; +package org.creditto.authserver.domain.certificate.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/org/creditto/authserver/certificate/dto/CertificateIssueResponse.java b/src/main/java/org/creditto/authserver/domain/certificate/dto/CertificateIssueResponse.java similarity index 82% rename from src/main/java/org/creditto/authserver/certificate/dto/CertificateIssueResponse.java rename to src/main/java/org/creditto/authserver/domain/certificate/dto/CertificateIssueResponse.java index 53ca674..107fb77 100644 --- a/src/main/java/org/creditto/authserver/certificate/dto/CertificateIssueResponse.java +++ b/src/main/java/org/creditto/authserver/domain/certificate/dto/CertificateIssueResponse.java @@ -1,8 +1,8 @@ -package org.creditto.authserver.certificate.dto; +package org.creditto.authserver.domain.certificate.dto; import lombok.AccessLevel; import lombok.Builder; -import org.creditto.authserver.certificate.entity.Certificate; +import org.creditto.authserver.domain.certificate.entity.Certificate; import java.time.LocalDateTime; diff --git a/src/main/java/org/creditto/authserver/certificate/dto/CertificateSerialRequest.java b/src/main/java/org/creditto/authserver/domain/certificate/dto/CertificateSerialRequest.java similarity index 88% rename from src/main/java/org/creditto/authserver/certificate/dto/CertificateSerialRequest.java rename to src/main/java/org/creditto/authserver/domain/certificate/dto/CertificateSerialRequest.java index dd4129a..5fadcb8 100644 --- a/src/main/java/org/creditto/authserver/certificate/dto/CertificateSerialRequest.java +++ b/src/main/java/org/creditto/authserver/domain/certificate/dto/CertificateSerialRequest.java @@ -1,4 +1,4 @@ -package org.creditto.authserver.certificate.dto; +package org.creditto.authserver.domain.certificate.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; diff --git a/src/main/java/org/creditto/authserver/certificate/entity/Certificate.java b/src/main/java/org/creditto/authserver/domain/certificate/entity/Certificate.java similarity index 93% rename from src/main/java/org/creditto/authserver/certificate/entity/Certificate.java rename to src/main/java/org/creditto/authserver/domain/certificate/entity/Certificate.java index c4b4400..043efb4 100644 --- a/src/main/java/org/creditto/authserver/certificate/entity/Certificate.java +++ b/src/main/java/org/creditto/authserver/domain/certificate/entity/Certificate.java @@ -1,10 +1,10 @@ -package org.creditto.authserver.certificate.entity; +package org.creditto.authserver.domain.certificate.entity; import jakarta.persistence.*; import lombok.*; -import org.creditto.authserver.certificate.enums.CertificateStatus; -import org.creditto.authserver.user.entity.User; +import org.creditto.authserver.domain.certificate.enums.CertificateStatus; +import org.creditto.authserver.domain.user.entity.User; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; diff --git a/src/main/java/org/creditto/authserver/certificate/entity/CertificateUsageHistory.java b/src/main/java/org/creditto/authserver/domain/certificate/entity/CertificateUsageHistory.java similarity index 92% rename from src/main/java/org/creditto/authserver/certificate/entity/CertificateUsageHistory.java rename to src/main/java/org/creditto/authserver/domain/certificate/entity/CertificateUsageHistory.java index a6d1b68..a72c0c2 100644 --- a/src/main/java/org/creditto/authserver/certificate/entity/CertificateUsageHistory.java +++ b/src/main/java/org/creditto/authserver/domain/certificate/entity/CertificateUsageHistory.java @@ -1,8 +1,8 @@ -package org.creditto.authserver.certificate.entity; +package org.creditto.authserver.domain.certificate.entity; import jakarta.persistence.*; import lombok.*; -import org.creditto.authserver.certificate.enums.HistoryAction; +import org.creditto.authserver.domain.certificate.enums.HistoryAction; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; diff --git a/src/main/java/org/creditto/authserver/certificate/enums/CertificateStatus.java b/src/main/java/org/creditto/authserver/domain/certificate/enums/CertificateStatus.java similarity index 81% rename from src/main/java/org/creditto/authserver/certificate/enums/CertificateStatus.java rename to src/main/java/org/creditto/authserver/domain/certificate/enums/CertificateStatus.java index 28bc042..300b671 100644 --- a/src/main/java/org/creditto/authserver/certificate/enums/CertificateStatus.java +++ b/src/main/java/org/creditto/authserver/domain/certificate/enums/CertificateStatus.java @@ -1,4 +1,4 @@ -package org.creditto.authserver.certificate.enums; +package org.creditto.authserver.domain.certificate.enums; import lombok.Getter; diff --git a/src/main/java/org/creditto/authserver/certificate/enums/HistoryAction.java b/src/main/java/org/creditto/authserver/domain/certificate/enums/HistoryAction.java similarity index 80% rename from src/main/java/org/creditto/authserver/certificate/enums/HistoryAction.java rename to src/main/java/org/creditto/authserver/domain/certificate/enums/HistoryAction.java index b4b0b70..fc0d9fe 100644 --- a/src/main/java/org/creditto/authserver/certificate/enums/HistoryAction.java +++ b/src/main/java/org/creditto/authserver/domain/certificate/enums/HistoryAction.java @@ -1,4 +1,4 @@ -package org.creditto.authserver.certificate.enums; +package org.creditto.authserver.domain.certificate.enums; public enum HistoryAction { READ("조회"), diff --git a/src/main/java/org/creditto/authserver/certificate/repository/CertificateRepository.java b/src/main/java/org/creditto/authserver/domain/certificate/repository/CertificateRepository.java similarity index 72% rename from src/main/java/org/creditto/authserver/certificate/repository/CertificateRepository.java rename to src/main/java/org/creditto/authserver/domain/certificate/repository/CertificateRepository.java index cd61923..bf5e810 100644 --- a/src/main/java/org/creditto/authserver/certificate/repository/CertificateRepository.java +++ b/src/main/java/org/creditto/authserver/domain/certificate/repository/CertificateRepository.java @@ -1,8 +1,8 @@ -package org.creditto.authserver.certificate.repository; +package org.creditto.authserver.domain.certificate.repository; -import org.creditto.authserver.certificate.enums.CertificateStatus; -import org.creditto.authserver.certificate.entity.Certificate; -import org.creditto.authserver.user.entity.User; +import org.creditto.authserver.domain.certificate.enums.CertificateStatus; +import org.creditto.authserver.domain.certificate.entity.Certificate; +import org.creditto.authserver.domain.user.entity.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/src/main/java/org/creditto/authserver/certificate/repository/CertificateUsageHistoryRepository.java b/src/main/java/org/creditto/authserver/domain/certificate/repository/CertificateUsageHistoryRepository.java similarity index 61% rename from src/main/java/org/creditto/authserver/certificate/repository/CertificateUsageHistoryRepository.java rename to src/main/java/org/creditto/authserver/domain/certificate/repository/CertificateUsageHistoryRepository.java index 6e15b57..1ca9c69 100644 --- a/src/main/java/org/creditto/authserver/certificate/repository/CertificateUsageHistoryRepository.java +++ b/src/main/java/org/creditto/authserver/domain/certificate/repository/CertificateUsageHistoryRepository.java @@ -1,6 +1,6 @@ -package org.creditto.authserver.certificate.repository; +package org.creditto.authserver.domain.certificate.repository; -import org.creditto.authserver.certificate.entity.CertificateUsageHistory; +import org.creditto.authserver.domain.certificate.entity.CertificateUsageHistory; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/org/creditto/authserver/certificate/service/CertificateService.java b/src/main/java/org/creditto/authserver/domain/certificate/service/CertificateService.java similarity index 92% rename from src/main/java/org/creditto/authserver/certificate/service/CertificateService.java rename to src/main/java/org/creditto/authserver/domain/certificate/service/CertificateService.java index fc80066..b667bdd 100644 --- a/src/main/java/org/creditto/authserver/certificate/service/CertificateService.java +++ b/src/main/java/org/creditto/authserver/domain/certificate/service/CertificateService.java @@ -1,25 +1,25 @@ -package org.creditto.authserver.certificate.service; +package org.creditto.authserver.domain.certificate.service; import jakarta.persistence.EntityNotFoundException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.creditto.authserver.auth.utils.AESUtil; import org.creditto.authserver.auth.utils.CertificateEncryptionUtil; -import org.creditto.authserver.certificate.dto.CertificateSerialRequest; -import org.creditto.authserver.certificate.enums.CertificateStatus; -import org.creditto.authserver.certificate.dto.CertificateIssueRequest; -import org.creditto.authserver.certificate.dto.CertificateIssueResponse; -import org.creditto.authserver.certificate.entity.Certificate; -import org.creditto.authserver.certificate.entity.CertificateUsageHistory; -import org.creditto.authserver.certificate.enums.HistoryAction; +import org.creditto.authserver.domain.certificate.dto.CertificateSerialRequest; +import org.creditto.authserver.domain.certificate.enums.CertificateStatus; +import org.creditto.authserver.domain.certificate.dto.CertificateIssueRequest; +import org.creditto.authserver.domain.certificate.dto.CertificateIssueResponse; +import org.creditto.authserver.domain.certificate.entity.Certificate; +import org.creditto.authserver.domain.certificate.entity.CertificateUsageHistory; +import org.creditto.authserver.domain.certificate.enums.HistoryAction; import org.creditto.authserver.global.exception.CertificateAlreadyExistsException; import org.creditto.authserver.global.exception.CertificateExpiredException; import org.creditto.authserver.global.exception.CertificateNotFoundException; import org.creditto.authserver.global.exception.InvalidSimplePasswordException; -import org.creditto.authserver.certificate.repository.CertificateRepository; -import org.creditto.authserver.certificate.repository.CertificateUsageHistoryRepository; -import org.creditto.authserver.user.entity.User; -import org.creditto.authserver.user.repository.UserRepository; +import org.creditto.authserver.domain.certificate.repository.CertificateRepository; +import org.creditto.authserver.domain.certificate.repository.CertificateUsageHistoryRepository; +import org.creditto.authserver.domain.user.entity.User; +import org.creditto.authserver.domain.user.repository.UserRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/org/creditto/authserver/client/entity/OAuth2AuthorizationEntity.java b/src/main/java/org/creditto/authserver/domain/client/entity/OAuth2AuthorizationEntity.java similarity index 98% rename from src/main/java/org/creditto/authserver/client/entity/OAuth2AuthorizationEntity.java rename to src/main/java/org/creditto/authserver/domain/client/entity/OAuth2AuthorizationEntity.java index 9332da7..ea5299b 100644 --- a/src/main/java/org/creditto/authserver/client/entity/OAuth2AuthorizationEntity.java +++ b/src/main/java/org/creditto/authserver/domain/client/entity/OAuth2AuthorizationEntity.java @@ -1,4 +1,4 @@ -package org.creditto.authserver.client.entity; +package org.creditto.authserver.domain.client.entity; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import jakarta.persistence.*; diff --git a/src/main/java/org/creditto/authserver/client/entity/OAuth2RegisteredClient.java b/src/main/java/org/creditto/authserver/domain/client/entity/OAuth2RegisteredClient.java similarity index 97% rename from src/main/java/org/creditto/authserver/client/entity/OAuth2RegisteredClient.java rename to src/main/java/org/creditto/authserver/domain/client/entity/OAuth2RegisteredClient.java index ca2663c..9e72b30 100644 --- a/src/main/java/org/creditto/authserver/client/entity/OAuth2RegisteredClient.java +++ b/src/main/java/org/creditto/authserver/domain/client/entity/OAuth2RegisteredClient.java @@ -1,8 +1,9 @@ -package org.creditto.authserver.client.entity; +package org.creditto.authserver.domain.client.entity; import jakarta.persistence.*; import lombok.*; import org.creditto.authserver.client.entity.sub.*; +import org.creditto.authserver.domain.client.entity.sub.*; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; diff --git a/src/main/java/org/creditto/authserver/client/entity/RegisteredClientMapper.java b/src/main/java/org/creditto/authserver/domain/client/entity/RegisteredClientMapper.java similarity index 98% rename from src/main/java/org/creditto/authserver/client/entity/RegisteredClientMapper.java rename to src/main/java/org/creditto/authserver/domain/client/entity/RegisteredClientMapper.java index e04f622..6d428c2 100644 --- a/src/main/java/org/creditto/authserver/client/entity/RegisteredClientMapper.java +++ b/src/main/java/org/creditto/authserver/domain/client/entity/RegisteredClientMapper.java @@ -1,10 +1,11 @@ -package org.creditto.authserver.client.entity; +package org.creditto.authserver.domain.client.entity; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.RequiredArgsConstructor; import org.creditto.authserver.auth.constants.SettingsConstants; import org.creditto.authserver.client.entity.sub.*; +import org.creditto.authserver.domain.client.entity.sub.*; import org.springframework.security.oauth2.core.AuthorizationGrantType; import org.springframework.security.oauth2.core.ClientAuthenticationMethod; import org.springframework.security.oauth2.server.authorization.client.RegisteredClient; diff --git a/src/main/java/org/creditto/authserver/client/entity/sub/AuthorizationGrantTypeEntity.java b/src/main/java/org/creditto/authserver/domain/client/entity/sub/AuthorizationGrantTypeEntity.java similarity index 87% rename from src/main/java/org/creditto/authserver/client/entity/sub/AuthorizationGrantTypeEntity.java rename to src/main/java/org/creditto/authserver/domain/client/entity/sub/AuthorizationGrantTypeEntity.java index f016357..926d900 100644 --- a/src/main/java/org/creditto/authserver/client/entity/sub/AuthorizationGrantTypeEntity.java +++ b/src/main/java/org/creditto/authserver/domain/client/entity/sub/AuthorizationGrantTypeEntity.java @@ -1,8 +1,8 @@ -package org.creditto.authserver.client.entity.sub; +package org.creditto.authserver.domain.client.entity.sub; import jakarta.persistence.*; import lombok.*; -import org.creditto.authserver.client.entity.OAuth2RegisteredClient; +import org.creditto.authserver.domain.client.entity.OAuth2RegisteredClient; @Entity @Table(name = "authorization_grant_type") diff --git a/src/main/java/org/creditto/authserver/client/entity/sub/ClientAuthenticationMethodEntity.java b/src/main/java/org/creditto/authserver/domain/client/entity/sub/ClientAuthenticationMethodEntity.java similarity index 87% rename from src/main/java/org/creditto/authserver/client/entity/sub/ClientAuthenticationMethodEntity.java rename to src/main/java/org/creditto/authserver/domain/client/entity/sub/ClientAuthenticationMethodEntity.java index 96723ea..18e7de7 100644 --- a/src/main/java/org/creditto/authserver/client/entity/sub/ClientAuthenticationMethodEntity.java +++ b/src/main/java/org/creditto/authserver/domain/client/entity/sub/ClientAuthenticationMethodEntity.java @@ -1,8 +1,8 @@ -package org.creditto.authserver.client.entity.sub; +package org.creditto.authserver.domain.client.entity.sub; import jakarta.persistence.*; import lombok.*; -import org.creditto.authserver.client.entity.OAuth2RegisteredClient; +import org.creditto.authserver.domain.client.entity.OAuth2RegisteredClient; @Entity @Table(name = "client_authentication_method") diff --git a/src/main/java/org/creditto/authserver/client/entity/sub/ClientScope.java b/src/main/java/org/creditto/authserver/domain/client/entity/sub/ClientScope.java similarity index 85% rename from src/main/java/org/creditto/authserver/client/entity/sub/ClientScope.java rename to src/main/java/org/creditto/authserver/domain/client/entity/sub/ClientScope.java index b545ae5..dda980b 100644 --- a/src/main/java/org/creditto/authserver/client/entity/sub/ClientScope.java +++ b/src/main/java/org/creditto/authserver/domain/client/entity/sub/ClientScope.java @@ -1,8 +1,8 @@ -package org.creditto.authserver.client.entity.sub; +package org.creditto.authserver.domain.client.entity.sub; import jakarta.persistence.*; import lombok.*; -import org.creditto.authserver.client.entity.OAuth2RegisteredClient; +import org.creditto.authserver.domain.client.entity.OAuth2RegisteredClient; @Entity @Table(name = "client_scope") diff --git a/src/main/java/org/creditto/authserver/client/entity/sub/PostLogoutRedirectUriEntity.java b/src/main/java/org/creditto/authserver/domain/client/entity/sub/PostLogoutRedirectUriEntity.java similarity index 87% rename from src/main/java/org/creditto/authserver/client/entity/sub/PostLogoutRedirectUriEntity.java rename to src/main/java/org/creditto/authserver/domain/client/entity/sub/PostLogoutRedirectUriEntity.java index f45295e..d28a143 100644 --- a/src/main/java/org/creditto/authserver/client/entity/sub/PostLogoutRedirectUriEntity.java +++ b/src/main/java/org/creditto/authserver/domain/client/entity/sub/PostLogoutRedirectUriEntity.java @@ -1,8 +1,8 @@ -package org.creditto.authserver.client.entity.sub; +package org.creditto.authserver.domain.client.entity.sub; import jakarta.persistence.*; import lombok.*; -import org.creditto.authserver.client.entity.OAuth2RegisteredClient; +import org.creditto.authserver.domain.client.entity.OAuth2RegisteredClient; @Entity @Table(name = "post_logout_redirect_uri") diff --git a/src/main/java/org/creditto/authserver/client/entity/sub/RedirectUriEntity.java b/src/main/java/org/creditto/authserver/domain/client/entity/sub/RedirectUriEntity.java similarity index 86% rename from src/main/java/org/creditto/authserver/client/entity/sub/RedirectUriEntity.java rename to src/main/java/org/creditto/authserver/domain/client/entity/sub/RedirectUriEntity.java index 9330985..27b8360 100644 --- a/src/main/java/org/creditto/authserver/client/entity/sub/RedirectUriEntity.java +++ b/src/main/java/org/creditto/authserver/domain/client/entity/sub/RedirectUriEntity.java @@ -1,8 +1,8 @@ -package org.creditto.authserver.client.entity.sub; +package org.creditto.authserver.domain.client.entity.sub; import jakarta.persistence.*; import lombok.*; -import org.creditto.authserver.client.entity.OAuth2RegisteredClient; +import org.creditto.authserver.domain.client.entity.OAuth2RegisteredClient; @Entity @Table(name = "redirect_uri") diff --git a/src/main/java/org/creditto/authserver/client/repository/JpaRegisteredClientRepositoryService.java b/src/main/java/org/creditto/authserver/domain/client/repository/JpaRegisteredClientRepositoryService.java similarity index 86% rename from src/main/java/org/creditto/authserver/client/repository/JpaRegisteredClientRepositoryService.java rename to src/main/java/org/creditto/authserver/domain/client/repository/JpaRegisteredClientRepositoryService.java index a2c34cc..f92bbbf 100644 --- a/src/main/java/org/creditto/authserver/client/repository/JpaRegisteredClientRepositoryService.java +++ b/src/main/java/org/creditto/authserver/domain/client/repository/JpaRegisteredClientRepositoryService.java @@ -1,8 +1,8 @@ -package org.creditto.authserver.client.repository; +package org.creditto.authserver.domain.client.repository; import lombok.RequiredArgsConstructor; -import org.creditto.authserver.client.entity.OAuth2RegisteredClient; -import org.creditto.authserver.client.entity.RegisteredClientMapper; +import org.creditto.authserver.domain.client.entity.OAuth2RegisteredClient; +import org.creditto.authserver.domain.client.entity.RegisteredClientMapper; import org.springframework.lang.Nullable; import org.springframework.security.oauth2.server.authorization.client.RegisteredClient; import org.springframework.security.oauth2.server.authorization.client.RegisteredClientRepository; diff --git a/src/main/java/org/creditto/authserver/client/repository/OAuth2RegisteredClientRepository.java b/src/main/java/org/creditto/authserver/domain/client/repository/OAuth2RegisteredClientRepository.java similarity index 90% rename from src/main/java/org/creditto/authserver/client/repository/OAuth2RegisteredClientRepository.java rename to src/main/java/org/creditto/authserver/domain/client/repository/OAuth2RegisteredClientRepository.java index b09f4bf..4c3c984 100644 --- a/src/main/java/org/creditto/authserver/client/repository/OAuth2RegisteredClientRepository.java +++ b/src/main/java/org/creditto/authserver/domain/client/repository/OAuth2RegisteredClientRepository.java @@ -1,7 +1,7 @@ -package org.creditto.authserver.client.repository; +package org.creditto.authserver.domain.client.repository; import lombok.NonNull; -import org.creditto.authserver.client.entity.OAuth2RegisteredClient; +import org.creditto.authserver.domain.client.entity.OAuth2RegisteredClient; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/src/main/java/org/creditto/authserver/client/service/RedisOAuth2AuthorizationService.java b/src/main/java/org/creditto/authserver/domain/client/service/RedisOAuth2AuthorizationService.java similarity index 98% rename from src/main/java/org/creditto/authserver/client/service/RedisOAuth2AuthorizationService.java rename to src/main/java/org/creditto/authserver/domain/client/service/RedisOAuth2AuthorizationService.java index fdca3a4..df7476c 100644 --- a/src/main/java/org/creditto/authserver/client/service/RedisOAuth2AuthorizationService.java +++ b/src/main/java/org/creditto/authserver/domain/client/service/RedisOAuth2AuthorizationService.java @@ -1,8 +1,8 @@ -package org.creditto.authserver.client.service; +package org.creditto.authserver.domain.client.service; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.creditto.authserver.client.entity.OAuth2AuthorizationEntity; +import org.creditto.authserver.domain.client.entity.OAuth2AuthorizationEntity; import org.creditto.authserver.global.redis.AuthorizationEntityMapper; import org.creditto.authserver.global.redis.AuthorizationKeyManager; import org.creditto.authserver.global.redis.AuthorizationRedisRepository; diff --git a/src/main/java/org/creditto/authserver/user/controller/UserController.java b/src/main/java/org/creditto/authserver/domain/user/controller/UserController.java similarity index 88% rename from src/main/java/org/creditto/authserver/user/controller/UserController.java rename to src/main/java/org/creditto/authserver/domain/user/controller/UserController.java index 335ead6..65400af 100644 --- a/src/main/java/org/creditto/authserver/user/controller/UserController.java +++ b/src/main/java/org/creditto/authserver/domain/user/controller/UserController.java @@ -1,4 +1,4 @@ -package org.creditto.authserver.user.controller; +package org.creditto.authserver.domain.user.controller; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; @@ -6,9 +6,9 @@ import org.creditto.authserver.global.response.ApiResponseUtil; import org.creditto.authserver.global.response.BaseResponse; import org.creditto.authserver.global.response.SuccessCode; -import org.creditto.authserver.user.dto.UserRegisterRequest; -import org.creditto.authserver.user.dto.UserResponse; -import org.creditto.authserver.user.service.UserService; +import org.creditto.authserver.domain.user.dto.UserRegisterRequest; +import org.creditto.authserver.domain.user.dto.UserResponse; +import org.creditto.authserver.domain.user.service.UserService; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/org/creditto/authserver/user/dto/UserRegisterRequest.java b/src/main/java/org/creditto/authserver/domain/user/dto/UserRegisterRequest.java similarity index 94% rename from src/main/java/org/creditto/authserver/user/dto/UserRegisterRequest.java rename to src/main/java/org/creditto/authserver/domain/user/dto/UserRegisterRequest.java index e48912f..826e6a3 100644 --- a/src/main/java/org/creditto/authserver/user/dto/UserRegisterRequest.java +++ b/src/main/java/org/creditto/authserver/domain/user/dto/UserRegisterRequest.java @@ -1,4 +1,4 @@ -package org.creditto.authserver.user.dto; +package org.creditto.authserver.domain.user.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/org/creditto/authserver/user/dto/UserResponse.java b/src/main/java/org/creditto/authserver/domain/user/dto/UserResponse.java similarity index 85% rename from src/main/java/org/creditto/authserver/user/dto/UserResponse.java rename to src/main/java/org/creditto/authserver/domain/user/dto/UserResponse.java index f6aeb47..684a61c 100644 --- a/src/main/java/org/creditto/authserver/user/dto/UserResponse.java +++ b/src/main/java/org/creditto/authserver/domain/user/dto/UserResponse.java @@ -1,7 +1,7 @@ -package org.creditto.authserver.user.dto; +package org.creditto.authserver.domain.user.dto; import lombok.Builder; -import org.creditto.authserver.user.entity.User; +import org.creditto.authserver.domain.user.entity.User; import java.time.LocalDate; diff --git a/src/main/java/org/creditto/authserver/user/entity/User.java b/src/main/java/org/creditto/authserver/domain/user/entity/User.java similarity index 92% rename from src/main/java/org/creditto/authserver/user/entity/User.java rename to src/main/java/org/creditto/authserver/domain/user/entity/User.java index 02bb687..d19c597 100644 --- a/src/main/java/org/creditto/authserver/user/entity/User.java +++ b/src/main/java/org/creditto/authserver/domain/user/entity/User.java @@ -1,9 +1,9 @@ -package org.creditto.authserver.user.entity; +package org.creditto.authserver.domain.user.entity; import jakarta.persistence.*; import lombok.*; -import org.creditto.authserver.user.dto.UserRegisterRequest; -import org.creditto.authserver.user.enums.UserRoles; +import org.creditto.authserver.domain.user.dto.UserRegisterRequest; +import org.creditto.authserver.domain.user.enums.UserRoles; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; diff --git a/src/main/java/org/creditto/authserver/user/enums/UserRoles.java b/src/main/java/org/creditto/authserver/domain/user/enums/UserRoles.java similarity index 50% rename from src/main/java/org/creditto/authserver/user/enums/UserRoles.java rename to src/main/java/org/creditto/authserver/domain/user/enums/UserRoles.java index d91cdd5..9f7c186 100644 --- a/src/main/java/org/creditto/authserver/user/enums/UserRoles.java +++ b/src/main/java/org/creditto/authserver/domain/user/enums/UserRoles.java @@ -1,4 +1,4 @@ -package org.creditto.authserver.user.enums; +package org.creditto.authserver.domain.user.enums; public enum UserRoles { CUSTOMER, diff --git a/src/main/java/org/creditto/authserver/user/repository/UserRepository.java b/src/main/java/org/creditto/authserver/domain/user/repository/UserRepository.java similarity index 75% rename from src/main/java/org/creditto/authserver/user/repository/UserRepository.java rename to src/main/java/org/creditto/authserver/domain/user/repository/UserRepository.java index 3af472a..cb17d80 100644 --- a/src/main/java/org/creditto/authserver/user/repository/UserRepository.java +++ b/src/main/java/org/creditto/authserver/domain/user/repository/UserRepository.java @@ -1,6 +1,6 @@ -package org.creditto.authserver.user.repository; +package org.creditto.authserver.domain.user.repository; -import org.creditto.authserver.user.entity.User; +import org.creditto.authserver.domain.user.entity.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/org/creditto/authserver/user/service/UserService.java b/src/main/java/org/creditto/authserver/domain/user/service/UserService.java similarity index 86% rename from src/main/java/org/creditto/authserver/user/service/UserService.java rename to src/main/java/org/creditto/authserver/domain/user/service/UserService.java index 982ad22..1cd3af9 100644 --- a/src/main/java/org/creditto/authserver/user/service/UserService.java +++ b/src/main/java/org/creditto/authserver/domain/user/service/UserService.java @@ -1,12 +1,12 @@ -package org.creditto.authserver.user.service; +package org.creditto.authserver.domain.user.service; import jakarta.persistence.EntityNotFoundException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.creditto.authserver.user.dto.UserRegisterRequest; -import org.creditto.authserver.user.dto.UserResponse; -import org.creditto.authserver.user.entity.User; -import org.creditto.authserver.user.repository.UserRepository; +import org.creditto.authserver.domain.user.dto.UserRegisterRequest; +import org.creditto.authserver.domain.user.dto.UserResponse; +import org.creditto.authserver.domain.user.entity.User; +import org.creditto.authserver.domain.user.repository.UserRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/org/creditto/authserver/global/redis/AuthorizationEntityMapper.java b/src/main/java/org/creditto/authserver/global/redis/AuthorizationEntityMapper.java index 0ecef14..ed5e2cb 100644 --- a/src/main/java/org/creditto/authserver/global/redis/AuthorizationEntityMapper.java +++ b/src/main/java/org/creditto/authserver/global/redis/AuthorizationEntityMapper.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.RequiredArgsConstructor; -import org.creditto.authserver.client.entity.OAuth2AuthorizationEntity; +import org.creditto.authserver.domain.client.entity.OAuth2AuthorizationEntity; import org.springframework.dao.DataRetrievalFailureException; import org.springframework.security.jackson2.SecurityJackson2Modules; import org.springframework.security.oauth2.core.AuthorizationGrantType; diff --git a/src/main/java/org/creditto/authserver/global/redis/AuthorizationRedisRepository.java b/src/main/java/org/creditto/authserver/global/redis/AuthorizationRedisRepository.java index 759be84..47c9c26 100644 --- a/src/main/java/org/creditto/authserver/global/redis/AuthorizationRedisRepository.java +++ b/src/main/java/org/creditto/authserver/global/redis/AuthorizationRedisRepository.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import lombok.RequiredArgsConstructor; -import org.creditto.authserver.client.entity.OAuth2AuthorizationEntity; +import org.creditto.authserver.domain.client.entity.OAuth2AuthorizationEntity; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; diff --git a/src/test/java/org/creditto/authserver/certificate/service/CertificateServiceTest.java b/src/test/java/org/creditto/authserver/certificate/service/CertificateServiceTest.java index b5ac5e0..6faf630 100644 --- a/src/test/java/org/creditto/authserver/certificate/service/CertificateServiceTest.java +++ b/src/test/java/org/creditto/authserver/certificate/service/CertificateServiceTest.java @@ -1,16 +1,18 @@ package org.creditto.authserver.certificate.service; import org.creditto.authserver.auth.utils.CertificateEncryptionUtil; -import org.creditto.authserver.certificate.dto.CertificateIssueRequest; -import org.creditto.authserver.certificate.dto.CertificateSerialRequest; -import org.creditto.authserver.certificate.entity.Certificate; -import org.creditto.authserver.certificate.entity.CertificateUsageHistory; -import org.creditto.authserver.certificate.enums.CertificateStatus; -import org.creditto.authserver.certificate.repository.CertificateRepository; -import org.creditto.authserver.certificate.repository.CertificateUsageHistoryRepository; +import org.creditto.authserver.domain.certificate.dto.CertificateIssueRequest; +import org.creditto.authserver.domain.certificate.dto.CertificateSerialRequest; +import org.creditto.authserver.domain.certificate.entity.Certificate; +import org.creditto.authserver.domain.certificate.entity.CertificateUsageHistory; +import org.creditto.authserver.domain.certificate.enums.CertificateStatus; +import org.creditto.authserver.domain.certificate.repository.CertificateRepository; +import org.creditto.authserver.domain.certificate.repository.CertificateUsageHistoryRepository; +import org.creditto.authserver.domain.certificate.service.CertificateService; +import org.creditto.authserver.domain.user.dto.UserRegisterRequest; import org.creditto.authserver.global.exception.InvalidSimplePasswordException; -import org.creditto.authserver.user.entity.User; -import org.creditto.authserver.user.repository.UserRepository; +import org.creditto.authserver.domain.user.entity.User; +import org.creditto.authserver.domain.user.repository.UserRepository; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -71,7 +73,7 @@ void setUp() { certificateSerialRequest = new CertificateSerialRequest("홍길동", "010-7777-8888"); - registerUser = User.create(new org.creditto.authserver.user.dto.UserRegisterRequest( + registerUser = User.create(new UserRegisterRequest( "홍길동", LocalDate.of(1990, 1, 1), "KR", @@ -80,7 +82,7 @@ void setUp() { )); ReflectionTestUtils.setField(registerUser, "id", 1L); - authUser = User.create(new org.creditto.authserver.user.dto.UserRegisterRequest( + authUser = User.create(new UserRegisterRequest( "홍길동", LocalDate.of(1990, 1, 1), "KR", @@ -89,7 +91,7 @@ void setUp() { )); ReflectionTestUtils.setField(authUser, "id", 2L); - invalidAuthUser = User.create(new org.creditto.authserver.user.dto.UserRegisterRequest( + invalidAuthUser = User.create(new UserRegisterRequest( "홍길동", LocalDate.of(1990, 1, 1), "KR", @@ -98,7 +100,7 @@ void setUp() { )); ReflectionTestUtils.setField(invalidAuthUser, "id", 3L); - serialLookupUser = User.create(new org.creditto.authserver.user.dto.UserRegisterRequest( + serialLookupUser = User.create(new UserRegisterRequest( "홍길동", LocalDate.of(1990, 1, 1), "KR", diff --git a/src/test/java/org/creditto/authserver/client/repository/JpaRegisteredClientRepositoryServiceTest.java b/src/test/java/org/creditto/authserver/client/repository/JpaRegisteredClientRepositoryServiceTest.java index e6e3269..610593a 100644 --- a/src/test/java/org/creditto/authserver/client/repository/JpaRegisteredClientRepositoryServiceTest.java +++ b/src/test/java/org/creditto/authserver/client/repository/JpaRegisteredClientRepositoryServiceTest.java @@ -1,7 +1,9 @@ package org.creditto.authserver.client.repository; -import org.creditto.authserver.client.entity.OAuth2RegisteredClient; -import org.creditto.authserver.client.entity.RegisteredClientMapper; +import org.creditto.authserver.domain.client.entity.OAuth2RegisteredClient; +import org.creditto.authserver.domain.client.entity.RegisteredClientMapper; +import org.creditto.authserver.domain.client.repository.JpaRegisteredClientRepositoryService; +import org.creditto.authserver.domain.client.repository.OAuth2RegisteredClientRepository; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/creditto/authserver/client/service/RedisOAuth2AuthorizationServiceTest.java b/src/test/java/org/creditto/authserver/client/service/RedisOAuth2AuthorizationServiceTest.java index 8872277..93d2187 100644 --- a/src/test/java/org/creditto/authserver/client/service/RedisOAuth2AuthorizationServiceTest.java +++ b/src/test/java/org/creditto/authserver/client/service/RedisOAuth2AuthorizationServiceTest.java @@ -1,5 +1,6 @@ package org.creditto.authserver.client.service; +import org.creditto.authserver.domain.client.service.RedisOAuth2AuthorizationService; import org.creditto.authserver.global.redis.AuthorizationEntityMapper; import org.creditto.authserver.global.redis.AuthorizationKeyManager; import org.creditto.authserver.global.redis.AuthorizationRedisRepository; diff --git a/src/test/java/org/creditto/authserver/user/service/UserServiceTest.java b/src/test/java/org/creditto/authserver/user/service/UserServiceTest.java index 04a5cfb..9461dfc 100644 --- a/src/test/java/org/creditto/authserver/user/service/UserServiceTest.java +++ b/src/test/java/org/creditto/authserver/user/service/UserServiceTest.java @@ -1,9 +1,10 @@ package org.creditto.authserver.user.service; -import org.creditto.authserver.user.dto.UserRegisterRequest; -import org.creditto.authserver.user.dto.UserResponse; -import org.creditto.authserver.user.entity.User; -import org.creditto.authserver.user.repository.UserRepository; +import org.creditto.authserver.domain.user.dto.UserRegisterRequest; +import org.creditto.authserver.domain.user.dto.UserResponse; +import org.creditto.authserver.domain.user.entity.User; +import org.creditto.authserver.domain.user.repository.UserRepository; +import org.creditto.authserver.domain.user.service.UserService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; From acf7b5fc767cc8a782033379307aa090cde77285 Mon Sep 17 00:00:00 2001 From: Jeyong <104718158+JayongLee@users.noreply.github.com> Date: Sat, 6 Dec 2025 13:12:31 +0900 Subject: [PATCH 2/3] =?UTF-8?q?test:=20Object=20Mapper=EB=A1=9C=20?= =?UTF-8?q?=EC=9D=B8=ED=95=9C=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95=20/=20#61=20(#65)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # src/test/java/org/creditto/authserver/client/service/RedisOAuth2AuthorizationServiceTest.java --- .../client/service/RedisOAuth2AuthorizationServiceTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/creditto/authserver/client/service/RedisOAuth2AuthorizationServiceTest.java b/src/test/java/org/creditto/authserver/client/service/RedisOAuth2AuthorizationServiceTest.java index 93d2187..01dbf0d 100644 --- a/src/test/java/org/creditto/authserver/client/service/RedisOAuth2AuthorizationServiceTest.java +++ b/src/test/java/org/creditto/authserver/client/service/RedisOAuth2AuthorizationServiceTest.java @@ -1,5 +1,6 @@ package org.creditto.authserver.client.service; +import com.fasterxml.jackson.databind.ObjectMapper; import org.creditto.authserver.domain.client.service.RedisOAuth2AuthorizationService; import org.creditto.authserver.global.redis.AuthorizationEntityMapper; import org.creditto.authserver.global.redis.AuthorizationKeyManager; @@ -45,6 +46,7 @@ class RedisOAuth2AuthorizationServiceTest { @Mock private ValueOperations valueOperations; + private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper().findAndRegisterModules(); private RedisOAuth2AuthorizationService service; private RegisteredClient registeredClient; private OAuth2Authorization authorization; @@ -53,7 +55,7 @@ class RedisOAuth2AuthorizationServiceTest { void setUp() { when(redisTemplate.opsForValue()).thenReturn(valueOperations); AuthorizationKeyManager keyManager = new AuthorizationKeyManager(); - AuthorizationRedisRepository repository = new AuthorizationRedisRepository(redisTemplate, keyManager); + AuthorizationRedisRepository repository = new AuthorizationRedisRepository(redisTemplate, keyManager, OBJECT_MAPPER); AuthorizationEntityMapper mapper = new AuthorizationEntityMapper(registeredClientRepository); AuthorizationTtlPolicy ttlPolicy = new AuthorizationTtlPolicy(Duration.ofHours(1)); service = new RedisOAuth2AuthorizationService(repository, mapper, keyManager, ttlPolicy); From 38db2b2e48500c7c7b658c2c52465ca0f660939b Mon Sep 17 00:00:00 2001 From: Jeyong Date: Sat, 6 Dec 2025 16:19:49 +0900 Subject: [PATCH 3/3] =?UTF-8?q?style:=20import=20=EA=B2=BD=EB=A1=9C=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../authserver/domain/client/entity/OAuth2RegisteredClient.java | 1 - .../authserver/domain/client/entity/RegisteredClientMapper.java | 1 - 2 files changed, 2 deletions(-) diff --git a/src/main/java/org/creditto/authserver/domain/client/entity/OAuth2RegisteredClient.java b/src/main/java/org/creditto/authserver/domain/client/entity/OAuth2RegisteredClient.java index 9e72b30..5527879 100644 --- a/src/main/java/org/creditto/authserver/domain/client/entity/OAuth2RegisteredClient.java +++ b/src/main/java/org/creditto/authserver/domain/client/entity/OAuth2RegisteredClient.java @@ -2,7 +2,6 @@ import jakarta.persistence.*; import lombok.*; -import org.creditto.authserver.client.entity.sub.*; import org.creditto.authserver.domain.client.entity.sub.*; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; diff --git a/src/main/java/org/creditto/authserver/domain/client/entity/RegisteredClientMapper.java b/src/main/java/org/creditto/authserver/domain/client/entity/RegisteredClientMapper.java index 6d428c2..4165d7b 100644 --- a/src/main/java/org/creditto/authserver/domain/client/entity/RegisteredClientMapper.java +++ b/src/main/java/org/creditto/authserver/domain/client/entity/RegisteredClientMapper.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import lombok.RequiredArgsConstructor; import org.creditto.authserver.auth.constants.SettingsConstants; -import org.creditto.authserver.client.entity.sub.*; import org.creditto.authserver.domain.client.entity.sub.*; import org.springframework.security.oauth2.core.AuthorizationGrantType; import org.springframework.security.oauth2.core.ClientAuthenticationMethod;