9주차 미션 / 서버 3조 김민석

src/main/java/kuit/server/KuitServerApplication.java

@@ -0,0 +1,13 @@
+package kuit.server;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class KuitServerApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(KuitServerApplication.class, args);
+    }
+
+}

src/main/java/kuit3/backend/common/argument_resolver/JwtAuthHandlerArgumentResolver.java → src/main/java/kuit/server/common/argument_resolver/JwtAuthHandlerArgumentResolver.java

@@ -1,9 +1,8 @@
-package kuit3.backend.common.argument_resolver;
+package kuit.server.common.argument_resolver;
 
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.MethodParameter;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.support.WebDataBinderFactory;
 import org.springframework.web.context.request.NativeWebRequest;
@@ -13,18 +12,21 @@
 @Slf4j
 @Component
 public class JwtAuthHandlerArgumentResolver implements HandlerMethodArgumentResolver {
+
     @Override
     public boolean supportsParameter(MethodParameter parameter) {
-        boolean hasAnnotation = parameter.hasParameterAnnotation(PreAuthorize.class);
+        log.info("[JwtAuthHandlerArgumentResolver.supportsParameter]");
+        boolean hasAnnotation = parameter.hasParameterAnnotation(PreAuthorizeUser.class);
         boolean hasType = long.class.isAssignableFrom(parameter.getParameterType());
-        log.info("hasAnnotation={}, hasType={}, hasAnnotation && hasType={}", hasAnnotation, hasType, hasAnnotation&&hasType);
+        log.info("hasAnnotation={} hasType={}",hasAnnotation,hasType);
         return hasAnnotation && hasType;
     }
 
     @Override
-    public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
+    public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) {
+        log.info("[JwtAuthHandlerArgumentResolver.resolveArgument]");
         HttpServletRequest request = (HttpServletRequest) webRequest.getNativeRequest();
-        log.info("userId={}", request.getAttribute("userId"));
         return request.getAttribute("userId");
     }
-}
+
+}

src/main/java/kuit3/backend/common/argument_resolver/PreAuthorize.java → src/main/java/kuit/server/common/argument_resolver/PreAuthorizeUser.java

@@ -1,4 +1,4 @@
-package kuit3.backend.common.argument_resolver;
+package kuit.server.common.argument_resolver;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -7,5 +7,5 @@
 
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface PreAuthorize {
+public @interface PreAuthorizeUser {
 }

src/main/java/kuit3/backend/common/exception/BadRequestException.java → src/main/java/kuit/server/common/exception/BadRequestException.java

@@ -1,6 +1,6 @@
-package kuit3.backend.common.exception;
+package kuit.server.common.exception;
 
-import kuit3.backend.common.response.status.ResponseStatus;
+import kuit.server.common.response.status.ResponseStatus;
 import lombok.Getter;
 
 @Getter
@@ -12,4 +12,5 @@ public BadRequestException(ResponseStatus exceptionStatus) {
         super(exceptionStatus.getMessage());
         this.exceptionStatus = exceptionStatus;
     }
+
 }

src/main/java/kuit3/backend/common/exception/DatabaseException.java → src/main/java/kuit/server/common/exception/DatabaseException.java

@@ -1,15 +1,16 @@
-package kuit3.backend.common.exception;
+package kuit.server.common.exception;
 
-import kuit3.backend.common.response.status.ResponseStatus;
+import kuit.server.common.response.status.ResponseStatus;
 import lombok.Getter;
 
 @Getter
