코드 리뷰 소스 정리

f-lab-edu · Sep 20, 2024 · 3d198f3 · 3d198f3
1 parent 8e9b3ef
commit 3d198f3
Show file tree

Hide file tree

Showing 11 changed files with 81 additions and 48 deletions.
diff --git a/src/main/java/com/pjw/retry_view/config/WebConfig.java b/src/main/java/com/pjw/retry_view/config/WebConfig.java
@@ -1,7 +1,6 @@
 package com.pjw.retry_view.config;
 
 import com.pjw.retry_view.filter.JWTVerifyFilter;
-import com.pjw.retry_view.filter.UserAuthenticateFilter;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

diff --git a/src/main/java/com/pjw/retry_view/controller/UserController.java b/src/main/java/com/pjw/retry_view/controller/UserController.java
@@ -13,24 +13,15 @@
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/users")
 public class UserController {
     private final UserService userService;
-    private final UserValidator userValidator;
 
-    public UserController(UserService userService, UserValidator userValidator){
+    public UserController(UserService userService) {
         this.userService = userService;
-        this.userValidator = userValidator;
-    }
-
-    @InitBinder
-    public void init(WebDataBinder binder) {
-        //binder.addValidators(userValidator);
     }
 
     @GetMapping
@@ -53,7 +44,7 @@ public ResponseEntity<RegistUserResponse> registUser(@RequestBody @Valid RegistU
             response.setBindingErrors(bindingResult.getAllErrors());
             httpStatus = HttpStatus.BAD_REQUEST;
         } else {
-            UserDTO registUser = userService.insertUser(userReq.toUserDTO());
+            UserDTO registUser = userService.saveUser(userReq.toUserDTO());
             response.setName(registUser.getName());
             response.setLoginId(registUser.getLoginId());
             response.setNickname(registUser.getNickname());

diff --git a/src/main/java/com/pjw/retry_view/dto/UserDTO.java b/src/main/java/com/pjw/retry_view/dto/UserDTO.java
@@ -17,11 +17,13 @@ public class UserDTO implements Serializable {
     private Gender gender;
     private String phone;
     private String address;
+    private String role;
     private String loginId;
     private String password;
     private String nickname;
     private String type;
     private Integer state;
+    private String refreshToken;
 
     private String createdBy;
     private ZonedDateTime createdAt;
@@ -35,11 +37,13 @@ public User toEntity(){
                 .gender(gender)
                 .phone(phone)
                 .address(address)
+                .role(role)
                 .loginId(loginId)
                 .password(password)
                 .nickname(nickname)
                 .type(type)
                 .state(state)
+                .refreshToken(refreshToken)
                 .createdBy(createdBy)
                 .createdAt(createdAt)
                 .updatedBy(updatedBy)
@@ -55,11 +59,13 @@ public String toString() {
                 ", gender=" + gender +
                 ", phone='" + phone + '\'' +
                 ", address='" + address + '\'' +
+                ", role='" + role + '\'' +
                 ", loginId='" + loginId + '\'' +
                 ", password='" + password + '\'' +
                 ", nickname='" + nickname + '\'' +
                 ", type='" + type + '\'' +
                 ", state=" + state +
+                ", refreshToken='" + refreshToken + '\'' +
                 ", createdBy='" + createdBy + '\'' +
                 ", createdAt=" + createdAt +
                 ", updatedBy='" + updatedBy + '\'' +

diff --git a/src/main/java/com/pjw/retry_view/entity/User.java b/src/main/java/com/pjw/retry_view/entity/User.java
@@ -18,33 +18,36 @@ public class User {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
-    @Column(name = "NAME")
+    @Column(name = "name")
     private String name;
-    @Column(name = "GENDER")
+    @Column(name = "gender")
     private Gender gender;
-    @Column(name = "PHONE")
+    @Column(name = "phone")
     private String phone;
-    @Column(name = "ADDRESS")
+    @Column(name = "address")
     private String address;
-    @Column(name = "LOGIN_ID")
+    @Column(name = "role")
+    private String role;
+    @Column(name = "login_id")
     private String loginId;
-    @Column(name = "PASSWORD")
+    @Column(name = "password")
     private String password;
-    @Column(name = "NICKNAME")
+    @Column(name = "nickname")
     private String nickname;
-    @Column(name = "TYPE")
+    @Column(name = "type")
     private String type;
-    @Column(name = "STATE")
+    @Column(name = "state")
     private Integer state;
+    @Column(name = "refresh_token")
+    private String refreshToken;
 
-
-    @Column(name = "CREATED_BY")
+    @Column(name = "created_by")
     private String createdBy;
-    @Column(name = "CREATED_AT")
+    @Column(name = "created_at")
     private ZonedDateTime createdAt;
-    @Column(name = "UPDATED_BY")
+    @Column(name = "updated_by")
     private String updatedBy;
-    @Column(name = "UPDATED_AT")
+    @Column(name = "updated_at")
     private ZonedDateTime updatedAt;
 
     public UserDTO toDTO(){
@@ -54,11 +57,13 @@ public UserDTO toDTO(){
                 .gender(gender)
                 .phone(phone)
                 .address(address)
+                .role(role)
                 .loginId(loginId)
                 .password(password)
                 .nickname(nickname)
                 .type(type)
                 .state(state)
+                .refreshToken(refreshToken)
                 .createdBy(createdBy)
                 .createdAt(createdAt)
                 .updatedBy(updatedBy)

diff --git a/src/main/java/com/pjw/retry_view/exception/BusinessException.java b/src/main/java/com/pjw/retry_view/exception/BusinessException.java
@@ -0,0 +1,15 @@
+package com.pjw.retry_view.exception;
+
+import org.springframework.http.HttpStatus;
+
+public abstract class BusinessException extends  RuntimeException {
+    public abstract HttpStatus getHttpStatus();
+
+    public BusinessException() {}
+    public BusinessException(String message) {
+        super(message);
+    }
+    public BusinessException(Exception e){
+        super(e);
+    }
+}
diff --git a/src/main/java/com/pjw/retry_view/exception/ResourceNotFoundException.java b/src/main/java/com/pjw/retry_view/exception/ResourceNotFoundException.java
@@ -0,0 +1,20 @@
+package com.pjw.retry_view.exception;
+
+import org.springframework.http.HttpStatus;
+
+public class ResourceNotFoundException extends BusinessException {
+    public ResourceNotFoundException(){}
+
+    public ResourceNotFoundException(String message) {
+        super(message);
+    }
+
+    public ResourceNotFoundException(Exception e){
+        super(e);
+    }
+
+    @Override
+    public HttpStatus getHttpStatus() {
+        return HttpStatus.NOT_FOUND;
+    }
+}
diff --git a/src/main/java/com/pjw/retry_view/exception/UserNotFoundException.java b/src/main/java/com/pjw/retry_view/exception/UserNotFoundException.java
@@ -1,9 +1,10 @@
 package com.pjw.retry_view.exception;
 
-import java.util.function.Supplier;
 
-public class UserNotFoundException extends RuntimeException{
-    public UserNotFoundException(){}
+public class UserNotFoundException extends ResourceNotFoundException {
+    public UserNotFoundException(){
+        super();
+    }
 
     public UserNotFoundException(String msg){
         super(msg);

diff --git a/src/main/java/com/pjw/retry_view/filter/JWTVerifyFilter.java b/src/main/java/com/pjw/retry_view/filter/JWTVerifyFilter.java
@@ -4,6 +4,7 @@
 import jakarta.servlet.*;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Component;
 
@@ -34,9 +35,9 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
     }
 
     private boolean isAllowMethod(String method){
-        switch(method){
-            case "GET","POST","PUT","DELETE": return true;
-            default: return false;
-        }
+        return switch (method) {
+            case "GET", "POST", "PUT", "DELETE" -> true;
+            default -> false;
+        };
     }
 }
diff --git a/src/main/java/com/pjw/retry_view/handler/GlobalExceptionHandler.java b/src/main/java/com/pjw/retry_view/handler/GlobalExceptionHandler.java
@@ -1,5 +1,6 @@
 package com.pjw.retry_view.handler;
 
+import com.pjw.retry_view.exception.BusinessException;
 import com.pjw.retry_view.exception.UserNotFoundException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -10,10 +11,9 @@
 // 전역 ExceptionHandler 설정
 @RestControllerAdvice
 public class GlobalExceptionHandler {
-    @ExceptionHandler(UserNotFoundException.class)
-    protected ResponseEntity<?> handle(UserNotFoundException me){
-        HttpStatus httpStatus = HttpStatus.UNAUTHORIZED;
-        final ErrorResponse errorResponse = ErrorResponse.builder(me, httpStatus, "Login Failed : User Not Found.").build();
-        return ResponseEntity.status(httpStatus).body(errorResponse);
+    @ExceptionHandler(BusinessException.class)
+    protected ResponseEntity<?> handle(BusinessException be){
+        final ErrorResponse errorResponse = ErrorResponse.builder(be, be.getHttpStatus(), be.getMessage()).build();
+        return ResponseEntity.status(be.getHttpStatus()).body(errorResponse);
     }
 }
diff --git a/src/main/java/com/pjw/retry_view/service/JWTService.java b/src/main/java/com/pjw/retry_view/service/JWTService.java
@@ -75,7 +75,7 @@ public boolean validateToken(String token){
     private String tokenSplit(String token){
         if(token.startsWith(BEARER_TYPE)){
             return token.split(" ")[1];
-        }else{
+        } else{
             return token;
         }
     }

diff --git a/src/main/java/com/pjw/retry_view/service/UserService.java b/src/main/java/com/pjw/retry_view/service/UserService.java
@@ -19,26 +19,21 @@ public class UserService {
 
     public List<UserDTO> getUserList(){
         List<User> userList = userRepository.findAll();
-        List<UserDTO> result = userList.stream().map(user->user.toDTO()).toList();
-        return result;
+        return userList.stream().map(User::toDTO).toList();
     }
 
     public UserDTO getUserInfo(String loginId){
         Optional<User> user = userRepository.findByLoginId(loginId);
-        return user.map(User::toDTO).orElse(null);
+        return user.map(User::toDTO).orElseThrow(UserNotFoundException::new);
     }
 
     public UserDTO userLogin(LoginRequest loginRequest){
-        User userParam = new User();
-        userParam.setLoginId(loginRequest.getLoginId());
-        userParam.setPassword(loginRequest.getPassword());
         Optional<User> user = userRepository.findByLoginIdAndPassword(loginRequest.getLoginId(), loginRequest.getPassword());
         return user.map(User::toDTO).orElseThrow(UserNotFoundException::new);
     }
 
     @Transactional
-    public UserDTO insertUser(UserDTO userDTO){
-        UserDTO result = userRepository.save(userDTO.toEntity()).toDTO();
-        return result;
+    public UserDTO saveUser(UserDTO userDTO){
+        return userRepository.save(userDTO.toEntity()).toDTO();
     }
 }