refactor: 패키지 변경

- global.authorization -> security.aspects
woowacourse-teams · Feb 15, 2025 · d8f2ca4 · d8f2ca4
1 parent 4e9679e
commit d8f2ca4
Show file tree

Hide file tree

Showing 17 changed files with 30 additions and 33 deletions.
diff --git a/backend/src/main/java/reviewme/highlight/controller/HighlightController.java b/backend/src/main/java/reviewme/highlight/controller/HighlightController.java
@@ -6,11 +6,7 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
-import reviewme.global.authorization.RequireReviewGroupAccess;
-import reviewme.security.resolver.GuestReviewGroupSession;
-import reviewme.security.resolver.LoginMemberSession;
-import reviewme.security.resolver.dto.GuestReviewGroup;
-import reviewme.security.resolver.dto.LoginMember;
+import reviewme.security.aspect.RequireReviewGroupAccess;
 import reviewme.highlight.service.HighlightService;
 import reviewme.highlight.service.dto.HighlightsRequest;
 

diff --git a/backend/src/main/java/reviewme/review/controller/ReviewController.java b/backend/src/main/java/reviewme/review/controller/ReviewController.java
@@ -11,12 +11,10 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import reviewme.security.resolver.GuestReviewGroupSession;
 import reviewme.security.resolver.LoginMemberSession;
-import reviewme.security.resolver.dto.GuestReviewGroup;
 import reviewme.security.resolver.dto.LoginMember;
-import reviewme.global.authorization.RequireReviewAccess;
-import reviewme.global.authorization.RequireReviewGroupAccess;
+import reviewme.security.aspect.RequireReviewAccess;
+import reviewme.security.aspect.RequireReviewGroupAccess;
 import reviewme.review.service.ReviewDetailLookupService;
 import reviewme.review.service.ReviewGatheredLookupService;
 import reviewme.review.service.ReviewListLookupService;

diff --git a/backend/src/main/java/reviewme/review/service/ReviewDetailLookupService.java b/backend/src/main/java/reviewme/review/service/ReviewDetailLookupService.java
@@ -6,7 +6,7 @@
 import reviewme.review.domain.Review;
 import reviewme.review.repository.ReviewRepository;
 import reviewme.review.service.dto.response.detail.ReviewDetailResponse;
-import reviewme.review.service.exception.ReviewNotFoundByIdAndGroupException;
+import reviewme.review.service.exception.ReviewNotFoundException;
 import reviewme.review.service.mapper.ReviewDetailMapper;
 import reviewme.reviewgroup.domain.ReviewGroup;
 import reviewme.reviewgroup.domain.exception.ReviewGroupNotFoundException;

diff --git a/...al/authorization/RequireReviewAccess.java → .../security/aspect/RequireReviewAccess.java b/...al/authorization/RequireReviewAccess.java → .../security/aspect/RequireReviewAccess.java
@@ -1,4 +1,4 @@
-package reviewme.global.authorization;
+package reviewme.security.aspect;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...thorization/RequireReviewGroupAccess.java → ...rity/aspect/RequireReviewGroupAccess.java b/...thorization/RequireReviewGroupAccess.java → ...rity/aspect/RequireReviewGroupAccess.java
@@ -1,4 +1,4 @@
-package reviewme.global.authorization;
+package reviewme.security.aspect;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...orization/ResourceAuthorizationUtils.java → ...ty/aspect/ResourceAuthorizationUtils.java b/...orization/ResourceAuthorizationUtils.java → ...ty/aspect/ResourceAuthorizationUtils.java
@@ -1,4 +1,4 @@
-package reviewme.global.authorization;
+package reviewme.security.aspect;
 
 import jakarta.servlet.http.HttpSession;
 import java.util.Objects;
