Skip to content

Commit

Permalink
refactor: 패키지 구조 변경 (exception)
Browse files Browse the repository at this point in the history 
- 각 도메인 별 ErrorAdvice를 common 패키지의 error 패키지로 이관
- 각 도메인 별 Exception은 도메인 패키지의 exception 패키지에 응집
  • Loading branch information
@giibeom
giibeom committed Nov 19, 2022
1 parent cd65f7a commit d16fb31
Show file tree
Hide file tree
Showing 47 changed files with 193 additions and 227 deletions.
2 changes: 1 addition & 1 deletion app/src/main/java/com/codesoom/assignment/common/auth/AuthenticationInterceptor.java
View file
@@ -1,7 +1,7 @@
package com.codesoom.assignment.common.auth;

import com.codesoom.assignment.common.util.JwtUtil;
import com.codesoom.assignment.domain.session.exception.TokenNotExistException;
import com.codesoom.assignment.session.exception.TokenNotExistException;
import org.springframework.http.HttpHeaders;
import org.springframework.stereotype.Component;
import org.springframework.web.method.HandlerMethod;
Expand Down
2 changes: 1 addition & 1 deletion ...nment/common/exception/ErrorResponse.java → ...ssignment/common/error/ErrorResponse.java
View file
@@ -1,4 +1,4 @@
package com.codesoom.assignment.common.exception;
package com.codesoom.assignment.common.error;

import lombok.Getter;
import org.springframework.context.support.DefaultMessageSourceResolvable;
Expand Down
10 changes: 4 additions & 6 deletions ...mon/exception/GlobalExceptionHandler.java → ...nment/common/error/GlobalErrorAdvice.java
View file
@@ -1,19 +1,17 @@
package com.codesoom.assignment.common.exception;
package com.codesoom.assignment.common.error;

import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.MethodArgumentNotValidException;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestControllerAdvice;
import org.springframework.web.context.request.WebRequest;
import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;

