Merge pull request #191 from urinaner/refactor/186

[BE] user 에러 & 페이지 에러 수정 & 더미데이터 수정
urinaner · Dec 7, 2024 · c7132f7 · c7132f7
2 parents e9f5732 + a96620a
commit c7132f7
Show file tree

Hide file tree

Showing 11 changed files with 261 additions and 149 deletions.
diff --git a/backend/build.gradle b/backend/build.gradle
@@ -69,4 +69,5 @@ tasks.named('test') {
 
 tasks.withType(JavaCompile) {
     options.annotationProcessorPath = configurations.annotationProcessor
+    options.compilerArgs << "-parameters"
 }
diff --git a/backend/src/main/java/org/example/backend/board/controller/BoardController.java b/backend/src/main/java/org/example/backend/board/controller/BoardController.java
@@ -2,13 +2,15 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.example.backend.board.domain.dto.BoardReqDto;
 import org.example.backend.board.domain.dto.BoardResDto;
 import org.example.backend.board.domain.entity.Category;
 import org.example.backend.board.service.BoardService;
+import org.example.backend.common.dto.PageRequestDto;
 import org.example.backend.common.dto.ResponseDto;
 import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
@@ -41,23 +43,17 @@ public ResponseEntity<Long> createBoard(@RequestPart(value = "boardReqDto") Boar
 
     @Operation(summary = "모든 게시판 조회 API", description = "모든 게시판의 리스트 반환")
     @GetMapping
-    public ResponseDto<List<BoardResDto>> getAllBoards(@RequestParam(defaultValue = "0") int page,
-                                                       @RequestParam(defaultValue = "10") int size,
-                                                       @RequestParam(defaultValue = "id") String sort,
-                                                       @RequestParam(defaultValue = "ASC") String sortDirection) {
+    public ResponseDto<List<BoardResDto>> getAllBoards(@Valid PageRequestDto pageRequest) {
 
-        Page<BoardResDto> boardList = boardService.getAllBoards(page, size, sort, sortDirection);
+        Page<BoardResDto> boardList = boardService.getAllBoards(pageRequest.toPageable());
         return ResponseDto.ok(boardList.getNumber(), boardList.getTotalPages(), boardList.getContent());
     }
     @Operation(summary = "카테고리별 게시판 조회 API", description = "카테고리별 게시판 리스트 반환")
     @GetMapping("/category/{category}")
     public ResponseDto<List<BoardResDto>> getBoardsByCategory(@PathVariable("category") Category category,
-                                                              @RequestParam(defaultValue = "0") int page,
-                                                              @RequestParam(defaultValue = "10") int size,
-                                                              @RequestParam(defaultValue = "id") String sort,
-                                                              @RequestParam(defaultValue = "ASC") String sortDirection) {
+                                                              @Valid PageRequestDto pageRequest) {
 
-        Page<BoardResDto> boardList = boardService.getBoardsByCategory(category, page, size, sort, sortDirection);
+        Page<BoardResDto> boardList = boardService.getBoardsByCategory(category, pageRequest.toPageable());
         return ResponseDto.ok(boardList.getNumber(), boardList.getTotalPages(), boardList.getContent());
     }
 

diff --git a/backend/src/main/java/org/example/backend/board/exception/BoardException.java b/backend/src/main/java/org/example/backend/board/exception/BoardException.java
@@ -3,7 +3,6 @@
 import lombok.RequiredArgsConstructor;
 import org.example.backend.common.exception.BaseException;
 import org.example.backend.common.exception.BaseExceptionType;
-import org.example.backend.board.exception.BoardExceptionType;
 
 @RequiredArgsConstructor
 public class BoardException extends BaseException {

diff --git a/backend/src/main/java/org/example/backend/board/service/BoardService.java b/backend/src/main/java/org/example/backend/board/service/BoardService.java
@@ -54,16 +54,12 @@ public BoardResDto getBoard(Long boardId) {
         return BoardResDto.of(board);
     }
 
-    public Page<BoardResDto> getAllBoards(int pageNo, int pageSize, String sortBy, String sortDirection) {
-        Sort sort = Sort.by(Sort.Direction.fromString(sortDirection), sortBy);
-        Pageable pageable = PageRequest.of(pageNo, pageSize, sort);
+    public Page<BoardResDto> getAllBoards(Pageable pageable) {
         return boardRepository.findAll(pageable)
                 .map(BoardResDto::of);
     }
 
-    public Page<BoardResDto> getBoardsByCategory(Category category, int pageNo, int pageSize, String sortBy, String sortDirection) {
-        Sort sort = Sort.by(Sort.Direction.fromString(sortDirection), sortBy);
-        Pageable pageable = PageRequest.of(pageNo, pageSize, sort);
+    public Page<BoardResDto> getBoardsByCategory(Category category, Pageable pageable) {
         return boardRepository.findAllByCategory(category, pageable)
                 .map(BoardResDto::of);
     }

diff --git a/backend/src/main/java/org/example/backend/common/dto/PageRequestDto.java b/backend/src/main/java/org/example/backend/common/dto/PageRequestDto.java
@@ -0,0 +1,27 @@
+package org.example.backend.common.dto;
+
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+
+@Getter
+@Setter
+public class PageRequestDto {
+    @Min(0)
+    private int page = 0;
+
+    @Min(1) @Max(100)
+    private int size = 10;
+
+    private String sort = "id";
+    private String sortDirection = "ASC";
+
+    public Pageable toPageable() {
+        Sort.Direction direction = Sort.Direction.valueOf(sortDirection.toUpperCase());
+        return PageRequest.of(page, size, direction, sort);
+    }
+}
diff --git a/backend/src/main/java/org/example/backend/common/exception/ExceptionControllerAdvice.java b/backend/src/main/java/org/example/backend/common/exception/ExceptionControllerAdvice.java
@@ -1,6 +1,5 @@
 package org.example.backend.common.exception;
 
-import static java.util.stream.Collectors.joining;
 import static org.springframework.http.HttpStatus.BAD_REQUEST;
 
 import jakarta.servlet.http.HttpServletRequest;
@@ -10,6 +9,7 @@
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.converter.HttpMessageNotReadableException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.MissingServletRequestParameterException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
@@ -69,4 +69,12 @@ > handleInvalidPaginationParameterException(InvalidPaginationParameterException
         return ResponseEntity.status(BAD_REQUEST)
                 .body(new ExceptionResponse(e.getExceptionType().errorMessage()));
     }
+
+    @ExceptionHandler({MethodArgumentNotValidException.class})
+    public ResponseEntity<ExceptionResponse> validException(
+            MethodArgumentNotValidException e) {
+
+        return ResponseEntity.status(BAD_REQUEST)
+                .body(new ExceptionResponse(e.getMessage()));
+    }
 }
diff --git a/...java/org/example/backend/common/exception/paging/InvalidPaginationParameterException.java b/...java/org/example/backend/common/exception/paging/InvalidPaginationParameterException.java
@@ -2,9 +2,15 @@
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import org.example.backend.common.exception.BaseException;
 
 @Getter
 @RequiredArgsConstructor
-public class InvalidPaginationParameterException extends RuntimeException {
+public class InvalidPaginationParameterException extends BaseException {
     private final InvalidPaginationParameterExceptionType exceptionType;
-}
+
+    @Override
+    public InvalidPaginationParameterExceptionType exceptionType(){
+        return exceptionType;
+    }
+}
diff --git a/.../org/example/backend/common/exception/paging/InvalidPaginationParameterExceptionType.java b/.../org/example/backend/common/exception/paging/InvalidPaginationParameterExceptionType.java
@@ -1,8 +1,10 @@
 package org.example.backend.common.exception.paging;
 
+import lombok.RequiredArgsConstructor;
 import org.example.backend.common.exception.BaseExceptionType;
 import org.springframework.http.HttpStatus;
 
+@RequiredArgsConstructor
 public enum InvalidPaginationParameterExceptionType implements BaseExceptionType {
     INVALID_PAGE("페이지 번호는 0 이상이어야 합니다.", HttpStatus.BAD_REQUEST),
     INVALID_SIZE("페이지 크기는 양의 정수여야 합니다.", HttpStatus.BAD_REQUEST),
@@ -11,10 +13,6 @@ public enum InvalidPaginationParameterExceptionType implements BaseExceptionType
     private final String message;
     private final HttpStatus httpStatus;
 
-    InvalidPaginationParameterExceptionType(String message, HttpStatus httpStatus) {
-        this.message = message;
-        this.httpStatus = httpStatus;
-    }
 
     @Override
     public String errorMessage() {

diff --git a/backend/src/main/java/org/example/backend/user/repository/UserRepository.java b/backend/src/main/java/org/example/backend/user/repository/UserRepository.java
@@ -1,7 +1,9 @@
 package org.example.backend.user.repository;
 
+import java.util.Optional;
 import org.example.backend.user.domain.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface UserRepository extends JpaRepository<User, Long> {
+    Optional<User> findByStudentId(String studentId);
 }
diff --git a/backend/src/main/java/org/example/backend/user/service/UserService.java b/backend/src/main/java/org/example/backend/user/service/UserService.java
@@ -2,6 +2,7 @@
 
 import static org.example.backend.user.exception.UserExceptionType.NOT_FOUND_USER;
 
+import java.util.Optional;
 import org.example.backend.user.domain.entity.User;
 import org.springframework.data.domain.Pageable;
 import lombok.RequiredArgsConstructor;
@@ -37,7 +38,15 @@ public String loginProcess(SignInReqDto joinDTO) {
                     .studentId(sjProfile.getStudentCode())
                     .major(sjProfile.getMajor())
                     .build();
-            Long userId = saveUser(userReqDto);
+
+            Long userId;
+            Optional<User> optionalUser = findUser(userReqDto);
+            if(optionalUser.isEmpty()){
+                userId = saveUser(userReqDto);
+            }else {
+                userId = Long.valueOf(optionalUser.get().getStudentId());
+            }
+
 
             return jwtUtil.createJwt(String.valueOf(userId), "USER", 60 * 60 * 10L);
         } catch (RuntimeException e) {
@@ -53,6 +62,11 @@ public Long saveUser(UserReqDto userReqDto) {
         return savedUser.getId();
     }
 
+    private Optional<User> findUser(UserReqDto userReqDto){
+        validateRequiredFields(userReqDto);
+        return userRepository.findByStudentId(userReqDto.getStudentId());
+    }
+
     private void validateRequiredFields(UserReqDto userReqDto) {
         if (userReqDto.getName() == null || userReqDto.getName().isEmpty()) {
             throw new UserException(UserExceptionType.REQUIRED_NAME);
@@ -88,6 +102,4 @@ private User findUserById(Long userId) {
         return userRepository.findById(userId)
                 .orElseThrow(() -> new UserException(NOT_FOUND_USER));
     }
-
-
 }