@@ -11,7 +11,7 @@
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import reviewme.global.authorization.exception.SpELEvaluationFailedException;
+import reviewme.security.aspect.exception.SpELEvaluationFailedException;
 
 public class ResourceAuthorizationUtils {
 

diff --git a/...horization/ReviewAuthorizationAspect.java → ...ity/aspect/ReviewAuthorizationAspect.java b/...horization/ReviewAuthorizationAspect.java → ...ity/aspect/ReviewAuthorizationAspect.java
@@ -1,7 +1,7 @@
-package reviewme.global.authorization;
+package reviewme.security.aspect;
 
-import static reviewme.global.authorization.ResourceAuthorizationUtils.getCurrentSession;
-import static reviewme.global.authorization.ResourceAuthorizationUtils.getTarget;
+import static reviewme.security.aspect.ResourceAuthorizationUtils.getCurrentSession;
+import static reviewme.security.aspect.ResourceAuthorizationUtils.getTarget;
 
 import jakarta.servlet.http.HttpSession;
 import lombok.RequiredArgsConstructor;
@@ -10,14 +10,14 @@
 import org.aspectj.lang.annotation.Aspect;
 import org.springframework.stereotype.Component;
 import reviewme.auth.domain.GitHubMember;
-import reviewme.global.authorization.exception.ReviewGroupNotExistsBySessionReviewRequestCodeException;
-import reviewme.global.authorization.exception.ForbiddenReviewAccessException;
-import reviewme.global.session.SessionManager;
+import reviewme.security.aspect.exception.ForbiddenReviewAccessException;
+import reviewme.security.aspect.exception.ReviewGroupNotExistsBySessionReviewRequestCodeException;
 import reviewme.review.domain.Review;
 import reviewme.review.repository.ReviewRepository;
 import reviewme.review.service.exception.ReviewNotFoundException;
 import reviewme.reviewgroup.domain.ReviewGroup;
 import reviewme.reviewgroup.repository.ReviewGroupRepository;
+import reviewme.security.session.SessionManager;
 
 @Aspect
 @Component

diff --git a/...ation/ReviewGroupAuthorizationAspect.java → ...spect/ReviewGroupAuthorizationAspect.java b/...ation/ReviewGroupAuthorizationAspect.java → ...spect/ReviewGroupAuthorizationAspect.java
@@ -1,7 +1,7 @@
-package reviewme.global.authorization;
+package reviewme.security.aspect;
 
-import static reviewme.global.authorization.ResourceAuthorizationUtils.getCurrentSession;
-import static reviewme.global.authorization.ResourceAuthorizationUtils.getTarget;
+import static reviewme.security.aspect.ResourceAuthorizationUtils.getCurrentSession;
+import static reviewme.security.aspect.ResourceAuthorizationUtils.getTarget;
 
 import jakarta.servlet.http.HttpSession;
 import lombok.RequiredArgsConstructor;
@@ -10,11 +10,11 @@
 import org.aspectj.lang.annotation.Aspect;
 import org.springframework.stereotype.Component;
 import reviewme.auth.domain.GitHubMember;
-import reviewme.global.authorization.exception.ForbiddenReviewGroupAccessException;
-import reviewme.global.session.SessionManager;
+import reviewme.security.aspect.exception.ForbiddenReviewGroupAccessException;
 import reviewme.reviewgroup.domain.ReviewGroup;
 import reviewme.reviewgroup.domain.exception.ReviewGroupNotFoundException;
 import reviewme.reviewgroup.repository.ReviewGroupRepository;
+import reviewme.security.session.SessionManager;
 
 @Aspect
 @Component

diff --git a/...ption/ForbiddenReviewAccessException.java → ...ption/ForbiddenReviewAccessException.java b/...ption/ForbiddenReviewAccessException.java → ...ption/ForbiddenReviewAccessException.java
@@ -1,4 +1,4 @@
-package reviewme.global.authorization.exception;
+package reviewme.security.aspect.exception;
 
 import lombok.extern.slf4j.Slf4j;
 import reviewme.global.exception.ForbiddenException;

diff --git a/.../ForbiddenReviewGroupAccessException.java → .../ForbiddenReviewGroupAccessException.java b/.../ForbiddenReviewGroupAccessException.java → .../ForbiddenReviewGroupAccessException.java
@@ -1,4 +1,4 @@
-package reviewme.global.authorization.exception;
+package reviewme.security.aspect.exception;
 
 import lombok.extern.slf4j.Slf4j;
 import reviewme.global.exception.ForbiddenException;

diff --git a/...sBySessionReviewRequestCodeException.java → ...sBySessionReviewRequestCodeException.java b/...sBySessionReviewRequestCodeException.java → ...sBySessionReviewRequestCodeException.java
@@ -1,4 +1,4 @@
-package reviewme.global.authorization.exception;
+package reviewme.security.aspect.exception;
 
 import lombok.extern.slf4j.Slf4j;
 

diff --git a/...eption/SpELEvaluationFailedException.java → ...eption/SpELEvaluationFailedException.java b/...eption/SpELEvaluationFailedException.java → ...eption/SpELEvaluationFailedException.java
@@ -1,4 +1,4 @@
-package reviewme.global.authorization.exception;
+package reviewme.security.aspect.exception;
 
 import lombok.extern.slf4j.Slf4j;
 

diff --git a/backend/src/test/java/reviewme/global/authorization/AopTestClass.java b/backend/src/test/java/reviewme/global/authorization/AopTestClass.java
@@ -1,6 +1,8 @@
 package reviewme.global.authorization;
 
 import org.springframework.stereotype.Component;
+import reviewme.security.aspect.RequireReviewAccess;
+import reviewme.security.aspect.RequireReviewGroupAccess;
 
 @Component
 class AopTestClass {

diff --git a/backend/src/test/java/reviewme/global/authorization/ResourceAuthorizationUtilsTest.java b/backend/src/test/java/reviewme/global/authorization/ResourceAuthorizationUtilsTest.java
@@ -15,7 +15,8 @@
 import org.springframework.mock.web.MockHttpSession;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import reviewme.global.authorization.exception.SpELEvaluationFailedException;
+import reviewme.security.aspect.ResourceAuthorizationUtils;
+import reviewme.security.aspect.exception.SpELEvaluationFailedException;
 import reviewme.support.ServiceTest;
 
 @ServiceTest

diff --git a/backend/src/test/java/reviewme/global/authorization/ReviewAuthorizationAspectTest.java b/backend/src/test/java/reviewme/global/authorization/ReviewAuthorizationAspectTest.java
@@ -25,7 +25,6 @@
 import reviewme.reviewgroup.domain.ReviewGroup;
 import reviewme.reviewgroup.repository.ReviewGroupRepository;
 import reviewme.security.aspect.exception.ForbiddenReviewAccessException;
-import reviewme.security.aspect.exception.ReviewGroupNotExistsBySessionReviewRequestCodeException;
 import reviewme.security.session.SessionManager;
 import reviewme.support.ServiceTest;
 

diff --git a/backend/src/test/java/reviewme/global/authorization/ReviewGroupAuthorizationAspectTest.java b/backend/src/test/java/reviewme/global/authorization/ReviewGroupAuthorizationAspectTest.java
@@ -14,13 +14,13 @@
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import reviewme.auth.domain.GitHubMember;
-import reviewme.global.authorization.exception.ForbiddenReviewGroupAccessException;
-import reviewme.global.session.SessionManager;
+import reviewme.security.aspect.exception.ForbiddenReviewGroupAccessException;
 import reviewme.member.domain.Member;
 import reviewme.member.repository.MemberRepository;
 import reviewme.reviewgroup.domain.ReviewGroup;
 import reviewme.reviewgroup.domain.exception.ReviewGroupNotFoundException;
 import reviewme.reviewgroup.repository.ReviewGroupRepository;
+import reviewme.security.session.SessionManager;
 import reviewme.support.ServiceTest;
 
 @ServiceTest

diff --git a/backend/src/test/java/reviewme/review/service/ReviewDetailLookupServiceTest.java b/backend/src/test/java/reviewme/review/service/ReviewDetailLookupServiceTest.java
@@ -1,6 +1,7 @@
 package reviewme.review.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static reviewme.fixture.OptionGroupFixture.선택지_그룹;
 import static reviewme.fixture.OptionItemFixture.선택지;