From f4e8ba1033dbc1896518e5da3b45f39934de848a Mon Sep 17 00:00:00 2001 From: Woongbin06 Date: Sat, 9 Nov 2024 00:44:13 +0900 Subject: [PATCH] =?UTF-8?q?CHORE(auth)=20::=20=EB=B9=A0=EC=A7=84=EA=B1=B0?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/service/AcceptApplicationService.java | 1 + .../application/service/CancelApplicationService.java | 1 + .../application/service/CreateApplicationService.java | 2 ++ .../application/service/FindApplicationService.java | 2 +- .../service/FindProjectApplicationService.java | 2 ++ .../application/service/RejectApplicationService.java | 1 + .../zoing/domain/{ => auth}/annotation/AdminOnly.java | 2 +- .../zoing/domain/{ => auth}/annotation/LoginOrNot.java | 2 +- .../domain/{ => auth}/annotation/LoginRequired.java | 2 +- .../zoing/domain/auth/intercepter/AuthInterceptor.java | 9 ++++----- .../zoing/domain/auth/presetation/AuthController.java | 2 -- .../zoing/domain/auth/service/RefreshTokenService.java | 3 +-- 12 files changed, 16 insertions(+), 13 deletions(-) rename src/main/java/com/woongeya/zoing/domain/{ => auth}/annotation/AdminOnly.java (84%) rename src/main/java/com/woongeya/zoing/domain/{ => auth}/annotation/LoginOrNot.java (84%) rename src/main/java/com/woongeya/zoing/domain/{ => auth}/annotation/LoginRequired.java (85%) diff --git a/src/main/java/com/woongeya/zoing/domain/application/service/AcceptApplicationService.java b/src/main/java/com/woongeya/zoing/domain/application/service/AcceptApplicationService.java index cd070d6..3efb095 100644 --- a/src/main/java/com/woongeya/zoing/domain/application/service/AcceptApplicationService.java +++ b/src/main/java/com/woongeya/zoing/domain/application/service/AcceptApplicationService.java @@ -3,6 +3,7 @@ import com.woongeya.zoing.domain.application.ApplicationFacade; import com.woongeya.zoing.domain.application.domain.Application; import com.woongeya.zoing.domain.application.domain.repository.ApplicationRepository; +import com.woongeya.zoing.domain.auth.repository.AuthRepository; import com.woongeya.zoing.domain.notice.domain.Notification; import com.woongeya.zoing.domain.notice.domain.repository.NotificationRepository; import com.woongeya.zoing.domain.notice.domain.type.NotificationState; diff --git a/src/main/java/com/woongeya/zoing/domain/application/service/CancelApplicationService.java b/src/main/java/com/woongeya/zoing/domain/application/service/CancelApplicationService.java index 09f4047..0eae630 100644 --- a/src/main/java/com/woongeya/zoing/domain/application/service/CancelApplicationService.java +++ b/src/main/java/com/woongeya/zoing/domain/application/service/CancelApplicationService.java @@ -2,6 +2,7 @@ import com.woongeya.zoing.domain.application.ApplicationFacade; import com.woongeya.zoing.domain.application.domain.Application; +import com.woongeya.zoing.domain.auth.repository.AuthRepository; import com.woongeya.zoing.domain.project.exception.IsNotWriterException; import com.woongeya.zoing.domain.user.UserFacade; import com.woongeya.zoing.domain.user.domain.User; diff --git a/src/main/java/com/woongeya/zoing/domain/application/service/CreateApplicationService.java b/src/main/java/com/woongeya/zoing/domain/application/service/CreateApplicationService.java index 36ed775..b38e595 100644 --- a/src/main/java/com/woongeya/zoing/domain/application/service/CreateApplicationService.java +++ b/src/main/java/com/woongeya/zoing/domain/application/service/CreateApplicationService.java @@ -5,6 +5,7 @@ import com.woongeya.zoing.domain.application.domain.type.ApplicationState; import com.woongeya.zoing.domain.application.exception.AlreadyApplicationException; import com.woongeya.zoing.domain.application.presetation.dto.request.ApplicationCreateRequest; +import com.woongeya.zoing.domain.auth.repository.AuthRepository; import com.woongeya.zoing.domain.notice.domain.Notification; import com.woongeya.zoing.domain.notice.domain.repository.NotificationRepository; import com.woongeya.zoing.domain.notice.domain.type.NotificationState; @@ -24,6 +25,7 @@ public class CreateApplicationService { private final AuthRepository authRepository; + private final UserFacade userFacade; private final ProjectFacade projectFacade; private final ApplicationRepository applicationRepository; private final NotificationRepository notificationRepository; diff --git a/src/main/java/com/woongeya/zoing/domain/application/service/FindApplicationService.java b/src/main/java/com/woongeya/zoing/domain/application/service/FindApplicationService.java index 583f832..17895a4 100644 --- a/src/main/java/com/woongeya/zoing/domain/application/service/FindApplicationService.java +++ b/src/main/java/com/woongeya/zoing/domain/application/service/FindApplicationService.java @@ -13,7 +13,7 @@ public class FindApplicationService { private final ApplicationFacade applicationFacade; - private final AuthRepository authRepository; + private final UserFacade userFacade; public ApplicationResponse execute(Long id) { Application application = applicationFacade.getApplication(id); diff --git a/src/main/java/com/woongeya/zoing/domain/application/service/FindProjectApplicationService.java b/src/main/java/com/woongeya/zoing/domain/application/service/FindProjectApplicationService.java index 8158d57..111554d 100644 --- a/src/main/java/com/woongeya/zoing/domain/application/service/FindProjectApplicationService.java +++ b/src/main/java/com/woongeya/zoing/domain/application/service/FindProjectApplicationService.java @@ -9,6 +9,7 @@ import com.woongeya.zoing.domain.application.domain.Application; import com.woongeya.zoing.domain.application.domain.repository.ApplicationRepository; import com.woongeya.zoing.domain.application.presetation.dto.response.ApplicationResponse; +import com.woongeya.zoing.domain.auth.repository.AuthRepository; import com.woongeya.zoing.domain.project.domain.Member; import com.woongeya.zoing.domain.project.domain.repository.MemberRepository; import com.woongeya.zoing.domain.project.exception.IsNotWriterException; @@ -25,6 +26,7 @@ public class FindProjectApplicationService { private final ApplicationRepository applicationRepository; private final MemberRepository memberRepository; private final AuthRepository authRepository; + private final UserFacade userFacade; @Transactional(readOnly = true) public List execute(Long id) { diff --git a/src/main/java/com/woongeya/zoing/domain/application/service/RejectApplicationService.java b/src/main/java/com/woongeya/zoing/domain/application/service/RejectApplicationService.java index f805833..011c840 100644 --- a/src/main/java/com/woongeya/zoing/domain/application/service/RejectApplicationService.java +++ b/src/main/java/com/woongeya/zoing/domain/application/service/RejectApplicationService.java @@ -3,6 +3,7 @@ import com.woongeya.zoing.domain.application.ApplicationFacade; import com.woongeya.zoing.domain.application.domain.Application; import com.woongeya.zoing.domain.application.domain.repository.ApplicationRepository; +import com.woongeya.zoing.domain.auth.repository.AuthRepository; import com.woongeya.zoing.domain.notice.domain.Notification; import com.woongeya.zoing.domain.notice.domain.repository.NotificationRepository; import com.woongeya.zoing.domain.notice.domain.type.NotificationState; diff --git a/src/main/java/com/woongeya/zoing/domain/annotation/AdminOnly.java b/src/main/java/com/woongeya/zoing/domain/auth/annotation/AdminOnly.java similarity index 84% rename from src/main/java/com/woongeya/zoing/domain/annotation/AdminOnly.java rename to src/main/java/com/woongeya/zoing/domain/auth/annotation/AdminOnly.java index 52a857c..cd3f1ba 100644 --- a/src/main/java/com/woongeya/zoing/domain/annotation/AdminOnly.java +++ b/src/main/java/com/woongeya/zoing/domain/auth/annotation/AdminOnly.java @@ -1,4 +1,4 @@ -package com.woongeya.zoing.domain.annotation; +package com.woongeya.zoing.domain.auth.annotation; import static java.lang.annotation.ElementType.*; diff --git a/src/main/java/com/woongeya/zoing/domain/annotation/LoginOrNot.java b/src/main/java/com/woongeya/zoing/domain/auth/annotation/LoginOrNot.java similarity index 84% rename from src/main/java/com/woongeya/zoing/domain/annotation/LoginOrNot.java rename to src/main/java/com/woongeya/zoing/domain/auth/annotation/LoginOrNot.java index 5b8c9f3..c743519 100644 --- a/src/main/java/com/woongeya/zoing/domain/annotation/LoginOrNot.java +++ b/src/main/java/com/woongeya/zoing/domain/auth/annotation/LoginOrNot.java @@ -1,4 +1,4 @@ -package com.woongeya.zoing.domain.annotation; +package com.woongeya.zoing.domain.auth.annotation; import static java.lang.annotation.ElementType.*; diff --git a/src/main/java/com/woongeya/zoing/domain/annotation/LoginRequired.java b/src/main/java/com/woongeya/zoing/domain/auth/annotation/LoginRequired.java similarity index 85% rename from src/main/java/com/woongeya/zoing/domain/annotation/LoginRequired.java rename to src/main/java/com/woongeya/zoing/domain/auth/annotation/LoginRequired.java index d3ad170..6f7b364 100644 --- a/src/main/java/com/woongeya/zoing/domain/annotation/LoginRequired.java +++ b/src/main/java/com/woongeya/zoing/domain/auth/annotation/LoginRequired.java @@ -1,4 +1,4 @@ -package com.woongeya.zoing.domain.annotation; +package com.woongeya.zoing.domain.auth.annotation; import static java.lang.annotation.ElementType.*; diff --git a/src/main/java/com/woongeya/zoing/domain/auth/intercepter/AuthInterceptor.java b/src/main/java/com/woongeya/zoing/domain/auth/intercepter/AuthInterceptor.java index f56f954..74f4c17 100644 --- a/src/main/java/com/woongeya/zoing/domain/auth/intercepter/AuthInterceptor.java +++ b/src/main/java/com/woongeya/zoing/domain/auth/intercepter/AuthInterceptor.java @@ -3,13 +3,12 @@ import static org.springframework.http.HttpHeaders.*; import org.springframework.context.annotation.Configuration; -import org.springframework.http.HttpHeaders; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerInterceptor; -import com.woongeya.zoing.domain.annotation.AdminOnly; -import com.woongeya.zoing.domain.annotation.LoginOrNot; -import com.woongeya.zoing.domain.annotation.LoginRequired; +import com.woongeya.zoing.domain.auth.annotation.AdminOnly; +import com.woongeya.zoing.domain.auth.annotation.LoginOrNot; +import com.woongeya.zoing.domain.auth.annotation.LoginRequired; import com.woongeya.zoing.domain.auth.exception.TokenNotExistException; import com.woongeya.zoing.domain.auth.exception.UserIsNotAdminException; import com.woongeya.zoing.domain.auth.repository.AuthRepository; @@ -29,7 +28,7 @@ public class AuthInterceptor implements HandlerInterceptor { private final JwtParser jwtParser; private final AuthRepository authRepository; - private final AuthRepository authRepository; + private final UserFacade userFacade; @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) { diff --git a/src/main/java/com/woongeya/zoing/domain/auth/presetation/AuthController.java b/src/main/java/com/woongeya/zoing/domain/auth/presetation/AuthController.java index b0b3639..02ec2eb 100644 --- a/src/main/java/com/woongeya/zoing/domain/auth/presetation/AuthController.java +++ b/src/main/java/com/woongeya/zoing/domain/auth/presetation/AuthController.java @@ -4,7 +4,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @@ -15,7 +14,6 @@ import com.woongeya.zoing.domain.auth.service.RefreshTokenService; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.NotBlank; import lombok.RequiredArgsConstructor; @RestController diff --git a/src/main/java/com/woongeya/zoing/domain/auth/service/RefreshTokenService.java b/src/main/java/com/woongeya/zoing/domain/auth/service/RefreshTokenService.java index d8f8854..5c8f9c6 100644 --- a/src/main/java/com/woongeya/zoing/domain/auth/service/RefreshTokenService.java +++ b/src/main/java/com/woongeya/zoing/domain/auth/service/RefreshTokenService.java @@ -3,7 +3,6 @@ import org.springframework.stereotype.Service; import com.woongeya.zoing.domain.auth.domain.Token; -import com.woongeya.zoing.domain.auth.presetation.dto.response.TokenResponse; import com.woongeya.zoing.domain.auth.service.implementation.TokenProvider; import com.woongeya.zoing.domain.auth.util.BearerTokenExtractor; import com.woongeya.zoing.domain.auth.util.JwtParser; @@ -17,7 +16,7 @@ public class RefreshTokenService { private final JwtParser jwtParser; private final TokenProvider tokenProvider; - private final AuthRepository authRepository; + private final UserFacade userFacade; public Token execute(String bearer) { String refreshToken = BearerTokenExtractor.extract(bearer);