-public class DatabaseException extends RuntimeException{
+public class DatabaseException extends RuntimeException {
 
     private final ResponseStatus exceptionStatus;
 
     public DatabaseException(ResponseStatus exceptionStatus) {
         super(exceptionStatus.getMessage());
         this.exceptionStatus = exceptionStatus;
     }
+
 }

src/main/java/kuit3/backend/common/exception/InternalServerErrorException.java → src/main/java/kuit/server/common/exception/InternalServerErrorException.java

@@ -1,6 +1,6 @@
-package kuit3.backend.common.exception;
+package kuit.server.common.exception;
 
-import kuit3.backend.common.response.status.ResponseStatus;
+import kuit.server.common.response.status.ResponseStatus;
 import lombok.Getter;
 
 @Getter
@@ -12,4 +12,5 @@ public InternalServerErrorException(ResponseStatus exceptionStatus) {
         super(exceptionStatus.getMessage());
         this.exceptionStatus = exceptionStatus;
     }
-}
+
+}

src/main/java/kuit/server/common/exception/MenuException.java

@@ -0,0 +1,20 @@
+package kuit.server.common.exception;
+
+import kuit.server.common.response.status.ResponseStatus;
+import lombok.Getter;
+
+@Getter
+public class MenuException extends RuntimeException {
+    private final ResponseStatus exceptionStatus;
+
+    public MenuException(ResponseStatus exceptionStatus) {
+        super(exceptionStatus.getMessage());
+        this.exceptionStatus = exceptionStatus;
+    }
+
+    public MenuException(ResponseStatus exceptionStatus, String message) {
+        super(message);
+        this.exceptionStatus = exceptionStatus;
+    }
+
+}

src/main/java/kuit3/backend/common/exception/UserException.java → src/main/java/kuit/server/common/exception/UserException.java

@@ -1,6 +1,6 @@
-package kuit3.backend.common.exception;
+package kuit.server.common.exception;
 
-import kuit3.backend.common.response.status.ResponseStatus;
+import kuit.server.common.response.status.ResponseStatus;
 import lombok.Getter;
 
 @Getter
@@ -17,4 +17,5 @@ public UserException(ResponseStatus exceptionStatus, String message) {
         super(message);
         this.exceptionStatus = exceptionStatus;
     }
+
 }

src/main/java/kuit3/backend/common/exception/jwt/bad_request/JwtBadRequestException.java → src/main/java/kuit/server/common/exception/jwt/bad_request/JwtBadRequestException.java

@@ -1,6 +1,6 @@
-package kuit3.backend.common.exception.jwt.bad_request;
+package kuit.server.common.exception.jwt.bad_request;
 
-import kuit3.backend.common.response.status.ResponseStatus;
+import kuit.server.common.response.status.ResponseStatus;
 import lombok.Getter;
 
 @Getter
@@ -12,4 +12,5 @@ public JwtBadRequestException(ResponseStatus exceptionStatus) {
         super(exceptionStatus.getMessage());
         this.exceptionStatus = exceptionStatus;
     }
-}
+
+}

src/main/java/kuit3/backend/common/exception/jwt/bad_request/JwtNoTokenException.java → src/main/java/kuit/server/common/exception/jwt/bad_request/JwtNoTokenException.java

@@ -1,6 +1,6 @@
-package kuit3.backend.common.exception.jwt.bad_request;
+package kuit.server.common.exception.jwt.bad_request;
 
-import kuit3.backend.common.response.status.ResponseStatus;
+import kuit.server.common.response.status.ResponseStatus;
 import lombok.Getter;
 
 @Getter
@@ -12,4 +12,5 @@ public JwtNoTokenException(ResponseStatus exceptionStatus) {
         super(exceptionStatus);
         this.exceptionStatus = exceptionStatus;
     }
-}
+
+}

src/main/java/kuit3/backend/common/exception/jwt/bad_request/JwtUnsupportedTokenException.java → src/main/java/kuit/server/common/exception/jwt/bad_request/JwtUnsupportedTokenException.java

@@ -1,6 +1,6 @@
-package kuit3.backend.common.exception.jwt.bad_request;
+package kuit.server.common.exception.jwt.bad_request;
 
-import kuit3.backend.common.response.status.ResponseStatus;
+import kuit.server.common.response.status.ResponseStatus;
 import lombok.Getter;
 
 @Getter
