From 2ea125fbe0f860e0c2b8bd7047f6d98cd60b32b6 Mon Sep 17 00:00:00 2001 From: nayonsoso Date: Fri, 16 May 2025 21:30:53 +0900 Subject: [PATCH 01/15] =?UTF-8?q?refactor:=20community=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20Type=20=ED=81=B4=EB=9E=98=EC=8A=A4=20=ED=8C=A8?= =?UTF-8?q?=ED=82=A4=EC=A7=80=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - BoardCode를 community.board.domain 으로 - PostCategory를 community.post.domain 으로 - RedisConstants 를 community.post.service 로 --- .../cache/ThunderingHerdCachingAspect.java | 8 ++++---- .../community/board/controller/BoardController.java | 2 +- .../{type => community/board/domain}/BoardCode.java | 2 +- .../solidconnection/community/post/domain/Post.java | 1 - .../community/post/domain/PostCategory.java | 5 +++++ .../community/post/dto/PostCreateRequest.java | 2 +- .../community/post/service/PostCommandService.java | 2 +- .../community/post/service/PostQueryService.java | 4 ++-- .../post/service}/RedisConstants.java | 2 +- .../solidconnection/config/redis/RedisConfig.java | 2 +- .../scheduler/UpdateViewCountScheduler.java | 2 +- .../example/solidconnection/service/RedisService.java | 4 ++-- .../com/example/solidconnection/type/PostCategory.java | 5 ----- .../com/example/solidconnection/util/RedisUtils.java | 8 ++++---- .../community/comment/service/CommentServiceTest.java | 2 +- .../community/post/service/PostCommandServiceTest.java | 2 +- .../community/post/service/PostLikeServiceTest.java | 3 +-- .../community/post/service/PostQueryServiceTest.java | 4 ++-- .../concurrency/PostLikeCountConcurrencyTest.java | 2 +- .../concurrency/PostViewCountConcurrencyTest.java | 6 +++--- .../support/integration/BaseIntegrationTest.java | 10 +++++----- 21 files changed, 38 insertions(+), 40 deletions(-) rename src/main/java/com/example/solidconnection/{type => community/board/domain}/BoardCode.java (50%) create mode 100644 src/main/java/com/example/solidconnection/community/post/domain/PostCategory.java rename src/main/java/com/example/solidconnection/{type => community/post/service}/RedisConstants.java (90%) delete mode 100644 src/main/java/com/example/solidconnection/type/PostCategory.java diff --git a/src/main/java/com/example/solidconnection/cache/ThunderingHerdCachingAspect.java b/src/main/java/com/example/solidconnection/cache/ThunderingHerdCachingAspect.java index a37e80f51..5527c2523 100644 --- a/src/main/java/com/example/solidconnection/cache/ThunderingHerdCachingAspect.java +++ b/src/main/java/com/example/solidconnection/cache/ThunderingHerdCachingAspect.java @@ -22,10 +22,10 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import static com.example.solidconnection.type.RedisConstants.CREATE_CHANNEL; -import static com.example.solidconnection.type.RedisConstants.LOCK_TIMEOUT_MS; -import static com.example.solidconnection.type.RedisConstants.MAX_WAIT_TIME_MS; -import static com.example.solidconnection.type.RedisConstants.REFRESH_LIMIT_PERCENT; +import static com.example.solidconnection.community.post.service.RedisConstants.CREATE_CHANNEL; +import static com.example.solidconnection.community.post.service.RedisConstants.LOCK_TIMEOUT_MS; +import static com.example.solidconnection.community.post.service.RedisConstants.MAX_WAIT_TIME_MS; +import static com.example.solidconnection.community.post.service.RedisConstants.REFRESH_LIMIT_PERCENT; @Aspect @Component diff --git a/src/main/java/com/example/solidconnection/community/board/controller/BoardController.java b/src/main/java/com/example/solidconnection/community/board/controller/BoardController.java index a87552796..babfdfebe 100644 --- a/src/main/java/com/example/solidconnection/community/board/controller/BoardController.java +++ b/src/main/java/com/example/solidconnection/community/board/controller/BoardController.java @@ -4,7 +4,7 @@ import com.example.solidconnection.community.post.service.PostQueryService; import com.example.solidconnection.custom.resolver.AuthorizedUser; import com.example.solidconnection.siteuser.domain.SiteUser; -import com.example.solidconnection.type.BoardCode; +import com.example.solidconnection.community.board.domain.BoardCode; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/example/solidconnection/type/BoardCode.java b/src/main/java/com/example/solidconnection/community/board/domain/BoardCode.java similarity index 50% rename from src/main/java/com/example/solidconnection/type/BoardCode.java rename to src/main/java/com/example/solidconnection/community/board/domain/BoardCode.java index 0d161e941..33266e8ef 100644 --- a/src/main/java/com/example/solidconnection/type/BoardCode.java +++ b/src/main/java/com/example/solidconnection/community/board/domain/BoardCode.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.type; +package com.example.solidconnection.community.board.domain; public enum BoardCode { EUROPE, AMERICAS, ASIA, FREE; diff --git a/src/main/java/com/example/solidconnection/community/post/domain/Post.java b/src/main/java/com/example/solidconnection/community/post/domain/Post.java index 4d96b9b22..bc4af1f8e 100644 --- a/src/main/java/com/example/solidconnection/community/post/domain/Post.java +++ b/src/main/java/com/example/solidconnection/community/post/domain/Post.java @@ -5,7 +5,6 @@ import com.example.solidconnection.entity.common.BaseEntity; import com.example.solidconnection.community.post.dto.PostUpdateRequest; import com.example.solidconnection.siteuser.domain.SiteUser; -import com.example.solidconnection.type.PostCategory; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/com/example/solidconnection/community/post/domain/PostCategory.java b/src/main/java/com/example/solidconnection/community/post/domain/PostCategory.java new file mode 100644 index 000000000..3f8819749 --- /dev/null +++ b/src/main/java/com/example/solidconnection/community/post/domain/PostCategory.java @@ -0,0 +1,5 @@ +package com.example.solidconnection.community.post.domain; + +public enum PostCategory { + 전체, 자유, 질문 +} diff --git a/src/main/java/com/example/solidconnection/community/post/dto/PostCreateRequest.java b/src/main/java/com/example/solidconnection/community/post/dto/PostCreateRequest.java index 5e6590b20..235c614d3 100644 --- a/src/main/java/com/example/solidconnection/community/post/dto/PostCreateRequest.java +++ b/src/main/java/com/example/solidconnection/community/post/dto/PostCreateRequest.java @@ -3,7 +3,7 @@ import com.example.solidconnection.community.board.domain.Board; import com.example.solidconnection.community.post.domain.Post; import com.example.solidconnection.siteuser.domain.SiteUser; -import com.example.solidconnection.type.PostCategory; +import com.example.solidconnection.community.post.domain.PostCategory; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; diff --git a/src/main/java/com/example/solidconnection/community/post/service/PostCommandService.java b/src/main/java/com/example/solidconnection/community/post/service/PostCommandService.java index b95cbcf1b..bf9fe00df 100644 --- a/src/main/java/com/example/solidconnection/community/post/service/PostCommandService.java +++ b/src/main/java/com/example/solidconnection/community/post/service/PostCommandService.java @@ -17,7 +17,7 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.type.ImgType; -import com.example.solidconnection.type.PostCategory; +import com.example.solidconnection.community.post.domain.PostCategory; import com.example.solidconnection.util.RedisUtils; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.EnumUtils; diff --git a/src/main/java/com/example/solidconnection/community/post/service/PostQueryService.java b/src/main/java/com/example/solidconnection/community/post/service/PostQueryService.java index 66cbb5faa..5523efe3a 100644 --- a/src/main/java/com/example/solidconnection/community/post/service/PostQueryService.java +++ b/src/main/java/com/example/solidconnection/community/post/service/PostQueryService.java @@ -15,8 +15,8 @@ import com.example.solidconnection.service.RedisService; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.dto.PostFindSiteUserResponse; -import com.example.solidconnection.type.BoardCode; -import com.example.solidconnection.type.PostCategory; +import com.example.solidconnection.community.board.domain.BoardCode; +import com.example.solidconnection.community.post.domain.PostCategory; import com.example.solidconnection.util.RedisUtils; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.EnumUtils; diff --git a/src/main/java/com/example/solidconnection/type/RedisConstants.java b/src/main/java/com/example/solidconnection/community/post/service/RedisConstants.java similarity index 90% rename from src/main/java/com/example/solidconnection/type/RedisConstants.java rename to src/main/java/com/example/solidconnection/community/post/service/RedisConstants.java index 7d4c7f2c9..46260596c 100644 --- a/src/main/java/com/example/solidconnection/type/RedisConstants.java +++ b/src/main/java/com/example/solidconnection/community/post/service/RedisConstants.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.type; +package com.example.solidconnection.community.post.service; import lombok.Getter; diff --git a/src/main/java/com/example/solidconnection/config/redis/RedisConfig.java b/src/main/java/com/example/solidconnection/config/redis/RedisConfig.java index 22847dc6d..e611b1ff0 100644 --- a/src/main/java/com/example/solidconnection/config/redis/RedisConfig.java +++ b/src/main/java/com/example/solidconnection/config/redis/RedisConfig.java @@ -16,7 +16,7 @@ import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; import org.springframework.data.redis.serializer.StringRedisSerializer; -import static com.example.solidconnection.type.RedisConstants.CREATE_CHANNEL; +import static com.example.solidconnection.community.post.service.RedisConstants.CREATE_CHANNEL; @Configuration @EnableRedisRepositories diff --git a/src/main/java/com/example/solidconnection/scheduler/UpdateViewCountScheduler.java b/src/main/java/com/example/solidconnection/scheduler/UpdateViewCountScheduler.java index 8da1fe1ca..a29f2e18a 100644 --- a/src/main/java/com/example/solidconnection/scheduler/UpdateViewCountScheduler.java +++ b/src/main/java/com/example/solidconnection/scheduler/UpdateViewCountScheduler.java @@ -13,7 +13,7 @@ import java.util.List; -import static com.example.solidconnection.type.RedisConstants.VIEW_COUNT_KEY_PATTERN; +import static com.example.solidconnection.community.post.service.RedisConstants.VIEW_COUNT_KEY_PATTERN; @RequiredArgsConstructor @Component diff --git a/src/main/java/com/example/solidconnection/service/RedisService.java b/src/main/java/com/example/solidconnection/service/RedisService.java index 36be7b66f..55e661bbf 100644 --- a/src/main/java/com/example/solidconnection/service/RedisService.java +++ b/src/main/java/com/example/solidconnection/service/RedisService.java @@ -9,8 +9,8 @@ import java.util.Collections; import java.util.concurrent.TimeUnit; -import static com.example.solidconnection.type.RedisConstants.VALIDATE_VIEW_COUNT_TTL; -import static com.example.solidconnection.type.RedisConstants.VIEW_COUNT_TTL; +import static com.example.solidconnection.community.post.service.RedisConstants.VALIDATE_VIEW_COUNT_TTL; +import static com.example.solidconnection.community.post.service.RedisConstants.VIEW_COUNT_TTL; @Service public class RedisService { diff --git a/src/main/java/com/example/solidconnection/type/PostCategory.java b/src/main/java/com/example/solidconnection/type/PostCategory.java deleted file mode 100644 index b42b94f95..000000000 --- a/src/main/java/com/example/solidconnection/type/PostCategory.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.example.solidconnection.type; - -public enum PostCategory { - 전체, 자유, 질문 -} diff --git a/src/main/java/com/example/solidconnection/util/RedisUtils.java b/src/main/java/com/example/solidconnection/util/RedisUtils.java index ed67acac0..6f11eedfa 100644 --- a/src/main/java/com/example/solidconnection/util/RedisUtils.java +++ b/src/main/java/com/example/solidconnection/util/RedisUtils.java @@ -11,10 +11,10 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.example.solidconnection.type.RedisConstants.CREATE_LOCK_PREFIX; -import static com.example.solidconnection.type.RedisConstants.REFRESH_LOCK_PREFIX; -import static com.example.solidconnection.type.RedisConstants.VALIDATE_VIEW_COUNT_KEY_PREFIX; -import static com.example.solidconnection.type.RedisConstants.VIEW_COUNT_KEY_PREFIX; +import static com.example.solidconnection.community.post.service.RedisConstants.CREATE_LOCK_PREFIX; +import static com.example.solidconnection.community.post.service.RedisConstants.REFRESH_LOCK_PREFIX; +import static com.example.solidconnection.community.post.service.RedisConstants.VALIDATE_VIEW_COUNT_KEY_PREFIX; +import static com.example.solidconnection.community.post.service.RedisConstants.VIEW_COUNT_KEY_PREFIX; @Component public class RedisUtils { diff --git a/src/test/java/com/example/solidconnection/community/comment/service/CommentServiceTest.java b/src/test/java/com/example/solidconnection/community/comment/service/CommentServiceTest.java index ee74bb90b..318d4427a 100644 --- a/src/test/java/com/example/solidconnection/community/comment/service/CommentServiceTest.java +++ b/src/test/java/com/example/solidconnection/community/comment/service/CommentServiceTest.java @@ -14,7 +14,7 @@ import com.example.solidconnection.custom.exception.CustomException; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.support.integration.BaseIntegrationTest; -import com.example.solidconnection.type.PostCategory; +import com.example.solidconnection.community.post.domain.PostCategory; import jakarta.transaction.Transactional; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/src/test/java/com/example/solidconnection/community/post/service/PostCommandServiceTest.java b/src/test/java/com/example/solidconnection/community/post/service/PostCommandServiceTest.java index d3931008a..65b935cf9 100644 --- a/src/test/java/com/example/solidconnection/community/post/service/PostCommandServiceTest.java +++ b/src/test/java/com/example/solidconnection/community/post/service/PostCommandServiceTest.java @@ -18,7 +18,7 @@ import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.integration.BaseIntegrationTest; import com.example.solidconnection.type.ImgType; -import com.example.solidconnection.type.PostCategory; +import com.example.solidconnection.community.post.domain.PostCategory; import com.example.solidconnection.util.RedisUtils; import jakarta.transaction.Transactional; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/com/example/solidconnection/community/post/service/PostLikeServiceTest.java b/src/test/java/com/example/solidconnection/community/post/service/PostLikeServiceTest.java index 30026e46a..3770daafc 100644 --- a/src/test/java/com/example/solidconnection/community/post/service/PostLikeServiceTest.java +++ b/src/test/java/com/example/solidconnection/community/post/service/PostLikeServiceTest.java @@ -10,8 +10,7 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.integration.BaseIntegrationTest; -import com.example.solidconnection.type.PostCategory; -import org.junit.jupiter.api.BeforeEach; +import com.example.solidconnection.community.post.domain.PostCategory; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/example/solidconnection/community/post/service/PostQueryServiceTest.java b/src/test/java/com/example/solidconnection/community/post/service/PostQueryServiceTest.java index 67212e014..1e61d2539 100644 --- a/src/test/java/com/example/solidconnection/community/post/service/PostQueryServiceTest.java +++ b/src/test/java/com/example/solidconnection/community/post/service/PostQueryServiceTest.java @@ -15,8 +15,8 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.integration.BaseIntegrationTest; -import com.example.solidconnection.type.BoardCode; -import com.example.solidconnection.type.PostCategory; +import com.example.solidconnection.community.board.domain.BoardCode; +import com.example.solidconnection.community.post.domain.PostCategory; import com.example.solidconnection.util.RedisUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/example/solidconnection/concurrency/PostLikeCountConcurrencyTest.java b/src/test/java/com/example/solidconnection/concurrency/PostLikeCountConcurrencyTest.java index 4f2ddf687..53b4311e8 100644 --- a/src/test/java/com/example/solidconnection/concurrency/PostLikeCountConcurrencyTest.java +++ b/src/test/java/com/example/solidconnection/concurrency/PostLikeCountConcurrencyTest.java @@ -9,7 +9,7 @@ import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.TestContainerSpringBootTest; -import com.example.solidconnection.type.PostCategory; +import com.example.solidconnection.community.post.domain.PostCategory; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/example/solidconnection/concurrency/PostViewCountConcurrencyTest.java b/src/test/java/com/example/solidconnection/concurrency/PostViewCountConcurrencyTest.java index 6c1a0e18f..09b001b98 100644 --- a/src/test/java/com/example/solidconnection/concurrency/PostViewCountConcurrencyTest.java +++ b/src/test/java/com/example/solidconnection/concurrency/PostViewCountConcurrencyTest.java @@ -8,8 +8,8 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.TestContainerSpringBootTest; -import com.example.solidconnection.type.PostCategory; -import com.example.solidconnection.util.RedisUtils; +import com.example.solidconnection.community.post.domain.PostCategory; +\import com.example.solidconnection.util.RedisUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -21,7 +21,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import static com.example.solidconnection.type.RedisConstants.VALIDATE_VIEW_COUNT_TTL; +import static com.example.solidconnection.community.post.service.RedisConstants.*; import static org.junit.jupiter.api.Assertions.assertEquals; @TestContainerSpringBootTest diff --git a/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java b/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java index 05b101985..6f31db1fa 100644 --- a/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java +++ b/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java @@ -23,7 +23,7 @@ import com.example.solidconnection.support.DatabaseClearExtension; import com.example.solidconnection.support.TestContainerSpringBootTest; import com.example.solidconnection.type.LanguageTestType; -import com.example.solidconnection.type.PostCategory; +import com.example.solidconnection.community.post.domain.PostCategory; import com.example.solidconnection.type.PreparationStatus; import com.example.solidconnection.type.Role; import com.example.solidconnection.type.VerifyStatus; @@ -41,10 +41,10 @@ import java.util.HashSet; import java.util.List; -import static com.example.solidconnection.type.BoardCode.AMERICAS; -import static com.example.solidconnection.type.BoardCode.ASIA; -import static com.example.solidconnection.type.BoardCode.EUROPE; -import static com.example.solidconnection.type.BoardCode.FREE; +import static com.example.solidconnection.community.board.domain.BoardCode.AMERICAS; +import static com.example.solidconnection.community.board.domain.BoardCode.ASIA; +import static com.example.solidconnection.community.board.domain.BoardCode.EUROPE; +import static com.example.solidconnection.community.board.domain.BoardCode.FREE; import static com.example.solidconnection.type.SemesterAvailableForDispatch.ONE_SEMESTER; import static com.example.solidconnection.type.TuitionFeeType.HOME_UNIVERSITY_PAYMENT; From 29bf1b8629a323f99a44c64aa642073c74563f38 Mon Sep 17 00:00:00 2001 From: nayonsoso Date: Fri, 16 May 2025 21:32:31 +0900 Subject: [PATCH 02/15] =?UTF-8?q?refactor:=20s3=20=EA=B4=80=EB=A0=A8=20Typ?= =?UTF-8?q?e=20=ED=81=B4=EB=9E=98=EC=8A=A4=20=ED=8C=A8=ED=82=A4=EC=A7=80?= =?UTF-8?q?=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ImgType을 s3로 --- .../community/post/service/PostCommandService.java | 2 +- .../com/example/solidconnection/{type => s3}/ImgType.java | 2 +- .../java/com/example/solidconnection/s3/S3Controller.java | 1 - src/main/java/com/example/solidconnection/s3/S3Service.java | 1 - .../example/solidconnection/score/service/ScoreService.java | 2 +- .../solidconnection/siteuser/service/MyPageService.java | 2 +- .../community/post/service/PostCommandServiceTest.java | 2 +- .../solidconnection/score/service/ScoreServiceTest.java | 2 +- .../solidconnection/siteuser/service/MyPageServiceTest.java | 5 +++-- 9 files changed, 9 insertions(+), 10 deletions(-) rename src/main/java/com/example/solidconnection/{type => s3}/ImgType.java (84%) diff --git a/src/main/java/com/example/solidconnection/community/post/service/PostCommandService.java b/src/main/java/com/example/solidconnection/community/post/service/PostCommandService.java index bf9fe00df..7a5a69ce1 100644 --- a/src/main/java/com/example/solidconnection/community/post/service/PostCommandService.java +++ b/src/main/java/com/example/solidconnection/community/post/service/PostCommandService.java @@ -16,7 +16,7 @@ import com.example.solidconnection.service.RedisService; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; -import com.example.solidconnection.type.ImgType; +import com.example.solidconnection.s3.ImgType; import com.example.solidconnection.community.post.domain.PostCategory; import com.example.solidconnection.util.RedisUtils; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/solidconnection/type/ImgType.java b/src/main/java/com/example/solidconnection/s3/ImgType.java similarity index 84% rename from src/main/java/com/example/solidconnection/type/ImgType.java rename to src/main/java/com/example/solidconnection/s3/ImgType.java index 45eb516bb..130b1a114 100644 --- a/src/main/java/com/example/solidconnection/type/ImgType.java +++ b/src/main/java/com/example/solidconnection/s3/ImgType.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.type; +package com.example.solidconnection.s3; import lombok.Getter; diff --git a/src/main/java/com/example/solidconnection/s3/S3Controller.java b/src/main/java/com/example/solidconnection/s3/S3Controller.java index 26f9160c0..32709fc71 100644 --- a/src/main/java/com/example/solidconnection/s3/S3Controller.java +++ b/src/main/java/com/example/solidconnection/s3/S3Controller.java @@ -2,7 +2,6 @@ import com.example.solidconnection.custom.resolver.AuthorizedUser; import com.example.solidconnection.siteuser.domain.SiteUser; -import com.example.solidconnection.type.ImgType; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/com/example/solidconnection/s3/S3Service.java b/src/main/java/com/example/solidconnection/s3/S3Service.java index 2f3c633dd..03e591e73 100644 --- a/src/main/java/com/example/solidconnection/s3/S3Service.java +++ b/src/main/java/com/example/solidconnection/s3/S3Service.java @@ -7,7 +7,6 @@ import com.example.solidconnection.custom.exception.CustomException; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; -import com.example.solidconnection.type.ImgType; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/example/solidconnection/score/service/ScoreService.java b/src/main/java/com/example/solidconnection/score/service/ScoreService.java index eb00a14e9..b8c0653df 100644 --- a/src/main/java/com/example/solidconnection/score/service/ScoreService.java +++ b/src/main/java/com/example/solidconnection/score/service/ScoreService.java @@ -17,7 +17,7 @@ import com.example.solidconnection.score.repository.LanguageTestScoreRepository; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; -import com.example.solidconnection.type.ImgType; +import com.example.solidconnection.s3.ImgType; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/example/solidconnection/siteuser/service/MyPageService.java b/src/main/java/com/example/solidconnection/siteuser/service/MyPageService.java index e89c6cdfa..1fe56a3c0 100644 --- a/src/main/java/com/example/solidconnection/siteuser/service/MyPageService.java +++ b/src/main/java/com/example/solidconnection/siteuser/service/MyPageService.java @@ -7,7 +7,7 @@ import com.example.solidconnection.siteuser.dto.MyPageResponse; import com.example.solidconnection.siteuser.repository.LikedUniversityRepository; import com.example.solidconnection.siteuser.repository.SiteUserRepository; -import com.example.solidconnection.type.ImgType; +import com.example.solidconnection.s3.ImgType; import com.example.solidconnection.university.domain.LikedUniversity; import com.example.solidconnection.university.dto.UniversityInfoForApplyPreviewResponse; import lombok.RequiredArgsConstructor; diff --git a/src/test/java/com/example/solidconnection/community/post/service/PostCommandServiceTest.java b/src/test/java/com/example/solidconnection/community/post/service/PostCommandServiceTest.java index 65b935cf9..7c69416ba 100644 --- a/src/test/java/com/example/solidconnection/community/post/service/PostCommandServiceTest.java +++ b/src/test/java/com/example/solidconnection/community/post/service/PostCommandServiceTest.java @@ -17,7 +17,7 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.integration.BaseIntegrationTest; -import com.example.solidconnection.type.ImgType; +import com.example.solidconnection.s3.ImgType; import com.example.solidconnection.community.post.domain.PostCategory; import com.example.solidconnection.util.RedisUtils; import jakarta.transaction.Transactional; diff --git a/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java b/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java index 27ed7a617..96b46bafb 100644 --- a/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java @@ -18,7 +18,7 @@ import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.integration.BaseIntegrationTest; -import com.example.solidconnection.type.ImgType; +import com.example.solidconnection.s3.ImgType; import com.example.solidconnection.type.LanguageTestType; import com.example.solidconnection.type.VerifyStatus; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/com/example/solidconnection/siteuser/service/MyPageServiceTest.java b/src/test/java/com/example/solidconnection/siteuser/service/MyPageServiceTest.java index 1c5680d33..a659e3d6a 100644 --- a/src/test/java/com/example/solidconnection/siteuser/service/MyPageServiceTest.java +++ b/src/test/java/com/example/solidconnection/siteuser/service/MyPageServiceTest.java @@ -10,8 +10,9 @@ import com.example.solidconnection.siteuser.fixture.SiteUserFixtureBuilder; import com.example.solidconnection.siteuser.repository.LikedUniversityRepository; import com.example.solidconnection.siteuser.repository.SiteUserRepository; -import com.example.solidconnection.support.TestContainerSpringBootTest; -import com.example.solidconnection.type.ImgType; +import com.example.solidconnection.support.integration.BaseIntegrationTest; +import com.example.solidconnection.s3.ImgType; +import com.example.solidconnection.type.PreparationStatus; import com.example.solidconnection.type.Role; import com.example.solidconnection.university.domain.LikedUniversity; import com.example.solidconnection.university.dto.UniversityInfoForApplyPreviewResponse; From 29aaeae860c4167ea27205ac29534b63a3b253ca Mon Sep 17 00:00:00 2001 From: nayonsoso Date: Fri, 16 May 2025 21:34:26 +0900 Subject: [PATCH 03/15] =?UTF-8?q?refactor:=20university=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20Type=20=ED=81=B4=EB=9E=98=EC=8A=A4=20=ED=8C=A8?= =?UTF-8?q?=ED=82=A4=EC=A7=80=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - LanguageTestType, SemesterAvailableForDispatch, TuitionFeeType을 university.domain 으로 --- .../solidconnection/admin/dto/LanguageTestResponse.java | 2 +- .../admin/dto/LanguageTestScoreResponse.java | 2 +- .../admin/dto/LanguageTestScoreUpdateRequest.java | 2 +- .../solidconnection/application/domain/LanguageTest.java | 2 +- .../solidconnection/application/dto/ApplicantResponse.java | 2 +- .../solidconnection/score/dto/LanguageTestResponse.java | 2 +- .../solidconnection/score/dto/LanguageTestScoreRequest.java | 2 +- .../score/repository/LanguageTestScoreRepository.java | 2 +- .../university/controller/UniversityController.java | 2 +- .../university/domain/LanguageRequirement.java | 1 - .../{type => university/domain}/LanguageTestType.java | 2 +- .../domain}/SemesterAvailableForDispatch.java | 2 +- .../{type => university/domain}/TuitionFeeType.java | 2 +- .../university/domain/UniversityInfoForApply.java | 2 -- .../university/dto/LanguageRequirementResponse.java | 2 +- .../repository/LanguageRequirementRepository.java | 2 +- .../repository/custom/UniversityFilterRepository.java | 2 +- .../repository/custom/UniversityFilterRepositoryImpl.java | 2 +- .../university/service/UniversityQueryService.java | 2 +- .../admin/service/AdminLanguageTestScoreServiceTest.java | 2 +- .../application/service/ApplicationQueryServiceTest.java | 2 +- .../service/ApplicationSubmissionServiceTest.java | 2 +- .../validation/validator/RejectedReasonValidatorTest.java | 2 +- .../solidconnection/score/service/ScoreServiceTest.java | 4 +++- .../support/integration/BaseIntegrationTest.java | 6 +++--- .../university/fixture/LanguageRequirementFixture.java | 2 +- .../fixture/LanguageRequirementFixtureBuilder.java | 2 +- .../university/fixture/UniversityFixtureBuilder.java | 4 ++-- .../fixture/UniversityInfoForApplyFixtureBuilder.java | 4 ++-- .../university/service/UniversityLikeServiceTest.java | 2 ++ .../university/service/UniversityQueryServiceTest.java | 6 +++--- 31 files changed, 38 insertions(+), 37 deletions(-) rename src/main/java/com/example/solidconnection/{type => university/domain}/LanguageTestType.java (96%) rename src/main/java/com/example/solidconnection/{type => university/domain}/SemesterAvailableForDispatch.java (90%) rename src/main/java/com/example/solidconnection/{type => university/domain}/TuitionFeeType.java (87%) diff --git a/src/main/java/com/example/solidconnection/admin/dto/LanguageTestResponse.java b/src/main/java/com/example/solidconnection/admin/dto/LanguageTestResponse.java index c91fc68c3..257b8fd6f 100644 --- a/src/main/java/com/example/solidconnection/admin/dto/LanguageTestResponse.java +++ b/src/main/java/com/example/solidconnection/admin/dto/LanguageTestResponse.java @@ -1,6 +1,6 @@ package com.example.solidconnection.admin.dto; -import com.example.solidconnection.type.LanguageTestType; +import com.example.solidconnection.university.domain.LanguageTestType; public record LanguageTestResponse( LanguageTestType languageTestType, diff --git a/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreResponse.java b/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreResponse.java index aee435c9c..8689ea7ce 100644 --- a/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreResponse.java +++ b/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreResponse.java @@ -1,7 +1,7 @@ package com.example.solidconnection.admin.dto; import com.example.solidconnection.score.domain.LanguageTestScore; -import com.example.solidconnection.type.LanguageTestType; +import com.example.solidconnection.university.domain.LanguageTestType; import com.example.solidconnection.type.VerifyStatus; public record LanguageTestScoreResponse( diff --git a/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreUpdateRequest.java b/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreUpdateRequest.java index 3e76e0c93..cbc426fce 100644 --- a/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreUpdateRequest.java +++ b/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreUpdateRequest.java @@ -1,7 +1,7 @@ package com.example.solidconnection.admin.dto; import com.example.solidconnection.custom.validation.annotation.RejectedReasonRequired; -import com.example.solidconnection.type.LanguageTestType; +import com.example.solidconnection.university.domain.LanguageTestType; import com.example.solidconnection.type.VerifyStatus; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/example/solidconnection/application/domain/LanguageTest.java b/src/main/java/com/example/solidconnection/application/domain/LanguageTest.java index 4295372d4..4a0544ea7 100644 --- a/src/main/java/com/example/solidconnection/application/domain/LanguageTest.java +++ b/src/main/java/com/example/solidconnection/application/domain/LanguageTest.java @@ -1,6 +1,6 @@ package com.example.solidconnection.application.domain; -import com.example.solidconnection.type.LanguageTestType; +import com.example.solidconnection.university.domain.LanguageTestType; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; import jakarta.persistence.EnumType; diff --git a/src/main/java/com/example/solidconnection/application/dto/ApplicantResponse.java b/src/main/java/com/example/solidconnection/application/dto/ApplicantResponse.java index 9835491b1..c6161a134 100644 --- a/src/main/java/com/example/solidconnection/application/dto/ApplicantResponse.java +++ b/src/main/java/com/example/solidconnection/application/dto/ApplicantResponse.java @@ -1,7 +1,7 @@ package com.example.solidconnection.application.dto; import com.example.solidconnection.application.domain.Application; -import com.example.solidconnection.type.LanguageTestType; +import com.example.solidconnection.university.domain.LanguageTestType; public record ApplicantResponse( String nicknameForApply, diff --git a/src/main/java/com/example/solidconnection/score/dto/LanguageTestResponse.java b/src/main/java/com/example/solidconnection/score/dto/LanguageTestResponse.java index 060574f46..2368e18c7 100644 --- a/src/main/java/com/example/solidconnection/score/dto/LanguageTestResponse.java +++ b/src/main/java/com/example/solidconnection/score/dto/LanguageTestResponse.java @@ -1,7 +1,7 @@ package com.example.solidconnection.score.dto; import com.example.solidconnection.application.domain.LanguageTest; -import com.example.solidconnection.type.LanguageTestType; +import com.example.solidconnection.university.domain.LanguageTestType; public record LanguageTestResponse( LanguageTestType languageTestType, diff --git a/src/main/java/com/example/solidconnection/score/dto/LanguageTestScoreRequest.java b/src/main/java/com/example/solidconnection/score/dto/LanguageTestScoreRequest.java index e49af4369..6173e8f00 100644 --- a/src/main/java/com/example/solidconnection/score/dto/LanguageTestScoreRequest.java +++ b/src/main/java/com/example/solidconnection/score/dto/LanguageTestScoreRequest.java @@ -1,6 +1,6 @@ package com.example.solidconnection.score.dto; -import com.example.solidconnection.type.LanguageTestType; +import com.example.solidconnection.university.domain.LanguageTestType; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/example/solidconnection/score/repository/LanguageTestScoreRepository.java b/src/main/java/com/example/solidconnection/score/repository/LanguageTestScoreRepository.java index 5bef377cf..1934a0612 100644 --- a/src/main/java/com/example/solidconnection/score/repository/LanguageTestScoreRepository.java +++ b/src/main/java/com/example/solidconnection/score/repository/LanguageTestScoreRepository.java @@ -3,7 +3,7 @@ import com.example.solidconnection.score.domain.LanguageTestScore; import com.example.solidconnection.score.repository.custom.LanguageTestScoreFilterRepository; import com.example.solidconnection.siteuser.domain.SiteUser; -import com.example.solidconnection.type.LanguageTestType; +import com.example.solidconnection.university.domain.LanguageTestType; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/solidconnection/university/controller/UniversityController.java b/src/main/java/com/example/solidconnection/university/controller/UniversityController.java index 635693d4c..1b1c3bc08 100644 --- a/src/main/java/com/example/solidconnection/university/controller/UniversityController.java +++ b/src/main/java/com/example/solidconnection/university/controller/UniversityController.java @@ -3,7 +3,7 @@ import com.example.solidconnection.custom.resolver.AuthorizedUser; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.service.MyPageService; -import com.example.solidconnection.type.LanguageTestType; +import com.example.solidconnection.university.domain.LanguageTestType; import com.example.solidconnection.university.dto.IsLikeResponse; import com.example.solidconnection.university.dto.LikeResultResponse; import com.example.solidconnection.university.dto.UniversityDetailResponse; diff --git a/src/main/java/com/example/solidconnection/university/domain/LanguageRequirement.java b/src/main/java/com/example/solidconnection/university/domain/LanguageRequirement.java index 508c7531e..55377131b 100644 --- a/src/main/java/com/example/solidconnection/university/domain/LanguageRequirement.java +++ b/src/main/java/com/example/solidconnection/university/domain/LanguageRequirement.java @@ -1,6 +1,5 @@ package com.example.solidconnection.university.domain; -import com.example.solidconnection.type.LanguageTestType; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; diff --git a/src/main/java/com/example/solidconnection/type/LanguageTestType.java b/src/main/java/com/example/solidconnection/university/domain/LanguageTestType.java similarity index 96% rename from src/main/java/com/example/solidconnection/type/LanguageTestType.java rename to src/main/java/com/example/solidconnection/university/domain/LanguageTestType.java index 29082c98e..f220ac3d3 100644 --- a/src/main/java/com/example/solidconnection/type/LanguageTestType.java +++ b/src/main/java/com/example/solidconnection/university/domain/LanguageTestType.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.type; +package com.example.solidconnection.university.domain; import java.util.Comparator; diff --git a/src/main/java/com/example/solidconnection/type/SemesterAvailableForDispatch.java b/src/main/java/com/example/solidconnection/university/domain/SemesterAvailableForDispatch.java similarity index 90% rename from src/main/java/com/example/solidconnection/type/SemesterAvailableForDispatch.java rename to src/main/java/com/example/solidconnection/university/domain/SemesterAvailableForDispatch.java index 2a04805d6..9d44ecd8c 100644 --- a/src/main/java/com/example/solidconnection/type/SemesterAvailableForDispatch.java +++ b/src/main/java/com/example/solidconnection/university/domain/SemesterAvailableForDispatch.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.type; +package com.example.solidconnection.university.domain; public enum SemesterAvailableForDispatch { ONE_SEMESTER("1개학기"), diff --git a/src/main/java/com/example/solidconnection/type/TuitionFeeType.java b/src/main/java/com/example/solidconnection/university/domain/TuitionFeeType.java similarity index 87% rename from src/main/java/com/example/solidconnection/type/TuitionFeeType.java rename to src/main/java/com/example/solidconnection/university/domain/TuitionFeeType.java index 21ab6700e..c7abc09e1 100644 --- a/src/main/java/com/example/solidconnection/type/TuitionFeeType.java +++ b/src/main/java/com/example/solidconnection/university/domain/TuitionFeeType.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.type; +package com.example.solidconnection.university.domain; public enum TuitionFeeType { HOME_UNIVERSITY_PAYMENT("본교등록금납부형"), diff --git a/src/main/java/com/example/solidconnection/university/domain/UniversityInfoForApply.java b/src/main/java/com/example/solidconnection/university/domain/UniversityInfoForApply.java index e1a87fe83..c968a3a1a 100644 --- a/src/main/java/com/example/solidconnection/university/domain/UniversityInfoForApply.java +++ b/src/main/java/com/example/solidconnection/university/domain/UniversityInfoForApply.java @@ -1,7 +1,5 @@ package com.example.solidconnection.university.domain; -import com.example.solidconnection.type.SemesterAvailableForDispatch; -import com.example.solidconnection.type.TuitionFeeType; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; diff --git a/src/main/java/com/example/solidconnection/university/dto/LanguageRequirementResponse.java b/src/main/java/com/example/solidconnection/university/dto/LanguageRequirementResponse.java index 8cc7b9733..0e4ec109d 100644 --- a/src/main/java/com/example/solidconnection/university/dto/LanguageRequirementResponse.java +++ b/src/main/java/com/example/solidconnection/university/dto/LanguageRequirementResponse.java @@ -1,6 +1,6 @@ package com.example.solidconnection.university.dto; -import com.example.solidconnection.type.LanguageTestType; +import com.example.solidconnection.university.domain.LanguageTestType; import com.example.solidconnection.university.domain.LanguageRequirement; public record LanguageRequirementResponse( diff --git a/src/main/java/com/example/solidconnection/university/repository/LanguageRequirementRepository.java b/src/main/java/com/example/solidconnection/university/repository/LanguageRequirementRepository.java index 4cbebc6f5..b50da842d 100644 --- a/src/main/java/com/example/solidconnection/university/repository/LanguageRequirementRepository.java +++ b/src/main/java/com/example/solidconnection/university/repository/LanguageRequirementRepository.java @@ -1,6 +1,6 @@ package com.example.solidconnection.university.repository; -import com.example.solidconnection.type.LanguageTestType; +import com.example.solidconnection.university.domain.LanguageTestType; import com.example.solidconnection.university.domain.LanguageRequirement; import com.example.solidconnection.university.domain.UniversityInfoForApply; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/example/solidconnection/university/repository/custom/UniversityFilterRepository.java b/src/main/java/com/example/solidconnection/university/repository/custom/UniversityFilterRepository.java index 009496be7..c35533877 100644 --- a/src/main/java/com/example/solidconnection/university/repository/custom/UniversityFilterRepository.java +++ b/src/main/java/com/example/solidconnection/university/repository/custom/UniversityFilterRepository.java @@ -1,6 +1,6 @@ package com.example.solidconnection.university.repository.custom; -import com.example.solidconnection.type.LanguageTestType; +import com.example.solidconnection.university.domain.LanguageTestType; import com.example.solidconnection.university.domain.University; import com.example.solidconnection.university.domain.UniversityInfoForApply; diff --git a/src/main/java/com/example/solidconnection/university/repository/custom/UniversityFilterRepositoryImpl.java b/src/main/java/com/example/solidconnection/university/repository/custom/UniversityFilterRepositoryImpl.java index dd84cfbf5..685048a86 100644 --- a/src/main/java/com/example/solidconnection/university/repository/custom/UniversityFilterRepositoryImpl.java +++ b/src/main/java/com/example/solidconnection/university/repository/custom/UniversityFilterRepositoryImpl.java @@ -2,7 +2,7 @@ import com.example.solidconnection.entity.QCountry; import com.example.solidconnection.entity.QRegion; -import com.example.solidconnection.type.LanguageTestType; +import com.example.solidconnection.university.domain.LanguageTestType; import com.example.solidconnection.university.domain.QUniversity; import com.example.solidconnection.university.domain.QUniversityInfoForApply; import com.example.solidconnection.university.domain.University; diff --git a/src/main/java/com/example/solidconnection/university/service/UniversityQueryService.java b/src/main/java/com/example/solidconnection/university/service/UniversityQueryService.java index f93f3ffae..e86f5debb 100644 --- a/src/main/java/com/example/solidconnection/university/service/UniversityQueryService.java +++ b/src/main/java/com/example/solidconnection/university/service/UniversityQueryService.java @@ -1,7 +1,7 @@ package com.example.solidconnection.university.service; import com.example.solidconnection.cache.annotation.ThunderingHerdCaching; -import com.example.solidconnection.type.LanguageTestType; +import com.example.solidconnection.university.domain.LanguageTestType; import com.example.solidconnection.university.domain.University; import com.example.solidconnection.university.domain.UniversityInfoForApply; import com.example.solidconnection.university.dto.UniversityDetailResponse; diff --git a/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java b/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java index edf34670b..4fa5470a6 100644 --- a/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java @@ -25,7 +25,7 @@ import java.util.List; import static com.example.solidconnection.custom.exception.ErrorCode.LANGUAGE_TEST_SCORE_NOT_FOUND; -import static com.example.solidconnection.type.LanguageTestType.TOEIC; +import static com.example.solidconnection.university.domain.LanguageTestType.TOEIC; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatCode; import static org.junit.jupiter.api.Assertions.assertAll; diff --git a/src/test/java/com/example/solidconnection/application/service/ApplicationQueryServiceTest.java b/src/test/java/com/example/solidconnection/application/service/ApplicationQueryServiceTest.java index 583c31d80..c1f97df18 100644 --- a/src/test/java/com/example/solidconnection/application/service/ApplicationQueryServiceTest.java +++ b/src/test/java/com/example/solidconnection/application/service/ApplicationQueryServiceTest.java @@ -13,7 +13,7 @@ import com.example.solidconnection.score.repository.LanguageTestScoreRepository; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.support.integration.BaseIntegrationTest; -import com.example.solidconnection.type.LanguageTestType; +import com.example.solidconnection.university.domain.LanguageTestType; import com.example.solidconnection.type.VerifyStatus; import com.example.solidconnection.university.domain.UniversityInfoForApply; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/example/solidconnection/application/service/ApplicationSubmissionServiceTest.java b/src/test/java/com/example/solidconnection/application/service/ApplicationSubmissionServiceTest.java index f4f442840..622f516f6 100644 --- a/src/test/java/com/example/solidconnection/application/service/ApplicationSubmissionServiceTest.java +++ b/src/test/java/com/example/solidconnection/application/service/ApplicationSubmissionServiceTest.java @@ -14,7 +14,7 @@ import com.example.solidconnection.score.repository.LanguageTestScoreRepository; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.support.integration.BaseIntegrationTest; -import com.example.solidconnection.type.LanguageTestType; +import com.example.solidconnection.university.domain.LanguageTestType; import com.example.solidconnection.type.VerifyStatus; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/example/solidconnection/custom/validation/validator/RejectedReasonValidatorTest.java b/src/test/java/com/example/solidconnection/custom/validation/validator/RejectedReasonValidatorTest.java index 5af4e8399..bdf3b9570 100644 --- a/src/test/java/com/example/solidconnection/custom/validation/validator/RejectedReasonValidatorTest.java +++ b/src/test/java/com/example/solidconnection/custom/validation/validator/RejectedReasonValidatorTest.java @@ -2,7 +2,7 @@ import com.example.solidconnection.admin.dto.GpaScoreUpdateRequest; import com.example.solidconnection.admin.dto.LanguageTestScoreUpdateRequest; -import com.example.solidconnection.type.LanguageTestType; +import com.example.solidconnection.university.domain.LanguageTestType; import com.example.solidconnection.type.VerifyStatus; import jakarta.validation.ConstraintViolation; import jakarta.validation.Validation; diff --git a/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java b/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java index 96b46bafb..3569c132f 100644 --- a/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java @@ -19,7 +19,9 @@ import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.integration.BaseIntegrationTest; import com.example.solidconnection.s3.ImgType; -import com.example.solidconnection.type.LanguageTestType; +import com.example.solidconnection.university.domain.LanguageTestType; +import com.example.solidconnection.type.PreparationStatus; +import com.example.solidconnection.type.Role; import com.example.solidconnection.type.VerifyStatus; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java b/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java index 6f31db1fa..fddf7cacd 100644 --- a/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java +++ b/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java @@ -22,7 +22,7 @@ import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.DatabaseClearExtension; import com.example.solidconnection.support.TestContainerSpringBootTest; -import com.example.solidconnection.type.LanguageTestType; +import com.example.solidconnection.university.domain.LanguageTestType; import com.example.solidconnection.community.post.domain.PostCategory; import com.example.solidconnection.type.PreparationStatus; import com.example.solidconnection.type.Role; @@ -45,8 +45,8 @@ import static com.example.solidconnection.community.board.domain.BoardCode.ASIA; import static com.example.solidconnection.community.board.domain.BoardCode.EUROPE; import static com.example.solidconnection.community.board.domain.BoardCode.FREE; -import static com.example.solidconnection.type.SemesterAvailableForDispatch.ONE_SEMESTER; -import static com.example.solidconnection.type.TuitionFeeType.HOME_UNIVERSITY_PAYMENT; +import static com.example.solidconnection.university.domain.SemesterAvailableForDispatch.ONE_SEMESTER; +import static com.example.solidconnection.university.domain.TuitionFeeType.HOME_UNIVERSITY_PAYMENT; @TestContainerSpringBootTest @ExtendWith(DatabaseClearExtension.class) diff --git a/src/test/java/com/example/solidconnection/university/fixture/LanguageRequirementFixture.java b/src/test/java/com/example/solidconnection/university/fixture/LanguageRequirementFixture.java index ba32c1b27..c97a1427e 100644 --- a/src/test/java/com/example/solidconnection/university/fixture/LanguageRequirementFixture.java +++ b/src/test/java/com/example/solidconnection/university/fixture/LanguageRequirementFixture.java @@ -1,7 +1,7 @@ package com.example.solidconnection.university.fixture; -import com.example.solidconnection.type.LanguageTestType; import com.example.solidconnection.university.domain.LanguageRequirement; +import com.example.solidconnection.university.domain.LanguageTestType; import com.example.solidconnection.university.domain.UniversityInfoForApply; import lombok.RequiredArgsConstructor; import org.springframework.boot.test.context.TestComponent; diff --git a/src/test/java/com/example/solidconnection/university/fixture/LanguageRequirementFixtureBuilder.java b/src/test/java/com/example/solidconnection/university/fixture/LanguageRequirementFixtureBuilder.java index e6f3fd4d5..f72e7caba 100644 --- a/src/test/java/com/example/solidconnection/university/fixture/LanguageRequirementFixtureBuilder.java +++ b/src/test/java/com/example/solidconnection/university/fixture/LanguageRequirementFixtureBuilder.java @@ -1,7 +1,7 @@ package com.example.solidconnection.university.fixture; -import com.example.solidconnection.type.LanguageTestType; import com.example.solidconnection.university.domain.LanguageRequirement; +import com.example.solidconnection.university.domain.LanguageTestType; import com.example.solidconnection.university.domain.UniversityInfoForApply; import com.example.solidconnection.university.repository.LanguageRequirementRepository; import lombok.RequiredArgsConstructor; diff --git a/src/test/java/com/example/solidconnection/university/fixture/UniversityFixtureBuilder.java b/src/test/java/com/example/solidconnection/university/fixture/UniversityFixtureBuilder.java index f51ea9677..4da6cdfd7 100644 --- a/src/test/java/com/example/solidconnection/university/fixture/UniversityFixtureBuilder.java +++ b/src/test/java/com/example/solidconnection/university/fixture/UniversityFixtureBuilder.java @@ -1,7 +1,7 @@ package com.example.solidconnection.university.fixture; -import com.example.solidconnection.entity.Country; -import com.example.solidconnection.entity.Region; +import com.example.solidconnection.location.country.domain.Country; +import com.example.solidconnection.location.region.domain.Region; import com.example.solidconnection.university.domain.University; import com.example.solidconnection.university.repository.UniversityRepository; import lombok.RequiredArgsConstructor; diff --git a/src/test/java/com/example/solidconnection/university/fixture/UniversityInfoForApplyFixtureBuilder.java b/src/test/java/com/example/solidconnection/university/fixture/UniversityInfoForApplyFixtureBuilder.java index 8041bda1e..260a037d9 100644 --- a/src/test/java/com/example/solidconnection/university/fixture/UniversityInfoForApplyFixtureBuilder.java +++ b/src/test/java/com/example/solidconnection/university/fixture/UniversityInfoForApplyFixtureBuilder.java @@ -8,8 +8,8 @@ import java.util.HashSet; -import static com.example.solidconnection.type.SemesterAvailableForDispatch.ONE_SEMESTER; -import static com.example.solidconnection.type.TuitionFeeType.HOME_UNIVERSITY_PAYMENT; +import static com.example.solidconnection.university.domain.SemesterAvailableForDispatch.ONE_SEMESTER; +import static com.example.solidconnection.university.domain.TuitionFeeType.HOME_UNIVERSITY_PAYMENT; @TestComponent @RequiredArgsConstructor diff --git a/src/test/java/com/example/solidconnection/university/service/UniversityLikeServiceTest.java b/src/test/java/com/example/solidconnection/university/service/UniversityLikeServiceTest.java index 7f970108a..e3ac0efeb 100644 --- a/src/test/java/com/example/solidconnection/university/service/UniversityLikeServiceTest.java +++ b/src/test/java/com/example/solidconnection/university/service/UniversityLikeServiceTest.java @@ -1,6 +1,8 @@ package com.example.solidconnection.university.service; import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.siteuser.repository.LikedUniversityRepository; diff --git a/src/test/java/com/example/solidconnection/university/service/UniversityQueryServiceTest.java b/src/test/java/com/example/solidconnection/university/service/UniversityQueryServiceTest.java index 731ccec5b..aacdfa402 100644 --- a/src/test/java/com/example/solidconnection/university/service/UniversityQueryServiceTest.java +++ b/src/test/java/com/example/solidconnection/university/service/UniversityQueryServiceTest.java @@ -2,13 +2,13 @@ import com.example.solidconnection.custom.exception.CustomException; import com.example.solidconnection.support.TestContainerSpringBootTest; -import com.example.solidconnection.university.fixture.LanguageRequirementFixture; -import com.example.solidconnection.university.fixture.UniversityInfoForApplyFixture; -import com.example.solidconnection.type.LanguageTestType; +import com.example.solidconnection.university.domain.LanguageTestType; import com.example.solidconnection.university.domain.UniversityInfoForApply; import com.example.solidconnection.university.dto.UniversityDetailResponse; import com.example.solidconnection.university.dto.UniversityInfoForApplyPreviewResponse; import com.example.solidconnection.university.dto.UniversityInfoForApplyPreviewResponses; +import com.example.solidconnection.university.fixture.LanguageRequirementFixture; +import com.example.solidconnection.university.fixture.UniversityInfoForApplyFixture; import com.example.solidconnection.university.repository.UniversityInfoForApplyRepository; import com.example.solidconnection.university.repository.custom.UniversityFilterRepository; import org.junit.jupiter.api.DisplayName; From 5e2fb4353d483d260f69478c033069478fd0803a Mon Sep 17 00:00:00 2001 From: nayonsoso Date: Fri, 16 May 2025 21:37:11 +0900 Subject: [PATCH 04/15] =?UTF-8?q?refactor:=20siteUser=20=EA=B4=80=EB=A0=A8?= =?UTF-8?q?=20Type=20=ED=81=B4=EB=9E=98=EC=8A=A4=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - PreparationStatus, Role을 siteuser.domain 로 --- .../com/example/solidconnection/auth/dto/SignUpRequest.java | 4 ++-- .../config/security/SecurityConfiguration.java | 2 +- .../custom/security/aspect/AdminAuthorizationAspect.java | 2 +- .../custom/security/userdetails/SecurityRoleMapper.java | 2 +- .../{type => siteuser/domain}/PreparationStatus.java | 2 +- .../solidconnection/{type => siteuser/domain}/Role.java | 2 +- .../example/solidconnection/siteuser/domain/SiteUser.java | 2 -- .../example/solidconnection/siteuser/dto/MyPageResponse.java | 2 +- .../admin/service/AdminGpaScoreServiceTest.java | 2 ++ .../admin/service/AdminLanguageTestScoreServiceTest.java | 2 ++ .../solidconnection/auth/service/AuthServiceTest.java | 2 ++ .../solidconnection/auth/service/EmailSignInServiceTest.java | 2 ++ .../solidconnection/auth/service/SignInServiceTest.java | 2 ++ .../concurrency/PostLikeCountConcurrencyTest.java | 2 ++ .../concurrency/PostViewCountConcurrencyTest.java | 5 ++++- .../solidconnection/concurrency/ThunderingHerdTest.java | 2 ++ .../custom/resolver/AuthorizedUserResolverTest.java | 2 ++ .../custom/security/aspect/AdminAuthorizationAspectTest.java | 2 ++ .../security/authentication/SiteUserAuthenticationTest.java | 4 ++-- .../provider/SiteUserAuthenticationProviderTest.java | 2 ++ .../security/userdetails/SiteUserDetailsServiceTest.java | 2 ++ .../custom/security/userdetails/SiteUserDetailsTest.java | 2 ++ .../java/com/example/solidconnection/e2e/DynamicFixture.java | 4 ++-- .../solidconnection/score/service/ScoreServiceTest.java | 4 ++-- .../siteuser/repository/SiteUserRepositoryTest.java | 4 ++-- .../solidconnection/siteuser/service/MyPageServiceTest.java | 4 ++-- .../siteuser/service/SiteUserServiceTest.java | 4 ++++ .../support/integration/BaseIntegrationTest.java | 4 ++-- 28 files changed, 52 insertions(+), 23 deletions(-) rename src/main/java/com/example/solidconnection/{type => siteuser/domain}/PreparationStatus.java (83%) rename src/main/java/com/example/solidconnection/{type => siteuser/domain}/Role.java (52%) diff --git a/src/main/java/com/example/solidconnection/auth/dto/SignUpRequest.java b/src/main/java/com/example/solidconnection/auth/dto/SignUpRequest.java index 9bf92a295..d96067741 100644 --- a/src/main/java/com/example/solidconnection/auth/dto/SignUpRequest.java +++ b/src/main/java/com/example/solidconnection/auth/dto/SignUpRequest.java @@ -2,8 +2,8 @@ import com.example.solidconnection.siteuser.domain.AuthType; import com.example.solidconnection.siteuser.domain.SiteUser; -import com.example.solidconnection.type.PreparationStatus; -import com.example.solidconnection.type.Role; +import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.Role; import jakarta.validation.constraints.NotBlank; import java.util.List; diff --git a/src/main/java/com/example/solidconnection/config/security/SecurityConfiguration.java b/src/main/java/com/example/solidconnection/config/security/SecurityConfiguration.java index 1d0b110bb..b00b6feb6 100644 --- a/src/main/java/com/example/solidconnection/config/security/SecurityConfiguration.java +++ b/src/main/java/com/example/solidconnection/config/security/SecurityConfiguration.java @@ -20,7 +20,7 @@ import org.springframework.web.cors.CorsConfigurationSource; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; -import static com.example.solidconnection.type.Role.ADMIN; +import static com.example.solidconnection.siteuser.domain.Role.ADMIN; @Configuration @EnableWebSecurity diff --git a/src/main/java/com/example/solidconnection/custom/security/aspect/AdminAuthorizationAspect.java b/src/main/java/com/example/solidconnection/custom/security/aspect/AdminAuthorizationAspect.java index 20e8c27c8..03cd5bedb 100644 --- a/src/main/java/com/example/solidconnection/custom/security/aspect/AdminAuthorizationAspect.java +++ b/src/main/java/com/example/solidconnection/custom/security/aspect/AdminAuthorizationAspect.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Component; import static com.example.solidconnection.custom.exception.ErrorCode.ACCESS_DENIED; -import static com.example.solidconnection.type.Role.ADMIN; +import static com.example.solidconnection.siteuser.domain.Role.ADMIN; @Aspect @Component diff --git a/src/main/java/com/example/solidconnection/custom/security/userdetails/SecurityRoleMapper.java b/src/main/java/com/example/solidconnection/custom/security/userdetails/SecurityRoleMapper.java index 3af238f13..1132df5dc 100644 --- a/src/main/java/com/example/solidconnection/custom/security/userdetails/SecurityRoleMapper.java +++ b/src/main/java/com/example/solidconnection/custom/security/userdetails/SecurityRoleMapper.java @@ -1,6 +1,6 @@ package com.example.solidconnection.custom.security.userdetails; -import com.example.solidconnection.type.Role; +import com.example.solidconnection.siteuser.domain.Role; import org.springframework.security.core.authority.SimpleGrantedAuthority; import java.util.List; diff --git a/src/main/java/com/example/solidconnection/type/PreparationStatus.java b/src/main/java/com/example/solidconnection/siteuser/domain/PreparationStatus.java similarity index 83% rename from src/main/java/com/example/solidconnection/type/PreparationStatus.java rename to src/main/java/com/example/solidconnection/siteuser/domain/PreparationStatus.java index c4f1650e9..6f86853c0 100644 --- a/src/main/java/com/example/solidconnection/type/PreparationStatus.java +++ b/src/main/java/com/example/solidconnection/siteuser/domain/PreparationStatus.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.type; +package com.example.solidconnection.siteuser.domain; public enum PreparationStatus { CONSIDERING, // 교환학생 지원 고민 상태 diff --git a/src/main/java/com/example/solidconnection/type/Role.java b/src/main/java/com/example/solidconnection/siteuser/domain/Role.java similarity index 52% rename from src/main/java/com/example/solidconnection/type/Role.java rename to src/main/java/com/example/solidconnection/siteuser/domain/Role.java index 8223e8de0..4ea5bf151 100644 --- a/src/main/java/com/example/solidconnection/type/Role.java +++ b/src/main/java/com/example/solidconnection/siteuser/domain/Role.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.type; +package com.example.solidconnection.siteuser.domain; public enum Role { diff --git a/src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java b/src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java index 21dfbcc13..bcfb1f9ac 100644 --- a/src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java +++ b/src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java @@ -5,8 +5,6 @@ import com.example.solidconnection.community.post.domain.PostLike; import com.example.solidconnection.score.domain.GpaScore; import com.example.solidconnection.score.domain.LanguageTestScore; -import com.example.solidconnection.type.PreparationStatus; -import com.example.solidconnection.type.Role; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/com/example/solidconnection/siteuser/dto/MyPageResponse.java b/src/main/java/com/example/solidconnection/siteuser/dto/MyPageResponse.java index 981866632..50a2702b5 100644 --- a/src/main/java/com/example/solidconnection/siteuser/dto/MyPageResponse.java +++ b/src/main/java/com/example/solidconnection/siteuser/dto/MyPageResponse.java @@ -2,7 +2,7 @@ import com.example.solidconnection.siteuser.domain.AuthType; import com.example.solidconnection.siteuser.domain.SiteUser; -import com.example.solidconnection.type.Role; +import com.example.solidconnection.siteuser.domain.Role; public record MyPageResponse( String nickname, diff --git a/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java b/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java index fc7735d86..b3ce6ac16 100644 --- a/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java @@ -11,6 +11,8 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.integration.BaseIntegrationTest; +import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.type.VerifyStatus; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java b/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java index 4fa5470a6..f533dccc9 100644 --- a/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java @@ -11,6 +11,8 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.integration.BaseIntegrationTest; +import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.type.VerifyStatus; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/example/solidconnection/auth/service/AuthServiceTest.java b/src/test/java/com/example/solidconnection/auth/service/AuthServiceTest.java index cb0ffbb96..a6c1be5c7 100644 --- a/src/test/java/com/example/solidconnection/auth/service/AuthServiceTest.java +++ b/src/test/java/com/example/solidconnection/auth/service/AuthServiceTest.java @@ -4,6 +4,8 @@ import com.example.solidconnection.auth.dto.ReissueRequest; import com.example.solidconnection.auth.dto.ReissueResponse; import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.TestContainerSpringBootTest; diff --git a/src/test/java/com/example/solidconnection/auth/service/EmailSignInServiceTest.java b/src/test/java/com/example/solidconnection/auth/service/EmailSignInServiceTest.java index 4a98de6ce..80fc64c86 100644 --- a/src/test/java/com/example/solidconnection/auth/service/EmailSignInServiceTest.java +++ b/src/test/java/com/example/solidconnection/auth/service/EmailSignInServiceTest.java @@ -7,6 +7,8 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.TestContainerSpringBootTest; +import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.Role; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/src/test/java/com/example/solidconnection/auth/service/SignInServiceTest.java b/src/test/java/com/example/solidconnection/auth/service/SignInServiceTest.java index 51eee236c..02397733e 100644 --- a/src/test/java/com/example/solidconnection/auth/service/SignInServiceTest.java +++ b/src/test/java/com/example/solidconnection/auth/service/SignInServiceTest.java @@ -6,6 +6,8 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.TestContainerSpringBootTest; +import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.util.JwtUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/example/solidconnection/concurrency/PostLikeCountConcurrencyTest.java b/src/test/java/com/example/solidconnection/concurrency/PostLikeCountConcurrencyTest.java index 53b4311e8..29ade179f 100644 --- a/src/test/java/com/example/solidconnection/concurrency/PostLikeCountConcurrencyTest.java +++ b/src/test/java/com/example/solidconnection/concurrency/PostLikeCountConcurrencyTest.java @@ -10,6 +10,8 @@ import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.TestContainerSpringBootTest; import com.example.solidconnection.community.post.domain.PostCategory; +import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.Role; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/example/solidconnection/concurrency/PostViewCountConcurrencyTest.java b/src/test/java/com/example/solidconnection/concurrency/PostViewCountConcurrencyTest.java index 09b001b98..33036aee4 100644 --- a/src/test/java/com/example/solidconnection/concurrency/PostViewCountConcurrencyTest.java +++ b/src/test/java/com/example/solidconnection/concurrency/PostViewCountConcurrencyTest.java @@ -9,7 +9,10 @@ import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.TestContainerSpringBootTest; import com.example.solidconnection.community.post.domain.PostCategory; -\import com.example.solidconnection.util.RedisUtils; +import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.Role; +import com.example.solidconnection.util.RedisUtils; +import com.example.solidconnection.util.RedisUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/example/solidconnection/concurrency/ThunderingHerdTest.java b/src/test/java/com/example/solidconnection/concurrency/ThunderingHerdTest.java index d2cadca65..95d2fc1ad 100644 --- a/src/test/java/com/example/solidconnection/concurrency/ThunderingHerdTest.java +++ b/src/test/java/com/example/solidconnection/concurrency/ThunderingHerdTest.java @@ -4,6 +4,8 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.TestContainerSpringBootTest; +import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.Role; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/example/solidconnection/custom/resolver/AuthorizedUserResolverTest.java b/src/test/java/com/example/solidconnection/custom/resolver/AuthorizedUserResolverTest.java index e0c1a006f..1922884c9 100644 --- a/src/test/java/com/example/solidconnection/custom/resolver/AuthorizedUserResolverTest.java +++ b/src/test/java/com/example/solidconnection/custom/resolver/AuthorizedUserResolverTest.java @@ -6,6 +6,8 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.TestContainerSpringBootTest; +import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.Role; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/src/test/java/com/example/solidconnection/custom/security/aspect/AdminAuthorizationAspectTest.java b/src/test/java/com/example/solidconnection/custom/security/aspect/AdminAuthorizationAspectTest.java index b733acceb..5f59d8e8f 100644 --- a/src/test/java/com/example/solidconnection/custom/security/aspect/AdminAuthorizationAspectTest.java +++ b/src/test/java/com/example/solidconnection/custom/security/aspect/AdminAuthorizationAspectTest.java @@ -5,6 +5,8 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.TestContainerSpringBootTest; +import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.Role; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/com/example/solidconnection/custom/security/authentication/SiteUserAuthenticationTest.java b/src/test/java/com/example/solidconnection/custom/security/authentication/SiteUserAuthenticationTest.java index 6285727cb..d69501598 100644 --- a/src/test/java/com/example/solidconnection/custom/security/authentication/SiteUserAuthenticationTest.java +++ b/src/test/java/com/example/solidconnection/custom/security/authentication/SiteUserAuthenticationTest.java @@ -2,8 +2,8 @@ import com.example.solidconnection.custom.security.userdetails.SiteUserDetails; import com.example.solidconnection.siteuser.domain.SiteUser; -import com.example.solidconnection.type.PreparationStatus; -import com.example.solidconnection.type.Role; +import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.Role; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/example/solidconnection/custom/security/provider/SiteUserAuthenticationProviderTest.java b/src/test/java/com/example/solidconnection/custom/security/provider/SiteUserAuthenticationProviderTest.java index b8999e3f5..125bc4086 100644 --- a/src/test/java/com/example/solidconnection/custom/security/provider/SiteUserAuthenticationProviderTest.java +++ b/src/test/java/com/example/solidconnection/custom/security/provider/SiteUserAuthenticationProviderTest.java @@ -7,6 +7,8 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.TestContainerSpringBootTest; +import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.Role; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/com/example/solidconnection/custom/security/userdetails/SiteUserDetailsServiceTest.java b/src/test/java/com/example/solidconnection/custom/security/userdetails/SiteUserDetailsServiceTest.java index 718732a44..2280b40e0 100644 --- a/src/test/java/com/example/solidconnection/custom/security/userdetails/SiteUserDetailsServiceTest.java +++ b/src/test/java/com/example/solidconnection/custom/security/userdetails/SiteUserDetailsServiceTest.java @@ -5,6 +5,8 @@ import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.TestContainerSpringBootTest; +import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.Role; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/example/solidconnection/custom/security/userdetails/SiteUserDetailsTest.java b/src/test/java/com/example/solidconnection/custom/security/userdetails/SiteUserDetailsTest.java index 6fe9b6d69..9f65a06c8 100644 --- a/src/test/java/com/example/solidconnection/custom/security/userdetails/SiteUserDetailsTest.java +++ b/src/test/java/com/example/solidconnection/custom/security/userdetails/SiteUserDetailsTest.java @@ -3,6 +3,8 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.TestContainerSpringBootTest; +import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.Role; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/com/example/solidconnection/e2e/DynamicFixture.java b/src/test/java/com/example/solidconnection/e2e/DynamicFixture.java index 43af92ea5..603bb5a19 100644 --- a/src/test/java/com/example/solidconnection/e2e/DynamicFixture.java +++ b/src/test/java/com/example/solidconnection/e2e/DynamicFixture.java @@ -1,8 +1,8 @@ package com.example.solidconnection.e2e; import com.example.solidconnection.siteuser.domain.SiteUser; -import com.example.solidconnection.type.PreparationStatus; -import com.example.solidconnection.type.Role; +import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.Role; public class DynamicFixture { // todo: test fixture 개선 작업 이후, 이 클래스의 사용이 대체되면 삭제 필요 diff --git a/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java b/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java index 3569c132f..f3f67ac9f 100644 --- a/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java @@ -20,8 +20,8 @@ import com.example.solidconnection.support.integration.BaseIntegrationTest; import com.example.solidconnection.s3.ImgType; import com.example.solidconnection.university.domain.LanguageTestType; -import com.example.solidconnection.type.PreparationStatus; -import com.example.solidconnection.type.Role; +import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.type.VerifyStatus; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/example/solidconnection/siteuser/repository/SiteUserRepositoryTest.java b/src/test/java/com/example/solidconnection/siteuser/repository/SiteUserRepositoryTest.java index c3d9d240e..4dc776ac4 100644 --- a/src/test/java/com/example/solidconnection/siteuser/repository/SiteUserRepositoryTest.java +++ b/src/test/java/com/example/solidconnection/siteuser/repository/SiteUserRepositoryTest.java @@ -3,8 +3,8 @@ import com.example.solidconnection.siteuser.domain.AuthType; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.support.TestContainerDataJpaTest; -import com.example.solidconnection.type.PreparationStatus; -import com.example.solidconnection.type.Role; +import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.Role; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/com/example/solidconnection/siteuser/service/MyPageServiceTest.java b/src/test/java/com/example/solidconnection/siteuser/service/MyPageServiceTest.java index a659e3d6a..b8b6a54b4 100644 --- a/src/test/java/com/example/solidconnection/siteuser/service/MyPageServiceTest.java +++ b/src/test/java/com/example/solidconnection/siteuser/service/MyPageServiceTest.java @@ -12,8 +12,8 @@ import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.integration.BaseIntegrationTest; import com.example.solidconnection.s3.ImgType; -import com.example.solidconnection.type.PreparationStatus; -import com.example.solidconnection.type.Role; +import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.university.domain.LikedUniversity; import com.example.solidconnection.university.dto.UniversityInfoForApplyPreviewResponse; import com.example.solidconnection.university.fixture.UniversityInfoForApplyFixture; diff --git a/src/test/java/com/example/solidconnection/siteuser/service/SiteUserServiceTest.java b/src/test/java/com/example/solidconnection/siteuser/service/SiteUserServiceTest.java index 665fb11da..0e75909e3 100644 --- a/src/test/java/com/example/solidconnection/siteuser/service/SiteUserServiceTest.java +++ b/src/test/java/com/example/solidconnection/siteuser/service/SiteUserServiceTest.java @@ -2,6 +2,10 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.dto.NicknameExistsResponse; +import com.example.solidconnection.siteuser.repository.SiteUserRepository; +import com.example.solidconnection.support.integration.BaseIntegrationTest; +import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.TestContainerSpringBootTest; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java b/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java index fddf7cacd..52f44651b 100644 --- a/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java +++ b/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java @@ -24,8 +24,8 @@ import com.example.solidconnection.support.TestContainerSpringBootTest; import com.example.solidconnection.university.domain.LanguageTestType; import com.example.solidconnection.community.post.domain.PostCategory; -import com.example.solidconnection.type.PreparationStatus; -import com.example.solidconnection.type.Role; +import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.type.VerifyStatus; import com.example.solidconnection.university.domain.LanguageRequirement; import com.example.solidconnection.university.domain.University; From ae052af34691c6b81d6a762f480c93dcdc291740 Mon Sep 17 00:00:00 2001 From: nayonsoso Date: Fri, 16 May 2025 21:38:08 +0900 Subject: [PATCH 05/15] =?UTF-8?q?refactor:=20application=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20Type=20=ED=81=B4=EB=9E=98=EC=8A=A4=20=ED=8C=A8?= =?UTF-8?q?=ED=82=A4=EC=A7=80=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - VerifyStatus 을 application.domain 로 --- .../example/solidconnection/admin/dto/GpaScoreResponse.java | 2 +- .../solidconnection/admin/dto/GpaScoreStatusResponse.java | 2 +- .../solidconnection/admin/dto/GpaScoreUpdateRequest.java | 2 +- .../solidconnection/admin/dto/LanguageTestScoreResponse.java | 2 +- .../admin/dto/LanguageTestScoreStatusResponse.java | 2 +- .../admin/dto/LanguageTestScoreUpdateRequest.java | 2 +- .../solidconnection/admin/dto/ScoreSearchCondition.java | 2 +- .../example/solidconnection/admin/dto/ScoreUpdateRequest.java | 2 +- .../solidconnection/admin/service/AdminGpaScoreService.java | 2 +- .../admin/service/AdminLanguageTestScoreService.java | 2 +- .../solidconnection/application/domain/Application.java | 3 +-- .../{type => application/domain}/VerifyStatus.java | 2 +- .../application/repository/ApplicationRepository.java | 2 +- .../application/service/ApplicationQueryService.java | 2 +- .../application/service/ApplicationSubmissionService.java | 2 +- .../custom/validation/validator/RejectedReasonValidator.java | 2 +- .../com/example/solidconnection/score/domain/GpaScore.java | 2 +- .../solidconnection/score/domain/LanguageTestScore.java | 2 +- .../solidconnection/score/dto/GpaScoreStatusResponse.java | 2 +- .../score/dto/LanguageTestScoreStatusResponse.java | 2 +- .../score/repository/custom/GpaScoreFilterRepositoryImpl.java | 2 +- .../custom/LanguageTestScoreFilterRepositoryImpl.java | 2 +- .../admin/service/AdminGpaScoreServiceTest.java | 2 +- .../admin/service/AdminLanguageTestScoreServiceTest.java | 2 +- .../application/service/ApplicationQueryServiceTest.java | 2 +- .../application/service/ApplicationSubmissionServiceTest.java | 2 +- .../validation/validator/RejectedReasonValidatorTest.java | 2 +- .../solidconnection/score/service/ScoreServiceTest.java | 2 +- .../support/integration/BaseIntegrationTest.java | 2 +- 29 files changed, 29 insertions(+), 30 deletions(-) rename src/main/java/com/example/solidconnection/{type => application/domain}/VerifyStatus.java (52%) diff --git a/src/main/java/com/example/solidconnection/admin/dto/GpaScoreResponse.java b/src/main/java/com/example/solidconnection/admin/dto/GpaScoreResponse.java index 5f37e823b..5acc69399 100644 --- a/src/main/java/com/example/solidconnection/admin/dto/GpaScoreResponse.java +++ b/src/main/java/com/example/solidconnection/admin/dto/GpaScoreResponse.java @@ -1,7 +1,7 @@ package com.example.solidconnection.admin.dto; import com.example.solidconnection.score.domain.GpaScore; -import com.example.solidconnection.type.VerifyStatus; +import com.example.solidconnection.application.domain.VerifyStatus; public record GpaScoreResponse( long id, diff --git a/src/main/java/com/example/solidconnection/admin/dto/GpaScoreStatusResponse.java b/src/main/java/com/example/solidconnection/admin/dto/GpaScoreStatusResponse.java index 49afbd4ed..a9d1d0668 100644 --- a/src/main/java/com/example/solidconnection/admin/dto/GpaScoreStatusResponse.java +++ b/src/main/java/com/example/solidconnection/admin/dto/GpaScoreStatusResponse.java @@ -1,6 +1,6 @@ package com.example.solidconnection.admin.dto; -import com.example.solidconnection.type.VerifyStatus; +import com.example.solidconnection.application.domain.VerifyStatus; import java.time.ZonedDateTime; diff --git a/src/main/java/com/example/solidconnection/admin/dto/GpaScoreUpdateRequest.java b/src/main/java/com/example/solidconnection/admin/dto/GpaScoreUpdateRequest.java index b7fe58c71..c24247d52 100644 --- a/src/main/java/com/example/solidconnection/admin/dto/GpaScoreUpdateRequest.java +++ b/src/main/java/com/example/solidconnection/admin/dto/GpaScoreUpdateRequest.java @@ -1,7 +1,7 @@ package com.example.solidconnection.admin.dto; import com.example.solidconnection.custom.validation.annotation.RejectedReasonRequired; -import com.example.solidconnection.type.VerifyStatus; +import com.example.solidconnection.application.domain.VerifyStatus; import jakarta.validation.constraints.NotNull; @RejectedReasonRequired diff --git a/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreResponse.java b/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreResponse.java index 8689ea7ce..7ba0d11df 100644 --- a/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreResponse.java +++ b/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreResponse.java @@ -2,7 +2,7 @@ import com.example.solidconnection.score.domain.LanguageTestScore; import com.example.solidconnection.university.domain.LanguageTestType; -import com.example.solidconnection.type.VerifyStatus; +import com.example.solidconnection.application.domain.VerifyStatus; public record LanguageTestScoreResponse( long id, diff --git a/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreStatusResponse.java b/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreStatusResponse.java index c852b5b2a..3094ea18f 100644 --- a/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreStatusResponse.java +++ b/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreStatusResponse.java @@ -1,6 +1,6 @@ package com.example.solidconnection.admin.dto; -import com.example.solidconnection.type.VerifyStatus; +import com.example.solidconnection.application.domain.VerifyStatus; import java.time.ZonedDateTime; diff --git a/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreUpdateRequest.java b/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreUpdateRequest.java index cbc426fce..e3b2baa5a 100644 --- a/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreUpdateRequest.java +++ b/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreUpdateRequest.java @@ -2,7 +2,7 @@ import com.example.solidconnection.custom.validation.annotation.RejectedReasonRequired; import com.example.solidconnection.university.domain.LanguageTestType; -import com.example.solidconnection.type.VerifyStatus; +import com.example.solidconnection.application.domain.VerifyStatus; import jakarta.validation.constraints.NotNull; @RejectedReasonRequired diff --git a/src/main/java/com/example/solidconnection/admin/dto/ScoreSearchCondition.java b/src/main/java/com/example/solidconnection/admin/dto/ScoreSearchCondition.java index 2e94628e6..1dc284be8 100644 --- a/src/main/java/com/example/solidconnection/admin/dto/ScoreSearchCondition.java +++ b/src/main/java/com/example/solidconnection/admin/dto/ScoreSearchCondition.java @@ -1,6 +1,6 @@ package com.example.solidconnection.admin.dto; -import com.example.solidconnection.type.VerifyStatus; +import com.example.solidconnection.application.domain.VerifyStatus; import java.time.LocalDate; diff --git a/src/main/java/com/example/solidconnection/admin/dto/ScoreUpdateRequest.java b/src/main/java/com/example/solidconnection/admin/dto/ScoreUpdateRequest.java index 184f76100..7223b48e4 100644 --- a/src/main/java/com/example/solidconnection/admin/dto/ScoreUpdateRequest.java +++ b/src/main/java/com/example/solidconnection/admin/dto/ScoreUpdateRequest.java @@ -1,6 +1,6 @@ package com.example.solidconnection.admin.dto; -import com.example.solidconnection.type.VerifyStatus; +import com.example.solidconnection.application.domain.VerifyStatus; public interface ScoreUpdateRequest { VerifyStatus verifyStatus(); diff --git a/src/main/java/com/example/solidconnection/admin/service/AdminGpaScoreService.java b/src/main/java/com/example/solidconnection/admin/service/AdminGpaScoreService.java index c761ff485..513961f3d 100644 --- a/src/main/java/com/example/solidconnection/admin/service/AdminGpaScoreService.java +++ b/src/main/java/com/example/solidconnection/admin/service/AdminGpaScoreService.java @@ -8,7 +8,7 @@ import com.example.solidconnection.custom.exception.CustomException; import com.example.solidconnection.score.domain.GpaScore; import com.example.solidconnection.score.repository.GpaScoreRepository; -import com.example.solidconnection.type.VerifyStatus; +import com.example.solidconnection.application.domain.VerifyStatus; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreService.java b/src/main/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreService.java index 380ef02c6..01cee4a7b 100644 --- a/src/main/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreService.java +++ b/src/main/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreService.java @@ -8,7 +8,7 @@ import com.example.solidconnection.custom.exception.CustomException; import com.example.solidconnection.score.domain.LanguageTestScore; import com.example.solidconnection.score.repository.LanguageTestScoreRepository; -import com.example.solidconnection.type.VerifyStatus; +import com.example.solidconnection.application.domain.VerifyStatus; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/com/example/solidconnection/application/domain/Application.java b/src/main/java/com/example/solidconnection/application/domain/Application.java index 6caa75331..98342ca88 100644 --- a/src/main/java/com/example/solidconnection/application/domain/Application.java +++ b/src/main/java/com/example/solidconnection/application/domain/Application.java @@ -1,7 +1,6 @@ package com.example.solidconnection.application.domain; import com.example.solidconnection.siteuser.domain.SiteUser; -import com.example.solidconnection.type.VerifyStatus; import com.example.solidconnection.university.domain.UniversityInfoForApply; import jakarta.persistence.Column; import jakarta.persistence.Embedded; @@ -19,7 +18,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import static com.example.solidconnection.type.VerifyStatus.PENDING; +import static com.example.solidconnection.application.domain.VerifyStatus.PENDING; @Getter @NoArgsConstructor(access = lombok.AccessLevel.PROTECTED) diff --git a/src/main/java/com/example/solidconnection/type/VerifyStatus.java b/src/main/java/com/example/solidconnection/application/domain/VerifyStatus.java similarity index 52% rename from src/main/java/com/example/solidconnection/type/VerifyStatus.java rename to src/main/java/com/example/solidconnection/application/domain/VerifyStatus.java index 95f122715..e6f1afbe6 100644 --- a/src/main/java/com/example/solidconnection/type/VerifyStatus.java +++ b/src/main/java/com/example/solidconnection/application/domain/VerifyStatus.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.type; +package com.example.solidconnection.application.domain; public enum VerifyStatus { PENDING, REJECTED, APPROVED diff --git a/src/main/java/com/example/solidconnection/application/repository/ApplicationRepository.java b/src/main/java/com/example/solidconnection/application/repository/ApplicationRepository.java index 5aeb972bf..5b70537fe 100644 --- a/src/main/java/com/example/solidconnection/application/repository/ApplicationRepository.java +++ b/src/main/java/com/example/solidconnection/application/repository/ApplicationRepository.java @@ -3,7 +3,7 @@ import com.example.solidconnection.application.domain.Application; import com.example.solidconnection.custom.exception.CustomException; import com.example.solidconnection.siteuser.domain.SiteUser; -import com.example.solidconnection.type.VerifyStatus; +import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.university.domain.UniversityInfoForApply; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/example/solidconnection/application/service/ApplicationQueryService.java b/src/main/java/com/example/solidconnection/application/service/ApplicationQueryService.java index 157c6adcd..59092b429 100644 --- a/src/main/java/com/example/solidconnection/application/service/ApplicationQueryService.java +++ b/src/main/java/com/example/solidconnection/application/service/ApplicationQueryService.java @@ -8,7 +8,7 @@ import com.example.solidconnection.cache.annotation.ThunderingHerdCaching; import com.example.solidconnection.custom.exception.CustomException; import com.example.solidconnection.siteuser.domain.SiteUser; -import com.example.solidconnection.type.VerifyStatus; +import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.university.domain.University; import com.example.solidconnection.university.domain.UniversityInfoForApply; import com.example.solidconnection.university.repository.UniversityInfoForApplyRepository; diff --git a/src/main/java/com/example/solidconnection/application/service/ApplicationSubmissionService.java b/src/main/java/com/example/solidconnection/application/service/ApplicationSubmissionService.java index 432e93aff..ea9797244 100644 --- a/src/main/java/com/example/solidconnection/application/service/ApplicationSubmissionService.java +++ b/src/main/java/com/example/solidconnection/application/service/ApplicationSubmissionService.java @@ -12,7 +12,7 @@ import com.example.solidconnection.score.repository.GpaScoreRepository; import com.example.solidconnection.score.repository.LanguageTestScoreRepository; import com.example.solidconnection.siteuser.domain.SiteUser; -import com.example.solidconnection.type.VerifyStatus; +import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.university.domain.UniversityInfoForApply; import com.example.solidconnection.university.repository.UniversityInfoForApplyRepository; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/solidconnection/custom/validation/validator/RejectedReasonValidator.java b/src/main/java/com/example/solidconnection/custom/validation/validator/RejectedReasonValidator.java index c975a0a0a..d31f2cb5c 100644 --- a/src/main/java/com/example/solidconnection/custom/validation/validator/RejectedReasonValidator.java +++ b/src/main/java/com/example/solidconnection/custom/validation/validator/RejectedReasonValidator.java @@ -2,7 +2,7 @@ import com.example.solidconnection.admin.dto.ScoreUpdateRequest; import com.example.solidconnection.custom.validation.annotation.RejectedReasonRequired; -import com.example.solidconnection.type.VerifyStatus; +import com.example.solidconnection.application.domain.VerifyStatus; import io.micrometer.common.util.StringUtils; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; diff --git a/src/main/java/com/example/solidconnection/score/domain/GpaScore.java b/src/main/java/com/example/solidconnection/score/domain/GpaScore.java index ddc583aa7..99c4f13cb 100644 --- a/src/main/java/com/example/solidconnection/score/domain/GpaScore.java +++ b/src/main/java/com/example/solidconnection/score/domain/GpaScore.java @@ -3,7 +3,7 @@ import com.example.solidconnection.application.domain.Gpa; import com.example.solidconnection.entity.common.BaseEntity; import com.example.solidconnection.siteuser.domain.SiteUser; -import com.example.solidconnection.type.VerifyStatus; +import com.example.solidconnection.application.domain.VerifyStatus; import jakarta.persistence.Column; import jakarta.persistence.Embedded; import jakarta.persistence.Entity; diff --git a/src/main/java/com/example/solidconnection/score/domain/LanguageTestScore.java b/src/main/java/com/example/solidconnection/score/domain/LanguageTestScore.java index ec791373e..be7dd107a 100644 --- a/src/main/java/com/example/solidconnection/score/domain/LanguageTestScore.java +++ b/src/main/java/com/example/solidconnection/score/domain/LanguageTestScore.java @@ -3,7 +3,7 @@ import com.example.solidconnection.application.domain.LanguageTest; import com.example.solidconnection.entity.common.BaseEntity; import com.example.solidconnection.siteuser.domain.SiteUser; -import com.example.solidconnection.type.VerifyStatus; +import com.example.solidconnection.application.domain.VerifyStatus; import jakarta.persistence.Column; import jakarta.persistence.Embedded; import jakarta.persistence.Entity; diff --git a/src/main/java/com/example/solidconnection/score/dto/GpaScoreStatusResponse.java b/src/main/java/com/example/solidconnection/score/dto/GpaScoreStatusResponse.java index df161d358..b2f2289dc 100644 --- a/src/main/java/com/example/solidconnection/score/dto/GpaScoreStatusResponse.java +++ b/src/main/java/com/example/solidconnection/score/dto/GpaScoreStatusResponse.java @@ -1,7 +1,7 @@ package com.example.solidconnection.score.dto; import com.example.solidconnection.score.domain.GpaScore; -import com.example.solidconnection.type.VerifyStatus; +import com.example.solidconnection.application.domain.VerifyStatus; public record GpaScoreStatusResponse( long id, diff --git a/src/main/java/com/example/solidconnection/score/dto/LanguageTestScoreStatusResponse.java b/src/main/java/com/example/solidconnection/score/dto/LanguageTestScoreStatusResponse.java index 3ee96906e..9ae7e5f64 100644 --- a/src/main/java/com/example/solidconnection/score/dto/LanguageTestScoreStatusResponse.java +++ b/src/main/java/com/example/solidconnection/score/dto/LanguageTestScoreStatusResponse.java @@ -1,7 +1,7 @@ package com.example.solidconnection.score.dto; import com.example.solidconnection.score.domain.LanguageTestScore; -import com.example.solidconnection.type.VerifyStatus; +import com.example.solidconnection.application.domain.VerifyStatus; public record LanguageTestScoreStatusResponse( long id, diff --git a/src/main/java/com/example/solidconnection/score/repository/custom/GpaScoreFilterRepositoryImpl.java b/src/main/java/com/example/solidconnection/score/repository/custom/GpaScoreFilterRepositoryImpl.java index a02e62b49..a90961c3d 100644 --- a/src/main/java/com/example/solidconnection/score/repository/custom/GpaScoreFilterRepositoryImpl.java +++ b/src/main/java/com/example/solidconnection/score/repository/custom/GpaScoreFilterRepositoryImpl.java @@ -5,7 +5,7 @@ import com.example.solidconnection.admin.dto.GpaScoreStatusResponse; import com.example.solidconnection.admin.dto.ScoreSearchCondition; import com.example.solidconnection.admin.dto.SiteUserResponse; -import com.example.solidconnection.type.VerifyStatus; +import com.example.solidconnection.application.domain.VerifyStatus; import com.querydsl.core.types.ConstructorExpression; import com.querydsl.core.types.Projections; import com.querydsl.core.types.dsl.BooleanExpression; diff --git a/src/main/java/com/example/solidconnection/score/repository/custom/LanguageTestScoreFilterRepositoryImpl.java b/src/main/java/com/example/solidconnection/score/repository/custom/LanguageTestScoreFilterRepositoryImpl.java index 5d88c1451..28baaf521 100644 --- a/src/main/java/com/example/solidconnection/score/repository/custom/LanguageTestScoreFilterRepositoryImpl.java +++ b/src/main/java/com/example/solidconnection/score/repository/custom/LanguageTestScoreFilterRepositoryImpl.java @@ -5,7 +5,7 @@ import com.example.solidconnection.admin.dto.LanguageTestScoreStatusResponse; import com.example.solidconnection.admin.dto.ScoreSearchCondition; import com.example.solidconnection.admin.dto.SiteUserResponse; -import com.example.solidconnection.type.VerifyStatus; +import com.example.solidconnection.application.domain.VerifyStatus; import com.querydsl.core.types.ConstructorExpression; import com.querydsl.core.types.Projections; import com.querydsl.core.types.dsl.BooleanExpression; diff --git a/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java b/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java index b3ce6ac16..8157a1d0b 100644 --- a/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java @@ -13,7 +13,7 @@ import com.example.solidconnection.support.integration.BaseIntegrationTest; import com.example.solidconnection.siteuser.domain.PreparationStatus; import com.example.solidconnection.siteuser.domain.Role; -import com.example.solidconnection.type.VerifyStatus; +import com.example.solidconnection.application.domain.VerifyStatus; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java b/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java index f533dccc9..a14f00e36 100644 --- a/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java @@ -13,7 +13,7 @@ import com.example.solidconnection.support.integration.BaseIntegrationTest; import com.example.solidconnection.siteuser.domain.PreparationStatus; import com.example.solidconnection.siteuser.domain.Role; -import com.example.solidconnection.type.VerifyStatus; +import com.example.solidconnection.application.domain.VerifyStatus; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/src/test/java/com/example/solidconnection/application/service/ApplicationQueryServiceTest.java b/src/test/java/com/example/solidconnection/application/service/ApplicationQueryServiceTest.java index c1f97df18..415562051 100644 --- a/src/test/java/com/example/solidconnection/application/service/ApplicationQueryServiceTest.java +++ b/src/test/java/com/example/solidconnection/application/service/ApplicationQueryServiceTest.java @@ -14,7 +14,7 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.support.integration.BaseIntegrationTest; import com.example.solidconnection.university.domain.LanguageTestType; -import com.example.solidconnection.type.VerifyStatus; +import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.university.domain.UniversityInfoForApply; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/src/test/java/com/example/solidconnection/application/service/ApplicationSubmissionServiceTest.java b/src/test/java/com/example/solidconnection/application/service/ApplicationSubmissionServiceTest.java index 622f516f6..50963d549 100644 --- a/src/test/java/com/example/solidconnection/application/service/ApplicationSubmissionServiceTest.java +++ b/src/test/java/com/example/solidconnection/application/service/ApplicationSubmissionServiceTest.java @@ -15,7 +15,7 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.support.integration.BaseIntegrationTest; import com.example.solidconnection.university.domain.LanguageTestType; -import com.example.solidconnection.type.VerifyStatus; +import com.example.solidconnection.application.domain.VerifyStatus; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/com/example/solidconnection/custom/validation/validator/RejectedReasonValidatorTest.java b/src/test/java/com/example/solidconnection/custom/validation/validator/RejectedReasonValidatorTest.java index bdf3b9570..042c9f9ee 100644 --- a/src/test/java/com/example/solidconnection/custom/validation/validator/RejectedReasonValidatorTest.java +++ b/src/test/java/com/example/solidconnection/custom/validation/validator/RejectedReasonValidatorTest.java @@ -3,7 +3,7 @@ import com.example.solidconnection.admin.dto.GpaScoreUpdateRequest; import com.example.solidconnection.admin.dto.LanguageTestScoreUpdateRequest; import com.example.solidconnection.university.domain.LanguageTestType; -import com.example.solidconnection.type.VerifyStatus; +import com.example.solidconnection.application.domain.VerifyStatus; import jakarta.validation.ConstraintViolation; import jakarta.validation.Validation; import jakarta.validation.Validator; diff --git a/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java b/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java index f3f67ac9f..0548f2134 100644 --- a/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java @@ -22,7 +22,7 @@ import com.example.solidconnection.university.domain.LanguageTestType; import com.example.solidconnection.siteuser.domain.PreparationStatus; import com.example.solidconnection.siteuser.domain.Role; -import com.example.solidconnection.type.VerifyStatus; +import com.example.solidconnection.application.domain.VerifyStatus; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java b/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java index 52f44651b..c95397162 100644 --- a/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java +++ b/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java @@ -26,7 +26,7 @@ import com.example.solidconnection.community.post.domain.PostCategory; import com.example.solidconnection.siteuser.domain.PreparationStatus; import com.example.solidconnection.siteuser.domain.Role; -import com.example.solidconnection.type.VerifyStatus; +import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.university.domain.LanguageRequirement; import com.example.solidconnection.university.domain.University; import com.example.solidconnection.university.domain.UniversityInfoForApply; From da2bcacf21a8b556f6d4cf8ebab5489f7503a651 Mon Sep 17 00:00:00 2001 From: nayonsoso Date: Fri, 16 May 2025 21:41:34 +0900 Subject: [PATCH 06/15] =?UTF-8?q?refactor:=20=EA=B2=8C=EC=8B=9C=EA=B8=80?= =?UTF-8?q?=20=EA=B4=80=EB=A0=A8=20redis=20=ED=81=B4=EB=9E=98=EC=8A=A4=20?= =?UTF-8?q?=ED=8C=A8=ED=82=A4=EC=A7=80=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - RedisService, UpdateViewCountService 를 post.service 로 --- .../community/post/service/PostCommandService.java | 1 - .../community/post/service/PostQueryService.java | 1 - .../{ => community/post}/service/RedisService.java | 4 ++-- .../post}/service/UpdateViewCountService.java | 2 +- .../scheduler/UpdateViewCountScheduler.java | 2 +- .../post/service/PostCommandServiceTest.java | 5 ++--- .../community/post/service/PostQueryServiceTest.java | 11 +++++------ .../concurrency/PostViewCountConcurrencyTest.java | 10 +++++----- 8 files changed, 16 insertions(+), 20 deletions(-) rename src/main/java/com/example/solidconnection/{ => community/post}/service/RedisService.java (93%) rename src/main/java/com/example/solidconnection/{ => community/post}/service/UpdateViewCountService.java (95%) diff --git a/src/main/java/com/example/solidconnection/community/post/service/PostCommandService.java b/src/main/java/com/example/solidconnection/community/post/service/PostCommandService.java index 7a5a69ce1..e676e943b 100644 --- a/src/main/java/com/example/solidconnection/community/post/service/PostCommandService.java +++ b/src/main/java/com/example/solidconnection/community/post/service/PostCommandService.java @@ -13,7 +13,6 @@ import com.example.solidconnection.custom.exception.CustomException; import com.example.solidconnection.s3.S3Service; import com.example.solidconnection.s3.UploadedFileUrlResponse; -import com.example.solidconnection.service.RedisService; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.s3.ImgType; diff --git a/src/main/java/com/example/solidconnection/community/post/service/PostQueryService.java b/src/main/java/com/example/solidconnection/community/post/service/PostQueryService.java index 5523efe3a..4af95575b 100644 --- a/src/main/java/com/example/solidconnection/community/post/service/PostQueryService.java +++ b/src/main/java/com/example/solidconnection/community/post/service/PostQueryService.java @@ -12,7 +12,6 @@ import com.example.solidconnection.community.post.dto.PostFindResponse; import com.example.solidconnection.community.post.repository.PostLikeRepository; import com.example.solidconnection.community.post.repository.PostRepository; -import com.example.solidconnection.service.RedisService; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.dto.PostFindSiteUserResponse; import com.example.solidconnection.community.board.domain.BoardCode; diff --git a/src/main/java/com/example/solidconnection/service/RedisService.java b/src/main/java/com/example/solidconnection/community/post/service/RedisService.java similarity index 93% rename from src/main/java/com/example/solidconnection/service/RedisService.java rename to src/main/java/com/example/solidconnection/community/post/service/RedisService.java index 55e661bbf..38d573d94 100644 --- a/src/main/java/com/example/solidconnection/service/RedisService.java +++ b/src/main/java/com/example/solidconnection/community/post/service/RedisService.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.service; +package com.example.solidconnection.community.post.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -13,7 +13,7 @@ import static com.example.solidconnection.community.post.service.RedisConstants.VIEW_COUNT_TTL; @Service -public class RedisService { +public class RedisService { // todo: 정말 필요한지 고민 필요 private final RedisTemplate redisTemplate; private final RedisScript incrViewCountLuaScript; diff --git a/src/main/java/com/example/solidconnection/service/UpdateViewCountService.java b/src/main/java/com/example/solidconnection/community/post/service/UpdateViewCountService.java similarity index 95% rename from src/main/java/com/example/solidconnection/service/UpdateViewCountService.java rename to src/main/java/com/example/solidconnection/community/post/service/UpdateViewCountService.java index 2b67e25ec..89a6f341a 100644 --- a/src/main/java/com/example/solidconnection/service/UpdateViewCountService.java +++ b/src/main/java/com/example/solidconnection/community/post/service/UpdateViewCountService.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.service; +package com.example.solidconnection.community.post.service; import com.example.solidconnection.community.post.domain.Post; import com.example.solidconnection.community.post.repository.PostRepository; diff --git a/src/main/java/com/example/solidconnection/scheduler/UpdateViewCountScheduler.java b/src/main/java/com/example/solidconnection/scheduler/UpdateViewCountScheduler.java index a29f2e18a..97a546c05 100644 --- a/src/main/java/com/example/solidconnection/scheduler/UpdateViewCountScheduler.java +++ b/src/main/java/com/example/solidconnection/scheduler/UpdateViewCountScheduler.java @@ -1,6 +1,6 @@ package com.example.solidconnection.scheduler; -import com.example.solidconnection.service.UpdateViewCountService; +import com.example.solidconnection.community.post.service.UpdateViewCountService; import com.example.solidconnection.util.RedisUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/test/java/com/example/solidconnection/community/post/service/PostCommandServiceTest.java b/src/test/java/com/example/solidconnection/community/post/service/PostCommandServiceTest.java index 7c69416ba..34461b214 100644 --- a/src/test/java/com/example/solidconnection/community/post/service/PostCommandServiceTest.java +++ b/src/test/java/com/example/solidconnection/community/post/service/PostCommandServiceTest.java @@ -2,6 +2,7 @@ import com.example.solidconnection.community.board.domain.Board; import com.example.solidconnection.community.post.domain.Post; +import com.example.solidconnection.community.post.domain.PostCategory; import com.example.solidconnection.community.post.domain.PostImage; import com.example.solidconnection.community.post.dto.PostCreateRequest; import com.example.solidconnection.community.post.dto.PostCreateResponse; @@ -11,14 +12,12 @@ import com.example.solidconnection.community.post.repository.PostImageRepository; import com.example.solidconnection.community.post.repository.PostRepository; import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.s3.ImgType; import com.example.solidconnection.s3.S3Service; import com.example.solidconnection.s3.UploadedFileUrlResponse; -import com.example.solidconnection.service.RedisService; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.integration.BaseIntegrationTest; -import com.example.solidconnection.s3.ImgType; -import com.example.solidconnection.community.post.domain.PostCategory; import com.example.solidconnection.util.RedisUtils; import jakarta.transaction.Transactional; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/com/example/solidconnection/community/post/service/PostQueryServiceTest.java b/src/test/java/com/example/solidconnection/community/post/service/PostQueryServiceTest.java index 1e61d2539..13a942ef7 100644 --- a/src/test/java/com/example/solidconnection/community/post/service/PostQueryServiceTest.java +++ b/src/test/java/com/example/solidconnection/community/post/service/PostQueryServiceTest.java @@ -1,22 +1,21 @@ package com.example.solidconnection.community.post.service; import com.example.solidconnection.community.board.domain.Board; +import com.example.solidconnection.community.board.domain.BoardCode; import com.example.solidconnection.community.comment.domain.Comment; import com.example.solidconnection.community.comment.dto.PostFindCommentResponse; -import com.example.solidconnection.community.post.dto.PostListResponse; import com.example.solidconnection.community.comment.repository.CommentRepository; -import com.example.solidconnection.community.post.domain.PostImage; import com.example.solidconnection.community.post.domain.Post; +import com.example.solidconnection.community.post.domain.PostCategory; +import com.example.solidconnection.community.post.domain.PostImage; import com.example.solidconnection.community.post.dto.PostFindPostImageResponse; import com.example.solidconnection.community.post.dto.PostFindResponse; -import com.example.solidconnection.community.post.repository.PostRepository; +import com.example.solidconnection.community.post.dto.PostListResponse; import com.example.solidconnection.community.post.repository.PostImageRepository; -import com.example.solidconnection.service.RedisService; +import com.example.solidconnection.community.post.repository.PostRepository; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.integration.BaseIntegrationTest; -import com.example.solidconnection.community.board.domain.BoardCode; -import com.example.solidconnection.community.post.domain.PostCategory; import com.example.solidconnection.util.RedisUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/example/solidconnection/concurrency/PostViewCountConcurrencyTest.java b/src/test/java/com/example/solidconnection/concurrency/PostViewCountConcurrencyTest.java index 33036aee4..07289da3b 100644 --- a/src/test/java/com/example/solidconnection/concurrency/PostViewCountConcurrencyTest.java +++ b/src/test/java/com/example/solidconnection/concurrency/PostViewCountConcurrencyTest.java @@ -3,14 +3,14 @@ import com.example.solidconnection.community.board.domain.Board; import com.example.solidconnection.community.board.repository.BoardRepository; import com.example.solidconnection.community.post.domain.Post; +import com.example.solidconnection.community.post.domain.PostCategory; import com.example.solidconnection.community.post.repository.PostRepository; -import com.example.solidconnection.service.RedisService; +import com.example.solidconnection.community.post.service.RedisService; +import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.TestContainerSpringBootTest; -import com.example.solidconnection.community.post.domain.PostCategory; -import com.example.solidconnection.siteuser.domain.PreparationStatus; -import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.util.RedisUtils; import com.example.solidconnection.util.RedisUtils; import org.junit.jupiter.api.BeforeEach; @@ -24,7 +24,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import static com.example.solidconnection.community.post.service.RedisConstants.*; +import static com.example.solidconnection.community.post.service.RedisConstants.VALIDATE_VIEW_COUNT_TTL; import static org.junit.jupiter.api.Assertions.assertEquals; @TestContainerSpringBootTest From 09e013749ef2057b0c92c0907ae5dc8b8b94e1bc Mon Sep 17 00:00:00 2001 From: nayonsoso Date: Fri, 16 May 2025 21:59:03 +0900 Subject: [PATCH 07/15] =?UTF-8?q?refactor:=20=EC=A7=80=EC=97=AD=20?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=ED=81=B4=EB=9E=98=EC=8A=A4=20=ED=8C=A8?= =?UTF-8?q?=ED=82=A4=EC=A7=80=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - location 패키지 하위에 region 과 country 를 생성 - Region, InterestedRegion 을 location.region.domain 으로 - Country, InterestedCountry 을 location.country.domain 으로 - RegionRepository, InterestedRegionRepository를 location.region.repository 으로 - CountryRepository, InterestedCountyRepository를 location.country.repository 으로 - 테스트 코드는 프로덕션 코드와 대응하는 위치로 --- .../auth/service/EmailSignUpService.java | 8 ++++---- .../solidconnection/auth/service/SignUpService.java | 12 ++++++------ .../auth/service/oauth/OAuthSignUpService.java | 8 ++++---- .../{entity => location/country/domain}/Country.java | 3 ++- .../country/domain}/InterestedCountry.java | 2 +- .../country/repository}/CountryRepository.java | 4 ++-- .../repository}/InterestedCountyRepository.java | 4 ++-- .../region/domain}/InterestedRegion.java | 2 +- .../{entity => location/region/domain}/Region.java | 2 +- .../repository}/InterestedRegionRepository.java | 4 ++-- .../region/repository}/RegionRepository.java | 4 ++-- .../university/domain/University.java | 4 ++-- .../custom/UniversityFilterRepositoryImpl.java | 4 ++-- .../country/fixture/CountryFixture.java | 6 +++--- .../country/fixture/CountryFixtureBuilder.java | 9 +++++---- .../country/repository/CountryRepositoryForTest.java | 4 ++-- .../{ => location}/region/fixture/RegionFixture.java | 4 ++-- .../region/fixture/RegionFixtureBuilder.java | 6 +++--- .../region/repository/RegionRepositoryForTest.java | 4 ++-- .../support/integration/BaseIntegrationTest.java | 8 ++++---- .../university/fixture/UniversityFixture.java | 4 ++-- .../service/UniversityRecommendServiceTest.java | 4 ++-- 22 files changed, 56 insertions(+), 54 deletions(-) rename src/main/java/com/example/solidconnection/{entity => location/country/domain}/Country.java (85%) rename src/main/java/com/example/solidconnection/{entity => location/country/domain}/InterestedCountry.java (92%) rename src/main/java/com/example/solidconnection/{repositories => location/country/repository}/CountryRepository.java (78%) rename src/main/java/com/example/solidconnection/{repositories => location/country/repository}/InterestedCountyRepository.java (72%) rename src/main/java/com/example/solidconnection/{entity => location/region/domain}/InterestedRegion.java (92%) rename src/main/java/com/example/solidconnection/{entity => location/region/domain}/Region.java (91%) rename src/main/java/com/example/solidconnection/{repositories => location/region/repository}/InterestedRegionRepository.java (72%) rename src/main/java/com/example/solidconnection/{repositories => location/region/repository}/RegionRepository.java (78%) rename src/test/java/com/example/solidconnection/{ => location}/country/fixture/CountryFixture.java (87%) rename src/test/java/com/example/solidconnection/{ => location}/country/fixture/CountryFixtureBuilder.java (77%) rename src/test/java/com/example/solidconnection/{ => location}/country/repository/CountryRepositoryForTest.java (62%) rename src/test/java/com/example/solidconnection/{ => location}/region/fixture/RegionFixture.java (86%) rename src/test/java/com/example/solidconnection/{ => location}/region/fixture/RegionFixtureBuilder.java (79%) rename src/test/java/com/example/solidconnection/{ => location}/region/repository/RegionRepositoryForTest.java (62%) diff --git a/src/main/java/com/example/solidconnection/auth/service/EmailSignUpService.java b/src/main/java/com/example/solidconnection/auth/service/EmailSignUpService.java index 37f6681ea..12238373c 100644 --- a/src/main/java/com/example/solidconnection/auth/service/EmailSignUpService.java +++ b/src/main/java/com/example/solidconnection/auth/service/EmailSignUpService.java @@ -2,10 +2,10 @@ import com.example.solidconnection.auth.dto.SignUpRequest; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.repositories.CountryRepository; -import com.example.solidconnection.repositories.InterestedCountyRepository; -import com.example.solidconnection.repositories.InterestedRegionRepository; -import com.example.solidconnection.repositories.RegionRepository; +import com.example.solidconnection.location.country.repository.CountryRepository; +import com.example.solidconnection.location.country.repository.InterestedCountyRepository; +import com.example.solidconnection.location.region.repository.InterestedRegionRepository; +import com.example.solidconnection.location.region.repository.RegionRepository; import com.example.solidconnection.siteuser.domain.AuthType; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; diff --git a/src/main/java/com/example/solidconnection/auth/service/SignUpService.java b/src/main/java/com/example/solidconnection/auth/service/SignUpService.java index 319083658..e52ba5884 100644 --- a/src/main/java/com/example/solidconnection/auth/service/SignUpService.java +++ b/src/main/java/com/example/solidconnection/auth/service/SignUpService.java @@ -3,12 +3,12 @@ import com.example.solidconnection.auth.dto.SignInResponse; import com.example.solidconnection.auth.dto.SignUpRequest; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.entity.InterestedCountry; -import com.example.solidconnection.entity.InterestedRegion; -import com.example.solidconnection.repositories.CountryRepository; -import com.example.solidconnection.repositories.InterestedCountyRepository; -import com.example.solidconnection.repositories.InterestedRegionRepository; -import com.example.solidconnection.repositories.RegionRepository; +import com.example.solidconnection.location.country.domain.InterestedCountry; +import com.example.solidconnection.location.region.domain.InterestedRegion; +import com.example.solidconnection.location.country.repository.CountryRepository; +import com.example.solidconnection.location.country.repository.InterestedCountyRepository; +import com.example.solidconnection.location.region.repository.InterestedRegionRepository; +import com.example.solidconnection.location.region.repository.RegionRepository; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpService.java b/src/main/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpService.java index a46728bb2..b307a7cdc 100644 --- a/src/main/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpService.java +++ b/src/main/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpService.java @@ -4,10 +4,10 @@ import com.example.solidconnection.auth.service.SignInService; import com.example.solidconnection.auth.service.SignUpService; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.repositories.CountryRepository; -import com.example.solidconnection.repositories.InterestedCountyRepository; -import com.example.solidconnection.repositories.InterestedRegionRepository; -import com.example.solidconnection.repositories.RegionRepository; +import com.example.solidconnection.location.country.repository.CountryRepository; +import com.example.solidconnection.location.country.repository.InterestedCountyRepository; +import com.example.solidconnection.location.region.repository.InterestedRegionRepository; +import com.example.solidconnection.location.region.repository.RegionRepository; import com.example.solidconnection.siteuser.domain.AuthType; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; diff --git a/src/main/java/com/example/solidconnection/entity/Country.java b/src/main/java/com/example/solidconnection/location/country/domain/Country.java similarity index 85% rename from src/main/java/com/example/solidconnection/entity/Country.java rename to src/main/java/com/example/solidconnection/location/country/domain/Country.java index 0a5d974d7..5a14fef86 100644 --- a/src/main/java/com/example/solidconnection/entity/Country.java +++ b/src/main/java/com/example/solidconnection/location/country/domain/Country.java @@ -1,5 +1,6 @@ -package com.example.solidconnection.entity; +package com.example.solidconnection.location.country.domain; +import com.example.solidconnection.location.region.domain.Region; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.Id; diff --git a/src/main/java/com/example/solidconnection/entity/InterestedCountry.java b/src/main/java/com/example/solidconnection/location/country/domain/InterestedCountry.java similarity index 92% rename from src/main/java/com/example/solidconnection/entity/InterestedCountry.java rename to src/main/java/com/example/solidconnection/location/country/domain/InterestedCountry.java index 8b8b4e735..9d75c51ed 100644 --- a/src/main/java/com/example/solidconnection/entity/InterestedCountry.java +++ b/src/main/java/com/example/solidconnection/location/country/domain/InterestedCountry.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.entity; +package com.example.solidconnection.location.country.domain; import com.example.solidconnection.siteuser.domain.SiteUser; import jakarta.persistence.Entity; diff --git a/src/main/java/com/example/solidconnection/repositories/CountryRepository.java b/src/main/java/com/example/solidconnection/location/country/repository/CountryRepository.java similarity index 78% rename from src/main/java/com/example/solidconnection/repositories/CountryRepository.java rename to src/main/java/com/example/solidconnection/location/country/repository/CountryRepository.java index d9ba75555..4860e6015 100644 --- a/src/main/java/com/example/solidconnection/repositories/CountryRepository.java +++ b/src/main/java/com/example/solidconnection/location/country/repository/CountryRepository.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.repositories; +package com.example.solidconnection.location.country.repository; -import com.example.solidconnection.entity.Country; +import com.example.solidconnection.location.country.domain.Country; 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/com/example/solidconnection/repositories/InterestedCountyRepository.java b/src/main/java/com/example/solidconnection/location/country/repository/InterestedCountyRepository.java similarity index 72% rename from src/main/java/com/example/solidconnection/repositories/InterestedCountyRepository.java rename to src/main/java/com/example/solidconnection/location/country/repository/InterestedCountyRepository.java index 68e10b320..879323e28 100644 --- a/src/main/java/com/example/solidconnection/repositories/InterestedCountyRepository.java +++ b/src/main/java/com/example/solidconnection/location/country/repository/InterestedCountyRepository.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.repositories; +package com.example.solidconnection.location.country.repository; -import com.example.solidconnection.entity.InterestedCountry; +import com.example.solidconnection.location.country.domain.InterestedCountry; import com.example.solidconnection.siteuser.domain.SiteUser; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/solidconnection/entity/InterestedRegion.java b/src/main/java/com/example/solidconnection/location/region/domain/InterestedRegion.java similarity index 92% rename from src/main/java/com/example/solidconnection/entity/InterestedRegion.java rename to src/main/java/com/example/solidconnection/location/region/domain/InterestedRegion.java index 7ec8fa50c..457ee4eb6 100644 --- a/src/main/java/com/example/solidconnection/entity/InterestedRegion.java +++ b/src/main/java/com/example/solidconnection/location/region/domain/InterestedRegion.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.entity; +package com.example.solidconnection.location.region.domain; import com.example.solidconnection.siteuser.domain.SiteUser; import jakarta.persistence.Entity; diff --git a/src/main/java/com/example/solidconnection/entity/Region.java b/src/main/java/com/example/solidconnection/location/region/domain/Region.java similarity index 91% rename from src/main/java/com/example/solidconnection/entity/Region.java rename to src/main/java/com/example/solidconnection/location/region/domain/Region.java index 6bd64c5cc..cb0d5ab7a 100644 --- a/src/main/java/com/example/solidconnection/entity/Region.java +++ b/src/main/java/com/example/solidconnection/location/region/domain/Region.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.entity; +package com.example.solidconnection.location.region.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/com/example/solidconnection/repositories/InterestedRegionRepository.java b/src/main/java/com/example/solidconnection/location/region/repository/InterestedRegionRepository.java similarity index 72% rename from src/main/java/com/example/solidconnection/repositories/InterestedRegionRepository.java rename to src/main/java/com/example/solidconnection/location/region/repository/InterestedRegionRepository.java index df5acd696..90d860b3c 100644 --- a/src/main/java/com/example/solidconnection/repositories/InterestedRegionRepository.java +++ b/src/main/java/com/example/solidconnection/location/region/repository/InterestedRegionRepository.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.repositories; +package com.example.solidconnection.location.region.repository; -import com.example.solidconnection.entity.InterestedRegion; +import com.example.solidconnection.location.region.domain.InterestedRegion; import com.example.solidconnection.siteuser.domain.SiteUser; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/solidconnection/repositories/RegionRepository.java b/src/main/java/com/example/solidconnection/location/region/repository/RegionRepository.java similarity index 78% rename from src/main/java/com/example/solidconnection/repositories/RegionRepository.java rename to src/main/java/com/example/solidconnection/location/region/repository/RegionRepository.java index 0dc99fb08..094f19f5f 100644 --- a/src/main/java/com/example/solidconnection/repositories/RegionRepository.java +++ b/src/main/java/com/example/solidconnection/location/region/repository/RegionRepository.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.repositories; +package com.example.solidconnection.location.region.repository; -import com.example.solidconnection.entity.Region; +import com.example.solidconnection.location.region.domain.Region; 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/com/example/solidconnection/university/domain/University.java b/src/main/java/com/example/solidconnection/university/domain/University.java index c3021385e..d010861d4 100644 --- a/src/main/java/com/example/solidconnection/university/domain/University.java +++ b/src/main/java/com/example/solidconnection/university/domain/University.java @@ -1,7 +1,7 @@ package com.example.solidconnection.university.domain; -import com.example.solidconnection.entity.Country; -import com.example.solidconnection.entity.Region; +import com.example.solidconnection.location.country.domain.Country; +import com.example.solidconnection.location.region.domain.Region; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/src/main/java/com/example/solidconnection/university/repository/custom/UniversityFilterRepositoryImpl.java b/src/main/java/com/example/solidconnection/university/repository/custom/UniversityFilterRepositoryImpl.java index 685048a86..25da850da 100644 --- a/src/main/java/com/example/solidconnection/university/repository/custom/UniversityFilterRepositoryImpl.java +++ b/src/main/java/com/example/solidconnection/university/repository/custom/UniversityFilterRepositoryImpl.java @@ -1,7 +1,7 @@ package com.example.solidconnection.university.repository.custom; -import com.example.solidconnection.entity.QCountry; -import com.example.solidconnection.entity.QRegion; +import com.example.solidconnection.location.country.domain.QCountry; +import com.example.solidconnection.location.region.domain.QRegion; import com.example.solidconnection.university.domain.LanguageTestType; import com.example.solidconnection.university.domain.QUniversity; import com.example.solidconnection.university.domain.QUniversityInfoForApply; diff --git a/src/test/java/com/example/solidconnection/country/fixture/CountryFixture.java b/src/test/java/com/example/solidconnection/location/country/fixture/CountryFixture.java similarity index 87% rename from src/test/java/com/example/solidconnection/country/fixture/CountryFixture.java rename to src/test/java/com/example/solidconnection/location/country/fixture/CountryFixture.java index 53f394eae..cf3e2d6b1 100644 --- a/src/test/java/com/example/solidconnection/country/fixture/CountryFixture.java +++ b/src/test/java/com/example/solidconnection/location/country/fixture/CountryFixture.java @@ -1,7 +1,7 @@ -package com.example.solidconnection.country.fixture; +package com.example.solidconnection.location.country.fixture; -import com.example.solidconnection.entity.Country; -import com.example.solidconnection.region.fixture.RegionFixture; +import com.example.solidconnection.location.country.domain.Country; +import com.example.solidconnection.location.region.fixture.RegionFixture; import lombok.RequiredArgsConstructor; import org.springframework.boot.test.context.TestComponent; diff --git a/src/test/java/com/example/solidconnection/country/fixture/CountryFixtureBuilder.java b/src/test/java/com/example/solidconnection/location/country/fixture/CountryFixtureBuilder.java similarity index 77% rename from src/test/java/com/example/solidconnection/country/fixture/CountryFixtureBuilder.java rename to src/test/java/com/example/solidconnection/location/country/fixture/CountryFixtureBuilder.java index e3ea004c5..ab8955954 100644 --- a/src/test/java/com/example/solidconnection/country/fixture/CountryFixtureBuilder.java +++ b/src/test/java/com/example/solidconnection/location/country/fixture/CountryFixtureBuilder.java @@ -1,8 +1,9 @@ -package com.example.solidconnection.country.fixture; +package com.example.solidconnection.location.country.fixture; -import com.example.solidconnection.entity.Country; -import com.example.solidconnection.entity.Region; -import com.example.solidconnection.country.repository.CountryRepositoryForTest; + +import com.example.solidconnection.location.country.repository.CountryRepositoryForTest; +import com.example.solidconnection.location.country.domain.Country; +import com.example.solidconnection.location.region.domain.Region; import lombok.RequiredArgsConstructor; import org.springframework.boot.test.context.TestComponent; diff --git a/src/test/java/com/example/solidconnection/country/repository/CountryRepositoryForTest.java b/src/test/java/com/example/solidconnection/location/country/repository/CountryRepositoryForTest.java similarity index 62% rename from src/test/java/com/example/solidconnection/country/repository/CountryRepositoryForTest.java rename to src/test/java/com/example/solidconnection/location/country/repository/CountryRepositoryForTest.java index fc5dab0f9..c9c7400a9 100644 --- a/src/test/java/com/example/solidconnection/country/repository/CountryRepositoryForTest.java +++ b/src/test/java/com/example/solidconnection/location/country/repository/CountryRepositoryForTest.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.country.repository; +package com.example.solidconnection.location.country.repository; -import com.example.solidconnection.entity.Country; +import com.example.solidconnection.location.country.domain.Country; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/test/java/com/example/solidconnection/region/fixture/RegionFixture.java b/src/test/java/com/example/solidconnection/location/region/fixture/RegionFixture.java similarity index 86% rename from src/test/java/com/example/solidconnection/region/fixture/RegionFixture.java rename to src/test/java/com/example/solidconnection/location/region/fixture/RegionFixture.java index a1cd97e56..2cf13437e 100644 --- a/src/test/java/com/example/solidconnection/region/fixture/RegionFixture.java +++ b/src/test/java/com/example/solidconnection/location/region/fixture/RegionFixture.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.region.fixture; +package com.example.solidconnection.location.region.fixture; -import com.example.solidconnection.entity.Region; +import com.example.solidconnection.location.region.domain.Region; import lombok.RequiredArgsConstructor; import org.springframework.boot.test.context.TestComponent; diff --git a/src/test/java/com/example/solidconnection/region/fixture/RegionFixtureBuilder.java b/src/test/java/com/example/solidconnection/location/region/fixture/RegionFixtureBuilder.java similarity index 79% rename from src/test/java/com/example/solidconnection/region/fixture/RegionFixtureBuilder.java rename to src/test/java/com/example/solidconnection/location/region/fixture/RegionFixtureBuilder.java index a385a53f8..968665e22 100644 --- a/src/test/java/com/example/solidconnection/region/fixture/RegionFixtureBuilder.java +++ b/src/test/java/com/example/solidconnection/location/region/fixture/RegionFixtureBuilder.java @@ -1,7 +1,7 @@ -package com.example.solidconnection.region.fixture; +package com.example.solidconnection.location.region.fixture; -import com.example.solidconnection.entity.Region; -import com.example.solidconnection.region.repository.RegionRepositoryForTest; +import com.example.solidconnection.location.region.domain.Region; +import com.example.solidconnection.location.region.repository.RegionRepositoryForTest; import lombok.RequiredArgsConstructor; import org.springframework.boot.test.context.TestComponent; diff --git a/src/test/java/com/example/solidconnection/region/repository/RegionRepositoryForTest.java b/src/test/java/com/example/solidconnection/location/region/repository/RegionRepositoryForTest.java similarity index 62% rename from src/test/java/com/example/solidconnection/region/repository/RegionRepositoryForTest.java rename to src/test/java/com/example/solidconnection/location/region/repository/RegionRepositoryForTest.java index 00c35c02d..a27c16b9b 100644 --- a/src/test/java/com/example/solidconnection/region/repository/RegionRepositoryForTest.java +++ b/src/test/java/com/example/solidconnection/location/region/repository/RegionRepositoryForTest.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.region.repository; +package com.example.solidconnection.location.region.repository; -import com.example.solidconnection.entity.Region; +import com.example.solidconnection.location.region.domain.Region; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java b/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java index c95397162..493c93c7b 100644 --- a/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java +++ b/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java @@ -6,14 +6,14 @@ import com.example.solidconnection.application.repository.ApplicationRepository; import com.example.solidconnection.community.board.domain.Board; import com.example.solidconnection.community.board.repository.BoardRepository; -import com.example.solidconnection.entity.Country; +import com.example.solidconnection.location.country.domain.Country; import com.example.solidconnection.community.post.domain.PostImage; -import com.example.solidconnection.entity.Region; +import com.example.solidconnection.location.region.domain.Region; import com.example.solidconnection.community.post.domain.Post; import com.example.solidconnection.community.post.repository.PostRepository; -import com.example.solidconnection.repositories.CountryRepository; +import com.example.solidconnection.location.country.repository.CountryRepository; import com.example.solidconnection.community.post.repository.PostImageRepository; -import com.example.solidconnection.repositories.RegionRepository; +import com.example.solidconnection.location.region.repository.RegionRepository; import com.example.solidconnection.score.domain.GpaScore; import com.example.solidconnection.score.domain.LanguageTestScore; import com.example.solidconnection.score.repository.GpaScoreRepository; diff --git a/src/test/java/com/example/solidconnection/university/fixture/UniversityFixture.java b/src/test/java/com/example/solidconnection/university/fixture/UniversityFixture.java index f3a41515f..d1c9d2dd4 100644 --- a/src/test/java/com/example/solidconnection/university/fixture/UniversityFixture.java +++ b/src/test/java/com/example/solidconnection/university/fixture/UniversityFixture.java @@ -1,7 +1,7 @@ package com.example.solidconnection.university.fixture; -import com.example.solidconnection.country.fixture.CountryFixture; -import com.example.solidconnection.region.fixture.RegionFixture; +import com.example.solidconnection.location.country.fixture.CountryFixture; +import com.example.solidconnection.location.region.fixture.RegionFixture; import com.example.solidconnection.university.domain.University; import lombok.RequiredArgsConstructor; import org.springframework.boot.test.context.TestComponent; diff --git a/src/test/java/com/example/solidconnection/university/service/UniversityRecommendServiceTest.java b/src/test/java/com/example/solidconnection/university/service/UniversityRecommendServiceTest.java index ffacab33f..a19d37fea 100644 --- a/src/test/java/com/example/solidconnection/university/service/UniversityRecommendServiceTest.java +++ b/src/test/java/com/example/solidconnection/university/service/UniversityRecommendServiceTest.java @@ -1,9 +1,9 @@ package com.example.solidconnection.university.service; -import com.example.solidconnection.country.fixture.CountryFixture; +import com.example.solidconnection.location.country.fixture.CountryFixture; import com.example.solidconnection.entity.InterestedCountry; import com.example.solidconnection.entity.InterestedRegion; -import com.example.solidconnection.region.fixture.RegionFixture; +import com.example.solidconnection.location.region.fixture.RegionFixture; import com.example.solidconnection.repositories.InterestedCountyRepository; import com.example.solidconnection.repositories.InterestedRegionRepository; import com.example.solidconnection.siteuser.domain.SiteUser; From 93a8b2dfd43b1b3b9c119d681a92d935e41a2533 Mon Sep 17 00:00:00 2001 From: nayonsoso Date: Fri, 16 May 2025 22:16:54 +0900 Subject: [PATCH 08/15] =?UTF-8?q?refactor:=20security=20=EA=B4=80=EB=A0=A8?= =?UTF-8?q?=20=ED=81=B4=EB=9E=98=EC=8A=A4=20=ED=8C=A8=ED=82=A4=EC=A7=80=20?= =?UTF-8?q?=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - custom.security에 있던 security를 루트 경로로 - 스프링 시큐리티는 서블릿 밖에 존재하므로, 분리된 하나의 관심사라 볼 수 있다. --- .../application/controller/ApplicationController.java | 2 +- .../config/security/AuthenticationManagerConfig.java | 2 +- .../config/security/SecurityConfiguration.java | 6 +++--- .../custom/resolver/AuthorizedUserResolver.java | 2 +- .../security/annotation/RequireAdminAccess.java | 2 +- .../security/aspect/AdminAuthorizationAspect.java | 4 ++-- .../security/authentication/JwtAuthentication.java | 2 +- .../authentication/SiteUserAuthentication.java | 4 ++-- .../security/filter/ExceptionHandlerFilter.java | 2 +- .../security/filter/JwtAuthenticationFilter.java | 6 +++--- .../security/filter/SignOutCheckFilter.java | 2 +- .../provider/SiteUserAuthenticationProvider.java | 10 +++++----- .../security/userdetails/SecurityRoleMapper.java | 2 +- .../security/userdetails/SiteUserDetails.java | 2 +- .../security/userdetails/SiteUserDetailsService.java | 2 +- .../custom/resolver/AuthorizedUserResolverTest.java | 4 ++-- .../security/aspect/AdminAuthorizationAspectTest.java | 4 ++-- .../authentication/SiteUserAuthenticationTest.java | 5 +++-- .../security/filter/ExceptionHandlerFilterTest.java | 4 ++-- .../security/filter/JwtAuthenticationFilterTest.java | 7 ++++--- .../security/filter/SignOutCheckFilterTest.java | 3 ++- .../provider/SiteUserAuthenticationProviderTest.java | 7 ++++--- .../userdetails/SiteUserDetailsServiceTest.java | 4 +++- .../security/userdetails/SiteUserDetailsTest.java | 3 ++- 24 files changed, 49 insertions(+), 42 deletions(-) rename src/main/java/com/example/solidconnection/{custom => }/security/annotation/RequireAdminAccess.java (80%) rename src/main/java/com/example/solidconnection/{custom => }/security/aspect/AdminAuthorizationAspect.java (89%) rename src/main/java/com/example/solidconnection/{custom => }/security/authentication/JwtAuthentication.java (92%) rename src/main/java/com/example/solidconnection/{custom => }/security/authentication/SiteUserAuthentication.java (69%) rename src/main/java/com/example/solidconnection/{custom => }/security/filter/ExceptionHandlerFilter.java (97%) rename src/main/java/com/example/solidconnection/{custom => }/security/filter/JwtAuthenticationFilter.java (87%) rename src/main/java/com/example/solidconnection/{custom => }/security/filter/SignOutCheckFilter.java (96%) rename src/main/java/com/example/solidconnection/{custom => }/security/provider/SiteUserAuthenticationProvider.java (75%) rename src/main/java/com/example/solidconnection/{custom => }/security/userdetails/SecurityRoleMapper.java (87%) rename src/main/java/com/example/solidconnection/{custom => }/security/userdetails/SiteUserDetails.java (95%) rename src/main/java/com/example/solidconnection/{custom => }/security/userdetails/SiteUserDetailsService.java (96%) rename src/test/java/com/example/solidconnection/{custom => }/security/aspect/AdminAuthorizationAspectTest.java (95%) rename src/test/java/com/example/solidconnection/{custom => }/security/authentication/SiteUserAuthenticationTest.java (90%) rename src/test/java/com/example/solidconnection/{custom => }/security/filter/ExceptionHandlerFilterTest.java (96%) rename src/test/java/com/example/solidconnection/{custom => }/security/filter/JwtAuthenticationFilterTest.java (91%) rename src/test/java/com/example/solidconnection/{custom => }/security/filter/SignOutCheckFilterTest.java (96%) rename src/test/java/com/example/solidconnection/{custom => }/security/provider/SiteUserAuthenticationProviderTest.java (94%) rename src/test/java/com/example/solidconnection/{custom => }/security/userdetails/SiteUserDetailsServiceTest.java (94%) rename src/test/java/com/example/solidconnection/{custom => }/security/userdetails/SiteUserDetailsTest.java (90%) diff --git a/src/main/java/com/example/solidconnection/application/controller/ApplicationController.java b/src/main/java/com/example/solidconnection/application/controller/ApplicationController.java index 36c7d6af2..d1e6b1ba5 100644 --- a/src/main/java/com/example/solidconnection/application/controller/ApplicationController.java +++ b/src/main/java/com/example/solidconnection/application/controller/ApplicationController.java @@ -6,7 +6,7 @@ import com.example.solidconnection.application.service.ApplicationQueryService; import com.example.solidconnection.application.service.ApplicationSubmissionService; import com.example.solidconnection.custom.resolver.AuthorizedUser; -import com.example.solidconnection.custom.security.annotation.RequireAdminAccess; +import com.example.solidconnection.security.annotation.RequireAdminAccess; import com.example.solidconnection.siteuser.domain.SiteUser; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/solidconnection/config/security/AuthenticationManagerConfig.java b/src/main/java/com/example/solidconnection/config/security/AuthenticationManagerConfig.java index e4af023b7..c690abc18 100644 --- a/src/main/java/com/example/solidconnection/config/security/AuthenticationManagerConfig.java +++ b/src/main/java/com/example/solidconnection/config/security/AuthenticationManagerConfig.java @@ -1,6 +1,6 @@ package com.example.solidconnection.config.security; -import com.example.solidconnection.custom.security.provider.SiteUserAuthenticationProvider; +import com.example.solidconnection.security.provider.SiteUserAuthenticationProvider; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/example/solidconnection/config/security/SecurityConfiguration.java b/src/main/java/com/example/solidconnection/config/security/SecurityConfiguration.java index b00b6feb6..9f4d7215c 100644 --- a/src/main/java/com/example/solidconnection/config/security/SecurityConfiguration.java +++ b/src/main/java/com/example/solidconnection/config/security/SecurityConfiguration.java @@ -2,9 +2,9 @@ import com.example.solidconnection.custom.exception.CustomAccessDeniedHandler; import com.example.solidconnection.custom.exception.CustomAuthenticationEntryPoint; -import com.example.solidconnection.custom.security.filter.ExceptionHandlerFilter; -import com.example.solidconnection.custom.security.filter.JwtAuthenticationFilter; -import com.example.solidconnection.custom.security.filter.SignOutCheckFilter; +import com.example.solidconnection.security.filter.ExceptionHandlerFilter; +import com.example.solidconnection.security.filter.JwtAuthenticationFilter; +import com.example.solidconnection.security.filter.SignOutCheckFilter; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/example/solidconnection/custom/resolver/AuthorizedUserResolver.java b/src/main/java/com/example/solidconnection/custom/resolver/AuthorizedUserResolver.java index f4ba9fe7f..b85e94cfd 100644 --- a/src/main/java/com/example/solidconnection/custom/resolver/AuthorizedUserResolver.java +++ b/src/main/java/com/example/solidconnection/custom/resolver/AuthorizedUserResolver.java @@ -1,7 +1,7 @@ package com.example.solidconnection.custom.resolver; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.custom.security.userdetails.SiteUserDetails; +import com.example.solidconnection.security.userdetails.SiteUserDetails; import com.example.solidconnection.siteuser.domain.SiteUser; import lombok.RequiredArgsConstructor; import org.springframework.core.MethodParameter; diff --git a/src/main/java/com/example/solidconnection/custom/security/annotation/RequireAdminAccess.java b/src/main/java/com/example/solidconnection/security/annotation/RequireAdminAccess.java similarity index 80% rename from src/main/java/com/example/solidconnection/custom/security/annotation/RequireAdminAccess.java rename to src/main/java/com/example/solidconnection/security/annotation/RequireAdminAccess.java index 559664e25..682d5bdf8 100644 --- a/src/main/java/com/example/solidconnection/custom/security/annotation/RequireAdminAccess.java +++ b/src/main/java/com/example/solidconnection/security/annotation/RequireAdminAccess.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.custom.security.annotation; +package com.example.solidconnection.security.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/com/example/solidconnection/custom/security/aspect/AdminAuthorizationAspect.java b/src/main/java/com/example/solidconnection/security/aspect/AdminAuthorizationAspect.java similarity index 89% rename from src/main/java/com/example/solidconnection/custom/security/aspect/AdminAuthorizationAspect.java rename to src/main/java/com/example/solidconnection/security/aspect/AdminAuthorizationAspect.java index 03cd5bedb..4cab05b51 100644 --- a/src/main/java/com/example/solidconnection/custom/security/aspect/AdminAuthorizationAspect.java +++ b/src/main/java/com/example/solidconnection/security/aspect/AdminAuthorizationAspect.java @@ -1,7 +1,7 @@ -package com.example.solidconnection.custom.security.aspect; +package com.example.solidconnection.security.aspect; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.custom.security.annotation.RequireAdminAccess; +import com.example.solidconnection.security.annotation.RequireAdminAccess; import com.example.solidconnection.siteuser.domain.SiteUser; import lombok.RequiredArgsConstructor; import org.aspectj.lang.ProceedingJoinPoint; diff --git a/src/main/java/com/example/solidconnection/custom/security/authentication/JwtAuthentication.java b/src/main/java/com/example/solidconnection/security/authentication/JwtAuthentication.java similarity index 92% rename from src/main/java/com/example/solidconnection/custom/security/authentication/JwtAuthentication.java rename to src/main/java/com/example/solidconnection/security/authentication/JwtAuthentication.java index 6c9f2fa21..64e89e891 100644 --- a/src/main/java/com/example/solidconnection/custom/security/authentication/JwtAuthentication.java +++ b/src/main/java/com/example/solidconnection/security/authentication/JwtAuthentication.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.custom.security.authentication; +package com.example.solidconnection.security.authentication; import org.springframework.security.authentication.AbstractAuthenticationToken; import org.springframework.security.core.userdetails.UserDetails; diff --git a/src/main/java/com/example/solidconnection/custom/security/authentication/SiteUserAuthentication.java b/src/main/java/com/example/solidconnection/security/authentication/SiteUserAuthentication.java similarity index 69% rename from src/main/java/com/example/solidconnection/custom/security/authentication/SiteUserAuthentication.java rename to src/main/java/com/example/solidconnection/security/authentication/SiteUserAuthentication.java index 3387cee55..60a71b032 100644 --- a/src/main/java/com/example/solidconnection/custom/security/authentication/SiteUserAuthentication.java +++ b/src/main/java/com/example/solidconnection/security/authentication/SiteUserAuthentication.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.custom.security.authentication; +package com.example.solidconnection.security.authentication; -import com.example.solidconnection.custom.security.userdetails.SiteUserDetails; +import com.example.solidconnection.security.userdetails.SiteUserDetails; public class SiteUserAuthentication extends JwtAuthentication { diff --git a/src/main/java/com/example/solidconnection/custom/security/filter/ExceptionHandlerFilter.java b/src/main/java/com/example/solidconnection/security/filter/ExceptionHandlerFilter.java similarity index 97% rename from src/main/java/com/example/solidconnection/custom/security/filter/ExceptionHandlerFilter.java rename to src/main/java/com/example/solidconnection/security/filter/ExceptionHandlerFilter.java index 2db133b8f..922ebde9f 100644 --- a/src/main/java/com/example/solidconnection/custom/security/filter/ExceptionHandlerFilter.java +++ b/src/main/java/com/example/solidconnection/security/filter/ExceptionHandlerFilter.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.custom.security.filter; +package com.example.solidconnection.security.filter; import com.example.solidconnection.custom.exception.CustomException; import com.example.solidconnection.custom.exception.ErrorCode; diff --git a/src/main/java/com/example/solidconnection/custom/security/filter/JwtAuthenticationFilter.java b/src/main/java/com/example/solidconnection/security/filter/JwtAuthenticationFilter.java similarity index 87% rename from src/main/java/com/example/solidconnection/custom/security/filter/JwtAuthenticationFilter.java rename to src/main/java/com/example/solidconnection/security/filter/JwtAuthenticationFilter.java index d9d8efd65..39917d42e 100644 --- a/src/main/java/com/example/solidconnection/custom/security/filter/JwtAuthenticationFilter.java +++ b/src/main/java/com/example/solidconnection/security/filter/JwtAuthenticationFilter.java @@ -1,7 +1,7 @@ -package com.example.solidconnection.custom.security.filter; +package com.example.solidconnection.security.filter; -import com.example.solidconnection.custom.security.authentication.JwtAuthentication; -import com.example.solidconnection.custom.security.authentication.SiteUserAuthentication; +import com.example.solidconnection.security.authentication.JwtAuthentication; +import com.example.solidconnection.security.authentication.SiteUserAuthentication; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/example/solidconnection/custom/security/filter/SignOutCheckFilter.java b/src/main/java/com/example/solidconnection/security/filter/SignOutCheckFilter.java similarity index 96% rename from src/main/java/com/example/solidconnection/custom/security/filter/SignOutCheckFilter.java rename to src/main/java/com/example/solidconnection/security/filter/SignOutCheckFilter.java index a111a7292..744a1b00d 100644 --- a/src/main/java/com/example/solidconnection/custom/security/filter/SignOutCheckFilter.java +++ b/src/main/java/com/example/solidconnection/security/filter/SignOutCheckFilter.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.custom.security.filter; +package com.example.solidconnection.security.filter; import com.example.solidconnection.auth.service.BlacklistChecker; import com.example.solidconnection.custom.exception.CustomException; diff --git a/src/main/java/com/example/solidconnection/custom/security/provider/SiteUserAuthenticationProvider.java b/src/main/java/com/example/solidconnection/security/provider/SiteUserAuthenticationProvider.java similarity index 75% rename from src/main/java/com/example/solidconnection/custom/security/provider/SiteUserAuthenticationProvider.java rename to src/main/java/com/example/solidconnection/security/provider/SiteUserAuthenticationProvider.java index 25f211710..190a74daf 100644 --- a/src/main/java/com/example/solidconnection/custom/security/provider/SiteUserAuthenticationProvider.java +++ b/src/main/java/com/example/solidconnection/security/provider/SiteUserAuthenticationProvider.java @@ -1,10 +1,10 @@ -package com.example.solidconnection.custom.security.provider; +package com.example.solidconnection.security.provider; import com.example.solidconnection.config.security.JwtProperties; -import com.example.solidconnection.custom.security.userdetails.SiteUserDetails; -import com.example.solidconnection.custom.security.userdetails.SiteUserDetailsService; -import com.example.solidconnection.custom.security.authentication.JwtAuthentication; -import com.example.solidconnection.custom.security.authentication.SiteUserAuthentication; +import com.example.solidconnection.security.userdetails.SiteUserDetails; +import com.example.solidconnection.security.userdetails.SiteUserDetailsService; +import com.example.solidconnection.security.authentication.JwtAuthentication; +import com.example.solidconnection.security.authentication.SiteUserAuthentication; import lombok.RequiredArgsConstructor; import org.springframework.security.authentication.AuthenticationProvider; import org.springframework.security.core.Authentication; diff --git a/src/main/java/com/example/solidconnection/custom/security/userdetails/SecurityRoleMapper.java b/src/main/java/com/example/solidconnection/security/userdetails/SecurityRoleMapper.java similarity index 87% rename from src/main/java/com/example/solidconnection/custom/security/userdetails/SecurityRoleMapper.java rename to src/main/java/com/example/solidconnection/security/userdetails/SecurityRoleMapper.java index 1132df5dc..802229e46 100644 --- a/src/main/java/com/example/solidconnection/custom/security/userdetails/SecurityRoleMapper.java +++ b/src/main/java/com/example/solidconnection/security/userdetails/SecurityRoleMapper.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.custom.security.userdetails; +package com.example.solidconnection.security.userdetails; import com.example.solidconnection.siteuser.domain.Role; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/src/main/java/com/example/solidconnection/custom/security/userdetails/SiteUserDetails.java b/src/main/java/com/example/solidconnection/security/userdetails/SiteUserDetails.java similarity index 95% rename from src/main/java/com/example/solidconnection/custom/security/userdetails/SiteUserDetails.java rename to src/main/java/com/example/solidconnection/security/userdetails/SiteUserDetails.java index 008f77ef5..d92d5cc32 100644 --- a/src/main/java/com/example/solidconnection/custom/security/userdetails/SiteUserDetails.java +++ b/src/main/java/com/example/solidconnection/security/userdetails/SiteUserDetails.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.custom.security.userdetails; +package com.example.solidconnection.security.userdetails; import com.example.solidconnection.siteuser.domain.SiteUser; import lombok.Getter; diff --git a/src/main/java/com/example/solidconnection/custom/security/userdetails/SiteUserDetailsService.java b/src/main/java/com/example/solidconnection/security/userdetails/SiteUserDetailsService.java similarity index 96% rename from src/main/java/com/example/solidconnection/custom/security/userdetails/SiteUserDetailsService.java rename to src/main/java/com/example/solidconnection/security/userdetails/SiteUserDetailsService.java index fd23fa899..7c27bab6f 100644 --- a/src/main/java/com/example/solidconnection/custom/security/userdetails/SiteUserDetailsService.java +++ b/src/main/java/com/example/solidconnection/security/userdetails/SiteUserDetailsService.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.custom.security.userdetails; +package com.example.solidconnection.security.userdetails; import com.example.solidconnection.custom.exception.CustomException; import com.example.solidconnection.siteuser.domain.SiteUser; diff --git a/src/test/java/com/example/solidconnection/custom/resolver/AuthorizedUserResolverTest.java b/src/test/java/com/example/solidconnection/custom/resolver/AuthorizedUserResolverTest.java index 1922884c9..967a881c9 100644 --- a/src/test/java/com/example/solidconnection/custom/resolver/AuthorizedUserResolverTest.java +++ b/src/test/java/com/example/solidconnection/custom/resolver/AuthorizedUserResolverTest.java @@ -1,8 +1,8 @@ package com.example.solidconnection.custom.resolver; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.custom.security.authentication.SiteUserAuthentication; -import com.example.solidconnection.custom.security.userdetails.SiteUserDetails; +import com.example.solidconnection.security.authentication.SiteUserAuthentication; +import com.example.solidconnection.security.userdetails.SiteUserDetails; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.TestContainerSpringBootTest; diff --git a/src/test/java/com/example/solidconnection/custom/security/aspect/AdminAuthorizationAspectTest.java b/src/test/java/com/example/solidconnection/security/aspect/AdminAuthorizationAspectTest.java similarity index 95% rename from src/test/java/com/example/solidconnection/custom/security/aspect/AdminAuthorizationAspectTest.java rename to src/test/java/com/example/solidconnection/security/aspect/AdminAuthorizationAspectTest.java index 5f59d8e8f..f421484f1 100644 --- a/src/test/java/com/example/solidconnection/custom/security/aspect/AdminAuthorizationAspectTest.java +++ b/src/test/java/com/example/solidconnection/security/aspect/AdminAuthorizationAspectTest.java @@ -1,7 +1,7 @@ -package com.example.solidconnection.custom.security.aspect; +package com.example.solidconnection.security.aspect; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.custom.security.annotation.RequireAdminAccess; +import com.example.solidconnection.security.annotation.RequireAdminAccess; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.TestContainerSpringBootTest; diff --git a/src/test/java/com/example/solidconnection/custom/security/authentication/SiteUserAuthenticationTest.java b/src/test/java/com/example/solidconnection/security/authentication/SiteUserAuthenticationTest.java similarity index 90% rename from src/test/java/com/example/solidconnection/custom/security/authentication/SiteUserAuthenticationTest.java rename to src/test/java/com/example/solidconnection/security/authentication/SiteUserAuthenticationTest.java index d69501598..a2eef256d 100644 --- a/src/test/java/com/example/solidconnection/custom/security/authentication/SiteUserAuthenticationTest.java +++ b/src/test/java/com/example/solidconnection/security/authentication/SiteUserAuthenticationTest.java @@ -1,6 +1,7 @@ -package com.example.solidconnection.custom.security.authentication; +package com.example.solidconnection.security.authentication; -import com.example.solidconnection.custom.security.userdetails.SiteUserDetails; +import com.example.solidconnection.security.authentication.SiteUserAuthentication; +import com.example.solidconnection.security.userdetails.SiteUserDetails; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.domain.PreparationStatus; import com.example.solidconnection.siteuser.domain.Role; diff --git a/src/test/java/com/example/solidconnection/custom/security/filter/ExceptionHandlerFilterTest.java b/src/test/java/com/example/solidconnection/security/filter/ExceptionHandlerFilterTest.java similarity index 96% rename from src/test/java/com/example/solidconnection/custom/security/filter/ExceptionHandlerFilterTest.java rename to src/test/java/com/example/solidconnection/security/filter/ExceptionHandlerFilterTest.java index f1b3c7359..017ed935e 100644 --- a/src/test/java/com/example/solidconnection/custom/security/filter/ExceptionHandlerFilterTest.java +++ b/src/test/java/com/example/solidconnection/security/filter/ExceptionHandlerFilterTest.java @@ -1,7 +1,8 @@ -package com.example.solidconnection.custom.security.filter; +package com.example.solidconnection.security.filter; import com.example.solidconnection.custom.exception.CustomException; import com.example.solidconnection.custom.exception.ErrorCode; +import com.example.solidconnection.security.filter.ExceptionHandlerFilter; import com.example.solidconnection.support.TestContainerSpringBootTest; import jakarta.servlet.FilterChain; import jakarta.servlet.http.HttpServletRequest; @@ -13,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; -import org.springframework.security.access.AccessDeniedException; import org.springframework.security.authentication.AnonymousAuthenticationToken; import org.springframework.security.authentication.TestingAuthenticationToken; import org.springframework.security.core.Authentication; diff --git a/src/test/java/com/example/solidconnection/custom/security/filter/JwtAuthenticationFilterTest.java b/src/test/java/com/example/solidconnection/security/filter/JwtAuthenticationFilterTest.java similarity index 91% rename from src/test/java/com/example/solidconnection/custom/security/filter/JwtAuthenticationFilterTest.java rename to src/test/java/com/example/solidconnection/security/filter/JwtAuthenticationFilterTest.java index 61e4c9170..8b7d2b7a3 100644 --- a/src/test/java/com/example/solidconnection/custom/security/filter/JwtAuthenticationFilterTest.java +++ b/src/test/java/com/example/solidconnection/security/filter/JwtAuthenticationFilterTest.java @@ -1,8 +1,9 @@ -package com.example.solidconnection.custom.security.filter; +package com.example.solidconnection.security.filter; import com.example.solidconnection.config.security.JwtProperties; -import com.example.solidconnection.custom.security.authentication.SiteUserAuthentication; -import com.example.solidconnection.custom.security.userdetails.SiteUserDetailsService; +import com.example.solidconnection.security.authentication.SiteUserAuthentication; +import com.example.solidconnection.security.filter.JwtAuthenticationFilter; +import com.example.solidconnection.security.userdetails.SiteUserDetailsService; import com.example.solidconnection.support.TestContainerSpringBootTest; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; diff --git a/src/test/java/com/example/solidconnection/custom/security/filter/SignOutCheckFilterTest.java b/src/test/java/com/example/solidconnection/security/filter/SignOutCheckFilterTest.java similarity index 96% rename from src/test/java/com/example/solidconnection/custom/security/filter/SignOutCheckFilterTest.java rename to src/test/java/com/example/solidconnection/security/filter/SignOutCheckFilterTest.java index e76a01c75..55dacfc77 100644 --- a/src/test/java/com/example/solidconnection/custom/security/filter/SignOutCheckFilterTest.java +++ b/src/test/java/com/example/solidconnection/security/filter/SignOutCheckFilterTest.java @@ -1,7 +1,8 @@ -package com.example.solidconnection.custom.security.filter; +package com.example.solidconnection.security.filter; import com.example.solidconnection.config.security.JwtProperties; import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.security.filter.SignOutCheckFilter; import com.example.solidconnection.support.TestContainerSpringBootTest; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; diff --git a/src/test/java/com/example/solidconnection/custom/security/provider/SiteUserAuthenticationProviderTest.java b/src/test/java/com/example/solidconnection/security/provider/SiteUserAuthenticationProviderTest.java similarity index 94% rename from src/test/java/com/example/solidconnection/custom/security/provider/SiteUserAuthenticationProviderTest.java rename to src/test/java/com/example/solidconnection/security/provider/SiteUserAuthenticationProviderTest.java index 125bc4086..1d88ee059 100644 --- a/src/test/java/com/example/solidconnection/custom/security/provider/SiteUserAuthenticationProviderTest.java +++ b/src/test/java/com/example/solidconnection/security/provider/SiteUserAuthenticationProviderTest.java @@ -1,9 +1,10 @@ -package com.example.solidconnection.custom.security.provider; +package com.example.solidconnection.security.provider; import com.example.solidconnection.config.security.JwtProperties; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.custom.security.authentication.SiteUserAuthentication; -import com.example.solidconnection.custom.security.userdetails.SiteUserDetails; +import com.example.solidconnection.security.authentication.SiteUserAuthentication; +import com.example.solidconnection.security.provider.SiteUserAuthenticationProvider; +import com.example.solidconnection.security.userdetails.SiteUserDetails; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.TestContainerSpringBootTest; diff --git a/src/test/java/com/example/solidconnection/custom/security/userdetails/SiteUserDetailsServiceTest.java b/src/test/java/com/example/solidconnection/security/userdetails/SiteUserDetailsServiceTest.java similarity index 94% rename from src/test/java/com/example/solidconnection/custom/security/userdetails/SiteUserDetailsServiceTest.java rename to src/test/java/com/example/solidconnection/security/userdetails/SiteUserDetailsServiceTest.java index 2280b40e0..f93eaeac4 100644 --- a/src/test/java/com/example/solidconnection/custom/security/userdetails/SiteUserDetailsServiceTest.java +++ b/src/test/java/com/example/solidconnection/security/userdetails/SiteUserDetailsServiceTest.java @@ -1,6 +1,8 @@ -package com.example.solidconnection.custom.security.userdetails; +package com.example.solidconnection.security.userdetails; import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.security.userdetails.SiteUserDetails; +import com.example.solidconnection.security.userdetails.SiteUserDetailsService; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.siteuser.repository.SiteUserRepository; diff --git a/src/test/java/com/example/solidconnection/custom/security/userdetails/SiteUserDetailsTest.java b/src/test/java/com/example/solidconnection/security/userdetails/SiteUserDetailsTest.java similarity index 90% rename from src/test/java/com/example/solidconnection/custom/security/userdetails/SiteUserDetailsTest.java rename to src/test/java/com/example/solidconnection/security/userdetails/SiteUserDetailsTest.java index 9f65a06c8..4ed94220c 100644 --- a/src/test/java/com/example/solidconnection/custom/security/userdetails/SiteUserDetailsTest.java +++ b/src/test/java/com/example/solidconnection/security/userdetails/SiteUserDetailsTest.java @@ -1,5 +1,6 @@ -package com.example.solidconnection.custom.security.userdetails; +package com.example.solidconnection.security.userdetails; +import com.example.solidconnection.security.userdetails.SiteUserDetails; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.TestContainerSpringBootTest; From e31700eecec77c47142b655331d532fb9e76a84e Mon Sep 17 00:00:00 2001 From: nayonsoso Date: Fri, 16 May 2025 22:18:35 +0900 Subject: [PATCH 09/15] =?UTF-8?q?refactor:=20=EA=B3=B5=EC=9A=A9=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=EC=9D=98=20=ED=8C=A8=ED=82=A4=EC=A7=80=20?= =?UTF-8?q?=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - custom -> common --- .../admin/controller/AdminScoreController.java | 2 +- .../admin/dto/GpaScoreUpdateRequest.java | 2 +- .../admin/dto/LanguageTestScoreUpdateRequest.java | 2 +- .../admin/service/AdminGpaScoreService.java | 4 ++-- .../admin/service/AdminLanguageTestScoreService.java | 4 ++-- .../controller/ApplicationController.java | 2 +- .../application/dto/UniversityChoiceRequest.java | 2 +- .../repository/ApplicationRepository.java | 4 ++-- .../application/service/ApplicationQueryService.java | 4 ++-- .../service/ApplicationSubmissionService.java | 12 ++++++------ .../auth/client/AppleOAuthClient.java | 6 +++--- .../auth/client/AppleOAuthClientSecretProvider.java | 4 ++-- .../auth/client/ApplePublicKeyProvider.java | 8 ++++---- .../auth/client/KakaoOAuthClient.java | 8 ++++---- .../auth/controller/AuthController.java | 6 +++--- .../solidconnection/auth/service/AuthService.java | 4 ++-- .../auth/service/CommonSignUpTokenProvider.java | 4 ++-- .../auth/service/EmailSignInService.java | 4 ++-- .../auth/service/EmailSignUpService.java | 4 ++-- .../auth/service/EmailSignUpTokenProvider.java | 6 +++--- .../solidconnection/auth/service/SignUpService.java | 4 ++-- .../auth/service/oauth/OAuthSignUpService.java | 4 ++-- .../auth/service/oauth/OAuthSignUpTokenProvider.java | 6 +++--- .../exception/CustomAccessDeniedHandler.java | 4 ++-- .../exception/CustomAuthenticationEntryPoint.java | 4 ++-- .../exception/CustomException.java | 2 +- .../exception/CustomExceptionHandler.java | 12 ++++++------ .../{custom => common}/exception/ErrorCode.java | 2 +- .../{custom => common}/resolver/AuthorizedUser.java | 2 +- .../resolver/AuthorizedUserResolver.java | 6 +++--- .../CustomPageableHandlerMethodArgumentResolver.java | 2 +- .../{custom => common}/response/ErrorResponse.java | 6 +++--- .../{custom => common}/response/PageResponse.java | 2 +- .../annotation/RejectedReasonRequired.java | 4 ++-- .../validation/annotation/ValidUniversityChoice.java | 4 ++-- .../validator/RejectedReasonValidator.java | 6 +++--- .../validator/ValidUniversityChoiceValidator.java | 10 +++++----- .../community/board/controller/BoardController.java | 2 +- .../community/board/repository/BoardRepository.java | 6 +++--- .../comment/controller/CommentController.java | 2 +- .../comment/repository/CommentRepository.java | 4 ++-- .../community/comment/service/CommentService.java | 10 +++++----- .../community/post/controller/PostController.java | 2 +- .../post/repository/PostLikeRepository.java | 4 ++-- .../community/post/repository/PostRepository.java | 4 ++-- .../community/post/service/PostCommandService.java | 12 ++++++------ .../community/post/service/PostLikeService.java | 6 +++--- .../community/post/service/PostQueryService.java | 6 +++--- .../config/security/SecurityConfiguration.java | 4 ++-- .../solidconnection/config/web/WebMvcConfig.java | 4 ++-- .../solidconnection/s3/FileUploadService.java | 6 +++--- .../com/example/solidconnection/s3/S3Controller.java | 2 +- .../com/example/solidconnection/s3/S3Service.java | 12 ++++++------ .../score/controller/ScoreController.java | 2 +- .../solidconnection/score/service/ScoreService.java | 4 ++-- .../security/aspect/AdminAuthorizationAspect.java | 4 ++-- .../security/filter/ExceptionHandlerFilter.java | 8 ++++---- .../security/filter/SignOutCheckFilter.java | 4 ++-- .../security/userdetails/SiteUserDetailsService.java | 6 +++--- .../siteuser/controller/MyPageController.java | 2 +- .../siteuser/service/MyPageService.java | 6 +++--- .../university/controller/UniversityController.java | 2 +- .../repository/UniversityInfoForApplyRepository.java | 6 +++--- .../university/repository/UniversityRepository.java | 4 ++-- .../university/service/UniversityLikeService.java | 6 +++--- .../com/example/solidconnection/util/JwtUtils.java | 4 ++-- .../admin/service/AdminGpaScoreServiceTest.java | 4 ++-- .../service/AdminLanguageTestScoreServiceTest.java | 4 ++-- .../service/ApplicationSubmissionServiceTest.java | 8 ++++---- .../auth/service/AuthServiceTest.java | 4 ++-- .../auth/service/EmailSignInServiceTest.java | 3 +++ .../service/oauth/OAuthSignUpTokenProviderTest.java | 6 +++--- .../exception/CustomAccessDeniedHandlerTest.java | 6 +++--- .../CustomAuthenticationEntryPointTest.java | 6 +++--- .../resolver/AuthorizedUserResolverTest.java | 6 +++--- ...tomPageableHandlerMethodArgumentResolverTest.java | 2 +- .../validator/RejectedReasonValidatorTest.java | 4 ++-- .../ValidUniversityChoiceValidatorTest.java | 8 ++++---- .../comment/service/CommentServiceTest.java | 10 +++++----- .../post/service/PostCommandServiceTest.java | 10 +++++----- .../community/post/service/PostLikeServiceTest.java | 6 +++--- .../aspect/AdminAuthorizationAspectTest.java | 4 ++-- .../security/filter/ExceptionHandlerFilterTest.java | 5 ++--- .../security/filter/SignOutCheckFilterTest.java | 5 ++--- .../provider/SiteUserAuthenticationProviderTest.java | 7 +++---- .../userdetails/SiteUserDetailsServiceTest.java | 8 +++----- .../siteuser/service/MyPageServiceTest.java | 6 +++--- .../service/UniversityLikeServiceTest.java | 8 ++++---- .../service/UniversityQueryServiceTest.java | 4 ++-- .../service/UniversityRecommendServiceTest.java | 10 ++++++---- .../example/solidconnection/util/JwtUtilsTest.java | 4 ++-- 91 files changed, 232 insertions(+), 232 deletions(-) rename src/main/java/com/example/solidconnection/{custom => common}/exception/CustomAccessDeniedHandler.java (90%) rename src/main/java/com/example/solidconnection/{custom => common}/exception/CustomAuthenticationEntryPoint.java (90%) rename src/main/java/com/example/solidconnection/{custom => common}/exception/CustomException.java (89%) rename src/main/java/com/example/solidconnection/{custom => common}/exception/CustomExceptionHandler.java (89%) rename src/main/java/com/example/solidconnection/{custom => common}/exception/ErrorCode.java (99%) rename src/main/java/com/example/solidconnection/{custom => common}/resolver/AuthorizedUser.java (85%) rename src/main/java/com/example/solidconnection/{custom => common}/resolver/AuthorizedUserResolver.java (91%) rename src/main/java/com/example/solidconnection/{custom => common}/resolver/CustomPageableHandlerMethodArgumentResolver.java (92%) rename src/main/java/com/example/solidconnection/{custom => common}/response/ErrorResponse.java (64%) rename src/main/java/com/example/solidconnection/{custom => common}/response/PageResponse.java (92%) rename src/main/java/com/example/solidconnection/{custom => common}/validation/annotation/RejectedReasonRequired.java (82%) rename src/main/java/com/example/solidconnection/{custom => common}/validation/annotation/ValidUniversityChoice.java (82%) rename src/main/java/com/example/solidconnection/{custom => common}/validation/validator/RejectedReasonValidator.java (87%) rename src/main/java/com/example/solidconnection/{custom => common}/validation/validator/ValidUniversityChoiceValidator.java (87%) rename src/test/java/com/example/solidconnection/{custom => common}/exception/CustomAccessDeniedHandlerTest.java (90%) rename src/test/java/com/example/solidconnection/{custom => common}/exception/CustomAuthenticationEntryPointTest.java (91%) rename src/test/java/com/example/solidconnection/{custom => common}/resolver/AuthorizedUserResolverTest.java (95%) rename src/test/java/com/example/solidconnection/{custom => common}/resolver/CustomPageableHandlerMethodArgumentResolverTest.java (98%) rename src/test/java/com/example/solidconnection/{custom => common}/validation/validator/RejectedReasonValidatorTest.java (96%) rename src/test/java/com/example/solidconnection/{custom => common}/validation/validator/ValidUniversityChoiceValidatorTest.java (92%) diff --git a/src/main/java/com/example/solidconnection/admin/controller/AdminScoreController.java b/src/main/java/com/example/solidconnection/admin/controller/AdminScoreController.java index 47bac37e1..d2869e4d3 100644 --- a/src/main/java/com/example/solidconnection/admin/controller/AdminScoreController.java +++ b/src/main/java/com/example/solidconnection/admin/controller/AdminScoreController.java @@ -9,7 +9,7 @@ import com.example.solidconnection.admin.dto.ScoreSearchCondition; import com.example.solidconnection.admin.service.AdminGpaScoreService; import com.example.solidconnection.admin.service.AdminLanguageTestScoreService; -import com.example.solidconnection.custom.response.PageResponse; +import com.example.solidconnection.common.response.PageResponse; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; diff --git a/src/main/java/com/example/solidconnection/admin/dto/GpaScoreUpdateRequest.java b/src/main/java/com/example/solidconnection/admin/dto/GpaScoreUpdateRequest.java index c24247d52..fed0bf4ba 100644 --- a/src/main/java/com/example/solidconnection/admin/dto/GpaScoreUpdateRequest.java +++ b/src/main/java/com/example/solidconnection/admin/dto/GpaScoreUpdateRequest.java @@ -1,6 +1,6 @@ package com.example.solidconnection.admin.dto; -import com.example.solidconnection.custom.validation.annotation.RejectedReasonRequired; +import com.example.solidconnection.common.validation.annotation.RejectedReasonRequired; import com.example.solidconnection.application.domain.VerifyStatus; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreUpdateRequest.java b/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreUpdateRequest.java index e3b2baa5a..65d0a1422 100644 --- a/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreUpdateRequest.java +++ b/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreUpdateRequest.java @@ -1,6 +1,6 @@ package com.example.solidconnection.admin.dto; -import com.example.solidconnection.custom.validation.annotation.RejectedReasonRequired; +import com.example.solidconnection.common.validation.annotation.RejectedReasonRequired; import com.example.solidconnection.university.domain.LanguageTestType; import com.example.solidconnection.application.domain.VerifyStatus; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/example/solidconnection/admin/service/AdminGpaScoreService.java b/src/main/java/com/example/solidconnection/admin/service/AdminGpaScoreService.java index 513961f3d..c98ca4315 100644 --- a/src/main/java/com/example/solidconnection/admin/service/AdminGpaScoreService.java +++ b/src/main/java/com/example/solidconnection/admin/service/AdminGpaScoreService.java @@ -5,7 +5,7 @@ import com.example.solidconnection.admin.dto.GpaScoreUpdateRequest; import com.example.solidconnection.admin.dto.ScoreSearchCondition; import com.example.solidconnection.application.domain.Gpa; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.score.domain.GpaScore; import com.example.solidconnection.score.repository.GpaScoreRepository; import com.example.solidconnection.application.domain.VerifyStatus; @@ -15,7 +15,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import static com.example.solidconnection.custom.exception.ErrorCode.GPA_SCORE_NOT_FOUND; +import static com.example.solidconnection.common.exception.ErrorCode.GPA_SCORE_NOT_FOUND; @RequiredArgsConstructor @Service diff --git a/src/main/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreService.java b/src/main/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreService.java index 01cee4a7b..8a3d05fab 100644 --- a/src/main/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreService.java +++ b/src/main/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreService.java @@ -5,7 +5,7 @@ import com.example.solidconnection.admin.dto.LanguageTestScoreUpdateRequest; import com.example.solidconnection.admin.dto.ScoreSearchCondition; import com.example.solidconnection.application.domain.LanguageTest; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.score.domain.LanguageTestScore; import com.example.solidconnection.score.repository.LanguageTestScoreRepository; import com.example.solidconnection.application.domain.VerifyStatus; @@ -15,7 +15,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import static com.example.solidconnection.custom.exception.ErrorCode.LANGUAGE_TEST_SCORE_NOT_FOUND; +import static com.example.solidconnection.common.exception.ErrorCode.LANGUAGE_TEST_SCORE_NOT_FOUND; @RequiredArgsConstructor @Service diff --git a/src/main/java/com/example/solidconnection/application/controller/ApplicationController.java b/src/main/java/com/example/solidconnection/application/controller/ApplicationController.java index d1e6b1ba5..228c436ba 100644 --- a/src/main/java/com/example/solidconnection/application/controller/ApplicationController.java +++ b/src/main/java/com/example/solidconnection/application/controller/ApplicationController.java @@ -5,7 +5,7 @@ import com.example.solidconnection.application.dto.ApplyRequest; import com.example.solidconnection.application.service.ApplicationQueryService; import com.example.solidconnection.application.service.ApplicationSubmissionService; -import com.example.solidconnection.custom.resolver.AuthorizedUser; +import com.example.solidconnection.common.resolver.AuthorizedUser; import com.example.solidconnection.security.annotation.RequireAdminAccess; import com.example.solidconnection.siteuser.domain.SiteUser; import jakarta.validation.Valid; diff --git a/src/main/java/com/example/solidconnection/application/dto/UniversityChoiceRequest.java b/src/main/java/com/example/solidconnection/application/dto/UniversityChoiceRequest.java index d219dbc2e..d447c9737 100644 --- a/src/main/java/com/example/solidconnection/application/dto/UniversityChoiceRequest.java +++ b/src/main/java/com/example/solidconnection/application/dto/UniversityChoiceRequest.java @@ -1,6 +1,6 @@ package com.example.solidconnection.application.dto; -import com.example.solidconnection.custom.validation.annotation.ValidUniversityChoice; +import com.example.solidconnection.common.validation.annotation.ValidUniversityChoice; @ValidUniversityChoice public record UniversityChoiceRequest( diff --git a/src/main/java/com/example/solidconnection/application/repository/ApplicationRepository.java b/src/main/java/com/example/solidconnection/application/repository/ApplicationRepository.java index 5b70537fe..258d7cf7f 100644 --- a/src/main/java/com/example/solidconnection/application/repository/ApplicationRepository.java +++ b/src/main/java/com/example/solidconnection/application/repository/ApplicationRepository.java @@ -1,7 +1,7 @@ package com.example.solidconnection.application.repository; import com.example.solidconnection.application.domain.Application; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.university.domain.UniversityInfoForApply; @@ -13,7 +13,7 @@ import java.util.List; import java.util.Optional; -import static com.example.solidconnection.custom.exception.ErrorCode.APPLICATION_NOT_FOUND; +import static com.example.solidconnection.common.exception.ErrorCode.APPLICATION_NOT_FOUND; @Repository public interface ApplicationRepository extends JpaRepository { diff --git a/src/main/java/com/example/solidconnection/application/service/ApplicationQueryService.java b/src/main/java/com/example/solidconnection/application/service/ApplicationQueryService.java index 59092b429..575abac86 100644 --- a/src/main/java/com/example/solidconnection/application/service/ApplicationQueryService.java +++ b/src/main/java/com/example/solidconnection/application/service/ApplicationQueryService.java @@ -6,7 +6,7 @@ import com.example.solidconnection.application.dto.UniversityApplicantsResponse; import com.example.solidconnection.application.repository.ApplicationRepository; import com.example.solidconnection.cache.annotation.ThunderingHerdCaching; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.university.domain.University; @@ -25,7 +25,7 @@ import java.util.function.Function; import java.util.stream.Collectors; -import static com.example.solidconnection.custom.exception.ErrorCode.APPLICATION_NOT_APPROVED; +import static com.example.solidconnection.common.exception.ErrorCode.APPLICATION_NOT_APPROVED; @RequiredArgsConstructor @Service diff --git a/src/main/java/com/example/solidconnection/application/service/ApplicationSubmissionService.java b/src/main/java/com/example/solidconnection/application/service/ApplicationSubmissionService.java index ea9797244..45c03f01f 100644 --- a/src/main/java/com/example/solidconnection/application/service/ApplicationSubmissionService.java +++ b/src/main/java/com/example/solidconnection/application/service/ApplicationSubmissionService.java @@ -6,7 +6,7 @@ import com.example.solidconnection.application.dto.UniversityChoiceRequest; import com.example.solidconnection.application.repository.ApplicationRepository; import com.example.solidconnection.cache.annotation.DefaultCacheOut; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.score.domain.GpaScore; import com.example.solidconnection.score.domain.LanguageTestScore; import com.example.solidconnection.score.repository.GpaScoreRepository; @@ -22,11 +22,11 @@ import java.util.Optional; -import static com.example.solidconnection.custom.exception.ErrorCode.APPLY_UPDATE_LIMIT_EXCEED; -import static com.example.solidconnection.custom.exception.ErrorCode.GPA_SCORE_NOT_FOUND; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_GPA_SCORE_STATUS; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_LANGUAGE_TEST_SCORE; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_LANGUAGE_TEST_SCORE_STATUS; +import static com.example.solidconnection.common.exception.ErrorCode.APPLY_UPDATE_LIMIT_EXCEED; +import static com.example.solidconnection.common.exception.ErrorCode.GPA_SCORE_NOT_FOUND; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_GPA_SCORE_STATUS; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_LANGUAGE_TEST_SCORE; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_LANGUAGE_TEST_SCORE_STATUS; @RequiredArgsConstructor @Service diff --git a/src/main/java/com/example/solidconnection/auth/client/AppleOAuthClient.java b/src/main/java/com/example/solidconnection/auth/client/AppleOAuthClient.java index aef1309af..a9b388797 100644 --- a/src/main/java/com/example/solidconnection/auth/client/AppleOAuthClient.java +++ b/src/main/java/com/example/solidconnection/auth/client/AppleOAuthClient.java @@ -3,7 +3,7 @@ import com.example.solidconnection.auth.dto.oauth.AppleTokenDto; import com.example.solidconnection.auth.dto.oauth.AppleUserInfoDto; import com.example.solidconnection.config.client.AppleOAuthClientProperties; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import io.jsonwebtoken.Jwts; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpEntity; @@ -19,8 +19,8 @@ import java.security.PublicKey; import java.util.Objects; -import static com.example.solidconnection.custom.exception.ErrorCode.APPLE_AUTHORIZATION_FAILED; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_APPLE_ID_TOKEN; +import static com.example.solidconnection.common.exception.ErrorCode.APPLE_AUTHORIZATION_FAILED; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_APPLE_ID_TOKEN; /* * 애플 인증을 위한 OAuth2 클라이언트 diff --git a/src/main/java/com/example/solidconnection/auth/client/AppleOAuthClientSecretProvider.java b/src/main/java/com/example/solidconnection/auth/client/AppleOAuthClientSecretProvider.java index 31228e5d3..1dae4a398 100644 --- a/src/main/java/com/example/solidconnection/auth/client/AppleOAuthClientSecretProvider.java +++ b/src/main/java/com/example/solidconnection/auth/client/AppleOAuthClientSecretProvider.java @@ -1,7 +1,7 @@ package com.example.solidconnection.auth.client; import com.example.solidconnection.config.client.AppleOAuthClientProperties; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; import jakarta.annotation.PostConstruct; @@ -16,7 +16,7 @@ import java.security.spec.PKCS8EncodedKeySpec; import java.util.Date; -import static com.example.solidconnection.custom.exception.ErrorCode.FAILED_TO_READ_APPLE_PRIVATE_KEY; +import static com.example.solidconnection.common.exception.ErrorCode.FAILED_TO_READ_APPLE_PRIVATE_KEY; /* * 애플 OAuth 에 필요한 클라이언트 시크릿은 매번 동적으로 생성해야 한다. diff --git a/src/main/java/com/example/solidconnection/auth/client/ApplePublicKeyProvider.java b/src/main/java/com/example/solidconnection/auth/client/ApplePublicKeyProvider.java index 1cc708cc7..0c9f80e8b 100644 --- a/src/main/java/com/example/solidconnection/auth/client/ApplePublicKeyProvider.java +++ b/src/main/java/com/example/solidconnection/auth/client/ApplePublicKeyProvider.java @@ -1,7 +1,7 @@ package com.example.solidconnection.auth.client; import com.example.solidconnection.config.client.AppleOAuthClientProperties; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -20,9 +20,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import static com.example.solidconnection.custom.exception.ErrorCode.APPLE_ID_TOKEN_EXPIRED; -import static com.example.solidconnection.custom.exception.ErrorCode.APPLE_PUBLIC_KEY_NOT_FOUND; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_APPLE_ID_TOKEN; +import static com.example.solidconnection.common.exception.ErrorCode.APPLE_ID_TOKEN_EXPIRED; +import static com.example.solidconnection.common.exception.ErrorCode.APPLE_PUBLIC_KEY_NOT_FOUND; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_APPLE_ID_TOKEN; import static org.apache.tomcat.util.codec.binary.Base64.decodeBase64URLSafe; /* diff --git a/src/main/java/com/example/solidconnection/auth/client/KakaoOAuthClient.java b/src/main/java/com/example/solidconnection/auth/client/KakaoOAuthClient.java index 5d625cb7c..9bda6c2cc 100644 --- a/src/main/java/com/example/solidconnection/auth/client/KakaoOAuthClient.java +++ b/src/main/java/com/example/solidconnection/auth/client/KakaoOAuthClient.java @@ -3,7 +3,7 @@ import com.example.solidconnection.auth.dto.oauth.KakaoTokenDto; import com.example.solidconnection.auth.dto.oauth.KakaoUserInfoDto; import com.example.solidconnection.config.client.KakaoOAuthClientProperties; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; @@ -16,9 +16,9 @@ import java.util.Objects; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_OR_EXPIRED_KAKAO_AUTH_CODE; -import static com.example.solidconnection.custom.exception.ErrorCode.KAKAO_REDIRECT_URI_MISMATCH; -import static com.example.solidconnection.custom.exception.ErrorCode.KAKAO_USER_INFO_FAIL; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_OR_EXPIRED_KAKAO_AUTH_CODE; +import static com.example.solidconnection.common.exception.ErrorCode.KAKAO_REDIRECT_URI_MISMATCH; +import static com.example.solidconnection.common.exception.ErrorCode.KAKAO_USER_INFO_FAIL; /* * 카카오 인증을 위한 OAuth2 클라이언트 diff --git a/src/main/java/com/example/solidconnection/auth/controller/AuthController.java b/src/main/java/com/example/solidconnection/auth/controller/AuthController.java index 064aa88aa..da3ea12c1 100644 --- a/src/main/java/com/example/solidconnection/auth/controller/AuthController.java +++ b/src/main/java/com/example/solidconnection/auth/controller/AuthController.java @@ -17,9 +17,9 @@ import com.example.solidconnection.auth.service.oauth.AppleOAuthService; import com.example.solidconnection.auth.service.oauth.KakaoOAuthService; import com.example.solidconnection.auth.service.oauth.OAuthSignUpService; -import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.custom.exception.ErrorCode; -import com.example.solidconnection.custom.resolver.AuthorizedUser; +import com.example.solidconnection.common.exception.CustomException; +import com.example.solidconnection.common.exception.ErrorCode; +import com.example.solidconnection.common.resolver.AuthorizedUser; import com.example.solidconnection.siteuser.domain.AuthType; import com.example.solidconnection.siteuser.domain.SiteUser; import jakarta.validation.Valid; diff --git a/src/main/java/com/example/solidconnection/auth/service/AuthService.java b/src/main/java/com/example/solidconnection/auth/service/AuthService.java index 50926ca93..496e48724 100644 --- a/src/main/java/com/example/solidconnection/auth/service/AuthService.java +++ b/src/main/java/com/example/solidconnection/auth/service/AuthService.java @@ -2,7 +2,7 @@ import com.example.solidconnection.auth.dto.ReissueRequest; import com.example.solidconnection.auth.dto.ReissueResponse; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.siteuser.domain.SiteUser; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -10,7 +10,7 @@ import java.time.LocalDate; -import static com.example.solidconnection.custom.exception.ErrorCode.REFRESH_TOKEN_EXPIRED; +import static com.example.solidconnection.common.exception.ErrorCode.REFRESH_TOKEN_EXPIRED; @RequiredArgsConstructor @Service diff --git a/src/main/java/com/example/solidconnection/auth/service/CommonSignUpTokenProvider.java b/src/main/java/com/example/solidconnection/auth/service/CommonSignUpTokenProvider.java index 3d0eda53b..323ad94de 100644 --- a/src/main/java/com/example/solidconnection/auth/service/CommonSignUpTokenProvider.java +++ b/src/main/java/com/example/solidconnection/auth/service/CommonSignUpTokenProvider.java @@ -1,14 +1,14 @@ package com.example.solidconnection.auth.service; import com.example.solidconnection.config.security.JwtProperties; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.siteuser.domain.AuthType; import com.example.solidconnection.util.JwtUtils; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; import static com.example.solidconnection.auth.service.EmailSignUpTokenProvider.AUTH_TYPE_CLAIM_KEY; -import static com.example.solidconnection.custom.exception.ErrorCode.SIGN_UP_TOKEN_INVALID; +import static com.example.solidconnection.common.exception.ErrorCode.SIGN_UP_TOKEN_INVALID; @Component @RequiredArgsConstructor diff --git a/src/main/java/com/example/solidconnection/auth/service/EmailSignInService.java b/src/main/java/com/example/solidconnection/auth/service/EmailSignInService.java index 3e26309a5..d80465791 100644 --- a/src/main/java/com/example/solidconnection/auth/service/EmailSignInService.java +++ b/src/main/java/com/example/solidconnection/auth/service/EmailSignInService.java @@ -2,7 +2,7 @@ import com.example.solidconnection.auth.dto.EmailSignInRequest; import com.example.solidconnection.auth.dto.SignInResponse; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.siteuser.domain.AuthType; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; @@ -12,7 +12,7 @@ import java.util.Optional; -import static com.example.solidconnection.custom.exception.ErrorCode.USER_NOT_FOUND; +import static com.example.solidconnection.common.exception.ErrorCode.USER_NOT_FOUND; /* * 보안을 위해 이메일과 비밀번호 중 무엇이 틀렸는지 구체적으로 응답하지 않는다. diff --git a/src/main/java/com/example/solidconnection/auth/service/EmailSignUpService.java b/src/main/java/com/example/solidconnection/auth/service/EmailSignUpService.java index 12238373c..01e117ea0 100644 --- a/src/main/java/com/example/solidconnection/auth/service/EmailSignUpService.java +++ b/src/main/java/com/example/solidconnection/auth/service/EmailSignUpService.java @@ -1,7 +1,7 @@ package com.example.solidconnection.auth.service; import com.example.solidconnection.auth.dto.SignUpRequest; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.location.country.repository.CountryRepository; import com.example.solidconnection.location.country.repository.InterestedCountyRepository; import com.example.solidconnection.location.region.repository.InterestedRegionRepository; @@ -11,7 +11,7 @@ import com.example.solidconnection.siteuser.repository.SiteUserRepository; import org.springframework.stereotype.Service; -import static com.example.solidconnection.custom.exception.ErrorCode.USER_ALREADY_EXISTED; +import static com.example.solidconnection.common.exception.ErrorCode.USER_ALREADY_EXISTED; @Service public class EmailSignUpService extends SignUpService { diff --git a/src/main/java/com/example/solidconnection/auth/service/EmailSignUpTokenProvider.java b/src/main/java/com/example/solidconnection/auth/service/EmailSignUpTokenProvider.java index 1c27a87bd..9020ab083 100644 --- a/src/main/java/com/example/solidconnection/auth/service/EmailSignUpTokenProvider.java +++ b/src/main/java/com/example/solidconnection/auth/service/EmailSignUpTokenProvider.java @@ -3,7 +3,7 @@ import com.example.solidconnection.auth.domain.TokenType; import com.example.solidconnection.auth.dto.EmailSignUpTokenRequest; import com.example.solidconnection.config.security.JwtProperties; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.siteuser.domain.AuthType; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; @@ -17,8 +17,8 @@ import java.util.Map; import java.util.Objects; -import static com.example.solidconnection.custom.exception.ErrorCode.SIGN_UP_TOKEN_INVALID; -import static com.example.solidconnection.custom.exception.ErrorCode.SIGN_UP_TOKEN_NOT_ISSUED_BY_SERVER; +import static com.example.solidconnection.common.exception.ErrorCode.SIGN_UP_TOKEN_INVALID; +import static com.example.solidconnection.common.exception.ErrorCode.SIGN_UP_TOKEN_NOT_ISSUED_BY_SERVER; import static com.example.solidconnection.util.JwtUtils.parseClaims; import static com.example.solidconnection.util.JwtUtils.parseSubject; diff --git a/src/main/java/com/example/solidconnection/auth/service/SignUpService.java b/src/main/java/com/example/solidconnection/auth/service/SignUpService.java index e52ba5884..cc69dfd5e 100644 --- a/src/main/java/com/example/solidconnection/auth/service/SignUpService.java +++ b/src/main/java/com/example/solidconnection/auth/service/SignUpService.java @@ -2,7 +2,7 @@ import com.example.solidconnection.auth.dto.SignInResponse; import com.example.solidconnection.auth.dto.SignUpRequest; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.location.country.domain.InterestedCountry; import com.example.solidconnection.location.region.domain.InterestedRegion; import com.example.solidconnection.location.country.repository.CountryRepository; @@ -15,7 +15,7 @@ import java.util.List; -import static com.example.solidconnection.custom.exception.ErrorCode.NICKNAME_ALREADY_EXISTED; +import static com.example.solidconnection.common.exception.ErrorCode.NICKNAME_ALREADY_EXISTED; /* * 우리 서버에서 인증되었음을 확인하기 위한 signUpToken 을 검증한다. diff --git a/src/main/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpService.java b/src/main/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpService.java index b307a7cdc..5676f1c7d 100644 --- a/src/main/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpService.java +++ b/src/main/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpService.java @@ -3,7 +3,7 @@ import com.example.solidconnection.auth.dto.SignUpRequest; import com.example.solidconnection.auth.service.SignInService; import com.example.solidconnection.auth.service.SignUpService; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.location.country.repository.CountryRepository; import com.example.solidconnection.location.country.repository.InterestedCountyRepository; import com.example.solidconnection.location.region.repository.InterestedRegionRepository; @@ -13,7 +13,7 @@ import com.example.solidconnection.siteuser.repository.SiteUserRepository; import org.springframework.stereotype.Service; -import static com.example.solidconnection.custom.exception.ErrorCode.USER_ALREADY_EXISTED; +import static com.example.solidconnection.common.exception.ErrorCode.USER_ALREADY_EXISTED; @Service public class OAuthSignUpService extends SignUpService { diff --git a/src/main/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpTokenProvider.java b/src/main/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpTokenProvider.java index c3a95dbe9..a6ee2afac 100644 --- a/src/main/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpTokenProvider.java +++ b/src/main/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpTokenProvider.java @@ -3,7 +3,7 @@ import com.example.solidconnection.auth.domain.TokenType; import com.example.solidconnection.auth.service.TokenProvider; import com.example.solidconnection.config.security.JwtProperties; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.siteuser.domain.AuthType; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; @@ -16,8 +16,8 @@ import java.util.Map; import java.util.Objects; -import static com.example.solidconnection.custom.exception.ErrorCode.SIGN_UP_TOKEN_INVALID; -import static com.example.solidconnection.custom.exception.ErrorCode.SIGN_UP_TOKEN_NOT_ISSUED_BY_SERVER; +import static com.example.solidconnection.common.exception.ErrorCode.SIGN_UP_TOKEN_INVALID; +import static com.example.solidconnection.common.exception.ErrorCode.SIGN_UP_TOKEN_NOT_ISSUED_BY_SERVER; import static com.example.solidconnection.util.JwtUtils.parseClaims; import static com.example.solidconnection.util.JwtUtils.parseSubject; diff --git a/src/main/java/com/example/solidconnection/custom/exception/CustomAccessDeniedHandler.java b/src/main/java/com/example/solidconnection/common/exception/CustomAccessDeniedHandler.java similarity index 90% rename from src/main/java/com/example/solidconnection/custom/exception/CustomAccessDeniedHandler.java rename to src/main/java/com/example/solidconnection/common/exception/CustomAccessDeniedHandler.java index 52b1725fc..2c7e0fd19 100644 --- a/src/main/java/com/example/solidconnection/custom/exception/CustomAccessDeniedHandler.java +++ b/src/main/java/com/example/solidconnection/common/exception/CustomAccessDeniedHandler.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.custom.exception; +package com.example.solidconnection.common.exception; -import com.example.solidconnection.custom.response.ErrorResponse; +import com.example.solidconnection.common.response.ErrorResponse; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/src/main/java/com/example/solidconnection/custom/exception/CustomAuthenticationEntryPoint.java b/src/main/java/com/example/solidconnection/common/exception/CustomAuthenticationEntryPoint.java similarity index 90% rename from src/main/java/com/example/solidconnection/custom/exception/CustomAuthenticationEntryPoint.java rename to src/main/java/com/example/solidconnection/common/exception/CustomAuthenticationEntryPoint.java index 20f0786b7..d5eb87705 100644 --- a/src/main/java/com/example/solidconnection/custom/exception/CustomAuthenticationEntryPoint.java +++ b/src/main/java/com/example/solidconnection/common/exception/CustomAuthenticationEntryPoint.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.custom.exception; +package com.example.solidconnection.common.exception; -import com.example.solidconnection.custom.response.ErrorResponse; +import com.example.solidconnection.common.response.ErrorResponse; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/src/main/java/com/example/solidconnection/custom/exception/CustomException.java b/src/main/java/com/example/solidconnection/common/exception/CustomException.java similarity index 89% rename from src/main/java/com/example/solidconnection/custom/exception/CustomException.java rename to src/main/java/com/example/solidconnection/common/exception/CustomException.java index 2f1962fbf..fab42924c 100644 --- a/src/main/java/com/example/solidconnection/custom/exception/CustomException.java +++ b/src/main/java/com/example/solidconnection/common/exception/CustomException.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.custom.exception; +package com.example.solidconnection.common.exception; import lombok.Getter; diff --git a/src/main/java/com/example/solidconnection/custom/exception/CustomExceptionHandler.java b/src/main/java/com/example/solidconnection/common/exception/CustomExceptionHandler.java similarity index 89% rename from src/main/java/com/example/solidconnection/custom/exception/CustomExceptionHandler.java rename to src/main/java/com/example/solidconnection/common/exception/CustomExceptionHandler.java index c0c610bce..bc03ca98a 100644 --- a/src/main/java/com/example/solidconnection/custom/exception/CustomExceptionHandler.java +++ b/src/main/java/com/example/solidconnection/common/exception/CustomExceptionHandler.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.custom.exception; +package com.example.solidconnection.common.exception; -import com.example.solidconnection.custom.response.ErrorResponse; +import com.example.solidconnection.common.response.ErrorResponse; import com.fasterxml.jackson.databind.exc.InvalidFormatException; import io.jsonwebtoken.JwtException; import lombok.extern.slf4j.Slf4j; @@ -13,10 +13,10 @@ import java.util.ArrayList; import java.util.List; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_INPUT; -import static com.example.solidconnection.custom.exception.ErrorCode.JSON_PARSING_FAILED; -import static com.example.solidconnection.custom.exception.ErrorCode.JWT_EXCEPTION; -import static com.example.solidconnection.custom.exception.ErrorCode.NOT_DEFINED_ERROR; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_INPUT; +import static com.example.solidconnection.common.exception.ErrorCode.JSON_PARSING_FAILED; +import static com.example.solidconnection.common.exception.ErrorCode.JWT_EXCEPTION; +import static com.example.solidconnection.common.exception.ErrorCode.NOT_DEFINED_ERROR; @Slf4j @ControllerAdvice diff --git a/src/main/java/com/example/solidconnection/custom/exception/ErrorCode.java b/src/main/java/com/example/solidconnection/common/exception/ErrorCode.java similarity index 99% rename from src/main/java/com/example/solidconnection/custom/exception/ErrorCode.java rename to src/main/java/com/example/solidconnection/common/exception/ErrorCode.java index 1a4e46b72..6e932a159 100644 --- a/src/main/java/com/example/solidconnection/custom/exception/ErrorCode.java +++ b/src/main/java/com/example/solidconnection/common/exception/ErrorCode.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.custom.exception; +package com.example.solidconnection.common.exception; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/example/solidconnection/custom/resolver/AuthorizedUser.java b/src/main/java/com/example/solidconnection/common/resolver/AuthorizedUser.java similarity index 85% rename from src/main/java/com/example/solidconnection/custom/resolver/AuthorizedUser.java rename to src/main/java/com/example/solidconnection/common/resolver/AuthorizedUser.java index fa1db7f74..0f4aa0954 100644 --- a/src/main/java/com/example/solidconnection/custom/resolver/AuthorizedUser.java +++ b/src/main/java/com/example/solidconnection/common/resolver/AuthorizedUser.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.custom.resolver; +package com.example.solidconnection.common.resolver; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/com/example/solidconnection/custom/resolver/AuthorizedUserResolver.java b/src/main/java/com/example/solidconnection/common/resolver/AuthorizedUserResolver.java similarity index 91% rename from src/main/java/com/example/solidconnection/custom/resolver/AuthorizedUserResolver.java rename to src/main/java/com/example/solidconnection/common/resolver/AuthorizedUserResolver.java index b85e94cfd..f729eb073 100644 --- a/src/main/java/com/example/solidconnection/custom/resolver/AuthorizedUserResolver.java +++ b/src/main/java/com/example/solidconnection/common/resolver/AuthorizedUserResolver.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.custom.resolver; +package com.example.solidconnection.common.resolver; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.security.userdetails.SiteUserDetails; import com.example.solidconnection.siteuser.domain.SiteUser; import lombok.RequiredArgsConstructor; @@ -13,7 +13,7 @@ import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.ModelAndViewContainer; -import static com.example.solidconnection.custom.exception.ErrorCode.AUTHENTICATION_FAILED; +import static com.example.solidconnection.common.exception.ErrorCode.AUTHENTICATION_FAILED; @Component @RequiredArgsConstructor diff --git a/src/main/java/com/example/solidconnection/custom/resolver/CustomPageableHandlerMethodArgumentResolver.java b/src/main/java/com/example/solidconnection/common/resolver/CustomPageableHandlerMethodArgumentResolver.java similarity index 92% rename from src/main/java/com/example/solidconnection/custom/resolver/CustomPageableHandlerMethodArgumentResolver.java rename to src/main/java/com/example/solidconnection/common/resolver/CustomPageableHandlerMethodArgumentResolver.java index 418c6867f..ecb8bc75b 100644 --- a/src/main/java/com/example/solidconnection/custom/resolver/CustomPageableHandlerMethodArgumentResolver.java +++ b/src/main/java/com/example/solidconnection/common/resolver/CustomPageableHandlerMethodArgumentResolver.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.custom.resolver; +package com.example.solidconnection.common.resolver; import org.springframework.data.domain.PageRequest; import org.springframework.data.web.PageableHandlerMethodArgumentResolver; diff --git a/src/main/java/com/example/solidconnection/custom/response/ErrorResponse.java b/src/main/java/com/example/solidconnection/common/response/ErrorResponse.java similarity index 64% rename from src/main/java/com/example/solidconnection/custom/response/ErrorResponse.java rename to src/main/java/com/example/solidconnection/common/response/ErrorResponse.java index 83cc02622..68b9c259f 100644 --- a/src/main/java/com/example/solidconnection/custom/response/ErrorResponse.java +++ b/src/main/java/com/example/solidconnection/common/response/ErrorResponse.java @@ -1,7 +1,7 @@ -package com.example.solidconnection.custom.response; +package com.example.solidconnection.common.response; -import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.custom.exception.ErrorCode; +import com.example.solidconnection.common.exception.CustomException; +import com.example.solidconnection.common.exception.ErrorCode; public record ErrorResponse(String message) { diff --git a/src/main/java/com/example/solidconnection/custom/response/PageResponse.java b/src/main/java/com/example/solidconnection/common/response/PageResponse.java similarity index 92% rename from src/main/java/com/example/solidconnection/custom/response/PageResponse.java rename to src/main/java/com/example/solidconnection/common/response/PageResponse.java index d1e3479d6..90790d271 100644 --- a/src/main/java/com/example/solidconnection/custom/response/PageResponse.java +++ b/src/main/java/com/example/solidconnection/common/response/PageResponse.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.custom.response; +package com.example.solidconnection.common.response; import org.springframework.data.domain.Page; diff --git a/src/main/java/com/example/solidconnection/custom/validation/annotation/RejectedReasonRequired.java b/src/main/java/com/example/solidconnection/common/validation/annotation/RejectedReasonRequired.java similarity index 82% rename from src/main/java/com/example/solidconnection/custom/validation/annotation/RejectedReasonRequired.java rename to src/main/java/com/example/solidconnection/common/validation/annotation/RejectedReasonRequired.java index 4ae4a6618..704919494 100644 --- a/src/main/java/com/example/solidconnection/custom/validation/annotation/RejectedReasonRequired.java +++ b/src/main/java/com/example/solidconnection/common/validation/annotation/RejectedReasonRequired.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.custom.validation.annotation; +package com.example.solidconnection.common.validation.annotation; -import com.example.solidconnection.custom.validation.validator.RejectedReasonValidator; +import com.example.solidconnection.common.validation.validator.RejectedReasonValidator; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/src/main/java/com/example/solidconnection/custom/validation/annotation/ValidUniversityChoice.java b/src/main/java/com/example/solidconnection/common/validation/annotation/ValidUniversityChoice.java similarity index 82% rename from src/main/java/com/example/solidconnection/custom/validation/annotation/ValidUniversityChoice.java rename to src/main/java/com/example/solidconnection/common/validation/annotation/ValidUniversityChoice.java index 7e5827113..592a500df 100644 --- a/src/main/java/com/example/solidconnection/custom/validation/annotation/ValidUniversityChoice.java +++ b/src/main/java/com/example/solidconnection/common/validation/annotation/ValidUniversityChoice.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.custom.validation.annotation; +package com.example.solidconnection.common.validation.annotation; -import com.example.solidconnection.custom.validation.validator.ValidUniversityChoiceValidator; +import com.example.solidconnection.common.validation.validator.ValidUniversityChoiceValidator; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/src/main/java/com/example/solidconnection/custom/validation/validator/RejectedReasonValidator.java b/src/main/java/com/example/solidconnection/common/validation/validator/RejectedReasonValidator.java similarity index 87% rename from src/main/java/com/example/solidconnection/custom/validation/validator/RejectedReasonValidator.java rename to src/main/java/com/example/solidconnection/common/validation/validator/RejectedReasonValidator.java index d31f2cb5c..ae4d27467 100644 --- a/src/main/java/com/example/solidconnection/custom/validation/validator/RejectedReasonValidator.java +++ b/src/main/java/com/example/solidconnection/common/validation/validator/RejectedReasonValidator.java @@ -1,13 +1,13 @@ -package com.example.solidconnection.custom.validation.validator; +package com.example.solidconnection.common.validation.validator; import com.example.solidconnection.admin.dto.ScoreUpdateRequest; -import com.example.solidconnection.custom.validation.annotation.RejectedReasonRequired; +import com.example.solidconnection.common.validation.annotation.RejectedReasonRequired; import com.example.solidconnection.application.domain.VerifyStatus; import io.micrometer.common.util.StringUtils; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; -import static com.example.solidconnection.custom.exception.ErrorCode.REJECTED_REASON_REQUIRED; +import static com.example.solidconnection.common.exception.ErrorCode.REJECTED_REASON_REQUIRED; public class RejectedReasonValidator implements ConstraintValidator { diff --git a/src/main/java/com/example/solidconnection/custom/validation/validator/ValidUniversityChoiceValidator.java b/src/main/java/com/example/solidconnection/common/validation/validator/ValidUniversityChoiceValidator.java similarity index 87% rename from src/main/java/com/example/solidconnection/custom/validation/validator/ValidUniversityChoiceValidator.java rename to src/main/java/com/example/solidconnection/common/validation/validator/ValidUniversityChoiceValidator.java index 6ac9fe1c2..68910155c 100644 --- a/src/main/java/com/example/solidconnection/custom/validation/validator/ValidUniversityChoiceValidator.java +++ b/src/main/java/com/example/solidconnection/common/validation/validator/ValidUniversityChoiceValidator.java @@ -1,7 +1,7 @@ -package com.example.solidconnection.custom.validation.validator; +package com.example.solidconnection.common.validation.validator; import com.example.solidconnection.application.dto.UniversityChoiceRequest; -import com.example.solidconnection.custom.validation.annotation.ValidUniversityChoice; +import com.example.solidconnection.common.validation.annotation.ValidUniversityChoice; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; @@ -10,9 +10,9 @@ import java.util.Set; import java.util.stream.Stream; -import static com.example.solidconnection.custom.exception.ErrorCode.DUPLICATE_UNIVERSITY_CHOICE; -import static com.example.solidconnection.custom.exception.ErrorCode.FIRST_CHOICE_REQUIRED; -import static com.example.solidconnection.custom.exception.ErrorCode.THIRD_CHOICE_REQUIRES_SECOND; +import static com.example.solidconnection.common.exception.ErrorCode.DUPLICATE_UNIVERSITY_CHOICE; +import static com.example.solidconnection.common.exception.ErrorCode.FIRST_CHOICE_REQUIRED; +import static com.example.solidconnection.common.exception.ErrorCode.THIRD_CHOICE_REQUIRES_SECOND; public class ValidUniversityChoiceValidator implements ConstraintValidator { diff --git a/src/main/java/com/example/solidconnection/community/board/controller/BoardController.java b/src/main/java/com/example/solidconnection/community/board/controller/BoardController.java index babfdfebe..60ab7bc79 100644 --- a/src/main/java/com/example/solidconnection/community/board/controller/BoardController.java +++ b/src/main/java/com/example/solidconnection/community/board/controller/BoardController.java @@ -2,7 +2,7 @@ import com.example.solidconnection.community.post.dto.PostListResponse; import com.example.solidconnection.community.post.service.PostQueryService; -import com.example.solidconnection.custom.resolver.AuthorizedUser; +import com.example.solidconnection.common.resolver.AuthorizedUser; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.community.board.domain.BoardCode; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/solidconnection/community/board/repository/BoardRepository.java b/src/main/java/com/example/solidconnection/community/board/repository/BoardRepository.java index 06dd01161..aec6bcd6f 100644 --- a/src/main/java/com/example/solidconnection/community/board/repository/BoardRepository.java +++ b/src/main/java/com/example/solidconnection/community/board/repository/BoardRepository.java @@ -1,8 +1,8 @@ package com.example.solidconnection.community.board.repository; import com.example.solidconnection.community.board.domain.Board; -import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.custom.exception.ErrorCode; +import com.example.solidconnection.common.exception.CustomException; +import com.example.solidconnection.common.exception.ErrorCode; import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.repository.query.Param; @@ -10,7 +10,7 @@ import java.util.Optional; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_BOARD_CODE; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_BOARD_CODE; @Repository public interface BoardRepository extends JpaRepository { diff --git a/src/main/java/com/example/solidconnection/community/comment/controller/CommentController.java b/src/main/java/com/example/solidconnection/community/comment/controller/CommentController.java index d096f6cc9..ab2eabcf9 100644 --- a/src/main/java/com/example/solidconnection/community/comment/controller/CommentController.java +++ b/src/main/java/com/example/solidconnection/community/comment/controller/CommentController.java @@ -6,7 +6,7 @@ import com.example.solidconnection.community.comment.dto.CommentUpdateRequest; import com.example.solidconnection.community.comment.dto.CommentUpdateResponse; import com.example.solidconnection.community.comment.service.CommentService; -import com.example.solidconnection.custom.resolver.AuthorizedUser; +import com.example.solidconnection.common.resolver.AuthorizedUser; import com.example.solidconnection.siteuser.domain.SiteUser; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/solidconnection/community/comment/repository/CommentRepository.java b/src/main/java/com/example/solidconnection/community/comment/repository/CommentRepository.java index e5feb3f04..834cd264b 100644 --- a/src/main/java/com/example/solidconnection/community/comment/repository/CommentRepository.java +++ b/src/main/java/com/example/solidconnection/community/comment/repository/CommentRepository.java @@ -1,14 +1,14 @@ package com.example.solidconnection.community.comment.repository; import com.example.solidconnection.community.comment.domain.Comment; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import java.util.List; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_COMMENT_ID; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_COMMENT_ID; public interface CommentRepository extends JpaRepository { diff --git a/src/main/java/com/example/solidconnection/community/comment/service/CommentService.java b/src/main/java/com/example/solidconnection/community/comment/service/CommentService.java index 76138b356..b27d1be80 100644 --- a/src/main/java/com/example/solidconnection/community/comment/service/CommentService.java +++ b/src/main/java/com/example/solidconnection/community/comment/service/CommentService.java @@ -10,7 +10,7 @@ import com.example.solidconnection.community.comment.repository.CommentRepository; import com.example.solidconnection.community.post.domain.Post; import com.example.solidconnection.community.post.repository.PostRepository; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import lombok.RequiredArgsConstructor; @@ -20,10 +20,10 @@ import java.util.List; import java.util.stream.Collectors; -import static com.example.solidconnection.custom.exception.ErrorCode.CAN_NOT_UPDATE_DEPRECATED_COMMENT; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_COMMENT_LEVEL; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_POST_ACCESS; -import static com.example.solidconnection.custom.exception.ErrorCode.USER_NOT_FOUND; +import static com.example.solidconnection.common.exception.ErrorCode.CAN_NOT_UPDATE_DEPRECATED_COMMENT; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_COMMENT_LEVEL; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_POST_ACCESS; +import static com.example.solidconnection.common.exception.ErrorCode.USER_NOT_FOUND; @Service @RequiredArgsConstructor diff --git a/src/main/java/com/example/solidconnection/community/post/controller/PostController.java b/src/main/java/com/example/solidconnection/community/post/controller/PostController.java index ee422930a..19d145319 100644 --- a/src/main/java/com/example/solidconnection/community/post/controller/PostController.java +++ b/src/main/java/com/example/solidconnection/community/post/controller/PostController.java @@ -11,7 +11,7 @@ import com.example.solidconnection.community.post.service.PostCommandService; import com.example.solidconnection.community.post.service.PostLikeService; import com.example.solidconnection.community.post.service.PostQueryService; -import com.example.solidconnection.custom.resolver.AuthorizedUser; +import com.example.solidconnection.common.resolver.AuthorizedUser; import com.example.solidconnection.siteuser.domain.SiteUser; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/solidconnection/community/post/repository/PostLikeRepository.java b/src/main/java/com/example/solidconnection/community/post/repository/PostLikeRepository.java index 417e97310..fba377899 100644 --- a/src/main/java/com/example/solidconnection/community/post/repository/PostLikeRepository.java +++ b/src/main/java/com/example/solidconnection/community/post/repository/PostLikeRepository.java @@ -1,6 +1,6 @@ package com.example.solidconnection.community.post.repository; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.community.post.domain.Post; import com.example.solidconnection.community.post.domain.PostLike; import com.example.solidconnection.siteuser.domain.SiteUser; @@ -9,7 +9,7 @@ import java.util.Optional; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_POST_LIKE; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_POST_LIKE; @Repository public interface PostLikeRepository extends JpaRepository { diff --git a/src/main/java/com/example/solidconnection/community/post/repository/PostRepository.java b/src/main/java/com/example/solidconnection/community/post/repository/PostRepository.java index 336189b05..8c1d256a6 100644 --- a/src/main/java/com/example/solidconnection/community/post/repository/PostRepository.java +++ b/src/main/java/com/example/solidconnection/community/post/repository/PostRepository.java @@ -1,6 +1,6 @@ package com.example.solidconnection.community.post.repository; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.community.post.domain.Post; import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.JpaRepository; @@ -11,7 +11,7 @@ import java.util.Optional; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_POST_ID; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_POST_ID; @Repository public interface PostRepository extends JpaRepository { diff --git a/src/main/java/com/example/solidconnection/community/post/service/PostCommandService.java b/src/main/java/com/example/solidconnection/community/post/service/PostCommandService.java index e676e943b..f48b12eb8 100644 --- a/src/main/java/com/example/solidconnection/community/post/service/PostCommandService.java +++ b/src/main/java/com/example/solidconnection/community/post/service/PostCommandService.java @@ -10,7 +10,7 @@ import com.example.solidconnection.community.post.dto.PostUpdateRequest; import com.example.solidconnection.community.post.dto.PostUpdateResponse; import com.example.solidconnection.community.post.repository.PostRepository; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.s3.S3Service; import com.example.solidconnection.s3.UploadedFileUrlResponse; import com.example.solidconnection.siteuser.domain.SiteUser; @@ -26,11 +26,11 @@ import java.util.List; -import static com.example.solidconnection.custom.exception.ErrorCode.CAN_NOT_DELETE_OR_UPDATE_QUESTION; -import static com.example.solidconnection.custom.exception.ErrorCode.CAN_NOT_UPLOAD_MORE_THAN_FIVE_IMAGES; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_POST_ACCESS; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_POST_CATEGORY; -import static com.example.solidconnection.custom.exception.ErrorCode.USER_NOT_FOUND; +import static com.example.solidconnection.common.exception.ErrorCode.CAN_NOT_DELETE_OR_UPDATE_QUESTION; +import static com.example.solidconnection.common.exception.ErrorCode.CAN_NOT_UPLOAD_MORE_THAN_FIVE_IMAGES; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_POST_ACCESS; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_POST_CATEGORY; +import static com.example.solidconnection.common.exception.ErrorCode.USER_NOT_FOUND; @Service @RequiredArgsConstructor diff --git a/src/main/java/com/example/solidconnection/community/post/service/PostLikeService.java b/src/main/java/com/example/solidconnection/community/post/service/PostLikeService.java index 98d1a239f..197ce8e51 100644 --- a/src/main/java/com/example/solidconnection/community/post/service/PostLikeService.java +++ b/src/main/java/com/example/solidconnection/community/post/service/PostLikeService.java @@ -6,7 +6,7 @@ import com.example.solidconnection.community.post.dto.PostLikeResponse; import com.example.solidconnection.community.post.repository.PostLikeRepository; import com.example.solidconnection.community.post.repository.PostRepository; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import lombok.RequiredArgsConstructor; @@ -14,8 +14,8 @@ import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Transactional; -import static com.example.solidconnection.custom.exception.ErrorCode.DUPLICATE_POST_LIKE; -import static com.example.solidconnection.custom.exception.ErrorCode.USER_NOT_FOUND; +import static com.example.solidconnection.common.exception.ErrorCode.DUPLICATE_POST_LIKE; +import static com.example.solidconnection.common.exception.ErrorCode.USER_NOT_FOUND; @Service @RequiredArgsConstructor diff --git a/src/main/java/com/example/solidconnection/community/post/service/PostQueryService.java b/src/main/java/com/example/solidconnection/community/post/service/PostQueryService.java index 4af95575b..a3db6dc5b 100644 --- a/src/main/java/com/example/solidconnection/community/post/service/PostQueryService.java +++ b/src/main/java/com/example/solidconnection/community/post/service/PostQueryService.java @@ -6,7 +6,7 @@ import com.example.solidconnection.community.post.dto.PostListResponse; import com.example.solidconnection.community.board.repository.BoardRepository; import com.example.solidconnection.community.comment.service.CommentService; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.community.post.domain.Post; import com.example.solidconnection.community.post.dto.PostFindPostImageResponse; import com.example.solidconnection.community.post.dto.PostFindResponse; @@ -25,8 +25,8 @@ import java.util.List; import java.util.stream.Collectors; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_BOARD_CODE; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_POST_CATEGORY; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_BOARD_CODE; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_POST_CATEGORY; @Service @RequiredArgsConstructor diff --git a/src/main/java/com/example/solidconnection/config/security/SecurityConfiguration.java b/src/main/java/com/example/solidconnection/config/security/SecurityConfiguration.java index 9f4d7215c..42f460b64 100644 --- a/src/main/java/com/example/solidconnection/config/security/SecurityConfiguration.java +++ b/src/main/java/com/example/solidconnection/config/security/SecurityConfiguration.java @@ -1,7 +1,7 @@ package com.example.solidconnection.config.security; -import com.example.solidconnection.custom.exception.CustomAccessDeniedHandler; -import com.example.solidconnection.custom.exception.CustomAuthenticationEntryPoint; +import com.example.solidconnection.common.exception.CustomAccessDeniedHandler; +import com.example.solidconnection.common.exception.CustomAuthenticationEntryPoint; import com.example.solidconnection.security.filter.ExceptionHandlerFilter; import com.example.solidconnection.security.filter.JwtAuthenticationFilter; import com.example.solidconnection.security.filter.SignOutCheckFilter; diff --git a/src/main/java/com/example/solidconnection/config/web/WebMvcConfig.java b/src/main/java/com/example/solidconnection/config/web/WebMvcConfig.java index 7f56e320f..7cf375057 100644 --- a/src/main/java/com/example/solidconnection/config/web/WebMvcConfig.java +++ b/src/main/java/com/example/solidconnection/config/web/WebMvcConfig.java @@ -1,7 +1,7 @@ package com.example.solidconnection.config.web; -import com.example.solidconnection.custom.resolver.AuthorizedUserResolver; -import com.example.solidconnection.custom.resolver.CustomPageableHandlerMethodArgumentResolver; +import com.example.solidconnection.common.resolver.AuthorizedUserResolver; +import com.example.solidconnection.common.resolver.CustomPageableHandlerMethodArgumentResolver; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Configuration; import org.springframework.web.method.support.HandlerMethodArgumentResolver; diff --git a/src/main/java/com/example/solidconnection/s3/FileUploadService.java b/src/main/java/com/example/solidconnection/s3/FileUploadService.java index 71d9f9c7a..133bdd1d4 100644 --- a/src/main/java/com/example/solidconnection/s3/FileUploadService.java +++ b/src/main/java/com/example/solidconnection/s3/FileUploadService.java @@ -6,7 +6,7 @@ import com.amazonaws.services.s3.model.CannedAccessControlList; import com.amazonaws.services.s3.model.ObjectMetadata; import com.amazonaws.services.s3.model.PutObjectRequest; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.EnableAsync; @@ -15,8 +15,8 @@ import java.io.IOException; -import static com.example.solidconnection.custom.exception.ErrorCode.S3_CLIENT_EXCEPTION; -import static com.example.solidconnection.custom.exception.ErrorCode.S3_SERVICE_EXCEPTION; +import static com.example.solidconnection.common.exception.ErrorCode.S3_CLIENT_EXCEPTION; +import static com.example.solidconnection.common.exception.ErrorCode.S3_SERVICE_EXCEPTION; @Component @EnableAsync diff --git a/src/main/java/com/example/solidconnection/s3/S3Controller.java b/src/main/java/com/example/solidconnection/s3/S3Controller.java index 32709fc71..e40f31f18 100644 --- a/src/main/java/com/example/solidconnection/s3/S3Controller.java +++ b/src/main/java/com/example/solidconnection/s3/S3Controller.java @@ -1,6 +1,6 @@ package com.example.solidconnection.s3; -import com.example.solidconnection.custom.resolver.AuthorizedUser; +import com.example.solidconnection.common.resolver.AuthorizedUser; import com.example.solidconnection.siteuser.domain.SiteUser; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/example/solidconnection/s3/S3Service.java b/src/main/java/com/example/solidconnection/s3/S3Service.java index 03e591e73..88db74d21 100644 --- a/src/main/java/com/example/solidconnection/s3/S3Service.java +++ b/src/main/java/com/example/solidconnection/s3/S3Service.java @@ -4,7 +4,7 @@ import com.amazonaws.SdkClientException; import com.amazonaws.services.s3.AmazonS3Client; import com.amazonaws.services.s3.model.DeleteObjectRequest; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import lombok.RequiredArgsConstructor; @@ -21,11 +21,11 @@ import java.util.Objects; import java.util.UUID; -import static com.example.solidconnection.custom.exception.ErrorCode.FILE_NOT_EXIST; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_FILE_EXTENSIONS; -import static com.example.solidconnection.custom.exception.ErrorCode.NOT_ALLOWED_FILE_EXTENSIONS; -import static com.example.solidconnection.custom.exception.ErrorCode.S3_CLIENT_EXCEPTION; -import static com.example.solidconnection.custom.exception.ErrorCode.S3_SERVICE_EXCEPTION; +import static com.example.solidconnection.common.exception.ErrorCode.FILE_NOT_EXIST; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_FILE_EXTENSIONS; +import static com.example.solidconnection.common.exception.ErrorCode.NOT_ALLOWED_FILE_EXTENSIONS; +import static com.example.solidconnection.common.exception.ErrorCode.S3_CLIENT_EXCEPTION; +import static com.example.solidconnection.common.exception.ErrorCode.S3_SERVICE_EXCEPTION; @Service @RequiredArgsConstructor diff --git a/src/main/java/com/example/solidconnection/score/controller/ScoreController.java b/src/main/java/com/example/solidconnection/score/controller/ScoreController.java index e67639274..257c3ef4c 100644 --- a/src/main/java/com/example/solidconnection/score/controller/ScoreController.java +++ b/src/main/java/com/example/solidconnection/score/controller/ScoreController.java @@ -1,6 +1,6 @@ package com.example.solidconnection.score.controller; -import com.example.solidconnection.custom.resolver.AuthorizedUser; +import com.example.solidconnection.common.resolver.AuthorizedUser; import com.example.solidconnection.score.dto.GpaScoreRequest; import com.example.solidconnection.score.dto.GpaScoreStatusesResponse; import com.example.solidconnection.score.dto.LanguageTestScoreRequest; diff --git a/src/main/java/com/example/solidconnection/score/service/ScoreService.java b/src/main/java/com/example/solidconnection/score/service/ScoreService.java index b8c0653df..5bcef9e7d 100644 --- a/src/main/java/com/example/solidconnection/score/service/ScoreService.java +++ b/src/main/java/com/example/solidconnection/score/service/ScoreService.java @@ -2,7 +2,7 @@ import com.example.solidconnection.application.domain.Gpa; import com.example.solidconnection.application.domain.LanguageTest; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.s3.S3Service; import com.example.solidconnection.s3.UploadedFileUrlResponse; import com.example.solidconnection.score.domain.GpaScore; @@ -28,7 +28,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import static com.example.solidconnection.custom.exception.ErrorCode.USER_NOT_FOUND; +import static com.example.solidconnection.common.exception.ErrorCode.USER_NOT_FOUND; @Service @RequiredArgsConstructor diff --git a/src/main/java/com/example/solidconnection/security/aspect/AdminAuthorizationAspect.java b/src/main/java/com/example/solidconnection/security/aspect/AdminAuthorizationAspect.java index 4cab05b51..5ebba881f 100644 --- a/src/main/java/com/example/solidconnection/security/aspect/AdminAuthorizationAspect.java +++ b/src/main/java/com/example/solidconnection/security/aspect/AdminAuthorizationAspect.java @@ -1,6 +1,6 @@ package com.example.solidconnection.security.aspect; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.security.annotation.RequireAdminAccess; import com.example.solidconnection.siteuser.domain.SiteUser; import lombok.RequiredArgsConstructor; @@ -9,7 +9,7 @@ import org.aspectj.lang.annotation.Aspect; import org.springframework.stereotype.Component; -import static com.example.solidconnection.custom.exception.ErrorCode.ACCESS_DENIED; +import static com.example.solidconnection.common.exception.ErrorCode.ACCESS_DENIED; import static com.example.solidconnection.siteuser.domain.Role.ADMIN; @Aspect diff --git a/src/main/java/com/example/solidconnection/security/filter/ExceptionHandlerFilter.java b/src/main/java/com/example/solidconnection/security/filter/ExceptionHandlerFilter.java index 922ebde9f..84602a5f8 100644 --- a/src/main/java/com/example/solidconnection/security/filter/ExceptionHandlerFilter.java +++ b/src/main/java/com/example/solidconnection/security/filter/ExceptionHandlerFilter.java @@ -1,8 +1,8 @@ package com.example.solidconnection.security.filter; -import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.custom.exception.ErrorCode; -import com.example.solidconnection.custom.response.ErrorResponse; +import com.example.solidconnection.common.exception.CustomException; +import com.example.solidconnection.common.exception.ErrorCode; +import com.example.solidconnection.common.response.ErrorResponse; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; @@ -16,7 +16,7 @@ import java.io.IOException; -import static com.example.solidconnection.custom.exception.ErrorCode.AUTHENTICATION_FAILED; +import static com.example.solidconnection.common.exception.ErrorCode.AUTHENTICATION_FAILED; @Component @RequiredArgsConstructor diff --git a/src/main/java/com/example/solidconnection/security/filter/SignOutCheckFilter.java b/src/main/java/com/example/solidconnection/security/filter/SignOutCheckFilter.java index 744a1b00d..5c51c53cd 100644 --- a/src/main/java/com/example/solidconnection/security/filter/SignOutCheckFilter.java +++ b/src/main/java/com/example/solidconnection/security/filter/SignOutCheckFilter.java @@ -1,7 +1,7 @@ package com.example.solidconnection.security.filter; import com.example.solidconnection.auth.service.BlacklistChecker; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; @@ -13,7 +13,7 @@ import java.io.IOException; -import static com.example.solidconnection.custom.exception.ErrorCode.USER_ALREADY_SIGN_OUT; +import static com.example.solidconnection.common.exception.ErrorCode.USER_ALREADY_SIGN_OUT; import static com.example.solidconnection.util.JwtUtils.parseTokenFromRequest; @Component diff --git a/src/main/java/com/example/solidconnection/security/userdetails/SiteUserDetailsService.java b/src/main/java/com/example/solidconnection/security/userdetails/SiteUserDetailsService.java index 7c27bab6f..e13dc1089 100644 --- a/src/main/java/com/example/solidconnection/security/userdetails/SiteUserDetailsService.java +++ b/src/main/java/com/example/solidconnection/security/userdetails/SiteUserDetailsService.java @@ -1,6 +1,6 @@ package com.example.solidconnection.security.userdetails; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import lombok.RequiredArgsConstructor; @@ -9,8 +9,8 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; -import static com.example.solidconnection.custom.exception.ErrorCode.AUTHENTICATION_FAILED; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_TOKEN; +import static com.example.solidconnection.common.exception.ErrorCode.AUTHENTICATION_FAILED; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_TOKEN; @Service @RequiredArgsConstructor diff --git a/src/main/java/com/example/solidconnection/siteuser/controller/MyPageController.java b/src/main/java/com/example/solidconnection/siteuser/controller/MyPageController.java index 41862bf8b..ff36d7baa 100644 --- a/src/main/java/com/example/solidconnection/siteuser/controller/MyPageController.java +++ b/src/main/java/com/example/solidconnection/siteuser/controller/MyPageController.java @@ -1,6 +1,6 @@ package com.example.solidconnection.siteuser.controller; -import com.example.solidconnection.custom.resolver.AuthorizedUser; +import com.example.solidconnection.common.resolver.AuthorizedUser; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.dto.MyPageResponse; import com.example.solidconnection.siteuser.service.MyPageService; diff --git a/src/main/java/com/example/solidconnection/siteuser/service/MyPageService.java b/src/main/java/com/example/solidconnection/siteuser/service/MyPageService.java index 1fe56a3c0..47854b363 100644 --- a/src/main/java/com/example/solidconnection/siteuser/service/MyPageService.java +++ b/src/main/java/com/example/solidconnection/siteuser/service/MyPageService.java @@ -1,6 +1,6 @@ package com.example.solidconnection.siteuser.service; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.s3.S3Service; import com.example.solidconnection.s3.UploadedFileUrlResponse; import com.example.solidconnection.siteuser.domain.SiteUser; @@ -19,8 +19,8 @@ import java.time.format.DateTimeFormatter; import java.util.List; -import static com.example.solidconnection.custom.exception.ErrorCode.CAN_NOT_CHANGE_NICKNAME_YET; -import static com.example.solidconnection.custom.exception.ErrorCode.NICKNAME_ALREADY_EXISTED; +import static com.example.solidconnection.common.exception.ErrorCode.CAN_NOT_CHANGE_NICKNAME_YET; +import static com.example.solidconnection.common.exception.ErrorCode.NICKNAME_ALREADY_EXISTED; @RequiredArgsConstructor @Service diff --git a/src/main/java/com/example/solidconnection/university/controller/UniversityController.java b/src/main/java/com/example/solidconnection/university/controller/UniversityController.java index 1b1c3bc08..6345876a9 100644 --- a/src/main/java/com/example/solidconnection/university/controller/UniversityController.java +++ b/src/main/java/com/example/solidconnection/university/controller/UniversityController.java @@ -1,6 +1,6 @@ package com.example.solidconnection.university.controller; -import com.example.solidconnection.custom.resolver.AuthorizedUser; +import com.example.solidconnection.common.resolver.AuthorizedUser; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.service.MyPageService; import com.example.solidconnection.university.domain.LanguageTestType; diff --git a/src/main/java/com/example/solidconnection/university/repository/UniversityInfoForApplyRepository.java b/src/main/java/com/example/solidconnection/university/repository/UniversityInfoForApplyRepository.java index 60474c13d..58fb7aeec 100644 --- a/src/main/java/com/example/solidconnection/university/repository/UniversityInfoForApplyRepository.java +++ b/src/main/java/com/example/solidconnection/university/repository/UniversityInfoForApplyRepository.java @@ -1,6 +1,6 @@ package com.example.solidconnection.university.repository; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.university.domain.University; import com.example.solidconnection.university.domain.UniversityInfoForApply; @@ -12,8 +12,8 @@ import java.util.List; import java.util.Optional; -import static com.example.solidconnection.custom.exception.ErrorCode.UNIVERSITY_INFO_FOR_APPLY_NOT_FOUND; -import static com.example.solidconnection.custom.exception.ErrorCode.UNIVERSITY_INFO_FOR_APPLY_NOT_FOUND_FOR_TERM; +import static com.example.solidconnection.common.exception.ErrorCode.UNIVERSITY_INFO_FOR_APPLY_NOT_FOUND; +import static com.example.solidconnection.common.exception.ErrorCode.UNIVERSITY_INFO_FOR_APPLY_NOT_FOUND_FOR_TERM; @Repository public interface UniversityInfoForApplyRepository extends JpaRepository { diff --git a/src/main/java/com/example/solidconnection/university/repository/UniversityRepository.java b/src/main/java/com/example/solidconnection/university/repository/UniversityRepository.java index e4cdeade2..b19285469 100644 --- a/src/main/java/com/example/solidconnection/university/repository/UniversityRepository.java +++ b/src/main/java/com/example/solidconnection/university/repository/UniversityRepository.java @@ -1,6 +1,6 @@ package com.example.solidconnection.university.repository; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.university.domain.University; import com.example.solidconnection.university.repository.custom.UniversityFilterRepository; import org.springframework.data.jpa.repository.JpaRepository; @@ -10,7 +10,7 @@ import java.util.List; -import static com.example.solidconnection.custom.exception.ErrorCode.UNIVERSITY_NOT_FOUND; +import static com.example.solidconnection.common.exception.ErrorCode.UNIVERSITY_NOT_FOUND; @Repository public interface UniversityRepository extends JpaRepository, UniversityFilterRepository { diff --git a/src/main/java/com/example/solidconnection/university/service/UniversityLikeService.java b/src/main/java/com/example/solidconnection/university/service/UniversityLikeService.java index 85971663b..228cc1ff8 100644 --- a/src/main/java/com/example/solidconnection/university/service/UniversityLikeService.java +++ b/src/main/java/com/example/solidconnection/university/service/UniversityLikeService.java @@ -1,6 +1,6 @@ package com.example.solidconnection.university.service; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.LikedUniversityRepository; import com.example.solidconnection.university.domain.LikedUniversity; @@ -15,8 +15,8 @@ import java.util.Optional; -import static com.example.solidconnection.custom.exception.ErrorCode.ALREADY_LIKED_UNIVERSITY; -import static com.example.solidconnection.custom.exception.ErrorCode.NOT_LIKED_UNIVERSITY; +import static com.example.solidconnection.common.exception.ErrorCode.ALREADY_LIKED_UNIVERSITY; +import static com.example.solidconnection.common.exception.ErrorCode.NOT_LIKED_UNIVERSITY; @RequiredArgsConstructor @Service diff --git a/src/main/java/com/example/solidconnection/util/JwtUtils.java b/src/main/java/com/example/solidconnection/util/JwtUtils.java index a5c96d092..040beb9ba 100644 --- a/src/main/java/com/example/solidconnection/util/JwtUtils.java +++ b/src/main/java/com/example/solidconnection/util/JwtUtils.java @@ -1,13 +1,13 @@ package com.example.solidconnection.util; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import io.jsonwebtoken.Claims; import io.jsonwebtoken.ExpiredJwtException; import io.jsonwebtoken.Jwts; import jakarta.servlet.http.HttpServletRequest; import org.springframework.stereotype.Component; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_TOKEN; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_TOKEN; @Component public class JwtUtils { diff --git a/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java b/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java index 8157a1d0b..dcdeb9d0e 100644 --- a/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java @@ -5,7 +5,7 @@ import com.example.solidconnection.admin.dto.GpaScoreUpdateRequest; import com.example.solidconnection.admin.dto.ScoreSearchCondition; import com.example.solidconnection.application.domain.Gpa; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.score.domain.GpaScore; import com.example.solidconnection.score.repository.GpaScoreRepository; import com.example.solidconnection.siteuser.domain.SiteUser; @@ -26,7 +26,7 @@ import java.time.LocalDate; import java.util.List; -import static com.example.solidconnection.custom.exception.ErrorCode.GPA_SCORE_NOT_FOUND; +import static com.example.solidconnection.common.exception.ErrorCode.GPA_SCORE_NOT_FOUND; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatCode; import static org.junit.jupiter.api.Assertions.assertAll; diff --git a/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java b/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java index a14f00e36..d207cd2df 100644 --- a/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java @@ -5,7 +5,7 @@ import com.example.solidconnection.admin.dto.LanguageTestScoreUpdateRequest; import com.example.solidconnection.admin.dto.ScoreSearchCondition; import com.example.solidconnection.application.domain.LanguageTest; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.score.domain.LanguageTestScore; import com.example.solidconnection.score.repository.LanguageTestScoreRepository; import com.example.solidconnection.siteuser.domain.SiteUser; @@ -26,7 +26,7 @@ import java.time.LocalDate; import java.util.List; -import static com.example.solidconnection.custom.exception.ErrorCode.LANGUAGE_TEST_SCORE_NOT_FOUND; +import static com.example.solidconnection.common.exception.ErrorCode.LANGUAGE_TEST_SCORE_NOT_FOUND; import static com.example.solidconnection.university.domain.LanguageTestType.TOEIC; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatCode; diff --git a/src/test/java/com/example/solidconnection/application/service/ApplicationSubmissionServiceTest.java b/src/test/java/com/example/solidconnection/application/service/ApplicationSubmissionServiceTest.java index 50963d549..d20e70958 100644 --- a/src/test/java/com/example/solidconnection/application/service/ApplicationSubmissionServiceTest.java +++ b/src/test/java/com/example/solidconnection/application/service/ApplicationSubmissionServiceTest.java @@ -7,7 +7,7 @@ import com.example.solidconnection.application.dto.ApplyRequest; import com.example.solidconnection.application.dto.UniversityChoiceRequest; import com.example.solidconnection.application.repository.ApplicationRepository; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.score.domain.GpaScore; import com.example.solidconnection.score.domain.LanguageTestScore; import com.example.solidconnection.score.repository.GpaScoreRepository; @@ -21,9 +21,9 @@ import org.springframework.beans.factory.annotation.Autowired; import static com.example.solidconnection.application.service.ApplicationSubmissionService.APPLICATION_UPDATE_COUNT_LIMIT; -import static com.example.solidconnection.custom.exception.ErrorCode.APPLY_UPDATE_LIMIT_EXCEED; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_GPA_SCORE_STATUS; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_LANGUAGE_TEST_SCORE_STATUS; +import static com.example.solidconnection.common.exception.ErrorCode.APPLY_UPDATE_LIMIT_EXCEED; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_GPA_SCORE_STATUS; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_LANGUAGE_TEST_SCORE_STATUS; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatCode; import static org.junit.jupiter.api.Assertions.assertAll; diff --git a/src/test/java/com/example/solidconnection/auth/service/AuthServiceTest.java b/src/test/java/com/example/solidconnection/auth/service/AuthServiceTest.java index a6c1be5c7..dff95d4bd 100644 --- a/src/test/java/com/example/solidconnection/auth/service/AuthServiceTest.java +++ b/src/test/java/com/example/solidconnection/auth/service/AuthServiceTest.java @@ -3,7 +3,7 @@ import com.example.solidconnection.auth.domain.TokenType; import com.example.solidconnection.auth.dto.ReissueRequest; import com.example.solidconnection.auth.dto.ReissueResponse; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.siteuser.domain.PreparationStatus; import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.siteuser.domain.SiteUser; @@ -17,7 +17,7 @@ import java.time.LocalDate; -import static com.example.solidconnection.custom.exception.ErrorCode.REFRESH_TOKEN_EXPIRED; +import static com.example.solidconnection.common.exception.ErrorCode.REFRESH_TOKEN_EXPIRED; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; import static org.junit.jupiter.api.Assertions.assertAll; diff --git a/src/test/java/com/example/solidconnection/auth/service/EmailSignInServiceTest.java b/src/test/java/com/example/solidconnection/auth/service/EmailSignInServiceTest.java index 80fc64c86..95019a462 100644 --- a/src/test/java/com/example/solidconnection/auth/service/EmailSignInServiceTest.java +++ b/src/test/java/com/example/solidconnection/auth/service/EmailSignInServiceTest.java @@ -2,6 +2,9 @@ import com.example.solidconnection.auth.dto.EmailSignInRequest; import com.example.solidconnection.auth.dto.SignInResponse; +import com.example.solidconnection.common.exception.CustomException; +import com.example.solidconnection.common.exception.ErrorCode; +import com.example.solidconnection.siteuser.domain.AuthType; import com.example.solidconnection.custom.exception.CustomException; import com.example.solidconnection.custom.exception.ErrorCode; import com.example.solidconnection.siteuser.domain.SiteUser; diff --git a/src/test/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpTokenProviderTest.java b/src/test/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpTokenProviderTest.java index 12ab6f666..79f8fded3 100644 --- a/src/test/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpTokenProviderTest.java +++ b/src/test/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpTokenProviderTest.java @@ -2,7 +2,7 @@ import com.example.solidconnection.auth.domain.TokenType; import com.example.solidconnection.config.security.JwtProperties; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.siteuser.domain.AuthType; import com.example.solidconnection.support.TestContainerSpringBootTest; import com.example.solidconnection.util.JwtUtils; @@ -21,8 +21,8 @@ import java.util.Map; import static com.example.solidconnection.auth.service.oauth.OAuthSignUpTokenProvider.AUTH_TYPE_CLAIM_KEY; -import static com.example.solidconnection.custom.exception.ErrorCode.SIGN_UP_TOKEN_INVALID; -import static com.example.solidconnection.custom.exception.ErrorCode.SIGN_UP_TOKEN_NOT_ISSUED_BY_SERVER; +import static com.example.solidconnection.common.exception.ErrorCode.SIGN_UP_TOKEN_INVALID; +import static com.example.solidconnection.common.exception.ErrorCode.SIGN_UP_TOKEN_NOT_ISSUED_BY_SERVER; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; import static org.junit.jupiter.api.Assertions.assertAll; diff --git a/src/test/java/com/example/solidconnection/custom/exception/CustomAccessDeniedHandlerTest.java b/src/test/java/com/example/solidconnection/common/exception/CustomAccessDeniedHandlerTest.java similarity index 90% rename from src/test/java/com/example/solidconnection/custom/exception/CustomAccessDeniedHandlerTest.java rename to src/test/java/com/example/solidconnection/common/exception/CustomAccessDeniedHandlerTest.java index 7e4cae5b2..977733785 100644 --- a/src/test/java/com/example/solidconnection/custom/exception/CustomAccessDeniedHandlerTest.java +++ b/src/test/java/com/example/solidconnection/common/exception/CustomAccessDeniedHandlerTest.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.custom.exception; +package com.example.solidconnection.common.exception; -import com.example.solidconnection.custom.response.ErrorResponse; +import com.example.solidconnection.common.response.ErrorResponse; import com.example.solidconnection.support.TestContainerSpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.BeforeEach; @@ -13,7 +13,7 @@ import java.io.IOException; -import static com.example.solidconnection.custom.exception.ErrorCode.ACCESS_DENIED; +import static com.example.solidconnection.common.exception.ErrorCode.ACCESS_DENIED; import static org.assertj.core.api.Assertions.assertThat; @TestContainerSpringBootTest diff --git a/src/test/java/com/example/solidconnection/custom/exception/CustomAuthenticationEntryPointTest.java b/src/test/java/com/example/solidconnection/common/exception/CustomAuthenticationEntryPointTest.java similarity index 91% rename from src/test/java/com/example/solidconnection/custom/exception/CustomAuthenticationEntryPointTest.java rename to src/test/java/com/example/solidconnection/common/exception/CustomAuthenticationEntryPointTest.java index 2cef64481..a10fed5df 100644 --- a/src/test/java/com/example/solidconnection/custom/exception/CustomAuthenticationEntryPointTest.java +++ b/src/test/java/com/example/solidconnection/common/exception/CustomAuthenticationEntryPointTest.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.custom.exception; +package com.example.solidconnection.common.exception; -import com.example.solidconnection.custom.response.ErrorResponse; +import com.example.solidconnection.common.response.ErrorResponse; import com.example.solidconnection.support.TestContainerSpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.BeforeEach; @@ -14,7 +14,7 @@ import java.io.IOException; -import static com.example.solidconnection.custom.exception.ErrorCode.AUTHENTICATION_FAILED; +import static com.example.solidconnection.common.exception.ErrorCode.AUTHENTICATION_FAILED; import static org.assertj.core.api.Assertions.assertThat; @TestContainerSpringBootTest diff --git a/src/test/java/com/example/solidconnection/custom/resolver/AuthorizedUserResolverTest.java b/src/test/java/com/example/solidconnection/common/resolver/AuthorizedUserResolverTest.java similarity index 95% rename from src/test/java/com/example/solidconnection/custom/resolver/AuthorizedUserResolverTest.java rename to src/test/java/com/example/solidconnection/common/resolver/AuthorizedUserResolverTest.java index 967a881c9..bd115192e 100644 --- a/src/test/java/com/example/solidconnection/custom/resolver/AuthorizedUserResolverTest.java +++ b/src/test/java/com/example/solidconnection/common/resolver/AuthorizedUserResolverTest.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.custom.resolver; +package com.example.solidconnection.common.resolver; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.security.authentication.SiteUserAuthentication; import com.example.solidconnection.security.userdetails.SiteUserDetails; import com.example.solidconnection.siteuser.domain.SiteUser; @@ -17,7 +17,7 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; -import static com.example.solidconnection.custom.exception.ErrorCode.AUTHENTICATION_FAILED; +import static com.example.solidconnection.common.exception.ErrorCode.AUTHENTICATION_FAILED; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; import static org.mockito.BDDMockito.given; diff --git a/src/test/java/com/example/solidconnection/custom/resolver/CustomPageableHandlerMethodArgumentResolverTest.java b/src/test/java/com/example/solidconnection/common/resolver/CustomPageableHandlerMethodArgumentResolverTest.java similarity index 98% rename from src/test/java/com/example/solidconnection/custom/resolver/CustomPageableHandlerMethodArgumentResolverTest.java rename to src/test/java/com/example/solidconnection/common/resolver/CustomPageableHandlerMethodArgumentResolverTest.java index dc628bc67..5d1bc0faa 100644 --- a/src/test/java/com/example/solidconnection/custom/resolver/CustomPageableHandlerMethodArgumentResolverTest.java +++ b/src/test/java/com/example/solidconnection/common/resolver/CustomPageableHandlerMethodArgumentResolverTest.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.custom.resolver; +package com.example.solidconnection.common.resolver; import com.example.solidconnection.support.TestContainerSpringBootTest; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/com/example/solidconnection/custom/validation/validator/RejectedReasonValidatorTest.java b/src/test/java/com/example/solidconnection/common/validation/validator/RejectedReasonValidatorTest.java similarity index 96% rename from src/test/java/com/example/solidconnection/custom/validation/validator/RejectedReasonValidatorTest.java rename to src/test/java/com/example/solidconnection/common/validation/validator/RejectedReasonValidatorTest.java index 042c9f9ee..32f1753e1 100644 --- a/src/test/java/com/example/solidconnection/custom/validation/validator/RejectedReasonValidatorTest.java +++ b/src/test/java/com/example/solidconnection/common/validation/validator/RejectedReasonValidatorTest.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.custom.validation.validator; +package com.example.solidconnection.common.validation.validator; import com.example.solidconnection.admin.dto.GpaScoreUpdateRequest; import com.example.solidconnection.admin.dto.LanguageTestScoreUpdateRequest; @@ -15,7 +15,7 @@ import java.util.Set; -import static com.example.solidconnection.custom.exception.ErrorCode.REJECTED_REASON_REQUIRED; +import static com.example.solidconnection.common.exception.ErrorCode.REJECTED_REASON_REQUIRED; import static org.assertj.core.api.Assertions.assertThat; @DisplayName("거절 사유 유효성 검사 테스트") diff --git a/src/test/java/com/example/solidconnection/custom/validation/validator/ValidUniversityChoiceValidatorTest.java b/src/test/java/com/example/solidconnection/common/validation/validator/ValidUniversityChoiceValidatorTest.java similarity index 92% rename from src/test/java/com/example/solidconnection/custom/validation/validator/ValidUniversityChoiceValidatorTest.java rename to src/test/java/com/example/solidconnection/common/validation/validator/ValidUniversityChoiceValidatorTest.java index b0267a08b..58e394c93 100644 --- a/src/test/java/com/example/solidconnection/custom/validation/validator/ValidUniversityChoiceValidatorTest.java +++ b/src/test/java/com/example/solidconnection/common/validation/validator/ValidUniversityChoiceValidatorTest.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.custom.validation.validator; +package com.example.solidconnection.common.validation.validator; import com.example.solidconnection.application.dto.UniversityChoiceRequest; import jakarta.validation.ConstraintViolation; @@ -11,9 +11,9 @@ import java.util.Set; -import static com.example.solidconnection.custom.exception.ErrorCode.DUPLICATE_UNIVERSITY_CHOICE; -import static com.example.solidconnection.custom.exception.ErrorCode.FIRST_CHOICE_REQUIRED; -import static com.example.solidconnection.custom.exception.ErrorCode.THIRD_CHOICE_REQUIRES_SECOND; +import static com.example.solidconnection.common.exception.ErrorCode.DUPLICATE_UNIVERSITY_CHOICE; +import static com.example.solidconnection.common.exception.ErrorCode.FIRST_CHOICE_REQUIRED; +import static com.example.solidconnection.common.exception.ErrorCode.THIRD_CHOICE_REQUIRES_SECOND; import static org.assertj.core.api.Assertions.assertThat; @DisplayName("대학 선택 유효성 검사 테스트") diff --git a/src/test/java/com/example/solidconnection/community/comment/service/CommentServiceTest.java b/src/test/java/com/example/solidconnection/community/comment/service/CommentServiceTest.java index 318d4427a..3fd62ae7f 100644 --- a/src/test/java/com/example/solidconnection/community/comment/service/CommentServiceTest.java +++ b/src/test/java/com/example/solidconnection/community/comment/service/CommentServiceTest.java @@ -11,7 +11,7 @@ import com.example.solidconnection.community.comment.repository.CommentRepository; import com.example.solidconnection.community.post.domain.Post; import com.example.solidconnection.community.post.repository.PostRepository; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.support.integration.BaseIntegrationTest; import com.example.solidconnection.community.post.domain.PostCategory; @@ -23,10 +23,10 @@ import java.util.List; -import static com.example.solidconnection.custom.exception.ErrorCode.CAN_NOT_UPDATE_DEPRECATED_COMMENT; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_COMMENT_ID; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_COMMENT_LEVEL; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_POST_ACCESS; +import static com.example.solidconnection.common.exception.ErrorCode.CAN_NOT_UPDATE_DEPRECATED_COMMENT; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_COMMENT_ID; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_COMMENT_LEVEL; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_POST_ACCESS; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertAll; diff --git a/src/test/java/com/example/solidconnection/community/post/service/PostCommandServiceTest.java b/src/test/java/com/example/solidconnection/community/post/service/PostCommandServiceTest.java index 34461b214..62c4c6f0b 100644 --- a/src/test/java/com/example/solidconnection/community/post/service/PostCommandServiceTest.java +++ b/src/test/java/com/example/solidconnection/community/post/service/PostCommandServiceTest.java @@ -11,7 +11,7 @@ import com.example.solidconnection.community.post.dto.PostUpdateResponse; import com.example.solidconnection.community.post.repository.PostImageRepository; import com.example.solidconnection.community.post.repository.PostRepository; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.s3.ImgType; import com.example.solidconnection.s3.S3Service; import com.example.solidconnection.s3.UploadedFileUrlResponse; @@ -31,10 +31,10 @@ import java.util.List; -import static com.example.solidconnection.custom.exception.ErrorCode.CAN_NOT_DELETE_OR_UPDATE_QUESTION; -import static com.example.solidconnection.custom.exception.ErrorCode.CAN_NOT_UPLOAD_MORE_THAN_FIVE_IMAGES; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_POST_ACCESS; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_POST_CATEGORY; +import static com.example.solidconnection.common.exception.ErrorCode.CAN_NOT_DELETE_OR_UPDATE_QUESTION; +import static com.example.solidconnection.common.exception.ErrorCode.CAN_NOT_UPLOAD_MORE_THAN_FIVE_IMAGES; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_POST_ACCESS; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_POST_CATEGORY; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertAll; diff --git a/src/test/java/com/example/solidconnection/community/post/service/PostLikeServiceTest.java b/src/test/java/com/example/solidconnection/community/post/service/PostLikeServiceTest.java index 3770daafc..e216bc905 100644 --- a/src/test/java/com/example/solidconnection/community/post/service/PostLikeServiceTest.java +++ b/src/test/java/com/example/solidconnection/community/post/service/PostLikeServiceTest.java @@ -1,7 +1,7 @@ package com.example.solidconnection.community.post.service; import com.example.solidconnection.community.board.domain.Board; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.community.post.domain.Post; import com.example.solidconnection.community.post.dto.PostDislikeResponse; import com.example.solidconnection.community.post.dto.PostLikeResponse; @@ -16,8 +16,8 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import static com.example.solidconnection.custom.exception.ErrorCode.DUPLICATE_POST_LIKE; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_POST_LIKE; +import static com.example.solidconnection.common.exception.ErrorCode.DUPLICATE_POST_LIKE; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_POST_LIKE; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertAll; diff --git a/src/test/java/com/example/solidconnection/security/aspect/AdminAuthorizationAspectTest.java b/src/test/java/com/example/solidconnection/security/aspect/AdminAuthorizationAspectTest.java index f421484f1..c1681c6ce 100644 --- a/src/test/java/com/example/solidconnection/security/aspect/AdminAuthorizationAspectTest.java +++ b/src/test/java/com/example/solidconnection/security/aspect/AdminAuthorizationAspectTest.java @@ -1,6 +1,6 @@ package com.example.solidconnection.security.aspect; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.security.annotation.RequireAdminAccess; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; @@ -14,7 +14,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; -import static com.example.solidconnection.custom.exception.ErrorCode.ACCESS_DENIED; +import static com.example.solidconnection.common.exception.ErrorCode.ACCESS_DENIED; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatCode; diff --git a/src/test/java/com/example/solidconnection/security/filter/ExceptionHandlerFilterTest.java b/src/test/java/com/example/solidconnection/security/filter/ExceptionHandlerFilterTest.java index 017ed935e..4fa01a234 100644 --- a/src/test/java/com/example/solidconnection/security/filter/ExceptionHandlerFilterTest.java +++ b/src/test/java/com/example/solidconnection/security/filter/ExceptionHandlerFilterTest.java @@ -1,8 +1,7 @@ package com.example.solidconnection.security.filter; -import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.custom.exception.ErrorCode; -import com.example.solidconnection.security.filter.ExceptionHandlerFilter; +import com.example.solidconnection.common.exception.CustomException; +import com.example.solidconnection.common.exception.ErrorCode; import com.example.solidconnection.support.TestContainerSpringBootTest; import jakarta.servlet.FilterChain; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/test/java/com/example/solidconnection/security/filter/SignOutCheckFilterTest.java b/src/test/java/com/example/solidconnection/security/filter/SignOutCheckFilterTest.java index 55dacfc77..aedd14b66 100644 --- a/src/test/java/com/example/solidconnection/security/filter/SignOutCheckFilterTest.java +++ b/src/test/java/com/example/solidconnection/security/filter/SignOutCheckFilterTest.java @@ -1,8 +1,7 @@ package com.example.solidconnection.security.filter; import com.example.solidconnection.config.security.JwtProperties; -import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.security.filter.SignOutCheckFilter; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.support.TestContainerSpringBootTest; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; @@ -21,7 +20,7 @@ import java.util.Objects; import static com.example.solidconnection.auth.domain.TokenType.BLACKLIST; -import static com.example.solidconnection.custom.exception.ErrorCode.USER_ALREADY_SIGN_OUT; +import static com.example.solidconnection.common.exception.ErrorCode.USER_ALREADY_SIGN_OUT; import static org.assertj.core.api.Assertions.assertThatCode; import static org.mockito.BDDMockito.then; import static org.mockito.Mockito.spy; diff --git a/src/test/java/com/example/solidconnection/security/provider/SiteUserAuthenticationProviderTest.java b/src/test/java/com/example/solidconnection/security/provider/SiteUserAuthenticationProviderTest.java index 1d88ee059..e8c9a7810 100644 --- a/src/test/java/com/example/solidconnection/security/provider/SiteUserAuthenticationProviderTest.java +++ b/src/test/java/com/example/solidconnection/security/provider/SiteUserAuthenticationProviderTest.java @@ -1,9 +1,8 @@ package com.example.solidconnection.security.provider; import com.example.solidconnection.config.security.JwtProperties; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.security.authentication.SiteUserAuthentication; -import com.example.solidconnection.security.provider.SiteUserAuthenticationProvider; import com.example.solidconnection.security.userdetails.SiteUserDetails; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; @@ -22,8 +21,8 @@ import java.net.PasswordAuthentication; import java.util.Date; -import static com.example.solidconnection.custom.exception.ErrorCode.AUTHENTICATION_FAILED; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_TOKEN; +import static com.example.solidconnection.common.exception.ErrorCode.AUTHENTICATION_FAILED; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_TOKEN; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; import static org.junit.jupiter.api.Assertions.assertAll; diff --git a/src/test/java/com/example/solidconnection/security/userdetails/SiteUserDetailsServiceTest.java b/src/test/java/com/example/solidconnection/security/userdetails/SiteUserDetailsServiceTest.java index f93eaeac4..841694e3c 100644 --- a/src/test/java/com/example/solidconnection/security/userdetails/SiteUserDetailsServiceTest.java +++ b/src/test/java/com/example/solidconnection/security/userdetails/SiteUserDetailsServiceTest.java @@ -1,8 +1,6 @@ package com.example.solidconnection.security.userdetails; -import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.security.userdetails.SiteUserDetails; -import com.example.solidconnection.security.userdetails.SiteUserDetailsService; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.siteuser.repository.SiteUserRepository; @@ -16,8 +14,8 @@ import java.time.LocalDate; -import static com.example.solidconnection.custom.exception.ErrorCode.AUTHENTICATION_FAILED; -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_TOKEN; +import static com.example.solidconnection.common.exception.ErrorCode.AUTHENTICATION_FAILED; +import static com.example.solidconnection.common.exception.ErrorCode.INVALID_TOKEN; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; import static org.junit.jupiter.api.Assertions.assertAll; diff --git a/src/test/java/com/example/solidconnection/siteuser/service/MyPageServiceTest.java b/src/test/java/com/example/solidconnection/siteuser/service/MyPageServiceTest.java index b8b6a54b4..d52e1108b 100644 --- a/src/test/java/com/example/solidconnection/siteuser/service/MyPageServiceTest.java +++ b/src/test/java/com/example/solidconnection/siteuser/service/MyPageServiceTest.java @@ -1,6 +1,6 @@ package com.example.solidconnection.siteuser.service; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.s3.S3Service; import com.example.solidconnection.s3.UploadedFileUrlResponse; import com.example.solidconnection.siteuser.domain.AuthType; @@ -29,8 +29,8 @@ import java.time.LocalDateTime; import java.util.List; -import static com.example.solidconnection.custom.exception.ErrorCode.CAN_NOT_CHANGE_NICKNAME_YET; -import static com.example.solidconnection.custom.exception.ErrorCode.NICKNAME_ALREADY_EXISTED; +import static com.example.solidconnection.common.exception.ErrorCode.CAN_NOT_CHANGE_NICKNAME_YET; +import static com.example.solidconnection.common.exception.ErrorCode.NICKNAME_ALREADY_EXISTED; import static com.example.solidconnection.siteuser.service.MyPageService.MIN_DAYS_BETWEEN_NICKNAME_CHANGES; import static com.example.solidconnection.siteuser.service.MyPageService.NICKNAME_LAST_CHANGE_DATE_FORMAT; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/example/solidconnection/university/service/UniversityLikeServiceTest.java b/src/test/java/com/example/solidconnection/university/service/UniversityLikeServiceTest.java index e3ac0efeb..4e0d03019 100644 --- a/src/test/java/com/example/solidconnection/university/service/UniversityLikeServiceTest.java +++ b/src/test/java/com/example/solidconnection/university/service/UniversityLikeServiceTest.java @@ -1,6 +1,6 @@ package com.example.solidconnection.university.service; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.siteuser.domain.PreparationStatus; import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.siteuser.domain.SiteUser; @@ -18,9 +18,9 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import static com.example.solidconnection.custom.exception.ErrorCode.ALREADY_LIKED_UNIVERSITY; -import static com.example.solidconnection.custom.exception.ErrorCode.NOT_LIKED_UNIVERSITY; -import static com.example.solidconnection.custom.exception.ErrorCode.UNIVERSITY_INFO_FOR_APPLY_NOT_FOUND; +import static com.example.solidconnection.common.exception.ErrorCode.ALREADY_LIKED_UNIVERSITY; +import static com.example.solidconnection.common.exception.ErrorCode.NOT_LIKED_UNIVERSITY; +import static com.example.solidconnection.common.exception.ErrorCode.UNIVERSITY_INFO_FOR_APPLY_NOT_FOUND; import static com.example.solidconnection.university.service.UniversityLikeService.LIKE_CANCELED_MESSAGE; import static com.example.solidconnection.university.service.UniversityLikeService.LIKE_SUCCESS_MESSAGE; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/example/solidconnection/university/service/UniversityQueryServiceTest.java b/src/test/java/com/example/solidconnection/university/service/UniversityQueryServiceTest.java index aacdfa402..d83e77b1d 100644 --- a/src/test/java/com/example/solidconnection/university/service/UniversityQueryServiceTest.java +++ b/src/test/java/com/example/solidconnection/university/service/UniversityQueryServiceTest.java @@ -1,6 +1,6 @@ package com.example.solidconnection.university.service; -import com.example.solidconnection.custom.exception.CustomException; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.support.TestContainerSpringBootTest; import com.example.solidconnection.university.domain.LanguageTestType; import com.example.solidconnection.university.domain.UniversityInfoForApply; @@ -18,7 +18,7 @@ import java.util.List; -import static com.example.solidconnection.custom.exception.ErrorCode.UNIVERSITY_INFO_FOR_APPLY_NOT_FOUND; +import static com.example.solidconnection.common.exception.ErrorCode.UNIVERSITY_INFO_FOR_APPLY_NOT_FOUND; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType; import static org.mockito.BDDMockito.then; diff --git a/src/test/java/com/example/solidconnection/university/service/UniversityRecommendServiceTest.java b/src/test/java/com/example/solidconnection/university/service/UniversityRecommendServiceTest.java index a19d37fea..215ab8096 100644 --- a/src/test/java/com/example/solidconnection/university/service/UniversityRecommendServiceTest.java +++ b/src/test/java/com/example/solidconnection/university/service/UniversityRecommendServiceTest.java @@ -1,11 +1,13 @@ package com.example.solidconnection.university.service; +import com.example.solidconnection.location.country.domain.InterestedCountry; import com.example.solidconnection.location.country.fixture.CountryFixture; -import com.example.solidconnection.entity.InterestedCountry; -import com.example.solidconnection.entity.InterestedRegion; +import com.example.solidconnection.location.country.repository.InterestedCountyRepository; +import com.example.solidconnection.location.region.domain.InterestedRegion; import com.example.solidconnection.location.region.fixture.RegionFixture; -import com.example.solidconnection.repositories.InterestedCountyRepository; -import com.example.solidconnection.repositories.InterestedRegionRepository; +import com.example.solidconnection.location.region.repository.InterestedRegionRepository; +import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.TestContainerSpringBootTest; diff --git a/src/test/java/com/example/solidconnection/util/JwtUtilsTest.java b/src/test/java/com/example/solidconnection/util/JwtUtilsTest.java index 0c16de671..c57e85193 100644 --- a/src/test/java/com/example/solidconnection/util/JwtUtilsTest.java +++ b/src/test/java/com/example/solidconnection/util/JwtUtilsTest.java @@ -1,7 +1,7 @@ package com.example.solidconnection.util; -import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.custom.exception.ErrorCode; +import com.example.solidconnection.common.exception.CustomException; +import com.example.solidconnection.common.exception.ErrorCode; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; import org.junit.jupiter.api.DisplayName; From 402264b58206399390ebd71d854761e7ff98822a Mon Sep 17 00:00:00 2001 From: nayonsoso Date: Sat, 10 May 2025 06:54:37 +0900 Subject: [PATCH 10/15] =?UTF-8?q?refactor:=20dto=20=EC=9E=85=EB=A0=A5=20?= =?UTF-8?q?=EA=B2=80=EC=A6=9D=20=EA=B4=80=EB=A0=A8=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=20=ED=8C=A8=ED=82=A4=EC=A7=80=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 특정 dto 에서만 사용하므로, 그 하위로 옮긴다. - RejectedReasonRequired, RejectedReasonValidator를 admin.dto.validation 으로 - ValidUniversityChoice, ValidUniversityChoiceValidator를 university.dto.validation 으로 --- .../solidconnection/admin/dto/GpaScoreUpdateRequest.java | 2 +- .../admin/dto/LanguageTestScoreUpdateRequest.java | 2 +- .../application/dto/UniversityChoiceRequest.java | 2 +- .../dto/validation}/RejectedReasonRequired.java | 3 +-- .../dto/validation}/RejectedReasonValidator.java | 3 +-- .../dto/validation}/ValidUniversityChoice.java | 3 +-- .../dto/validation}/ValidUniversityChoiceValidator.java | 3 +-- .../dto/validation}/RejectedReasonValidatorTest.java | 2 +- .../dto/validation}/ValidUniversityChoiceValidatorTest.java | 2 +- 9 files changed, 9 insertions(+), 13 deletions(-) rename src/main/java/com/example/solidconnection/{common/validation/annotation => application/dto/validation}/RejectedReasonRequired.java (78%) rename src/main/java/com/example/solidconnection/{common/validation/validator => application/dto/validation}/RejectedReasonValidator.java (90%) rename src/main/java/com/example/solidconnection/{common/validation/annotation => university/dto/validation}/ValidUniversityChoice.java (78%) rename src/main/java/com/example/solidconnection/{common/validation/validator => university/dto/validation}/ValidUniversityChoiceValidator.java (93%) rename src/test/java/com/example/solidconnection/{common/validation/validator => admin/dto/validation}/RejectedReasonValidatorTest.java (98%) rename src/test/java/com/example/solidconnection/{common/validation/validator => university/dto/validation}/ValidUniversityChoiceValidatorTest.java (98%) diff --git a/src/main/java/com/example/solidconnection/admin/dto/GpaScoreUpdateRequest.java b/src/main/java/com/example/solidconnection/admin/dto/GpaScoreUpdateRequest.java index fed0bf4ba..907710d10 100644 --- a/src/main/java/com/example/solidconnection/admin/dto/GpaScoreUpdateRequest.java +++ b/src/main/java/com/example/solidconnection/admin/dto/GpaScoreUpdateRequest.java @@ -1,6 +1,6 @@ package com.example.solidconnection.admin.dto; -import com.example.solidconnection.common.validation.annotation.RejectedReasonRequired; +import com.example.solidconnection.application.dto.validation.RejectedReasonRequired; import com.example.solidconnection.application.domain.VerifyStatus; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreUpdateRequest.java b/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreUpdateRequest.java index 65d0a1422..1df46f678 100644 --- a/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreUpdateRequest.java +++ b/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreUpdateRequest.java @@ -1,6 +1,6 @@ package com.example.solidconnection.admin.dto; -import com.example.solidconnection.common.validation.annotation.RejectedReasonRequired; +import com.example.solidconnection.application.dto.validation.RejectedReasonRequired; import com.example.solidconnection.university.domain.LanguageTestType; import com.example.solidconnection.application.domain.VerifyStatus; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/example/solidconnection/application/dto/UniversityChoiceRequest.java b/src/main/java/com/example/solidconnection/application/dto/UniversityChoiceRequest.java index d447c9737..220b803b3 100644 --- a/src/main/java/com/example/solidconnection/application/dto/UniversityChoiceRequest.java +++ b/src/main/java/com/example/solidconnection/application/dto/UniversityChoiceRequest.java @@ -1,6 +1,6 @@ package com.example.solidconnection.application.dto; -import com.example.solidconnection.common.validation.annotation.ValidUniversityChoice; +import com.example.solidconnection.university.dto.validation.ValidUniversityChoice; @ValidUniversityChoice public record UniversityChoiceRequest( diff --git a/src/main/java/com/example/solidconnection/common/validation/annotation/RejectedReasonRequired.java b/src/main/java/com/example/solidconnection/application/dto/validation/RejectedReasonRequired.java similarity index 78% rename from src/main/java/com/example/solidconnection/common/validation/annotation/RejectedReasonRequired.java rename to src/main/java/com/example/solidconnection/application/dto/validation/RejectedReasonRequired.java index 704919494..281be235b 100644 --- a/src/main/java/com/example/solidconnection/common/validation/annotation/RejectedReasonRequired.java +++ b/src/main/java/com/example/solidconnection/application/dto/validation/RejectedReasonRequired.java @@ -1,6 +1,5 @@ -package com.example.solidconnection.common.validation.annotation; +package com.example.solidconnection.application.dto.validation; -import com.example.solidconnection.common.validation.validator.RejectedReasonValidator; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/src/main/java/com/example/solidconnection/common/validation/validator/RejectedReasonValidator.java b/src/main/java/com/example/solidconnection/application/dto/validation/RejectedReasonValidator.java similarity index 90% rename from src/main/java/com/example/solidconnection/common/validation/validator/RejectedReasonValidator.java rename to src/main/java/com/example/solidconnection/application/dto/validation/RejectedReasonValidator.java index ae4d27467..0f1837e0e 100644 --- a/src/main/java/com/example/solidconnection/common/validation/validator/RejectedReasonValidator.java +++ b/src/main/java/com/example/solidconnection/application/dto/validation/RejectedReasonValidator.java @@ -1,7 +1,6 @@ -package com.example.solidconnection.common.validation.validator; +package com.example.solidconnection.application.dto.validation; import com.example.solidconnection.admin.dto.ScoreUpdateRequest; -import com.example.solidconnection.common.validation.annotation.RejectedReasonRequired; import com.example.solidconnection.application.domain.VerifyStatus; import io.micrometer.common.util.StringUtils; import jakarta.validation.ConstraintValidator; diff --git a/src/main/java/com/example/solidconnection/common/validation/annotation/ValidUniversityChoice.java b/src/main/java/com/example/solidconnection/university/dto/validation/ValidUniversityChoice.java similarity index 78% rename from src/main/java/com/example/solidconnection/common/validation/annotation/ValidUniversityChoice.java rename to src/main/java/com/example/solidconnection/university/dto/validation/ValidUniversityChoice.java index 592a500df..658de067c 100644 --- a/src/main/java/com/example/solidconnection/common/validation/annotation/ValidUniversityChoice.java +++ b/src/main/java/com/example/solidconnection/university/dto/validation/ValidUniversityChoice.java @@ -1,6 +1,5 @@ -package com.example.solidconnection.common.validation.annotation; +package com.example.solidconnection.university.dto.validation; -import com.example.solidconnection.common.validation.validator.ValidUniversityChoiceValidator; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/src/main/java/com/example/solidconnection/common/validation/validator/ValidUniversityChoiceValidator.java b/src/main/java/com/example/solidconnection/university/dto/validation/ValidUniversityChoiceValidator.java similarity index 93% rename from src/main/java/com/example/solidconnection/common/validation/validator/ValidUniversityChoiceValidator.java rename to src/main/java/com/example/solidconnection/university/dto/validation/ValidUniversityChoiceValidator.java index 68910155c..63d47b0de 100644 --- a/src/main/java/com/example/solidconnection/common/validation/validator/ValidUniversityChoiceValidator.java +++ b/src/main/java/com/example/solidconnection/university/dto/validation/ValidUniversityChoiceValidator.java @@ -1,7 +1,6 @@ -package com.example.solidconnection.common.validation.validator; +package com.example.solidconnection.university.dto.validation; import com.example.solidconnection.application.dto.UniversityChoiceRequest; -import com.example.solidconnection.common.validation.annotation.ValidUniversityChoice; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; diff --git a/src/test/java/com/example/solidconnection/common/validation/validator/RejectedReasonValidatorTest.java b/src/test/java/com/example/solidconnection/admin/dto/validation/RejectedReasonValidatorTest.java similarity index 98% rename from src/test/java/com/example/solidconnection/common/validation/validator/RejectedReasonValidatorTest.java rename to src/test/java/com/example/solidconnection/admin/dto/validation/RejectedReasonValidatorTest.java index 32f1753e1..7015a633e 100644 --- a/src/test/java/com/example/solidconnection/common/validation/validator/RejectedReasonValidatorTest.java +++ b/src/test/java/com/example/solidconnection/admin/dto/validation/RejectedReasonValidatorTest.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.common.validation.validator; +package com.example.solidconnection.admin.dto.validation; import com.example.solidconnection.admin.dto.GpaScoreUpdateRequest; import com.example.solidconnection.admin.dto.LanguageTestScoreUpdateRequest; diff --git a/src/test/java/com/example/solidconnection/common/validation/validator/ValidUniversityChoiceValidatorTest.java b/src/test/java/com/example/solidconnection/university/dto/validation/ValidUniversityChoiceValidatorTest.java similarity index 98% rename from src/test/java/com/example/solidconnection/common/validation/validator/ValidUniversityChoiceValidatorTest.java rename to src/test/java/com/example/solidconnection/university/dto/validation/ValidUniversityChoiceValidatorTest.java index 58e394c93..e08f49e6a 100644 --- a/src/test/java/com/example/solidconnection/common/validation/validator/ValidUniversityChoiceValidatorTest.java +++ b/src/test/java/com/example/solidconnection/university/dto/validation/ValidUniversityChoiceValidatorTest.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.common.validation.validator; +package com.example.solidconnection.university.dto.validation; import com.example.solidconnection.application.dto.UniversityChoiceRequest; import jakarta.validation.ConstraintViolation; From ee113acb5d48ab5a4941a89280908f28edef07c5 Mon Sep 17 00:00:00 2001 From: nayonsoso Date: Sat, 17 May 2025 00:12:58 +0900 Subject: [PATCH 11/15] =?UTF-8?q?refactor:=20BaseEntity=20=ED=8C=A8?= =?UTF-8?q?=ED=82=A4=EC=A7=80=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 여러 도메인에서 쓰이므로 common 하위로 --- .../example/solidconnection/{entity => }/common/BaseEntity.java | 2 +- .../solidconnection/community/comment/domain/Comment.java | 2 +- .../com/example/solidconnection/community/post/domain/Post.java | 2 +- src/main/java/com/example/solidconnection/news/domain/News.java | 2 +- .../java/com/example/solidconnection/score/domain/GpaScore.java | 2 +- .../example/solidconnection/score/domain/LanguageTestScore.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename src/main/java/com/example/solidconnection/{entity => }/common/BaseEntity.java (95%) diff --git a/src/main/java/com/example/solidconnection/entity/common/BaseEntity.java b/src/main/java/com/example/solidconnection/common/BaseEntity.java similarity index 95% rename from src/main/java/com/example/solidconnection/entity/common/BaseEntity.java rename to src/main/java/com/example/solidconnection/common/BaseEntity.java index 508953f88..febf5e77c 100644 --- a/src/main/java/com/example/solidconnection/entity/common/BaseEntity.java +++ b/src/main/java/com/example/solidconnection/common/BaseEntity.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.entity.common; +package com.example.solidconnection.common; import jakarta.persistence.EntityListeners; import jakarta.persistence.MappedSuperclass; diff --git a/src/main/java/com/example/solidconnection/community/comment/domain/Comment.java b/src/main/java/com/example/solidconnection/community/comment/domain/Comment.java index abed4b8f0..9bb2dccd9 100644 --- a/src/main/java/com/example/solidconnection/community/comment/domain/Comment.java +++ b/src/main/java/com/example/solidconnection/community/comment/domain/Comment.java @@ -1,6 +1,6 @@ package com.example.solidconnection.community.comment.domain; -import com.example.solidconnection.entity.common.BaseEntity; +import com.example.solidconnection.common.BaseEntity; import com.example.solidconnection.community.post.domain.Post; import com.example.solidconnection.siteuser.domain.SiteUser; import jakarta.persistence.CascadeType; diff --git a/src/main/java/com/example/solidconnection/community/post/domain/Post.java b/src/main/java/com/example/solidconnection/community/post/domain/Post.java index bc4af1f8e..240a697d9 100644 --- a/src/main/java/com/example/solidconnection/community/post/domain/Post.java +++ b/src/main/java/com/example/solidconnection/community/post/domain/Post.java @@ -2,7 +2,7 @@ import com.example.solidconnection.community.board.domain.Board; import com.example.solidconnection.community.comment.domain.Comment; -import com.example.solidconnection.entity.common.BaseEntity; +import com.example.solidconnection.common.BaseEntity; import com.example.solidconnection.community.post.dto.PostUpdateRequest; import com.example.solidconnection.siteuser.domain.SiteUser; import jakarta.persistence.CascadeType; diff --git a/src/main/java/com/example/solidconnection/news/domain/News.java b/src/main/java/com/example/solidconnection/news/domain/News.java index 1a9f22a4a..6a3bbdf1f 100644 --- a/src/main/java/com/example/solidconnection/news/domain/News.java +++ b/src/main/java/com/example/solidconnection/news/domain/News.java @@ -1,6 +1,6 @@ package com.example.solidconnection.news.domain; -import com.example.solidconnection.entity.common.BaseEntity; +import com.example.solidconnection.common.BaseEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/src/main/java/com/example/solidconnection/score/domain/GpaScore.java b/src/main/java/com/example/solidconnection/score/domain/GpaScore.java index 99c4f13cb..8545ed313 100644 --- a/src/main/java/com/example/solidconnection/score/domain/GpaScore.java +++ b/src/main/java/com/example/solidconnection/score/domain/GpaScore.java @@ -1,7 +1,7 @@ package com.example.solidconnection.score.domain; import com.example.solidconnection.application.domain.Gpa; -import com.example.solidconnection.entity.common.BaseEntity; +import com.example.solidconnection.common.BaseEntity; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.application.domain.VerifyStatus; import jakarta.persistence.Column; diff --git a/src/main/java/com/example/solidconnection/score/domain/LanguageTestScore.java b/src/main/java/com/example/solidconnection/score/domain/LanguageTestScore.java index be7dd107a..f2023dbd4 100644 --- a/src/main/java/com/example/solidconnection/score/domain/LanguageTestScore.java +++ b/src/main/java/com/example/solidconnection/score/domain/LanguageTestScore.java @@ -1,7 +1,7 @@ package com.example.solidconnection.score.domain; import com.example.solidconnection.application.domain.LanguageTest; -import com.example.solidconnection.entity.common.BaseEntity; +import com.example.solidconnection.common.BaseEntity; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.application.domain.VerifyStatus; import jakarta.persistence.Column; From 74f60c58e12eb2b7df6f5e1b0fc58d185ee40e68 Mon Sep 17 00:00:00 2001 From: nayonsoso Date: Sat, 17 May 2025 00:18:44 +0900 Subject: [PATCH 12/15] =?UTF-8?q?refactor:=20=ED=8A=B9=EC=A0=95=20?= =?UTF-8?q?=EB=8F=84=EB=A9=94=EC=9D=B8=EC=97=90=EB=A7=8C=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=EB=90=9C=20config=20=ED=8C=A8=ED=82=A4=EC=A7=80=20?= =?UTF-8?q?=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 관련 도메인 하위에서만 필요한 설정은 그 도메인 하위로 옮긴다. - AppleOAuthClientProperties, KakaoOAuthClientProperties 를 auth.client.config 로 - CorsProperties, JwtProperties, SecurityConfiguration, AuthenticationManagerConfig 를 security.config 로 --- .../example/solidconnection/auth/client/AppleOAuthClient.java | 2 +- .../auth/client/AppleOAuthClientSecretProvider.java | 2 +- .../solidconnection/auth/client/ApplePublicKeyProvider.java | 2 +- .../example/solidconnection/auth/client/KakaoOAuthClient.java | 2 +- .../client/config}/AppleOAuthClientProperties.java | 2 +- .../client/config}/KakaoOAuthClientProperties.java | 2 +- .../solidconnection/auth/service/AuthTokenProvider.java | 2 +- .../auth/service/CommonSignUpTokenProvider.java | 2 +- .../solidconnection/auth/service/EmailSignUpTokenProvider.java | 2 +- .../example/solidconnection/auth/service/TokenProvider.java | 2 +- .../auth/service/oauth/OAuthSignUpTokenProvider.java | 2 +- .../config}/AuthenticationManagerConfig.java | 2 +- .../{config/security => security/config}/CorsProperties.java | 2 +- .../{config/security => security/config}/JwtProperties.java | 2 +- .../security => security/config}/SecurityConfiguration.java | 2 +- .../security/provider/SiteUserAuthenticationProvider.java | 2 +- .../solidconnection/auth/service/SignInServiceTest.java | 2 +- .../auth/service/oauth/OAuthSignUpTokenProviderTest.java | 2 +- .../security/filter/JwtAuthenticationFilterTest.java | 3 +-- .../security/filter/SignOutCheckFilterTest.java | 2 +- .../security/provider/SiteUserAuthenticationProviderTest.java | 2 +- 21 files changed, 21 insertions(+), 22 deletions(-) rename src/main/java/com/example/solidconnection/{config/client => auth/client/config}/AppleOAuthClientProperties.java (87%) rename src/main/java/com/example/solidconnection/{config/client => auth/client/config}/KakaoOAuthClientProperties.java (83%) rename src/main/java/com/example/solidconnection/{config/security => security/config}/AuthenticationManagerConfig.java (93%) rename src/main/java/com/example/solidconnection/{config/security => security/config}/CorsProperties.java (79%) rename src/main/java/com/example/solidconnection/{config/security => security/config}/JwtProperties.java (75%) rename src/main/java/com/example/solidconnection/{config/security => security/config}/SecurityConfiguration.java (98%) diff --git a/src/main/java/com/example/solidconnection/auth/client/AppleOAuthClient.java b/src/main/java/com/example/solidconnection/auth/client/AppleOAuthClient.java index a9b388797..fa31d0639 100644 --- a/src/main/java/com/example/solidconnection/auth/client/AppleOAuthClient.java +++ b/src/main/java/com/example/solidconnection/auth/client/AppleOAuthClient.java @@ -2,7 +2,7 @@ import com.example.solidconnection.auth.dto.oauth.AppleTokenDto; import com.example.solidconnection.auth.dto.oauth.AppleUserInfoDto; -import com.example.solidconnection.config.client.AppleOAuthClientProperties; +import com.example.solidconnection.auth.client.config.AppleOAuthClientProperties; import com.example.solidconnection.common.exception.CustomException; import io.jsonwebtoken.Jwts; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/solidconnection/auth/client/AppleOAuthClientSecretProvider.java b/src/main/java/com/example/solidconnection/auth/client/AppleOAuthClientSecretProvider.java index 1dae4a398..6bdd6a5fb 100644 --- a/src/main/java/com/example/solidconnection/auth/client/AppleOAuthClientSecretProvider.java +++ b/src/main/java/com/example/solidconnection/auth/client/AppleOAuthClientSecretProvider.java @@ -1,6 +1,6 @@ package com.example.solidconnection.auth.client; -import com.example.solidconnection.config.client.AppleOAuthClientProperties; +import com.example.solidconnection.auth.client.config.AppleOAuthClientProperties; import com.example.solidconnection.common.exception.CustomException; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; diff --git a/src/main/java/com/example/solidconnection/auth/client/ApplePublicKeyProvider.java b/src/main/java/com/example/solidconnection/auth/client/ApplePublicKeyProvider.java index 0c9f80e8b..0fe6b9700 100644 --- a/src/main/java/com/example/solidconnection/auth/client/ApplePublicKeyProvider.java +++ b/src/main/java/com/example/solidconnection/auth/client/ApplePublicKeyProvider.java @@ -1,6 +1,6 @@ package com.example.solidconnection.auth.client; -import com.example.solidconnection.config.client.AppleOAuthClientProperties; +import com.example.solidconnection.auth.client.config.AppleOAuthClientProperties; import com.example.solidconnection.common.exception.CustomException; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; diff --git a/src/main/java/com/example/solidconnection/auth/client/KakaoOAuthClient.java b/src/main/java/com/example/solidconnection/auth/client/KakaoOAuthClient.java index 9bda6c2cc..9ecc853b1 100644 --- a/src/main/java/com/example/solidconnection/auth/client/KakaoOAuthClient.java +++ b/src/main/java/com/example/solidconnection/auth/client/KakaoOAuthClient.java @@ -2,7 +2,7 @@ import com.example.solidconnection.auth.dto.oauth.KakaoTokenDto; import com.example.solidconnection.auth.dto.oauth.KakaoUserInfoDto; -import com.example.solidconnection.config.client.KakaoOAuthClientProperties; +import com.example.solidconnection.auth.client.config.KakaoOAuthClientProperties; import com.example.solidconnection.common.exception.CustomException; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpEntity; diff --git a/src/main/java/com/example/solidconnection/config/client/AppleOAuthClientProperties.java b/src/main/java/com/example/solidconnection/auth/client/config/AppleOAuthClientProperties.java similarity index 87% rename from src/main/java/com/example/solidconnection/config/client/AppleOAuthClientProperties.java rename to src/main/java/com/example/solidconnection/auth/client/config/AppleOAuthClientProperties.java index c04908583..ae62d3561 100644 --- a/src/main/java/com/example/solidconnection/config/client/AppleOAuthClientProperties.java +++ b/src/main/java/com/example/solidconnection/auth/client/config/AppleOAuthClientProperties.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.config.client; +package com.example.solidconnection.auth.client.config; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/com/example/solidconnection/config/client/KakaoOAuthClientProperties.java b/src/main/java/com/example/solidconnection/auth/client/config/KakaoOAuthClientProperties.java similarity index 83% rename from src/main/java/com/example/solidconnection/config/client/KakaoOAuthClientProperties.java rename to src/main/java/com/example/solidconnection/auth/client/config/KakaoOAuthClientProperties.java index 73b196d76..f9a476e6a 100644 --- a/src/main/java/com/example/solidconnection/config/client/KakaoOAuthClientProperties.java +++ b/src/main/java/com/example/solidconnection/auth/client/config/KakaoOAuthClientProperties.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.config.client; +package com.example.solidconnection.auth.client.config; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/com/example/solidconnection/auth/service/AuthTokenProvider.java b/src/main/java/com/example/solidconnection/auth/service/AuthTokenProvider.java index 2e43e8be9..fa2a064cc 100644 --- a/src/main/java/com/example/solidconnection/auth/service/AuthTokenProvider.java +++ b/src/main/java/com/example/solidconnection/auth/service/AuthTokenProvider.java @@ -1,7 +1,7 @@ package com.example.solidconnection.auth.service; import com.example.solidconnection.auth.domain.TokenType; -import com.example.solidconnection.config.security.JwtProperties; +import com.example.solidconnection.security.config.JwtProperties; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.util.JwtUtils; import org.springframework.data.redis.core.RedisTemplate; diff --git a/src/main/java/com/example/solidconnection/auth/service/CommonSignUpTokenProvider.java b/src/main/java/com/example/solidconnection/auth/service/CommonSignUpTokenProvider.java index 323ad94de..aed44ea1c 100644 --- a/src/main/java/com/example/solidconnection/auth/service/CommonSignUpTokenProvider.java +++ b/src/main/java/com/example/solidconnection/auth/service/CommonSignUpTokenProvider.java @@ -1,6 +1,6 @@ package com.example.solidconnection.auth.service; -import com.example.solidconnection.config.security.JwtProperties; +import com.example.solidconnection.security.config.JwtProperties; import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.siteuser.domain.AuthType; import com.example.solidconnection.util.JwtUtils; diff --git a/src/main/java/com/example/solidconnection/auth/service/EmailSignUpTokenProvider.java b/src/main/java/com/example/solidconnection/auth/service/EmailSignUpTokenProvider.java index 9020ab083..385ebdae4 100644 --- a/src/main/java/com/example/solidconnection/auth/service/EmailSignUpTokenProvider.java +++ b/src/main/java/com/example/solidconnection/auth/service/EmailSignUpTokenProvider.java @@ -2,7 +2,7 @@ import com.example.solidconnection.auth.domain.TokenType; import com.example.solidconnection.auth.dto.EmailSignUpTokenRequest; -import com.example.solidconnection.config.security.JwtProperties; +import com.example.solidconnection.security.config.JwtProperties; import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.siteuser.domain.AuthType; import io.jsonwebtoken.Claims; diff --git a/src/main/java/com/example/solidconnection/auth/service/TokenProvider.java b/src/main/java/com/example/solidconnection/auth/service/TokenProvider.java index f5f638ab3..0f3552db2 100644 --- a/src/main/java/com/example/solidconnection/auth/service/TokenProvider.java +++ b/src/main/java/com/example/solidconnection/auth/service/TokenProvider.java @@ -1,7 +1,7 @@ package com.example.solidconnection.auth.service; import com.example.solidconnection.auth.domain.TokenType; -import com.example.solidconnection.config.security.JwtProperties; +import com.example.solidconnection.security.config.JwtProperties; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; diff --git a/src/main/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpTokenProvider.java b/src/main/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpTokenProvider.java index a6ee2afac..071ac32c0 100644 --- a/src/main/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpTokenProvider.java +++ b/src/main/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpTokenProvider.java @@ -2,7 +2,7 @@ import com.example.solidconnection.auth.domain.TokenType; import com.example.solidconnection.auth.service.TokenProvider; -import com.example.solidconnection.config.security.JwtProperties; +import com.example.solidconnection.security.config.JwtProperties; import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.siteuser.domain.AuthType; import io.jsonwebtoken.Claims; diff --git a/src/main/java/com/example/solidconnection/config/security/AuthenticationManagerConfig.java b/src/main/java/com/example/solidconnection/security/config/AuthenticationManagerConfig.java similarity index 93% rename from src/main/java/com/example/solidconnection/config/security/AuthenticationManagerConfig.java rename to src/main/java/com/example/solidconnection/security/config/AuthenticationManagerConfig.java index c690abc18..72601237b 100644 --- a/src/main/java/com/example/solidconnection/config/security/AuthenticationManagerConfig.java +++ b/src/main/java/com/example/solidconnection/security/config/AuthenticationManagerConfig.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.config.security; +package com.example.solidconnection.security.config; import com.example.solidconnection.security.provider.SiteUserAuthenticationProvider; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/solidconnection/config/security/CorsProperties.java b/src/main/java/com/example/solidconnection/security/config/CorsProperties.java similarity index 79% rename from src/main/java/com/example/solidconnection/config/security/CorsProperties.java rename to src/main/java/com/example/solidconnection/security/config/CorsProperties.java index f851692c6..a179a7563 100644 --- a/src/main/java/com/example/solidconnection/config/security/CorsProperties.java +++ b/src/main/java/com/example/solidconnection/security/config/CorsProperties.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.config.security; +package com.example.solidconnection.security.config; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/com/example/solidconnection/config/security/JwtProperties.java b/src/main/java/com/example/solidconnection/security/config/JwtProperties.java similarity index 75% rename from src/main/java/com/example/solidconnection/config/security/JwtProperties.java rename to src/main/java/com/example/solidconnection/security/config/JwtProperties.java index e0c63da46..f4afa5245 100644 --- a/src/main/java/com/example/solidconnection/config/security/JwtProperties.java +++ b/src/main/java/com/example/solidconnection/security/config/JwtProperties.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.config.security; +package com.example.solidconnection.security.config; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/com/example/solidconnection/config/security/SecurityConfiguration.java b/src/main/java/com/example/solidconnection/security/config/SecurityConfiguration.java similarity index 98% rename from src/main/java/com/example/solidconnection/config/security/SecurityConfiguration.java rename to src/main/java/com/example/solidconnection/security/config/SecurityConfiguration.java index 42f460b64..46d1793df 100644 --- a/src/main/java/com/example/solidconnection/config/security/SecurityConfiguration.java +++ b/src/main/java/com/example/solidconnection/security/config/SecurityConfiguration.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.config.security; +package com.example.solidconnection.security.config; import com.example.solidconnection.common.exception.CustomAccessDeniedHandler; import com.example.solidconnection.common.exception.CustomAuthenticationEntryPoint; diff --git a/src/main/java/com/example/solidconnection/security/provider/SiteUserAuthenticationProvider.java b/src/main/java/com/example/solidconnection/security/provider/SiteUserAuthenticationProvider.java index 190a74daf..80e316ce5 100644 --- a/src/main/java/com/example/solidconnection/security/provider/SiteUserAuthenticationProvider.java +++ b/src/main/java/com/example/solidconnection/security/provider/SiteUserAuthenticationProvider.java @@ -1,6 +1,6 @@ package com.example.solidconnection.security.provider; -import com.example.solidconnection.config.security.JwtProperties; +import com.example.solidconnection.security.config.JwtProperties; import com.example.solidconnection.security.userdetails.SiteUserDetails; import com.example.solidconnection.security.userdetails.SiteUserDetailsService; import com.example.solidconnection.security.authentication.JwtAuthentication; diff --git a/src/test/java/com/example/solidconnection/auth/service/SignInServiceTest.java b/src/test/java/com/example/solidconnection/auth/service/SignInServiceTest.java index 02397733e..f8b24ca6f 100644 --- a/src/test/java/com/example/solidconnection/auth/service/SignInServiceTest.java +++ b/src/test/java/com/example/solidconnection/auth/service/SignInServiceTest.java @@ -2,7 +2,7 @@ import com.example.solidconnection.auth.domain.TokenType; import com.example.solidconnection.auth.dto.SignInResponse; -import com.example.solidconnection.config.security.JwtProperties; +import com.example.solidconnection.security.config.JwtProperties; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.TestContainerSpringBootTest; diff --git a/src/test/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpTokenProviderTest.java b/src/test/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpTokenProviderTest.java index 79f8fded3..5fd721ef1 100644 --- a/src/test/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpTokenProviderTest.java +++ b/src/test/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpTokenProviderTest.java @@ -1,7 +1,7 @@ package com.example.solidconnection.auth.service.oauth; import com.example.solidconnection.auth.domain.TokenType; -import com.example.solidconnection.config.security.JwtProperties; +import com.example.solidconnection.security.config.JwtProperties; import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.siteuser.domain.AuthType; import com.example.solidconnection.support.TestContainerSpringBootTest; diff --git a/src/test/java/com/example/solidconnection/security/filter/JwtAuthenticationFilterTest.java b/src/test/java/com/example/solidconnection/security/filter/JwtAuthenticationFilterTest.java index 8b7d2b7a3..d48858c50 100644 --- a/src/test/java/com/example/solidconnection/security/filter/JwtAuthenticationFilterTest.java +++ b/src/test/java/com/example/solidconnection/security/filter/JwtAuthenticationFilterTest.java @@ -1,8 +1,7 @@ package com.example.solidconnection.security.filter; -import com.example.solidconnection.config.security.JwtProperties; +import com.example.solidconnection.security.config.JwtProperties; import com.example.solidconnection.security.authentication.SiteUserAuthentication; -import com.example.solidconnection.security.filter.JwtAuthenticationFilter; import com.example.solidconnection.security.userdetails.SiteUserDetailsService; import com.example.solidconnection.support.TestContainerSpringBootTest; import io.jsonwebtoken.Jwts; diff --git a/src/test/java/com/example/solidconnection/security/filter/SignOutCheckFilterTest.java b/src/test/java/com/example/solidconnection/security/filter/SignOutCheckFilterTest.java index aedd14b66..d0e20dd62 100644 --- a/src/test/java/com/example/solidconnection/security/filter/SignOutCheckFilterTest.java +++ b/src/test/java/com/example/solidconnection/security/filter/SignOutCheckFilterTest.java @@ -1,6 +1,6 @@ package com.example.solidconnection.security.filter; -import com.example.solidconnection.config.security.JwtProperties; +import com.example.solidconnection.security.config.JwtProperties; import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.support.TestContainerSpringBootTest; import io.jsonwebtoken.Jwts; diff --git a/src/test/java/com/example/solidconnection/security/provider/SiteUserAuthenticationProviderTest.java b/src/test/java/com/example/solidconnection/security/provider/SiteUserAuthenticationProviderTest.java index e8c9a7810..2d098e60d 100644 --- a/src/test/java/com/example/solidconnection/security/provider/SiteUserAuthenticationProviderTest.java +++ b/src/test/java/com/example/solidconnection/security/provider/SiteUserAuthenticationProviderTest.java @@ -1,6 +1,6 @@ package com.example.solidconnection.security.provider; -import com.example.solidconnection.config.security.JwtProperties; +import com.example.solidconnection.security.config.JwtProperties; import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.security.authentication.SiteUserAuthentication; import com.example.solidconnection.security.userdetails.SiteUserDetails; From f5e452ce58355fc3ebcc30cb326e3acee5486d9d Mon Sep 17 00:00:00 2001 From: nayonsoso Date: Mon, 19 May 2025 02:38:39 +0900 Subject: [PATCH 13/15] =?UTF-8?q?refactor:=20config=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=20=ED=8C=A8=ED=82=A4=EC=A7=80=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit config -> common.config --- .../{ => common}/config/client/RestTemplateConfig.java | 2 +- .../solidconnection/{ => common}/config/redis/RedisConfig.java | 2 +- .../{ => common}/config/scheduler/SchedulerConfig.java | 2 +- .../solidconnection/{ => common}/config/sync/AsyncConfig.java | 2 +- .../solidconnection/{ => common}/config/web/WebMvcConfig.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename src/main/java/com/example/solidconnection/{ => common}/config/client/RestTemplateConfig.java (90%) rename src/main/java/com/example/solidconnection/{ => common}/config/redis/RedisConfig.java (98%) rename src/main/java/com/example/solidconnection/{ => common}/config/scheduler/SchedulerConfig.java (94%) rename src/main/java/com/example/solidconnection/{ => common}/config/sync/AsyncConfig.java (92%) rename src/main/java/com/example/solidconnection/{ => common}/config/web/WebMvcConfig.java (94%) diff --git a/src/main/java/com/example/solidconnection/config/client/RestTemplateConfig.java b/src/main/java/com/example/solidconnection/common/config/client/RestTemplateConfig.java similarity index 90% rename from src/main/java/com/example/solidconnection/config/client/RestTemplateConfig.java rename to src/main/java/com/example/solidconnection/common/config/client/RestTemplateConfig.java index 36ce3f67b..88afde086 100644 --- a/src/main/java/com/example/solidconnection/config/client/RestTemplateConfig.java +++ b/src/main/java/com/example/solidconnection/common/config/client/RestTemplateConfig.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.config.client; +package com.example.solidconnection.common.config.client; import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/example/solidconnection/config/redis/RedisConfig.java b/src/main/java/com/example/solidconnection/common/config/redis/RedisConfig.java similarity index 98% rename from src/main/java/com/example/solidconnection/config/redis/RedisConfig.java rename to src/main/java/com/example/solidconnection/common/config/redis/RedisConfig.java index e611b1ff0..99c98581a 100644 --- a/src/main/java/com/example/solidconnection/config/redis/RedisConfig.java +++ b/src/main/java/com/example/solidconnection/common/config/redis/RedisConfig.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.config.redis; +package com.example.solidconnection.common.config.redis; import com.example.solidconnection.cache.CacheUpdateListener; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/example/solidconnection/config/scheduler/SchedulerConfig.java b/src/main/java/com/example/solidconnection/common/config/scheduler/SchedulerConfig.java similarity index 94% rename from src/main/java/com/example/solidconnection/config/scheduler/SchedulerConfig.java rename to src/main/java/com/example/solidconnection/common/config/scheduler/SchedulerConfig.java index 2a2cfa6a5..227b35372 100644 --- a/src/main/java/com/example/solidconnection/config/scheduler/SchedulerConfig.java +++ b/src/main/java/com/example/solidconnection/common/config/scheduler/SchedulerConfig.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.config.scheduler; +package com.example.solidconnection.common.config.scheduler; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.SchedulingConfigurer; diff --git a/src/main/java/com/example/solidconnection/config/sync/AsyncConfig.java b/src/main/java/com/example/solidconnection/common/config/sync/AsyncConfig.java similarity index 92% rename from src/main/java/com/example/solidconnection/config/sync/AsyncConfig.java rename to src/main/java/com/example/solidconnection/common/config/sync/AsyncConfig.java index 417b040b3..852e3de02 100644 --- a/src/main/java/com/example/solidconnection/config/sync/AsyncConfig.java +++ b/src/main/java/com/example/solidconnection/common/config/sync/AsyncConfig.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.config.sync; +package com.example.solidconnection.common.config.sync; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/example/solidconnection/config/web/WebMvcConfig.java b/src/main/java/com/example/solidconnection/common/config/web/WebMvcConfig.java similarity index 94% rename from src/main/java/com/example/solidconnection/config/web/WebMvcConfig.java rename to src/main/java/com/example/solidconnection/common/config/web/WebMvcConfig.java index 7cf375057..a6ba76f7b 100644 --- a/src/main/java/com/example/solidconnection/config/web/WebMvcConfig.java +++ b/src/main/java/com/example/solidconnection/common/config/web/WebMvcConfig.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.config.web; +package com.example.solidconnection.common.config.web; import com.example.solidconnection.common.resolver.AuthorizedUserResolver; import com.example.solidconnection.common.resolver.CustomPageableHandlerMethodArgumentResolver; From a77d55a29dabfa66efa5a9d320d904e04c592c71 Mon Sep 17 00:00:00 2001 From: nayonsoso Date: Mon, 19 May 2025 02:41:18 +0900 Subject: [PATCH 14/15] =?UTF-8?q?refactor:=20S3=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=20=ED=8C=A8=ED=82=A4=EC=A7=80=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 다른 도메인 패키지들과 마찬가지로, 레이어별로 패키지를 나눈다. --- .../community/post/service/PostCommandService.java | 6 +++--- .../solidconnection/s3/{ => config}/AmazonS3Config.java | 2 +- .../solidconnection/s3/{ => controller}/S3Controller.java | 6 +++++- .../example/solidconnection/s3/{ => domain}/ImgType.java | 2 +- .../s3/{ => dto}/UploadedFileUrlResponse.java | 2 +- .../solidconnection/s3/{ => dto}/urlPrefixResponse.java | 2 +- .../s3/{ => service}/FileUploadService.java | 2 +- .../solidconnection/s3/{ => service}/S3Service.java | 4 +++- .../solidconnection/score/service/ScoreService.java | 6 +++--- .../solidconnection/siteuser/service/MyPageService.java | 6 +++--- .../community/post/service/PostCommandServiceTest.java | 6 +++--- .../solidconnection/score/service/ScoreServiceTest.java | 6 +++--- .../siteuser/service/MyPageServiceTest.java | 7 +++---- 13 files changed, 31 insertions(+), 26 deletions(-) rename src/main/java/com/example/solidconnection/s3/{ => config}/AmazonS3Config.java (95%) rename src/main/java/com/example/solidconnection/s3/{ => controller}/S3Controller.java (90%) rename src/main/java/com/example/solidconnection/s3/{ => domain}/ImgType.java (83%) rename src/main/java/com/example/solidconnection/s3/{ => dto}/UploadedFileUrlResponse.java (60%) rename src/main/java/com/example/solidconnection/s3/{ => dto}/urlPrefixResponse.java (78%) rename src/main/java/com/example/solidconnection/s3/{ => service}/FileUploadService.java (97%) rename src/main/java/com/example/solidconnection/s3/{ => service}/S3Service.java (96%) diff --git a/src/main/java/com/example/solidconnection/community/post/service/PostCommandService.java b/src/main/java/com/example/solidconnection/community/post/service/PostCommandService.java index f48b12eb8..ddef51b49 100644 --- a/src/main/java/com/example/solidconnection/community/post/service/PostCommandService.java +++ b/src/main/java/com/example/solidconnection/community/post/service/PostCommandService.java @@ -11,11 +11,11 @@ import com.example.solidconnection.community.post.dto.PostUpdateResponse; import com.example.solidconnection.community.post.repository.PostRepository; import com.example.solidconnection.common.exception.CustomException; -import com.example.solidconnection.s3.S3Service; -import com.example.solidconnection.s3.UploadedFileUrlResponse; +import com.example.solidconnection.s3.service.S3Service; +import com.example.solidconnection.s3.dto.UploadedFileUrlResponse; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; -import com.example.solidconnection.s3.ImgType; +import com.example.solidconnection.s3.domain.ImgType; import com.example.solidconnection.community.post.domain.PostCategory; import com.example.solidconnection.util.RedisUtils; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/solidconnection/s3/AmazonS3Config.java b/src/main/java/com/example/solidconnection/s3/config/AmazonS3Config.java similarity index 95% rename from src/main/java/com/example/solidconnection/s3/AmazonS3Config.java rename to src/main/java/com/example/solidconnection/s3/config/AmazonS3Config.java index c12f067dd..3b19cecfa 100644 --- a/src/main/java/com/example/solidconnection/s3/AmazonS3Config.java +++ b/src/main/java/com/example/solidconnection/s3/config/AmazonS3Config.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.s3; +package com.example.solidconnection.s3.config; import com.amazonaws.auth.AWSStaticCredentialsProvider; import com.amazonaws.auth.BasicAWSCredentials; diff --git a/src/main/java/com/example/solidconnection/s3/S3Controller.java b/src/main/java/com/example/solidconnection/s3/controller/S3Controller.java similarity index 90% rename from src/main/java/com/example/solidconnection/s3/S3Controller.java rename to src/main/java/com/example/solidconnection/s3/controller/S3Controller.java index e40f31f18..59ceeffaa 100644 --- a/src/main/java/com/example/solidconnection/s3/S3Controller.java +++ b/src/main/java/com/example/solidconnection/s3/controller/S3Controller.java @@ -1,6 +1,10 @@ -package com.example.solidconnection.s3; +package com.example.solidconnection.s3.controller; import com.example.solidconnection.common.resolver.AuthorizedUser; +import com.example.solidconnection.s3.domain.ImgType; +import com.example.solidconnection.s3.service.S3Service; +import com.example.solidconnection.s3.dto.UploadedFileUrlResponse; +import com.example.solidconnection.s3.dto.urlPrefixResponse; import com.example.solidconnection.siteuser.domain.SiteUser; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/example/solidconnection/s3/ImgType.java b/src/main/java/com/example/solidconnection/s3/domain/ImgType.java similarity index 83% rename from src/main/java/com/example/solidconnection/s3/ImgType.java rename to src/main/java/com/example/solidconnection/s3/domain/ImgType.java index 130b1a114..df881fe4b 100644 --- a/src/main/java/com/example/solidconnection/s3/ImgType.java +++ b/src/main/java/com/example/solidconnection/s3/domain/ImgType.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.s3; +package com.example.solidconnection.s3.domain; import lombok.Getter; diff --git a/src/main/java/com/example/solidconnection/s3/UploadedFileUrlResponse.java b/src/main/java/com/example/solidconnection/s3/dto/UploadedFileUrlResponse.java similarity index 60% rename from src/main/java/com/example/solidconnection/s3/UploadedFileUrlResponse.java rename to src/main/java/com/example/solidconnection/s3/dto/UploadedFileUrlResponse.java index 6d9b690fa..ca6a08b46 100644 --- a/src/main/java/com/example/solidconnection/s3/UploadedFileUrlResponse.java +++ b/src/main/java/com/example/solidconnection/s3/dto/UploadedFileUrlResponse.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.s3; +package com.example.solidconnection.s3.dto; public record UploadedFileUrlResponse( String fileUrl) { diff --git a/src/main/java/com/example/solidconnection/s3/urlPrefixResponse.java b/src/main/java/com/example/solidconnection/s3/dto/urlPrefixResponse.java similarity index 78% rename from src/main/java/com/example/solidconnection/s3/urlPrefixResponse.java rename to src/main/java/com/example/solidconnection/s3/dto/urlPrefixResponse.java index 59eac23ca..f36838060 100644 --- a/src/main/java/com/example/solidconnection/s3/urlPrefixResponse.java +++ b/src/main/java/com/example/solidconnection/s3/dto/urlPrefixResponse.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.s3; +package com.example.solidconnection.s3.dto; public record urlPrefixResponse( String s3Default, diff --git a/src/main/java/com/example/solidconnection/s3/FileUploadService.java b/src/main/java/com/example/solidconnection/s3/service/FileUploadService.java similarity index 97% rename from src/main/java/com/example/solidconnection/s3/FileUploadService.java rename to src/main/java/com/example/solidconnection/s3/service/FileUploadService.java index 133bdd1d4..61bc6f89c 100644 --- a/src/main/java/com/example/solidconnection/s3/FileUploadService.java +++ b/src/main/java/com/example/solidconnection/s3/service/FileUploadService.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.s3; +package com.example.solidconnection.s3.service; import com.amazonaws.AmazonServiceException; import com.amazonaws.SdkClientException; diff --git a/src/main/java/com/example/solidconnection/s3/S3Service.java b/src/main/java/com/example/solidconnection/s3/service/S3Service.java similarity index 96% rename from src/main/java/com/example/solidconnection/s3/S3Service.java rename to src/main/java/com/example/solidconnection/s3/service/S3Service.java index 88db74d21..1b7daf78f 100644 --- a/src/main/java/com/example/solidconnection/s3/S3Service.java +++ b/src/main/java/com/example/solidconnection/s3/service/S3Service.java @@ -1,10 +1,12 @@ -package com.example.solidconnection.s3; +package com.example.solidconnection.s3.service; import com.amazonaws.AmazonServiceException; import com.amazonaws.SdkClientException; import com.amazonaws.services.s3.AmazonS3Client; import com.amazonaws.services.s3.model.DeleteObjectRequest; import com.example.solidconnection.common.exception.CustomException; +import com.example.solidconnection.s3.domain.ImgType; +import com.example.solidconnection.s3.dto.UploadedFileUrlResponse; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/solidconnection/score/service/ScoreService.java b/src/main/java/com/example/solidconnection/score/service/ScoreService.java index 5bcef9e7d..9eb666e86 100644 --- a/src/main/java/com/example/solidconnection/score/service/ScoreService.java +++ b/src/main/java/com/example/solidconnection/score/service/ScoreService.java @@ -3,8 +3,8 @@ import com.example.solidconnection.application.domain.Gpa; import com.example.solidconnection.application.domain.LanguageTest; import com.example.solidconnection.common.exception.CustomException; -import com.example.solidconnection.s3.S3Service; -import com.example.solidconnection.s3.UploadedFileUrlResponse; +import com.example.solidconnection.s3.service.S3Service; +import com.example.solidconnection.s3.dto.UploadedFileUrlResponse; import com.example.solidconnection.score.domain.GpaScore; import com.example.solidconnection.score.domain.LanguageTestScore; import com.example.solidconnection.score.dto.GpaScoreRequest; @@ -17,7 +17,7 @@ import com.example.solidconnection.score.repository.LanguageTestScoreRepository; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; -import com.example.solidconnection.s3.ImgType; +import com.example.solidconnection.s3.domain.ImgType; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/example/solidconnection/siteuser/service/MyPageService.java b/src/main/java/com/example/solidconnection/siteuser/service/MyPageService.java index 47854b363..d7c0d5345 100644 --- a/src/main/java/com/example/solidconnection/siteuser/service/MyPageService.java +++ b/src/main/java/com/example/solidconnection/siteuser/service/MyPageService.java @@ -1,13 +1,13 @@ package com.example.solidconnection.siteuser.service; import com.example.solidconnection.common.exception.CustomException; -import com.example.solidconnection.s3.S3Service; -import com.example.solidconnection.s3.UploadedFileUrlResponse; +import com.example.solidconnection.s3.service.S3Service; +import com.example.solidconnection.s3.dto.UploadedFileUrlResponse; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.dto.MyPageResponse; import com.example.solidconnection.siteuser.repository.LikedUniversityRepository; import com.example.solidconnection.siteuser.repository.SiteUserRepository; -import com.example.solidconnection.s3.ImgType; +import com.example.solidconnection.s3.domain.ImgType; import com.example.solidconnection.university.domain.LikedUniversity; import com.example.solidconnection.university.dto.UniversityInfoForApplyPreviewResponse; import lombok.RequiredArgsConstructor; diff --git a/src/test/java/com/example/solidconnection/community/post/service/PostCommandServiceTest.java b/src/test/java/com/example/solidconnection/community/post/service/PostCommandServiceTest.java index 62c4c6f0b..cc4372b89 100644 --- a/src/test/java/com/example/solidconnection/community/post/service/PostCommandServiceTest.java +++ b/src/test/java/com/example/solidconnection/community/post/service/PostCommandServiceTest.java @@ -12,9 +12,9 @@ import com.example.solidconnection.community.post.repository.PostImageRepository; import com.example.solidconnection.community.post.repository.PostRepository; import com.example.solidconnection.common.exception.CustomException; -import com.example.solidconnection.s3.ImgType; -import com.example.solidconnection.s3.S3Service; -import com.example.solidconnection.s3.UploadedFileUrlResponse; +import com.example.solidconnection.s3.domain.ImgType; +import com.example.solidconnection.s3.service.S3Service; +import com.example.solidconnection.s3.dto.UploadedFileUrlResponse; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.integration.BaseIntegrationTest; diff --git a/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java b/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java index 0548f2134..42e146f29 100644 --- a/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java @@ -2,8 +2,8 @@ import com.example.solidconnection.application.domain.Gpa; import com.example.solidconnection.application.domain.LanguageTest; -import com.example.solidconnection.s3.S3Service; -import com.example.solidconnection.s3.UploadedFileUrlResponse; +import com.example.solidconnection.s3.service.S3Service; +import com.example.solidconnection.s3.dto.UploadedFileUrlResponse; import com.example.solidconnection.score.domain.GpaScore; import com.example.solidconnection.score.domain.LanguageTestScore; import com.example.solidconnection.score.dto.GpaScoreRequest; @@ -18,7 +18,7 @@ import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.integration.BaseIntegrationTest; -import com.example.solidconnection.s3.ImgType; +import com.example.solidconnection.s3.domain.ImgType; import com.example.solidconnection.university.domain.LanguageTestType; import com.example.solidconnection.siteuser.domain.PreparationStatus; import com.example.solidconnection.siteuser.domain.Role; diff --git a/src/test/java/com/example/solidconnection/siteuser/service/MyPageServiceTest.java b/src/test/java/com/example/solidconnection/siteuser/service/MyPageServiceTest.java index d52e1108b..e6aab4973 100644 --- a/src/test/java/com/example/solidconnection/siteuser/service/MyPageServiceTest.java +++ b/src/test/java/com/example/solidconnection/siteuser/service/MyPageServiceTest.java @@ -1,9 +1,8 @@ package com.example.solidconnection.siteuser.service; import com.example.solidconnection.common.exception.CustomException; -import com.example.solidconnection.s3.S3Service; -import com.example.solidconnection.s3.UploadedFileUrlResponse; -import com.example.solidconnection.siteuser.domain.AuthType; +import com.example.solidconnection.s3.service.S3Service; +import com.example.solidconnection.s3.dto.UploadedFileUrlResponse; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.dto.MyPageResponse; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; @@ -11,7 +10,7 @@ import com.example.solidconnection.siteuser.repository.LikedUniversityRepository; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.integration.BaseIntegrationTest; -import com.example.solidconnection.s3.ImgType; +import com.example.solidconnection.s3.domain.ImgType; import com.example.solidconnection.siteuser.domain.PreparationStatus; import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.university.domain.LikedUniversity; From 2b1614228cac6c9547a55f9f3866699f875c84a6 Mon Sep 17 00:00:00 2001 From: nayonsoso Date: Mon, 19 May 2025 21:46:32 +0900 Subject: [PATCH 15/15] =?UTF-8?q?chore:=20conflict=20=ED=95=B4=EC=86=8C?= =?UTF-8?q?=EC=99=80=20import=EB=AC=B8=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/dto/GpaScoreResponse.java | 2 +- .../admin/dto/GpaScoreUpdateRequest.java | 2 +- .../admin/dto/LanguageTestScoreResponse.java | 2 +- .../dto/LanguageTestScoreUpdateRequest.java | 2 +- .../admin/service/AdminGpaScoreService.java | 2 +- .../service/AdminLanguageTestScoreService.java | 2 +- .../repository/ApplicationRepository.java | 2 +- .../service/ApplicationQueryService.java | 2 +- .../service/ApplicationSubmissionService.java | 2 +- .../auth/client/AppleOAuthClient.java | 2 +- .../auth/client/KakaoOAuthClient.java | 2 +- .../auth/dto/SignUpRequest.java | 2 +- .../service/CommonSignUpTokenProvider.java | 2 +- .../auth/service/EmailSignUpTokenProvider.java | 2 +- .../auth/service/SignUpService.java | 4 +++- .../oauth/OAuthSignUpTokenProvider.java | 2 +- .../board/controller/BoardController.java | 4 ++-- .../board/repository/BoardRepository.java | 2 +- .../comment/controller/CommentController.java | 2 +- .../comment/repository/CommentRepository.java | 2 +- .../comment/service/CommentService.java | 2 +- .../post/controller/PostController.java | 2 +- .../community/post/domain/Post.java | 2 +- .../community/post/dto/PostCreateRequest.java | 2 +- .../community/post/dto/PostListResponse.java | 2 +- .../post/service/PostCommandService.java | 8 ++++---- .../post/service/PostLikeService.java | 2 +- .../post/service/PostQueryService.java | 10 +++++----- .../s3/controller/S3Controller.java | 2 +- .../solidconnection/score/domain/GpaScore.java | 2 +- .../score/domain/LanguageTestScore.java | 2 +- .../score/dto/GpaScoreStatusResponse.java | 2 +- .../dto/LanguageTestScoreStatusResponse.java | 2 +- .../score/service/ScoreService.java | 4 ++-- .../SiteUserAuthenticationProvider.java | 4 ++-- .../siteuser/dto/MyPageResponse.java | 2 +- .../siteuser/service/MyPageService.java | 4 ++-- .../dto/LanguageRequirementResponse.java | 2 +- .../LanguageRequirementRepository.java | 2 +- .../RejectedReasonValidatorTest.java | 2 +- .../service/AdminGpaScoreServiceTest.java | 4 +--- .../AdminLanguageTestScoreServiceTest.java | 4 +--- .../service/ApplicationQueryServiceTest.java | 2 +- .../ApplicationSubmissionServiceTest.java | 4 ++-- .../auth/service/AuthServiceTest.java | 2 -- .../auth/service/EmailSignInServiceTest.java | 5 ----- .../auth/service/SignInServiceTest.java | 2 -- .../oauth/OAuthSignUpTokenProviderTest.java | 4 ++-- .../resolver/AuthorizedUserResolverTest.java | 2 -- .../comment/service/CommentServiceTest.java | 4 ++-- .../post/service/PostCommandServiceTest.java | 4 ++-- .../post/service/PostLikeServiceTest.java | 5 +++-- .../PostLikeCountConcurrencyTest.java | 4 +--- .../PostViewCountConcurrencyTest.java | 3 --- .../concurrency/ThunderingHerdTest.java | 2 -- .../solidconnection/e2e/DynamicFixture.java | 2 +- .../country/fixture/CountryFixtureBuilder.java | 3 +-- .../score/service/ScoreServiceTest.java | 8 +++----- .../aspect/AdminAuthorizationAspectTest.java | 2 -- .../SiteUserAuthenticationTest.java | 3 +-- .../filter/JwtAuthenticationFilterTest.java | 2 +- .../filter/SignOutCheckFilterTest.java | 14 +++++++------- .../SiteUserAuthenticationProviderTest.java | 4 +--- .../SiteUserDetailsServiceTest.java | 2 -- .../userdetails/SiteUserDetailsTest.java | 3 --- .../siteuser/fixture/SiteUserFixture.java | 2 +- .../fixture/SiteUserFixtureBuilder.java | 4 ++-- .../repository/SiteUserRepositoryTest.java | 4 ++-- .../siteuser/service/MyPageServiceTest.java | 10 +++++----- .../siteuser/service/SiteUserServiceTest.java | 4 ---- .../integration/BaseIntegrationTest.java | 18 +++++++++--------- .../service/UniversityLikeServiceTest.java | 2 -- .../UniversityRecommendServiceTest.java | 2 -- 73 files changed, 102 insertions(+), 142 deletions(-) diff --git a/src/main/java/com/example/solidconnection/admin/dto/GpaScoreResponse.java b/src/main/java/com/example/solidconnection/admin/dto/GpaScoreResponse.java index 5acc69399..c90ba6a40 100644 --- a/src/main/java/com/example/solidconnection/admin/dto/GpaScoreResponse.java +++ b/src/main/java/com/example/solidconnection/admin/dto/GpaScoreResponse.java @@ -1,7 +1,7 @@ package com.example.solidconnection.admin.dto; -import com.example.solidconnection.score.domain.GpaScore; import com.example.solidconnection.application.domain.VerifyStatus; +import com.example.solidconnection.score.domain.GpaScore; public record GpaScoreResponse( long id, diff --git a/src/main/java/com/example/solidconnection/admin/dto/GpaScoreUpdateRequest.java b/src/main/java/com/example/solidconnection/admin/dto/GpaScoreUpdateRequest.java index 907710d10..c22979ea6 100644 --- a/src/main/java/com/example/solidconnection/admin/dto/GpaScoreUpdateRequest.java +++ b/src/main/java/com/example/solidconnection/admin/dto/GpaScoreUpdateRequest.java @@ -1,7 +1,7 @@ package com.example.solidconnection.admin.dto; -import com.example.solidconnection.application.dto.validation.RejectedReasonRequired; import com.example.solidconnection.application.domain.VerifyStatus; +import com.example.solidconnection.application.dto.validation.RejectedReasonRequired; import jakarta.validation.constraints.NotNull; @RejectedReasonRequired diff --git a/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreResponse.java b/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreResponse.java index 7ba0d11df..978dcae82 100644 --- a/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreResponse.java +++ b/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreResponse.java @@ -1,8 +1,8 @@ package com.example.solidconnection.admin.dto; +import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.score.domain.LanguageTestScore; import com.example.solidconnection.university.domain.LanguageTestType; -import com.example.solidconnection.application.domain.VerifyStatus; public record LanguageTestScoreResponse( long id, diff --git a/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreUpdateRequest.java b/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreUpdateRequest.java index 1df46f678..c072111ec 100644 --- a/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreUpdateRequest.java +++ b/src/main/java/com/example/solidconnection/admin/dto/LanguageTestScoreUpdateRequest.java @@ -1,8 +1,8 @@ package com.example.solidconnection.admin.dto; +import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.application.dto.validation.RejectedReasonRequired; import com.example.solidconnection.university.domain.LanguageTestType; -import com.example.solidconnection.application.domain.VerifyStatus; import jakarta.validation.constraints.NotNull; @RejectedReasonRequired diff --git a/src/main/java/com/example/solidconnection/admin/service/AdminGpaScoreService.java b/src/main/java/com/example/solidconnection/admin/service/AdminGpaScoreService.java index c98ca4315..eae555406 100644 --- a/src/main/java/com/example/solidconnection/admin/service/AdminGpaScoreService.java +++ b/src/main/java/com/example/solidconnection/admin/service/AdminGpaScoreService.java @@ -5,10 +5,10 @@ import com.example.solidconnection.admin.dto.GpaScoreUpdateRequest; import com.example.solidconnection.admin.dto.ScoreSearchCondition; import com.example.solidconnection.application.domain.Gpa; +import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.score.domain.GpaScore; import com.example.solidconnection.score.repository.GpaScoreRepository; -import com.example.solidconnection.application.domain.VerifyStatus; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreService.java b/src/main/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreService.java index 8a3d05fab..db89ae91c 100644 --- a/src/main/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreService.java +++ b/src/main/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreService.java @@ -5,10 +5,10 @@ import com.example.solidconnection.admin.dto.LanguageTestScoreUpdateRequest; import com.example.solidconnection.admin.dto.ScoreSearchCondition; import com.example.solidconnection.application.domain.LanguageTest; +import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.score.domain.LanguageTestScore; import com.example.solidconnection.score.repository.LanguageTestScoreRepository; -import com.example.solidconnection.application.domain.VerifyStatus; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/com/example/solidconnection/application/repository/ApplicationRepository.java b/src/main/java/com/example/solidconnection/application/repository/ApplicationRepository.java index 258d7cf7f..7df53eae6 100644 --- a/src/main/java/com/example/solidconnection/application/repository/ApplicationRepository.java +++ b/src/main/java/com/example/solidconnection/application/repository/ApplicationRepository.java @@ -1,9 +1,9 @@ package com.example.solidconnection.application.repository; import com.example.solidconnection.application.domain.Application; +import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.siteuser.domain.SiteUser; -import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.university.domain.UniversityInfoForApply; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/example/solidconnection/application/service/ApplicationQueryService.java b/src/main/java/com/example/solidconnection/application/service/ApplicationQueryService.java index 575abac86..e13ca7e3f 100644 --- a/src/main/java/com/example/solidconnection/application/service/ApplicationQueryService.java +++ b/src/main/java/com/example/solidconnection/application/service/ApplicationQueryService.java @@ -1,6 +1,7 @@ package com.example.solidconnection.application.service; import com.example.solidconnection.application.domain.Application; +import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.application.dto.ApplicantResponse; import com.example.solidconnection.application.dto.ApplicationsResponse; import com.example.solidconnection.application.dto.UniversityApplicantsResponse; @@ -8,7 +9,6 @@ import com.example.solidconnection.cache.annotation.ThunderingHerdCaching; import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.siteuser.domain.SiteUser; -import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.university.domain.University; import com.example.solidconnection.university.domain.UniversityInfoForApply; import com.example.solidconnection.university.repository.UniversityInfoForApplyRepository; diff --git a/src/main/java/com/example/solidconnection/application/service/ApplicationSubmissionService.java b/src/main/java/com/example/solidconnection/application/service/ApplicationSubmissionService.java index 45c03f01f..af1678a16 100644 --- a/src/main/java/com/example/solidconnection/application/service/ApplicationSubmissionService.java +++ b/src/main/java/com/example/solidconnection/application/service/ApplicationSubmissionService.java @@ -1,6 +1,7 @@ package com.example.solidconnection.application.service; import com.example.solidconnection.application.domain.Application; +import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.application.dto.ApplicationSubmissionResponse; import com.example.solidconnection.application.dto.ApplyRequest; import com.example.solidconnection.application.dto.UniversityChoiceRequest; @@ -12,7 +13,6 @@ import com.example.solidconnection.score.repository.GpaScoreRepository; import com.example.solidconnection.score.repository.LanguageTestScoreRepository; import com.example.solidconnection.siteuser.domain.SiteUser; -import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.university.domain.UniversityInfoForApply; import com.example.solidconnection.university.repository.UniversityInfoForApplyRepository; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/solidconnection/auth/client/AppleOAuthClient.java b/src/main/java/com/example/solidconnection/auth/client/AppleOAuthClient.java index fa31d0639..733eb5700 100644 --- a/src/main/java/com/example/solidconnection/auth/client/AppleOAuthClient.java +++ b/src/main/java/com/example/solidconnection/auth/client/AppleOAuthClient.java @@ -1,8 +1,8 @@ package com.example.solidconnection.auth.client; +import com.example.solidconnection.auth.client.config.AppleOAuthClientProperties; import com.example.solidconnection.auth.dto.oauth.AppleTokenDto; import com.example.solidconnection.auth.dto.oauth.AppleUserInfoDto; -import com.example.solidconnection.auth.client.config.AppleOAuthClientProperties; import com.example.solidconnection.common.exception.CustomException; import io.jsonwebtoken.Jwts; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/solidconnection/auth/client/KakaoOAuthClient.java b/src/main/java/com/example/solidconnection/auth/client/KakaoOAuthClient.java index 9ecc853b1..9539116aa 100644 --- a/src/main/java/com/example/solidconnection/auth/client/KakaoOAuthClient.java +++ b/src/main/java/com/example/solidconnection/auth/client/KakaoOAuthClient.java @@ -1,8 +1,8 @@ package com.example.solidconnection.auth.client; +import com.example.solidconnection.auth.client.config.KakaoOAuthClientProperties; import com.example.solidconnection.auth.dto.oauth.KakaoTokenDto; import com.example.solidconnection.auth.dto.oauth.KakaoUserInfoDto; -import com.example.solidconnection.auth.client.config.KakaoOAuthClientProperties; import com.example.solidconnection.common.exception.CustomException; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpEntity; diff --git a/src/main/java/com/example/solidconnection/auth/dto/SignUpRequest.java b/src/main/java/com/example/solidconnection/auth/dto/SignUpRequest.java index d96067741..b43671e82 100644 --- a/src/main/java/com/example/solidconnection/auth/dto/SignUpRequest.java +++ b/src/main/java/com/example/solidconnection/auth/dto/SignUpRequest.java @@ -1,9 +1,9 @@ package com.example.solidconnection.auth.dto; import com.example.solidconnection.siteuser.domain.AuthType; -import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.domain.PreparationStatus; import com.example.solidconnection.siteuser.domain.Role; +import com.example.solidconnection.siteuser.domain.SiteUser; import jakarta.validation.constraints.NotBlank; import java.util.List; diff --git a/src/main/java/com/example/solidconnection/auth/service/CommonSignUpTokenProvider.java b/src/main/java/com/example/solidconnection/auth/service/CommonSignUpTokenProvider.java index aed44ea1c..d16cb5134 100644 --- a/src/main/java/com/example/solidconnection/auth/service/CommonSignUpTokenProvider.java +++ b/src/main/java/com/example/solidconnection/auth/service/CommonSignUpTokenProvider.java @@ -1,7 +1,7 @@ package com.example.solidconnection.auth.service; -import com.example.solidconnection.security.config.JwtProperties; import com.example.solidconnection.common.exception.CustomException; +import com.example.solidconnection.security.config.JwtProperties; import com.example.solidconnection.siteuser.domain.AuthType; import com.example.solidconnection.util.JwtUtils; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/solidconnection/auth/service/EmailSignUpTokenProvider.java b/src/main/java/com/example/solidconnection/auth/service/EmailSignUpTokenProvider.java index 385ebdae4..c6bee80ab 100644 --- a/src/main/java/com/example/solidconnection/auth/service/EmailSignUpTokenProvider.java +++ b/src/main/java/com/example/solidconnection/auth/service/EmailSignUpTokenProvider.java @@ -2,8 +2,8 @@ import com.example.solidconnection.auth.domain.TokenType; import com.example.solidconnection.auth.dto.EmailSignUpTokenRequest; -import com.example.solidconnection.security.config.JwtProperties; import com.example.solidconnection.common.exception.CustomException; +import com.example.solidconnection.security.config.JwtProperties; import com.example.solidconnection.siteuser.domain.AuthType; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; diff --git a/src/main/java/com/example/solidconnection/auth/service/SignUpService.java b/src/main/java/com/example/solidconnection/auth/service/SignUpService.java index cc69dfd5e..95bd4ecac 100644 --- a/src/main/java/com/example/solidconnection/auth/service/SignUpService.java +++ b/src/main/java/com/example/solidconnection/auth/service/SignUpService.java @@ -4,9 +4,9 @@ import com.example.solidconnection.auth.dto.SignUpRequest; import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.location.country.domain.InterestedCountry; -import com.example.solidconnection.location.region.domain.InterestedRegion; import com.example.solidconnection.location.country.repository.CountryRepository; import com.example.solidconnection.location.country.repository.InterestedCountyRepository; +import com.example.solidconnection.location.region.domain.InterestedRegion; import com.example.solidconnection.location.region.repository.InterestedRegionRepository; import com.example.solidconnection.location.region.repository.RegionRepository; import com.example.solidconnection.siteuser.domain.SiteUser; @@ -85,6 +85,8 @@ private void saveInterestedCountry(SignUpRequest signUpRequest, SiteUser savedSi } protected abstract void validateSignUpToken(SignUpRequest signUpRequest); + protected abstract void validateUserNotDuplicated(SignUpRequest signUpRequest); + protected abstract SiteUser createSiteUser(SignUpRequest signUpRequest); } diff --git a/src/main/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpTokenProvider.java b/src/main/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpTokenProvider.java index 071ac32c0..8fa290d30 100644 --- a/src/main/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpTokenProvider.java +++ b/src/main/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpTokenProvider.java @@ -2,8 +2,8 @@ import com.example.solidconnection.auth.domain.TokenType; import com.example.solidconnection.auth.service.TokenProvider; -import com.example.solidconnection.security.config.JwtProperties; import com.example.solidconnection.common.exception.CustomException; +import com.example.solidconnection.security.config.JwtProperties; import com.example.solidconnection.siteuser.domain.AuthType; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; diff --git a/src/main/java/com/example/solidconnection/community/board/controller/BoardController.java b/src/main/java/com/example/solidconnection/community/board/controller/BoardController.java index 60ab7bc79..b46c93256 100644 --- a/src/main/java/com/example/solidconnection/community/board/controller/BoardController.java +++ b/src/main/java/com/example/solidconnection/community/board/controller/BoardController.java @@ -1,10 +1,10 @@ package com.example.solidconnection.community.board.controller; +import com.example.solidconnection.common.resolver.AuthorizedUser; +import com.example.solidconnection.community.board.domain.BoardCode; import com.example.solidconnection.community.post.dto.PostListResponse; import com.example.solidconnection.community.post.service.PostQueryService; -import com.example.solidconnection.common.resolver.AuthorizedUser; import com.example.solidconnection.siteuser.domain.SiteUser; -import com.example.solidconnection.community.board.domain.BoardCode; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/example/solidconnection/community/board/repository/BoardRepository.java b/src/main/java/com/example/solidconnection/community/board/repository/BoardRepository.java index aec6bcd6f..4c6f799d3 100644 --- a/src/main/java/com/example/solidconnection/community/board/repository/BoardRepository.java +++ b/src/main/java/com/example/solidconnection/community/board/repository/BoardRepository.java @@ -1,8 +1,8 @@ package com.example.solidconnection.community.board.repository; -import com.example.solidconnection.community.board.domain.Board; import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.common.exception.ErrorCode; +import com.example.solidconnection.community.board.domain.Board; import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.repository.query.Param; diff --git a/src/main/java/com/example/solidconnection/community/comment/controller/CommentController.java b/src/main/java/com/example/solidconnection/community/comment/controller/CommentController.java index ab2eabcf9..f17792a75 100644 --- a/src/main/java/com/example/solidconnection/community/comment/controller/CommentController.java +++ b/src/main/java/com/example/solidconnection/community/comment/controller/CommentController.java @@ -1,12 +1,12 @@ package com.example.solidconnection.community.comment.controller; +import com.example.solidconnection.common.resolver.AuthorizedUser; import com.example.solidconnection.community.comment.dto.CommentCreateRequest; import com.example.solidconnection.community.comment.dto.CommentCreateResponse; import com.example.solidconnection.community.comment.dto.CommentDeleteResponse; import com.example.solidconnection.community.comment.dto.CommentUpdateRequest; import com.example.solidconnection.community.comment.dto.CommentUpdateResponse; import com.example.solidconnection.community.comment.service.CommentService; -import com.example.solidconnection.common.resolver.AuthorizedUser; import com.example.solidconnection.siteuser.domain.SiteUser; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/solidconnection/community/comment/repository/CommentRepository.java b/src/main/java/com/example/solidconnection/community/comment/repository/CommentRepository.java index 834cd264b..cd2ae72ae 100644 --- a/src/main/java/com/example/solidconnection/community/comment/repository/CommentRepository.java +++ b/src/main/java/com/example/solidconnection/community/comment/repository/CommentRepository.java @@ -1,7 +1,7 @@ package com.example.solidconnection.community.comment.repository; -import com.example.solidconnection.community.comment.domain.Comment; import com.example.solidconnection.common.exception.CustomException; +import com.example.solidconnection.community.comment.domain.Comment; 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/com/example/solidconnection/community/comment/service/CommentService.java b/src/main/java/com/example/solidconnection/community/comment/service/CommentService.java index b27d1be80..6a2760cf0 100644 --- a/src/main/java/com/example/solidconnection/community/comment/service/CommentService.java +++ b/src/main/java/com/example/solidconnection/community/comment/service/CommentService.java @@ -1,5 +1,6 @@ package com.example.solidconnection.community.comment.service; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.community.comment.domain.Comment; import com.example.solidconnection.community.comment.dto.CommentCreateRequest; import com.example.solidconnection.community.comment.dto.CommentCreateResponse; @@ -10,7 +11,6 @@ import com.example.solidconnection.community.comment.repository.CommentRepository; import com.example.solidconnection.community.post.domain.Post; import com.example.solidconnection.community.post.repository.PostRepository; -import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/solidconnection/community/post/controller/PostController.java b/src/main/java/com/example/solidconnection/community/post/controller/PostController.java index 19d145319..23b34568e 100644 --- a/src/main/java/com/example/solidconnection/community/post/controller/PostController.java +++ b/src/main/java/com/example/solidconnection/community/post/controller/PostController.java @@ -1,5 +1,6 @@ package com.example.solidconnection.community.post.controller; +import com.example.solidconnection.common.resolver.AuthorizedUser; import com.example.solidconnection.community.post.dto.PostCreateRequest; import com.example.solidconnection.community.post.dto.PostCreateResponse; import com.example.solidconnection.community.post.dto.PostDeleteResponse; @@ -11,7 +12,6 @@ import com.example.solidconnection.community.post.service.PostCommandService; import com.example.solidconnection.community.post.service.PostLikeService; import com.example.solidconnection.community.post.service.PostQueryService; -import com.example.solidconnection.common.resolver.AuthorizedUser; import com.example.solidconnection.siteuser.domain.SiteUser; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/solidconnection/community/post/domain/Post.java b/src/main/java/com/example/solidconnection/community/post/domain/Post.java index 240a697d9..613abbb4b 100644 --- a/src/main/java/com/example/solidconnection/community/post/domain/Post.java +++ b/src/main/java/com/example/solidconnection/community/post/domain/Post.java @@ -1,8 +1,8 @@ package com.example.solidconnection.community.post.domain; +import com.example.solidconnection.common.BaseEntity; import com.example.solidconnection.community.board.domain.Board; import com.example.solidconnection.community.comment.domain.Comment; -import com.example.solidconnection.common.BaseEntity; import com.example.solidconnection.community.post.dto.PostUpdateRequest; import com.example.solidconnection.siteuser.domain.SiteUser; import jakarta.persistence.CascadeType; diff --git a/src/main/java/com/example/solidconnection/community/post/dto/PostCreateRequest.java b/src/main/java/com/example/solidconnection/community/post/dto/PostCreateRequest.java index 235c614d3..0cc3afc1f 100644 --- a/src/main/java/com/example/solidconnection/community/post/dto/PostCreateRequest.java +++ b/src/main/java/com/example/solidconnection/community/post/dto/PostCreateRequest.java @@ -2,8 +2,8 @@ import com.example.solidconnection.community.board.domain.Board; import com.example.solidconnection.community.post.domain.Post; -import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.community.post.domain.PostCategory; +import com.example.solidconnection.siteuser.domain.SiteUser; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; diff --git a/src/main/java/com/example/solidconnection/community/post/dto/PostListResponse.java b/src/main/java/com/example/solidconnection/community/post/dto/PostListResponse.java index f02af017e..15f5ec7a5 100644 --- a/src/main/java/com/example/solidconnection/community/post/dto/PostListResponse.java +++ b/src/main/java/com/example/solidconnection/community/post/dto/PostListResponse.java @@ -1,7 +1,7 @@ package com.example.solidconnection.community.post.dto; -import com.example.solidconnection.community.post.domain.PostImage; import com.example.solidconnection.community.post.domain.Post; +import com.example.solidconnection.community.post.domain.PostImage; import java.time.ZonedDateTime; import java.util.List; diff --git a/src/main/java/com/example/solidconnection/community/post/service/PostCommandService.java b/src/main/java/com/example/solidconnection/community/post/service/PostCommandService.java index ddef51b49..cb553fd0c 100644 --- a/src/main/java/com/example/solidconnection/community/post/service/PostCommandService.java +++ b/src/main/java/com/example/solidconnection/community/post/service/PostCommandService.java @@ -1,8 +1,10 @@ package com.example.solidconnection.community.post.service; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.community.board.domain.Board; import com.example.solidconnection.community.board.repository.BoardRepository; import com.example.solidconnection.community.post.domain.Post; +import com.example.solidconnection.community.post.domain.PostCategory; import com.example.solidconnection.community.post.domain.PostImage; import com.example.solidconnection.community.post.dto.PostCreateRequest; import com.example.solidconnection.community.post.dto.PostCreateResponse; @@ -10,13 +12,11 @@ import com.example.solidconnection.community.post.dto.PostUpdateRequest; import com.example.solidconnection.community.post.dto.PostUpdateResponse; import com.example.solidconnection.community.post.repository.PostRepository; -import com.example.solidconnection.common.exception.CustomException; -import com.example.solidconnection.s3.service.S3Service; +import com.example.solidconnection.s3.domain.ImgType; import com.example.solidconnection.s3.dto.UploadedFileUrlResponse; +import com.example.solidconnection.s3.service.S3Service; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; -import com.example.solidconnection.s3.domain.ImgType; -import com.example.solidconnection.community.post.domain.PostCategory; import com.example.solidconnection.util.RedisUtils; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.EnumUtils; diff --git a/src/main/java/com/example/solidconnection/community/post/service/PostLikeService.java b/src/main/java/com/example/solidconnection/community/post/service/PostLikeService.java index 197ce8e51..e0921e295 100644 --- a/src/main/java/com/example/solidconnection/community/post/service/PostLikeService.java +++ b/src/main/java/com/example/solidconnection/community/post/service/PostLikeService.java @@ -1,12 +1,12 @@ package com.example.solidconnection.community.post.service; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.community.post.domain.Post; import com.example.solidconnection.community.post.domain.PostLike; import com.example.solidconnection.community.post.dto.PostDislikeResponse; import com.example.solidconnection.community.post.dto.PostLikeResponse; import com.example.solidconnection.community.post.repository.PostLikeRepository; import com.example.solidconnection.community.post.repository.PostRepository; -import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/solidconnection/community/post/service/PostQueryService.java b/src/main/java/com/example/solidconnection/community/post/service/PostQueryService.java index a3db6dc5b..b8d07b54f 100644 --- a/src/main/java/com/example/solidconnection/community/post/service/PostQueryService.java +++ b/src/main/java/com/example/solidconnection/community/post/service/PostQueryService.java @@ -1,21 +1,21 @@ package com.example.solidconnection.community.post.service; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.community.board.domain.Board; +import com.example.solidconnection.community.board.domain.BoardCode; import com.example.solidconnection.community.board.dto.PostFindBoardResponse; -import com.example.solidconnection.community.comment.dto.PostFindCommentResponse; -import com.example.solidconnection.community.post.dto.PostListResponse; import com.example.solidconnection.community.board.repository.BoardRepository; +import com.example.solidconnection.community.comment.dto.PostFindCommentResponse; import com.example.solidconnection.community.comment.service.CommentService; -import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.community.post.domain.Post; +import com.example.solidconnection.community.post.domain.PostCategory; import com.example.solidconnection.community.post.dto.PostFindPostImageResponse; import com.example.solidconnection.community.post.dto.PostFindResponse; +import com.example.solidconnection.community.post.dto.PostListResponse; import com.example.solidconnection.community.post.repository.PostLikeRepository; import com.example.solidconnection.community.post.repository.PostRepository; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.dto.PostFindSiteUserResponse; -import com.example.solidconnection.community.board.domain.BoardCode; -import com.example.solidconnection.community.post.domain.PostCategory; import com.example.solidconnection.util.RedisUtils; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.EnumUtils; diff --git a/src/main/java/com/example/solidconnection/s3/controller/S3Controller.java b/src/main/java/com/example/solidconnection/s3/controller/S3Controller.java index 59ceeffaa..20013fa6a 100644 --- a/src/main/java/com/example/solidconnection/s3/controller/S3Controller.java +++ b/src/main/java/com/example/solidconnection/s3/controller/S3Controller.java @@ -2,9 +2,9 @@ import com.example.solidconnection.common.resolver.AuthorizedUser; import com.example.solidconnection.s3.domain.ImgType; -import com.example.solidconnection.s3.service.S3Service; import com.example.solidconnection.s3.dto.UploadedFileUrlResponse; import com.example.solidconnection.s3.dto.urlPrefixResponse; +import com.example.solidconnection.s3.service.S3Service; import com.example.solidconnection.siteuser.domain.SiteUser; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/example/solidconnection/score/domain/GpaScore.java b/src/main/java/com/example/solidconnection/score/domain/GpaScore.java index 8545ed313..0156dae9a 100644 --- a/src/main/java/com/example/solidconnection/score/domain/GpaScore.java +++ b/src/main/java/com/example/solidconnection/score/domain/GpaScore.java @@ -1,9 +1,9 @@ package com.example.solidconnection.score.domain; import com.example.solidconnection.application.domain.Gpa; +import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.common.BaseEntity; import com.example.solidconnection.siteuser.domain.SiteUser; -import com.example.solidconnection.application.domain.VerifyStatus; import jakarta.persistence.Column; import jakarta.persistence.Embedded; import jakarta.persistence.Entity; diff --git a/src/main/java/com/example/solidconnection/score/domain/LanguageTestScore.java b/src/main/java/com/example/solidconnection/score/domain/LanguageTestScore.java index f2023dbd4..f2257561d 100644 --- a/src/main/java/com/example/solidconnection/score/domain/LanguageTestScore.java +++ b/src/main/java/com/example/solidconnection/score/domain/LanguageTestScore.java @@ -1,9 +1,9 @@ package com.example.solidconnection.score.domain; import com.example.solidconnection.application.domain.LanguageTest; +import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.common.BaseEntity; import com.example.solidconnection.siteuser.domain.SiteUser; -import com.example.solidconnection.application.domain.VerifyStatus; import jakarta.persistence.Column; import jakarta.persistence.Embedded; import jakarta.persistence.Entity; diff --git a/src/main/java/com/example/solidconnection/score/dto/GpaScoreStatusResponse.java b/src/main/java/com/example/solidconnection/score/dto/GpaScoreStatusResponse.java index b2f2289dc..4804d6874 100644 --- a/src/main/java/com/example/solidconnection/score/dto/GpaScoreStatusResponse.java +++ b/src/main/java/com/example/solidconnection/score/dto/GpaScoreStatusResponse.java @@ -1,7 +1,7 @@ package com.example.solidconnection.score.dto; -import com.example.solidconnection.score.domain.GpaScore; import com.example.solidconnection.application.domain.VerifyStatus; +import com.example.solidconnection.score.domain.GpaScore; public record GpaScoreStatusResponse( long id, diff --git a/src/main/java/com/example/solidconnection/score/dto/LanguageTestScoreStatusResponse.java b/src/main/java/com/example/solidconnection/score/dto/LanguageTestScoreStatusResponse.java index 9ae7e5f64..4aa033d72 100644 --- a/src/main/java/com/example/solidconnection/score/dto/LanguageTestScoreStatusResponse.java +++ b/src/main/java/com/example/solidconnection/score/dto/LanguageTestScoreStatusResponse.java @@ -1,7 +1,7 @@ package com.example.solidconnection.score.dto; -import com.example.solidconnection.score.domain.LanguageTestScore; import com.example.solidconnection.application.domain.VerifyStatus; +import com.example.solidconnection.score.domain.LanguageTestScore; public record LanguageTestScoreStatusResponse( long id, diff --git a/src/main/java/com/example/solidconnection/score/service/ScoreService.java b/src/main/java/com/example/solidconnection/score/service/ScoreService.java index 9eb666e86..5a6cf9801 100644 --- a/src/main/java/com/example/solidconnection/score/service/ScoreService.java +++ b/src/main/java/com/example/solidconnection/score/service/ScoreService.java @@ -3,8 +3,9 @@ import com.example.solidconnection.application.domain.Gpa; import com.example.solidconnection.application.domain.LanguageTest; import com.example.solidconnection.common.exception.CustomException; -import com.example.solidconnection.s3.service.S3Service; +import com.example.solidconnection.s3.domain.ImgType; import com.example.solidconnection.s3.dto.UploadedFileUrlResponse; +import com.example.solidconnection.s3.service.S3Service; import com.example.solidconnection.score.domain.GpaScore; import com.example.solidconnection.score.domain.LanguageTestScore; import com.example.solidconnection.score.dto.GpaScoreRequest; @@ -17,7 +18,6 @@ import com.example.solidconnection.score.repository.LanguageTestScoreRepository; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; -import com.example.solidconnection.s3.domain.ImgType; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/example/solidconnection/security/provider/SiteUserAuthenticationProvider.java b/src/main/java/com/example/solidconnection/security/provider/SiteUserAuthenticationProvider.java index 80e316ce5..6ce43b97c 100644 --- a/src/main/java/com/example/solidconnection/security/provider/SiteUserAuthenticationProvider.java +++ b/src/main/java/com/example/solidconnection/security/provider/SiteUserAuthenticationProvider.java @@ -1,10 +1,10 @@ package com.example.solidconnection.security.provider; +import com.example.solidconnection.security.authentication.JwtAuthentication; +import com.example.solidconnection.security.authentication.SiteUserAuthentication; import com.example.solidconnection.security.config.JwtProperties; import com.example.solidconnection.security.userdetails.SiteUserDetails; import com.example.solidconnection.security.userdetails.SiteUserDetailsService; -import com.example.solidconnection.security.authentication.JwtAuthentication; -import com.example.solidconnection.security.authentication.SiteUserAuthentication; import lombok.RequiredArgsConstructor; import org.springframework.security.authentication.AuthenticationProvider; import org.springframework.security.core.Authentication; diff --git a/src/main/java/com/example/solidconnection/siteuser/dto/MyPageResponse.java b/src/main/java/com/example/solidconnection/siteuser/dto/MyPageResponse.java index 50a2702b5..9185362cf 100644 --- a/src/main/java/com/example/solidconnection/siteuser/dto/MyPageResponse.java +++ b/src/main/java/com/example/solidconnection/siteuser/dto/MyPageResponse.java @@ -1,8 +1,8 @@ package com.example.solidconnection.siteuser.dto; import com.example.solidconnection.siteuser.domain.AuthType; -import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.domain.Role; +import com.example.solidconnection.siteuser.domain.SiteUser; public record MyPageResponse( String nickname, diff --git a/src/main/java/com/example/solidconnection/siteuser/service/MyPageService.java b/src/main/java/com/example/solidconnection/siteuser/service/MyPageService.java index d7c0d5345..2c84f0518 100644 --- a/src/main/java/com/example/solidconnection/siteuser/service/MyPageService.java +++ b/src/main/java/com/example/solidconnection/siteuser/service/MyPageService.java @@ -1,13 +1,13 @@ package com.example.solidconnection.siteuser.service; import com.example.solidconnection.common.exception.CustomException; -import com.example.solidconnection.s3.service.S3Service; +import com.example.solidconnection.s3.domain.ImgType; import com.example.solidconnection.s3.dto.UploadedFileUrlResponse; +import com.example.solidconnection.s3.service.S3Service; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.dto.MyPageResponse; import com.example.solidconnection.siteuser.repository.LikedUniversityRepository; import com.example.solidconnection.siteuser.repository.SiteUserRepository; -import com.example.solidconnection.s3.domain.ImgType; import com.example.solidconnection.university.domain.LikedUniversity; import com.example.solidconnection.university.dto.UniversityInfoForApplyPreviewResponse; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/solidconnection/university/dto/LanguageRequirementResponse.java b/src/main/java/com/example/solidconnection/university/dto/LanguageRequirementResponse.java index 0e4ec109d..292bd837d 100644 --- a/src/main/java/com/example/solidconnection/university/dto/LanguageRequirementResponse.java +++ b/src/main/java/com/example/solidconnection/university/dto/LanguageRequirementResponse.java @@ -1,7 +1,7 @@ package com.example.solidconnection.university.dto; -import com.example.solidconnection.university.domain.LanguageTestType; import com.example.solidconnection.university.domain.LanguageRequirement; +import com.example.solidconnection.university.domain.LanguageTestType; public record LanguageRequirementResponse( LanguageTestType languageTestType, diff --git a/src/main/java/com/example/solidconnection/university/repository/LanguageRequirementRepository.java b/src/main/java/com/example/solidconnection/university/repository/LanguageRequirementRepository.java index b50da842d..cfe9f7050 100644 --- a/src/main/java/com/example/solidconnection/university/repository/LanguageRequirementRepository.java +++ b/src/main/java/com/example/solidconnection/university/repository/LanguageRequirementRepository.java @@ -1,7 +1,7 @@ package com.example.solidconnection.university.repository; -import com.example.solidconnection.university.domain.LanguageTestType; import com.example.solidconnection.university.domain.LanguageRequirement; +import com.example.solidconnection.university.domain.LanguageTestType; import com.example.solidconnection.university.domain.UniversityInfoForApply; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/src/test/java/com/example/solidconnection/admin/dto/validation/RejectedReasonValidatorTest.java b/src/test/java/com/example/solidconnection/admin/dto/validation/RejectedReasonValidatorTest.java index 7015a633e..8c9af55c6 100644 --- a/src/test/java/com/example/solidconnection/admin/dto/validation/RejectedReasonValidatorTest.java +++ b/src/test/java/com/example/solidconnection/admin/dto/validation/RejectedReasonValidatorTest.java @@ -2,8 +2,8 @@ import com.example.solidconnection.admin.dto.GpaScoreUpdateRequest; import com.example.solidconnection.admin.dto.LanguageTestScoreUpdateRequest; -import com.example.solidconnection.university.domain.LanguageTestType; import com.example.solidconnection.application.domain.VerifyStatus; +import com.example.solidconnection.university.domain.LanguageTestType; import jakarta.validation.ConstraintViolation; import jakarta.validation.Validation; import jakarta.validation.Validator; diff --git a/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java b/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java index dcdeb9d0e..a891759cd 100644 --- a/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/admin/service/AdminGpaScoreServiceTest.java @@ -5,15 +5,13 @@ import com.example.solidconnection.admin.dto.GpaScoreUpdateRequest; import com.example.solidconnection.admin.dto.ScoreSearchCondition; import com.example.solidconnection.application.domain.Gpa; +import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.score.domain.GpaScore; import com.example.solidconnection.score.repository.GpaScoreRepository; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.integration.BaseIntegrationTest; -import com.example.solidconnection.siteuser.domain.PreparationStatus; -import com.example.solidconnection.siteuser.domain.Role; -import com.example.solidconnection.application.domain.VerifyStatus; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java b/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java index d207cd2df..3fe3eb5a8 100644 --- a/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/admin/service/AdminLanguageTestScoreServiceTest.java @@ -5,15 +5,13 @@ import com.example.solidconnection.admin.dto.LanguageTestScoreUpdateRequest; import com.example.solidconnection.admin.dto.ScoreSearchCondition; import com.example.solidconnection.application.domain.LanguageTest; +import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.score.domain.LanguageTestScore; import com.example.solidconnection.score.repository.LanguageTestScoreRepository; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.integration.BaseIntegrationTest; -import com.example.solidconnection.siteuser.domain.PreparationStatus; -import com.example.solidconnection.siteuser.domain.Role; -import com.example.solidconnection.application.domain.VerifyStatus; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/src/test/java/com/example/solidconnection/application/service/ApplicationQueryServiceTest.java b/src/test/java/com/example/solidconnection/application/service/ApplicationQueryServiceTest.java index 415562051..240217496 100644 --- a/src/test/java/com/example/solidconnection/application/service/ApplicationQueryServiceTest.java +++ b/src/test/java/com/example/solidconnection/application/service/ApplicationQueryServiceTest.java @@ -3,6 +3,7 @@ import com.example.solidconnection.application.domain.Application; import com.example.solidconnection.application.domain.Gpa; import com.example.solidconnection.application.domain.LanguageTest; +import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.application.dto.ApplicantResponse; import com.example.solidconnection.application.dto.ApplicationsResponse; import com.example.solidconnection.application.dto.UniversityApplicantsResponse; @@ -14,7 +15,6 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.support.integration.BaseIntegrationTest; import com.example.solidconnection.university.domain.LanguageTestType; -import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.university.domain.UniversityInfoForApply; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/src/test/java/com/example/solidconnection/application/service/ApplicationSubmissionServiceTest.java b/src/test/java/com/example/solidconnection/application/service/ApplicationSubmissionServiceTest.java index d20e70958..3c107424a 100644 --- a/src/test/java/com/example/solidconnection/application/service/ApplicationSubmissionServiceTest.java +++ b/src/test/java/com/example/solidconnection/application/service/ApplicationSubmissionServiceTest.java @@ -3,6 +3,7 @@ import com.example.solidconnection.application.domain.Application; import com.example.solidconnection.application.domain.Gpa; import com.example.solidconnection.application.domain.LanguageTest; +import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.application.dto.ApplicationSubmissionResponse; import com.example.solidconnection.application.dto.ApplyRequest; import com.example.solidconnection.application.dto.UniversityChoiceRequest; @@ -15,7 +16,6 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.support.integration.BaseIntegrationTest; import com.example.solidconnection.university.domain.LanguageTestType; -import com.example.solidconnection.application.domain.VerifyStatus; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -141,7 +141,7 @@ class ApplicationSubmissionServiceTest extends BaseIntegrationTest { private GpaScore createUnapprovedGpaScore(SiteUser siteUser) { GpaScore gpaScore = new GpaScore( - new Gpa(4.0, 4.5, "/gpa-report.pdf"), + new Gpa(4.0, 4.5, "/gpa-report.pdf"), siteUser ); return gpaScoreRepository.save(gpaScore); diff --git a/src/test/java/com/example/solidconnection/auth/service/AuthServiceTest.java b/src/test/java/com/example/solidconnection/auth/service/AuthServiceTest.java index dff95d4bd..8fd57eae6 100644 --- a/src/test/java/com/example/solidconnection/auth/service/AuthServiceTest.java +++ b/src/test/java/com/example/solidconnection/auth/service/AuthServiceTest.java @@ -4,8 +4,6 @@ import com.example.solidconnection.auth.dto.ReissueRequest; import com.example.solidconnection.auth.dto.ReissueResponse; import com.example.solidconnection.common.exception.CustomException; -import com.example.solidconnection.siteuser.domain.PreparationStatus; -import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.TestContainerSpringBootTest; diff --git a/src/test/java/com/example/solidconnection/auth/service/EmailSignInServiceTest.java b/src/test/java/com/example/solidconnection/auth/service/EmailSignInServiceTest.java index 95019a462..84c0f362b 100644 --- a/src/test/java/com/example/solidconnection/auth/service/EmailSignInServiceTest.java +++ b/src/test/java/com/example/solidconnection/auth/service/EmailSignInServiceTest.java @@ -4,14 +4,9 @@ import com.example.solidconnection.auth.dto.SignInResponse; import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.common.exception.ErrorCode; -import com.example.solidconnection.siteuser.domain.AuthType; -import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.custom.exception.ErrorCode; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.TestContainerSpringBootTest; -import com.example.solidconnection.siteuser.domain.PreparationStatus; -import com.example.solidconnection.siteuser.domain.Role; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/src/test/java/com/example/solidconnection/auth/service/SignInServiceTest.java b/src/test/java/com/example/solidconnection/auth/service/SignInServiceTest.java index f8b24ca6f..1656ed4e5 100644 --- a/src/test/java/com/example/solidconnection/auth/service/SignInServiceTest.java +++ b/src/test/java/com/example/solidconnection/auth/service/SignInServiceTest.java @@ -6,8 +6,6 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.TestContainerSpringBootTest; -import com.example.solidconnection.siteuser.domain.PreparationStatus; -import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.util.JwtUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpTokenProviderTest.java b/src/test/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpTokenProviderTest.java index 5fd721ef1..233317458 100644 --- a/src/test/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpTokenProviderTest.java +++ b/src/test/java/com/example/solidconnection/auth/service/oauth/OAuthSignUpTokenProviderTest.java @@ -1,8 +1,8 @@ package com.example.solidconnection.auth.service.oauth; import com.example.solidconnection.auth.domain.TokenType; -import com.example.solidconnection.security.config.JwtProperties; import com.example.solidconnection.common.exception.CustomException; +import com.example.solidconnection.security.config.JwtProperties; import com.example.solidconnection.siteuser.domain.AuthType; import com.example.solidconnection.support.TestContainerSpringBootTest; import com.example.solidconnection.util.JwtUtils; @@ -163,7 +163,7 @@ class 주어진_회원가입_토큰을_검증한다 { // then assertThat(extractedAuthType).isEqualTo(authType); } - + private String createExpiredToken() { return Jwts.builder() .setSubject("subject") diff --git a/src/test/java/com/example/solidconnection/common/resolver/AuthorizedUserResolverTest.java b/src/test/java/com/example/solidconnection/common/resolver/AuthorizedUserResolverTest.java index bd115192e..7eb144214 100644 --- a/src/test/java/com/example/solidconnection/common/resolver/AuthorizedUserResolverTest.java +++ b/src/test/java/com/example/solidconnection/common/resolver/AuthorizedUserResolverTest.java @@ -6,8 +6,6 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.TestContainerSpringBootTest; -import com.example.solidconnection.siteuser.domain.PreparationStatus; -import com.example.solidconnection.siteuser.domain.Role; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/src/test/java/com/example/solidconnection/community/comment/service/CommentServiceTest.java b/src/test/java/com/example/solidconnection/community/comment/service/CommentServiceTest.java index 3fd62ae7f..17309e100 100644 --- a/src/test/java/com/example/solidconnection/community/comment/service/CommentServiceTest.java +++ b/src/test/java/com/example/solidconnection/community/comment/service/CommentServiceTest.java @@ -1,5 +1,6 @@ package com.example.solidconnection.community.comment.service; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.community.board.domain.Board; import com.example.solidconnection.community.comment.domain.Comment; import com.example.solidconnection.community.comment.dto.CommentCreateRequest; @@ -10,11 +11,10 @@ import com.example.solidconnection.community.comment.dto.PostFindCommentResponse; import com.example.solidconnection.community.comment.repository.CommentRepository; import com.example.solidconnection.community.post.domain.Post; +import com.example.solidconnection.community.post.domain.PostCategory; import com.example.solidconnection.community.post.repository.PostRepository; -import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.support.integration.BaseIntegrationTest; -import com.example.solidconnection.community.post.domain.PostCategory; import jakarta.transaction.Transactional; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/src/test/java/com/example/solidconnection/community/post/service/PostCommandServiceTest.java b/src/test/java/com/example/solidconnection/community/post/service/PostCommandServiceTest.java index cc4372b89..2656b2858 100644 --- a/src/test/java/com/example/solidconnection/community/post/service/PostCommandServiceTest.java +++ b/src/test/java/com/example/solidconnection/community/post/service/PostCommandServiceTest.java @@ -1,5 +1,6 @@ package com.example.solidconnection.community.post.service; +import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.community.board.domain.Board; import com.example.solidconnection.community.post.domain.Post; import com.example.solidconnection.community.post.domain.PostCategory; @@ -11,10 +12,9 @@ import com.example.solidconnection.community.post.dto.PostUpdateResponse; import com.example.solidconnection.community.post.repository.PostImageRepository; import com.example.solidconnection.community.post.repository.PostRepository; -import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.s3.domain.ImgType; -import com.example.solidconnection.s3.service.S3Service; import com.example.solidconnection.s3.dto.UploadedFileUrlResponse; +import com.example.solidconnection.s3.service.S3Service; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.integration.BaseIntegrationTest; diff --git a/src/test/java/com/example/solidconnection/community/post/service/PostLikeServiceTest.java b/src/test/java/com/example/solidconnection/community/post/service/PostLikeServiceTest.java index e216bc905..4205019b7 100644 --- a/src/test/java/com/example/solidconnection/community/post/service/PostLikeServiceTest.java +++ b/src/test/java/com/example/solidconnection/community/post/service/PostLikeServiceTest.java @@ -1,8 +1,9 @@ package com.example.solidconnection.community.post.service; -import com.example.solidconnection.community.board.domain.Board; import com.example.solidconnection.common.exception.CustomException; +import com.example.solidconnection.community.board.domain.Board; import com.example.solidconnection.community.post.domain.Post; +import com.example.solidconnection.community.post.domain.PostCategory; import com.example.solidconnection.community.post.dto.PostDislikeResponse; import com.example.solidconnection.community.post.dto.PostLikeResponse; import com.example.solidconnection.community.post.repository.PostLikeRepository; @@ -10,7 +11,7 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.integration.BaseIntegrationTest; -import com.example.solidconnection.community.post.domain.PostCategory; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/example/solidconnection/concurrency/PostLikeCountConcurrencyTest.java b/src/test/java/com/example/solidconnection/concurrency/PostLikeCountConcurrencyTest.java index 29ade179f..188f717ca 100644 --- a/src/test/java/com/example/solidconnection/concurrency/PostLikeCountConcurrencyTest.java +++ b/src/test/java/com/example/solidconnection/concurrency/PostLikeCountConcurrencyTest.java @@ -3,15 +3,13 @@ import com.example.solidconnection.community.board.domain.Board; import com.example.solidconnection.community.board.repository.BoardRepository; import com.example.solidconnection.community.post.domain.Post; +import com.example.solidconnection.community.post.domain.PostCategory; import com.example.solidconnection.community.post.repository.PostRepository; import com.example.solidconnection.community.post.service.PostLikeService; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.TestContainerSpringBootTest; -import com.example.solidconnection.community.post.domain.PostCategory; -import com.example.solidconnection.siteuser.domain.PreparationStatus; -import com.example.solidconnection.siteuser.domain.Role; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/example/solidconnection/concurrency/PostViewCountConcurrencyTest.java b/src/test/java/com/example/solidconnection/concurrency/PostViewCountConcurrencyTest.java index 07289da3b..5f2b70d37 100644 --- a/src/test/java/com/example/solidconnection/concurrency/PostViewCountConcurrencyTest.java +++ b/src/test/java/com/example/solidconnection/concurrency/PostViewCountConcurrencyTest.java @@ -6,13 +6,10 @@ import com.example.solidconnection.community.post.domain.PostCategory; import com.example.solidconnection.community.post.repository.PostRepository; import com.example.solidconnection.community.post.service.RedisService; -import com.example.solidconnection.siteuser.domain.PreparationStatus; -import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.TestContainerSpringBootTest; import com.example.solidconnection.util.RedisUtils; -import com.example.solidconnection.util.RedisUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/example/solidconnection/concurrency/ThunderingHerdTest.java b/src/test/java/com/example/solidconnection/concurrency/ThunderingHerdTest.java index 95d2fc1ad..d2cadca65 100644 --- a/src/test/java/com/example/solidconnection/concurrency/ThunderingHerdTest.java +++ b/src/test/java/com/example/solidconnection/concurrency/ThunderingHerdTest.java @@ -4,8 +4,6 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.TestContainerSpringBootTest; -import com.example.solidconnection.siteuser.domain.PreparationStatus; -import com.example.solidconnection.siteuser.domain.Role; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/example/solidconnection/e2e/DynamicFixture.java b/src/test/java/com/example/solidconnection/e2e/DynamicFixture.java index 603bb5a19..4c90e58dc 100644 --- a/src/test/java/com/example/solidconnection/e2e/DynamicFixture.java +++ b/src/test/java/com/example/solidconnection/e2e/DynamicFixture.java @@ -1,8 +1,8 @@ package com.example.solidconnection.e2e; -import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.domain.PreparationStatus; import com.example.solidconnection.siteuser.domain.Role; +import com.example.solidconnection.siteuser.domain.SiteUser; public class DynamicFixture { // todo: test fixture 개선 작업 이후, 이 클래스의 사용이 대체되면 삭제 필요 diff --git a/src/test/java/com/example/solidconnection/location/country/fixture/CountryFixtureBuilder.java b/src/test/java/com/example/solidconnection/location/country/fixture/CountryFixtureBuilder.java index ab8955954..85fdb466f 100644 --- a/src/test/java/com/example/solidconnection/location/country/fixture/CountryFixtureBuilder.java +++ b/src/test/java/com/example/solidconnection/location/country/fixture/CountryFixtureBuilder.java @@ -1,8 +1,7 @@ package com.example.solidconnection.location.country.fixture; - -import com.example.solidconnection.location.country.repository.CountryRepositoryForTest; import com.example.solidconnection.location.country.domain.Country; +import com.example.solidconnection.location.country.repository.CountryRepositoryForTest; import com.example.solidconnection.location.region.domain.Region; import lombok.RequiredArgsConstructor; import org.springframework.boot.test.context.TestComponent; diff --git a/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java b/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java index 42e146f29..e03813607 100644 --- a/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java +++ b/src/test/java/com/example/solidconnection/score/service/ScoreServiceTest.java @@ -2,8 +2,10 @@ import com.example.solidconnection.application.domain.Gpa; import com.example.solidconnection.application.domain.LanguageTest; -import com.example.solidconnection.s3.service.S3Service; +import com.example.solidconnection.application.domain.VerifyStatus; +import com.example.solidconnection.s3.domain.ImgType; import com.example.solidconnection.s3.dto.UploadedFileUrlResponse; +import com.example.solidconnection.s3.service.S3Service; import com.example.solidconnection.score.domain.GpaScore; import com.example.solidconnection.score.domain.LanguageTestScore; import com.example.solidconnection.score.dto.GpaScoreRequest; @@ -18,11 +20,7 @@ import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.integration.BaseIntegrationTest; -import com.example.solidconnection.s3.domain.ImgType; import com.example.solidconnection.university.domain.LanguageTestType; -import com.example.solidconnection.siteuser.domain.PreparationStatus; -import com.example.solidconnection.siteuser.domain.Role; -import com.example.solidconnection.application.domain.VerifyStatus; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/example/solidconnection/security/aspect/AdminAuthorizationAspectTest.java b/src/test/java/com/example/solidconnection/security/aspect/AdminAuthorizationAspectTest.java index c1681c6ce..343bbbc30 100644 --- a/src/test/java/com/example/solidconnection/security/aspect/AdminAuthorizationAspectTest.java +++ b/src/test/java/com/example/solidconnection/security/aspect/AdminAuthorizationAspectTest.java @@ -5,8 +5,6 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.TestContainerSpringBootTest; -import com.example.solidconnection.siteuser.domain.PreparationStatus; -import com.example.solidconnection.siteuser.domain.Role; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/com/example/solidconnection/security/authentication/SiteUserAuthenticationTest.java b/src/test/java/com/example/solidconnection/security/authentication/SiteUserAuthenticationTest.java index a2eef256d..8c3b9e216 100644 --- a/src/test/java/com/example/solidconnection/security/authentication/SiteUserAuthenticationTest.java +++ b/src/test/java/com/example/solidconnection/security/authentication/SiteUserAuthenticationTest.java @@ -1,10 +1,9 @@ package com.example.solidconnection.security.authentication; -import com.example.solidconnection.security.authentication.SiteUserAuthentication; import com.example.solidconnection.security.userdetails.SiteUserDetails; -import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.domain.PreparationStatus; import com.example.solidconnection.siteuser.domain.Role; +import com.example.solidconnection.siteuser.domain.SiteUser; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/example/solidconnection/security/filter/JwtAuthenticationFilterTest.java b/src/test/java/com/example/solidconnection/security/filter/JwtAuthenticationFilterTest.java index d48858c50..c66037c82 100644 --- a/src/test/java/com/example/solidconnection/security/filter/JwtAuthenticationFilterTest.java +++ b/src/test/java/com/example/solidconnection/security/filter/JwtAuthenticationFilterTest.java @@ -1,7 +1,7 @@ package com.example.solidconnection.security.filter; -import com.example.solidconnection.security.config.JwtProperties; import com.example.solidconnection.security.authentication.SiteUserAuthentication; +import com.example.solidconnection.security.config.JwtProperties; import com.example.solidconnection.security.userdetails.SiteUserDetailsService; import com.example.solidconnection.support.TestContainerSpringBootTest; import io.jsonwebtoken.Jwts; diff --git a/src/test/java/com/example/solidconnection/security/filter/SignOutCheckFilterTest.java b/src/test/java/com/example/solidconnection/security/filter/SignOutCheckFilterTest.java index d0e20dd62..5ccc1aa1b 100644 --- a/src/test/java/com/example/solidconnection/security/filter/SignOutCheckFilterTest.java +++ b/src/test/java/com/example/solidconnection/security/filter/SignOutCheckFilterTest.java @@ -1,7 +1,7 @@ package com.example.solidconnection.security.filter; -import com.example.solidconnection.security.config.JwtProperties; import com.example.solidconnection.common.exception.CustomException; +import com.example.solidconnection.security.config.JwtProperties; import com.example.solidconnection.support.TestContainerSpringBootTest; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; @@ -95,12 +95,12 @@ void setUp() { } private String createToken(String subject) { - return Jwts.builder() - .setSubject(subject) - .setIssuedAt(new Date()) - .setExpiration(new Date(System.currentTimeMillis() + 1000)) - .signWith(SignatureAlgorithm.HS256, jwtProperties.secret()) - .compact(); + return Jwts.builder() + .setSubject(subject) + .setIssuedAt(new Date()) + .setExpiration(new Date(System.currentTimeMillis() + 1000)) + .signWith(SignatureAlgorithm.HS256, jwtProperties.secret()) + .compact(); } private HttpServletRequest createRequest(String token) { diff --git a/src/test/java/com/example/solidconnection/security/provider/SiteUserAuthenticationProviderTest.java b/src/test/java/com/example/solidconnection/security/provider/SiteUserAuthenticationProviderTest.java index 2d098e60d..9c51de838 100644 --- a/src/test/java/com/example/solidconnection/security/provider/SiteUserAuthenticationProviderTest.java +++ b/src/test/java/com/example/solidconnection/security/provider/SiteUserAuthenticationProviderTest.java @@ -1,14 +1,12 @@ package com.example.solidconnection.security.provider; -import com.example.solidconnection.security.config.JwtProperties; import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.security.authentication.SiteUserAuthentication; +import com.example.solidconnection.security.config.JwtProperties; import com.example.solidconnection.security.userdetails.SiteUserDetails; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.TestContainerSpringBootTest; -import com.example.solidconnection.siteuser.domain.PreparationStatus; -import com.example.solidconnection.siteuser.domain.Role; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/com/example/solidconnection/security/userdetails/SiteUserDetailsServiceTest.java b/src/test/java/com/example/solidconnection/security/userdetails/SiteUserDetailsServiceTest.java index 841694e3c..c292203af 100644 --- a/src/test/java/com/example/solidconnection/security/userdetails/SiteUserDetailsServiceTest.java +++ b/src/test/java/com/example/solidconnection/security/userdetails/SiteUserDetailsServiceTest.java @@ -5,8 +5,6 @@ import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.TestContainerSpringBootTest; -import com.example.solidconnection.siteuser.domain.PreparationStatus; -import com.example.solidconnection.siteuser.domain.Role; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/example/solidconnection/security/userdetails/SiteUserDetailsTest.java b/src/test/java/com/example/solidconnection/security/userdetails/SiteUserDetailsTest.java index 4ed94220c..8f533e8b7 100644 --- a/src/test/java/com/example/solidconnection/security/userdetails/SiteUserDetailsTest.java +++ b/src/test/java/com/example/solidconnection/security/userdetails/SiteUserDetailsTest.java @@ -1,11 +1,8 @@ package com.example.solidconnection.security.userdetails; -import com.example.solidconnection.security.userdetails.SiteUserDetails; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.TestContainerSpringBootTest; -import com.example.solidconnection.siteuser.domain.PreparationStatus; -import com.example.solidconnection.siteuser.domain.Role; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/com/example/solidconnection/siteuser/fixture/SiteUserFixture.java b/src/test/java/com/example/solidconnection/siteuser/fixture/SiteUserFixture.java index 000b7bc48..664a727c1 100644 --- a/src/test/java/com/example/solidconnection/siteuser/fixture/SiteUserFixture.java +++ b/src/test/java/com/example/solidconnection/siteuser/fixture/SiteUserFixture.java @@ -1,8 +1,8 @@ package com.example.solidconnection.siteuser.fixture; import com.example.solidconnection.siteuser.domain.AuthType; +import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.siteuser.domain.SiteUser; -import com.example.solidconnection.type.Role; import lombok.RequiredArgsConstructor; import org.springframework.boot.test.context.TestComponent; diff --git a/src/test/java/com/example/solidconnection/siteuser/fixture/SiteUserFixtureBuilder.java b/src/test/java/com/example/solidconnection/siteuser/fixture/SiteUserFixtureBuilder.java index f0d8bd406..46db8bae4 100644 --- a/src/test/java/com/example/solidconnection/siteuser/fixture/SiteUserFixtureBuilder.java +++ b/src/test/java/com/example/solidconnection/siteuser/fixture/SiteUserFixtureBuilder.java @@ -1,10 +1,10 @@ package com.example.solidconnection.siteuser.fixture; import com.example.solidconnection.siteuser.domain.AuthType; +import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; -import com.example.solidconnection.type.PreparationStatus; -import com.example.solidconnection.type.Role; import lombok.RequiredArgsConstructor; import org.springframework.boot.test.context.TestComponent; import org.springframework.security.crypto.password.PasswordEncoder; diff --git a/src/test/java/com/example/solidconnection/siteuser/repository/SiteUserRepositoryTest.java b/src/test/java/com/example/solidconnection/siteuser/repository/SiteUserRepositoryTest.java index 4dc776ac4..41806d6cf 100644 --- a/src/test/java/com/example/solidconnection/siteuser/repository/SiteUserRepositoryTest.java +++ b/src/test/java/com/example/solidconnection/siteuser/repository/SiteUserRepositoryTest.java @@ -1,10 +1,10 @@ package com.example.solidconnection.siteuser.repository; import com.example.solidconnection.siteuser.domain.AuthType; -import com.example.solidconnection.siteuser.domain.SiteUser; -import com.example.solidconnection.support.TestContainerDataJpaTest; import com.example.solidconnection.siteuser.domain.PreparationStatus; import com.example.solidconnection.siteuser.domain.Role; +import com.example.solidconnection.siteuser.domain.SiteUser; +import com.example.solidconnection.support.TestContainerDataJpaTest; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/com/example/solidconnection/siteuser/service/MyPageServiceTest.java b/src/test/java/com/example/solidconnection/siteuser/service/MyPageServiceTest.java index e6aab4973..1168a0eeb 100644 --- a/src/test/java/com/example/solidconnection/siteuser/service/MyPageServiceTest.java +++ b/src/test/java/com/example/solidconnection/siteuser/service/MyPageServiceTest.java @@ -1,18 +1,18 @@ package com.example.solidconnection.siteuser.service; import com.example.solidconnection.common.exception.CustomException; -import com.example.solidconnection.s3.service.S3Service; +import com.example.solidconnection.s3.domain.ImgType; import com.example.solidconnection.s3.dto.UploadedFileUrlResponse; +import com.example.solidconnection.s3.service.S3Service; +import com.example.solidconnection.siteuser.domain.AuthType; +import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.dto.MyPageResponse; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.siteuser.fixture.SiteUserFixtureBuilder; import com.example.solidconnection.siteuser.repository.LikedUniversityRepository; import com.example.solidconnection.siteuser.repository.SiteUserRepository; -import com.example.solidconnection.support.integration.BaseIntegrationTest; -import com.example.solidconnection.s3.domain.ImgType; -import com.example.solidconnection.siteuser.domain.PreparationStatus; -import com.example.solidconnection.siteuser.domain.Role; +import com.example.solidconnection.support.TestContainerSpringBootTest; import com.example.solidconnection.university.domain.LikedUniversity; import com.example.solidconnection.university.dto.UniversityInfoForApplyPreviewResponse; import com.example.solidconnection.university.fixture.UniversityInfoForApplyFixture; diff --git a/src/test/java/com/example/solidconnection/siteuser/service/SiteUserServiceTest.java b/src/test/java/com/example/solidconnection/siteuser/service/SiteUserServiceTest.java index 0e75909e3..665fb11da 100644 --- a/src/test/java/com/example/solidconnection/siteuser/service/SiteUserServiceTest.java +++ b/src/test/java/com/example/solidconnection/siteuser/service/SiteUserServiceTest.java @@ -2,10 +2,6 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.dto.NicknameExistsResponse; -import com.example.solidconnection.siteuser.repository.SiteUserRepository; -import com.example.solidconnection.support.integration.BaseIntegrationTest; -import com.example.solidconnection.siteuser.domain.PreparationStatus; -import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.TestContainerSpringBootTest; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java b/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java index 493c93c7b..ae449641f 100644 --- a/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java +++ b/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java @@ -3,31 +3,31 @@ import com.example.solidconnection.application.domain.Application; import com.example.solidconnection.application.domain.Gpa; import com.example.solidconnection.application.domain.LanguageTest; +import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.application.repository.ApplicationRepository; import com.example.solidconnection.community.board.domain.Board; import com.example.solidconnection.community.board.repository.BoardRepository; -import com.example.solidconnection.location.country.domain.Country; -import com.example.solidconnection.community.post.domain.PostImage; -import com.example.solidconnection.location.region.domain.Region; import com.example.solidconnection.community.post.domain.Post; +import com.example.solidconnection.community.post.domain.PostCategory; +import com.example.solidconnection.community.post.domain.PostImage; +import com.example.solidconnection.community.post.repository.PostImageRepository; import com.example.solidconnection.community.post.repository.PostRepository; +import com.example.solidconnection.location.country.domain.Country; import com.example.solidconnection.location.country.repository.CountryRepository; -import com.example.solidconnection.community.post.repository.PostImageRepository; +import com.example.solidconnection.location.region.domain.Region; import com.example.solidconnection.location.region.repository.RegionRepository; import com.example.solidconnection.score.domain.GpaScore; import com.example.solidconnection.score.domain.LanguageTestScore; import com.example.solidconnection.score.repository.GpaScoreRepository; import com.example.solidconnection.score.repository.LanguageTestScoreRepository; +import com.example.solidconnection.siteuser.domain.PreparationStatus; +import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.DatabaseClearExtension; import com.example.solidconnection.support.TestContainerSpringBootTest; -import com.example.solidconnection.university.domain.LanguageTestType; -import com.example.solidconnection.community.post.domain.PostCategory; -import com.example.solidconnection.siteuser.domain.PreparationStatus; -import com.example.solidconnection.siteuser.domain.Role; -import com.example.solidconnection.application.domain.VerifyStatus; import com.example.solidconnection.university.domain.LanguageRequirement; +import com.example.solidconnection.university.domain.LanguageTestType; import com.example.solidconnection.university.domain.University; import com.example.solidconnection.university.domain.UniversityInfoForApply; import com.example.solidconnection.university.repository.LanguageRequirementRepository; diff --git a/src/test/java/com/example/solidconnection/university/service/UniversityLikeServiceTest.java b/src/test/java/com/example/solidconnection/university/service/UniversityLikeServiceTest.java index 4e0d03019..9ba0df2b1 100644 --- a/src/test/java/com/example/solidconnection/university/service/UniversityLikeServiceTest.java +++ b/src/test/java/com/example/solidconnection/university/service/UniversityLikeServiceTest.java @@ -1,8 +1,6 @@ package com.example.solidconnection.university.service; import com.example.solidconnection.common.exception.CustomException; -import com.example.solidconnection.siteuser.domain.PreparationStatus; -import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.siteuser.repository.LikedUniversityRepository; diff --git a/src/test/java/com/example/solidconnection/university/service/UniversityRecommendServiceTest.java b/src/test/java/com/example/solidconnection/university/service/UniversityRecommendServiceTest.java index 215ab8096..ff274b96a 100644 --- a/src/test/java/com/example/solidconnection/university/service/UniversityRecommendServiceTest.java +++ b/src/test/java/com/example/solidconnection/university/service/UniversityRecommendServiceTest.java @@ -6,8 +6,6 @@ import com.example.solidconnection.location.region.domain.InterestedRegion; import com.example.solidconnection.location.region.fixture.RegionFixture; import com.example.solidconnection.location.region.repository.InterestedRegionRepository; -import com.example.solidconnection.siteuser.domain.PreparationStatus; -import com.example.solidconnection.siteuser.domain.Role; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.support.TestContainerSpringBootTest;