@ResponseBody
@ControllerAdvice
public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
@RestControllerAdvice
public class GlobalErrorAdvice extends ResponseEntityExceptionHandler {
@ExceptionHandler(value = {Exception.class})
@ResponseStatus
public ErrorResponse handleException(final Exception exception) {
Expand Down
23 changes: 23 additions & 0 deletions app/src/main/java/com/codesoom/assignment/common/error/ProductErrorAdvice.java
View file
@@ -0,0 +1,23 @@
package com.codesoom.assignment.common.error;

import com.codesoom.assignment.product.exception.ProductNotFoundException;
import com.codesoom.assignment.product.presentation.ProductController;
import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order;
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;

@RestControllerAdvice(basePackageClasses = {
ProductController.class
})
@Order(Ordered.HIGHEST_PRECEDENCE)
public class ProductErrorAdvice {

@ResponseStatus(HttpStatus.NOT_FOUND)
@ExceptionHandler(ProductNotFoundException.class)
public ErrorResponse handleProductNotFound() {
return new ErrorResponse("Product not found");
}
}
16 changes: 12 additions & 4 deletions ...on/exception/SessionExceptionHandler.java → ...ment/common/error/SessionErrorAdvice.java
View file
@@ -1,12 +1,20 @@
package com.codesoom.assignment.domain.session.exception;
package com.codesoom.assignment.common.error;

import com.codesoom.assignment.common.exception.ErrorResponse;
import com.codesoom.assignment.product.presentation.ProductController;
import com.codesoom.assignment.session.exception.InvalidTokenException;
import com.codesoom.assignment.session.exception.TokenNotExistException;
import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order;
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;

@SessionErrorAdvice
public class SessionExceptionHandler {
@RestControllerAdvice(basePackageClasses = {
ProductController.class
})
@Order(Ordered.HIGHEST_PRECEDENCE)
public class SessionErrorAdvice {

@ResponseStatus(HttpStatus.UNAUTHORIZED)
@ExceptionHandler(InvalidTokenException.class)
Expand Down
19 changes: 15 additions & 4 deletions .../user/exception/UserExceptionHandler.java → ...ignment/common/error/UserErrorAdvice.java
View file
@@ -1,12 +1,23 @@
package com.codesoom.assignment.domain.user.exception;
package com.codesoom.assignment.common.error;

import com.codesoom.assignment.common.exception.ErrorResponse;
import com.codesoom.assignment.session.controller.SessionController;
import com.codesoom.assignment.user.exception.UserEmailDuplicationException;
import com.codesoom.assignment.user.exception.UserInvalidPasswordException;
import com.codesoom.assignment.user.exception.UserNotFoundException;
import com.codesoom.assignment.user.presentation.UserController;
import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order;
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;

@UserErrorAdvice
public class UserExceptionHandler {
@RestControllerAdvice(basePackageClasses = {
UserController.class,
SessionController.class
})
@Order(Ordered.HIGHEST_PRECEDENCE)
public class UserErrorAdvice {

@ResponseStatus(HttpStatus.NOT_FOUND)
@ExceptionHandler(UserNotFoundException.class)
Expand Down
28 changes: 14 additions & 14 deletions app/src/main/java/com/codesoom/assignment/common/util/JwtUtil.java
View file
@@ -1,7 +1,7 @@
package com.codesoom.assignment.common.util;

import com.codesoom.assignment.domain.session.exception.InvalidTokenException;
import com.codesoom.assignment.domain.session.exception.TokenNotExistException;
import com.codesoom.assignment.session.exception.InvalidTokenException;
import com.codesoom.assignment.session.exception.TokenNotExistException;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.security.Keys;
Expand All @@ -20,6 +20,18 @@ public JwtUtil(@Value("${jwt.secret}") String secretKey) {
this.secretKey = Keys.hmacShaKeyFor(secretKey.getBytes());
}

public void validateAccessToken(String authHeader) {
if (authHeader == null) {
throw new TokenNotExistException();
}

if (!authHeader.startsWith(ACCESS_TOKEN_TYPE)) {
throw new InvalidTokenException();
}

decode(authHeader.substring(ACCESS_TOKEN_TYPE.length()));
}

public String encode(Long id) {
return Jwts.builder()
.claim("userId", id)
Expand All @@ -42,16 +54,4 @@ public Claims decode(String token) {
throw new InvalidTokenException(token);
}
}

public void validateAccessToken(String authHeader) {
if (authHeader == null) {
throw new TokenNotExistException();
}

if (!authHeader.startsWith(ACCESS_TOKEN_TYPE)) {
throw new InvalidTokenException();
}

decode(authHeader.substring(ACCESS_TOKEN_TYPE.length()));
}
}
20 changes: 0 additions & 20 deletions app/src/main/java/com/codesoom/assignment/domain/product/exception/ProductErrorAdvice.java
View file

This file was deleted.

16 changes: 0 additions & 16 deletions ...c/main/java/com/codesoom/assignment/domain/product/exception/ProductExceptionHandler.java
View file

This file was deleted.

20 changes: 0 additions & 20 deletions app/src/main/java/com/codesoom/assignment/domain/session/exception/SessionErrorAdvice.java
View file

This file was deleted.

22 changes: 0 additions & 22 deletions app/src/main/java/com/codesoom/assignment/domain/user/exception/UserErrorAdvice.java
View file

This file was deleted.

10 changes: 5 additions & 5 deletions ...n/product/application/ProductService.java → ...t/product/application/ProductService.java
View file
@@ -1,9 +1,9 @@
package com.codesoom.assignment.domain.product.application;
package com.codesoom.assignment.product.application;

import com.codesoom.assignment.domain.product.domain.Product;
import com.codesoom.assignment.domain.product.domain.ProductRepository;
import com.codesoom.assignment.domain.product.exception.ProductNotFoundException;
import com.codesoom.assignment.domain.product.presentation.dto.ProductData;
import com.codesoom.assignment.product.domain.Product;
import com.codesoom.assignment.product.domain.ProductRepository;
import com.codesoom.assignment.product.exception.ProductNotFoundException;
import com.codesoom.assignment.product.presentation.dto.ProductData;
import com.github.dozermapper.core.Mapper;
import org.springframework.stereotype.Service;

Expand Down
2 changes: 1 addition & 1 deletion ...gnment/domain/product/domain/Product.java → ...om/assignment/product/domain/Product.java
View file
Expand Up @@ -14,7 +14,7 @@
// 3. 가격 - 5,000원 (판매가)
// 4. 이미지 - static, CDN => image URL

package com.codesoom.assignment.domain.product.domain;
package com.codesoom.assignment.product.domain;

import lombok.AllArgsConstructor;
import lombok.Builder;
Expand Down
2 changes: 1 addition & 1 deletion ...ain/product/domain/ProductRepository.java → ...ent/product/domain/ProductRepository.java
View file
@@ -1,4 +1,4 @@
package com.codesoom.assignment.domain.product.domain;
package com.codesoom.assignment.product.domain;

import java.util.List;
import java.util.Optional;
Expand Down
2 changes: 1 addition & 1 deletion ...t/exception/ProductNotFoundException.java → ...t/exception/ProductNotFoundException.java
View file
@@ -1,4 +1,4 @@
package com.codesoom.assignment.domain.product.exception;
package com.codesoom.assignment.product.exception;

public class ProductNotFoundException extends RuntimeException {
public ProductNotFoundException(Long id) {
Expand Down
6 changes: 3 additions & 3 deletions ...n/product/infra/JpaProductRepository.java → ...t/product/infra/JpaProductRepository.java
View file
@@ -1,7 +1,7 @@
package com.codesoom.assignment.domain.product.infra;
package com.codesoom.assignment.product.infra;

import com.codesoom.assignment.domain.product.domain.Product;
import com.codesoom.assignment.domain.product.domain.ProductRepository;
import com.codesoom.assignment.product.domain.Product;
import com.codesoom.assignment.product.domain.ProductRepository;
import org.springframework.data.repository.CrudRepository;

import java.util.List;
Expand Down
8 changes: 4 additions & 4 deletions ...oduct/presentation/ProductController.java → ...oduct/presentation/ProductController.java
View file
@@ -1,9 +1,9 @@
package com.codesoom.assignment.domain.product.presentation;
package com.codesoom.assignment.product.presentation;

import com.codesoom.assignment.common.auth.Login;
import com.codesoom.assignment.domain.product.application.ProductService;
import com.codesoom.assignment.domain.product.domain.Product;
import com.codesoom.assignment.domain.product.presentation.dto.ProductData;
import com.codesoom.assignment.product.application.ProductService;
import com.codesoom.assignment.product.domain.Product;
import com.codesoom.assignment.product.presentation.dto.ProductData;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.DeleteMapping;
Expand Down
8 changes: 6 additions & 2 deletions ...product/presentation/dto/ProductData.java → ...product/presentation/dto/ProductData.java
View file
@@ -1,7 +1,11 @@
package com.codesoom.assignment.domain.product.presentation.dto;
package com.codesoom.assignment.product.presentation.dto;

import com.github.dozermapper.core.Mapping;
import lombok.*;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
Expand Down
12 changes: 6 additions & 6 deletions ...on/application/AuthenticationService.java → ...on/application/AuthenticationService.java
View file
@@ -1,11 +1,11 @@
package com.codesoom.assignment.domain.session.application;
package com.codesoom.assignment.session.application;

import com.codesoom.assignment.common.util.JwtUtil;
import com.codesoom.assignment.domain.session.controller.dto.SessionRequestDto;
import com.codesoom.assignment.domain.user.domain.User;
import com.codesoom.assignment.domain.user.domain.UserRepository;
import com.codesoom.assignment.domain.user.exception.UserInvalidPasswordException;
import com.codesoom.assignment.domain.user.exception.UserNotFoundException;
import com.codesoom.assignment.session.controller.dto.SessionRequestDto;
import com.codesoom.assignment.user.domain.User;
import com.codesoom.assignment.user.domain.UserRepository;
import com.codesoom.assignment.user.exception.UserInvalidPasswordException;
import com.codesoom.assignment.user.exception.UserNotFoundException;
import org.springframework.stereotype.Service;

@Service
Expand Down
8 changes: 4 additions & 4 deletions ...session/controller/SessionController.java → ...session/controller/SessionController.java
View file
@@ -1,9 +1,9 @@
package com.codesoom.assignment.domain.session.controller;
package com.codesoom.assignment.session.controller;

import com.codesoom.assignment.common.auth.Login;
import com.codesoom.assignment.domain.session.application.AuthenticationService;
import com.codesoom.assignment.domain.session.controller.dto.SessionRequestDto;
import com.codesoom.assignment.domain.session.controller.dto.SessionResponseDto;
import com.codesoom.assignment.session.application.AuthenticationService;
import com.codesoom.assignment.session.controller.dto.SessionRequestDto;
import com.codesoom.assignment.session.controller.dto.SessionResponseDto;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
Expand Down
2 changes: 1 addition & 1 deletion ...ion/controller/dto/SessionRequestDto.java → ...ion/controller/dto/SessionRequestDto.java
View file
@@ -1,4 +1,4 @@
package com.codesoom.assignment.domain.session.controller.dto;
package com.codesoom.assignment.session.controller.dto;

import lombok.Builder;
import lombok.EqualsAndHashCode;
Expand Down
2 changes: 1 addition & 1 deletion ...on/controller/dto/SessionResponseDto.java → ...on/controller/dto/SessionResponseDto.java
View file
@@ -1,4 +1,4 @@
package com.codesoom.assignment.domain.session.controller.dto;
package com.codesoom.assignment.session.controller.dto;

import lombok.Builder;
import lombok.Getter;
Expand Down
2 changes: 1 addition & 1 deletion ...sion/exception/InvalidTokenException.java → ...sion/exception/InvalidTokenException.java
View file
@@ -1,4 +1,4 @@
package com.codesoom.assignment.domain.session.exception;
package com.codesoom.assignment.session.exception;

public class InvalidTokenException extends RuntimeException {
public InvalidTokenException() {
Expand Down
2 changes: 1 addition & 1 deletion ...ion/exception/TokenNotExistException.java → ...ion/exception/TokenNotExistException.java
View file
@@ -1,4 +1,4 @@
package com.codesoom.assignment.domain.session.exception;
package com.codesoom.assignment.session.exception;

public class TokenNotExistException extends RuntimeException {
public TokenNotExistException() {
Expand Down
16 changes: 8 additions & 8 deletions .../domain/user/application/UserService.java → ...ignment/user/application/UserService.java
View file
@@ -1,11 +1,11 @@
package com.codesoom.assignment.domain.user.application;

import com.codesoom.assignment.domain.user.domain.User;
import com.codesoom.assignment.domain.user.domain.UserRepository;
import com.codesoom.assignment.domain.user.exception.UserEmailDuplicationException;
import com.codesoom.assignment.domain.user.exception.UserNotFoundException;
import com.codesoom.assignment.domain.user.presentation.dto.UserModificationData;
import com.codesoom.assignment.domain.user.presentation.dto.UserRegistrationData;
package com.codesoom.assignment.user.application;

import com.codesoom.assignment.user.domain.User;
import com.codesoom.assignment.user.domain.UserRepository;
import com.codesoom.assignment.user.exception.UserEmailDuplicationException;
import com.codesoom.assignment.user.exception.UserNotFoundException;
import com.codesoom.assignment.user.presentation.dto.UserModificationData;
import com.codesoom.assignment.user.presentation.dto.UserRegistrationData;
import com.github.dozermapper.core.Mapper;
import org.springframework.stereotype.Service;

Expand Down

0 comments on commit d16fb31

Please sign in to comment.