@@ -12,4 +12,5 @@ public JwtUnsupportedTokenException(ResponseStatus exceptionStatus) {
         super(exceptionStatus);
         this.exceptionStatus = exceptionStatus;
     }
-}
+
+}

src/main/java/kuit3/backend/common/exception/jwt/unauthorized/JwtExpiredTokenException.java → src/main/java/kuit/server/common/exception/jwt/unauthorized/JwtExpiredTokenException.java

@@ -1,6 +1,6 @@
-package kuit3.backend.common.exception.jwt.unauthorized;
+package kuit.server.common.exception.jwt.unauthorized;
 
-import kuit3.backend.common.response.status.ResponseStatus;
+import kuit.server.common.response.status.ResponseStatus;
 import lombok.Getter;
 
 @Getter
@@ -12,4 +12,5 @@ public JwtExpiredTokenException(ResponseStatus exceptionStatus) {
         super(exceptionStatus);
         this.exceptionStatus = exceptionStatus;
     }
+
 }

src/main/java/kuit3/backend/common/exception/jwt/unauthorized/JwtInvalidTokenException.java → src/main/java/kuit/server/common/exception/jwt/unauthorized/JwtInvalidTokenException.java

@@ -1,6 +1,6 @@
-package kuit3.backend.common.exception.jwt.unauthorized;
+package kuit.server.common.exception.jwt.unauthorized;
 
-import kuit3.backend.common.response.status.ResponseStatus;
+import kuit.server.common.response.status.ResponseStatus;
 import lombok.Getter;
 
 @Getter
@@ -12,4 +12,5 @@ public JwtInvalidTokenException(ResponseStatus exceptionStatus) {
         super(exceptionStatus);
         this.exceptionStatus = exceptionStatus;
     }
-}
+
+}

src/main/java/kuit3/backend/common/exception/jwt/unauthorized/JwtMalformedTokenException.java → src/main/java/kuit/server/common/exception/jwt/unauthorized/JwtMalformedTokenException.java

@@ -1,6 +1,6 @@
-package kuit3.backend.common.exception.jwt.unauthorized;
+package kuit.server.common.exception.jwt.unauthorized;
 
-import kuit3.backend.common.response.status.ResponseStatus;
+import kuit.server.common.response.status.ResponseStatus;
 import lombok.Getter;
 
 @Getter
@@ -12,4 +12,5 @@ public JwtMalformedTokenException(ResponseStatus exceptionStatus) {
         super(exceptionStatus);
         this.exceptionStatus = exceptionStatus;
     }
-}
+
+}

src/main/java/kuit3/backend/common/exception/jwt/unauthorized/JwtUnauthorizedTokenException.java → src/main/java/kuit/server/common/exception/jwt/unauthorized/JwtUnauthorizedTokenException.java

@@ -1,6 +1,6 @@
-package kuit3.backend.common.exception.jwt.unauthorized;
+package kuit.server.common.exception.jwt.unauthorized;
 
-import kuit3.backend.common.response.status.ResponseStatus;
+import kuit.server.common.response.status.ResponseStatus;
 import lombok.Getter;
 
 @Getter
@@ -12,4 +12,5 @@ public JwtUnauthorizedTokenException(ResponseStatus exceptionStatus) {
         super(exceptionStatus.getMessage());
         this.exceptionStatus = exceptionStatus;
     }
-}
+
+}

src/main/java/kuit3/backend/common/exception_handler/BaseExceptionControllerAdvice.java → src/main/java/kuit/server/common/exception_handler/BaseExceptionControllerAdvice.java

@@ -1,9 +1,9 @@
-package kuit3.backend.common.exception_handler;
+package kuit.server.common.exception_handler;
 
 import jakarta.validation.ConstraintViolationException;
-import kuit3.backend.common.exception.BadRequestException;
-import kuit3.backend.common.exception.InternalServerErrorException;
-import kuit3.backend.common.response.BaseErrorResponse;
+import kuit.server.common.exception.BadRequestException;
+import kuit.server.common.exception.InternalServerErrorException;
+import kuit.server.common.response.BaseErrorResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.TypeMismatchException;
 import org.springframework.http.HttpStatus;
@@ -13,7 +13,7 @@
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.servlet.NoHandlerFoundException;
 
-import static kuit3.backend.common.response.status.BaseExceptionResponseStatus.*;
+import static kuit.server.common.response.status.BaseExceptionResponseStatus.*;
 
 @Slf4j
 @RestControllerAdvice
@@ -63,4 +63,4 @@ public BaseErrorResponse handle_RuntimeException(Exception e) {
         return new BaseErrorResponse(SERVER_ERROR);
     }
 
-}
+}

src/main/java/kuit3/backend/common/exception_handler/DatabaseExceptionControllerAdvice.java → src/main/java/kuit/server/common/exception_handler/DatabaseExceptionControllerAdvice.java

@@ -1,7 +1,7 @@
-package kuit3.backend.common.exception_handler;
+package kuit.server.common.exception_handler;
 
 import jakarta.annotation.Priority;
-import kuit3.backend.common.response.BaseErrorResponse;
+import kuit.server.common.response.BaseErrorResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.dao.DataAccessException;
 import org.springframework.http.HttpStatus;
@@ -10,8 +10,8 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
-import static kuit3.backend.common.response.status.BaseExceptionResponseStatus.BAD_SQL_GRAMMAR;
-import static kuit3.backend.common.response.status.BaseExceptionResponseStatus.DATABASE_ERROR;
+import static kuit.server.common.response.status.BaseExceptionResponseStatus.BAD_SQL_GRAMMAR;
+import static kuit.server.common.response.status.BaseExceptionResponseStatus.DATABASE_ERROR;
 
 @Slf4j
 @Priority(0)
@@ -31,4 +31,5 @@ public BaseErrorResponse handle_DataAccessException(DataAccessException e) {
         log.error("[handle_DataAccessException]", e);
         return new BaseErrorResponse(DATABASE_ERROR);
     }
+
 }

src/main/java/kuit3/backend/common/exception_handler/JwtExceptionControllerAdvice.java → src/main/java/kuit/server/common/exception_handler/JwtExceptionControllerAdvice.java

@@ -1,9 +1,9 @@
-package kuit3.backend.common.exception_handler;
+package kuit.server.common.exception_handler;
 
 import jakarta.annotation.Priority;
-import kuit3.backend.common.exception.jwt.bad_request.JwtBadRequestException;
-import kuit3.backend.common.exception.jwt.unauthorized.JwtUnauthorizedTokenException;
-import kuit3.backend.common.response.BaseErrorResponse;
+import kuit.server.common.exception.jwt.bad_request.JwtBadRequestException;
+import kuit.server.common.exception.jwt.unauthorized.JwtUnauthorizedTokenException;
+import kuit.server.common.response.BaseErrorResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -28,4 +28,5 @@ public BaseErrorResponse handle_JwtUnauthorizedException(JwtUnauthorizedTokenExc
         log.error("[handle_JwtUnauthorizedException]", e);
         return new BaseErrorResponse(e.getExceptionStatus());
     }
-}
+
+}

src/main/java/kuit/server/common/exception_handler/MenuExceptionControllerAdvice.java

@@ -0,0 +1,24 @@
+package kuit.server.common.exception_handler;
+
+import jakarta.annotation.Priority;
+import kuit.server.common.exception.MenuException;
+import kuit.server.common.response.BaseErrorResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+import static kuit.server.common.response.status.BaseExceptionResponseStatus.INVALID_MENU_VALUE;
+
+@Slf4j
+@Priority(0)
+@RestControllerAdvice
+public class MenuExceptionControllerAdvice {
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ExceptionHandler(MenuException.class)
+    public BaseErrorResponse handle_MenuException(MenuException e) {
+        log.error("[handle_MenuException]", e);
+        return new BaseErrorResponse(INVALID_MENU_VALUE, e.getMessage());
+    }
+}