Merge pull request #9 from Dalguring/feature/user_and_exception

Feature/user and exception

Author: Dalguring

src/main/java/com/rentify/rentify_api/common/config/SwaggerConfig.java

@@ -13,15 +13,19 @@ public class SwaggerConfig {
 
     @Bean
     public OpenAPI openAPI() {
-        Server server = new Server();
-        server.setUrl("http://localhost:8080");
-        server.setDescription("back-end-server");
+        Server devServer = new Server();
+        devServer.setUrl("http://43.201.87.180:8080");
+        devServer.setDescription("back-end-server");
+
+        Server localServer = new Server();
+        localServer.setUrl("http://localhost:8080");
+        localServer.setDescription("local-server");
 
         return new OpenAPI()
             .info(new Info()
                 .title("Universal-device-rental")
                 .version("v1")
                 .description("다방면용 전자기기 대여 서비스 백엔드 서버")
-            ).servers(List.of(server));
+            ).servers(List.of(devServer, localServer));
     }
 }

src/main/java/com/rentify/rentify_api/common/exception/DuplicateException.java

@@ -0,0 +1,8 @@
+package com.rentify.rentify_api.common.exception;
+
+public class DuplicateException extends RuntimeException {
+
+    public DuplicateException(String message) {
+        super(message);
+    }
+}

src/main/java/com/rentify/rentify_api/common/exception/GlobalExceptionHandler.java

@@ -0,0 +1,59 @@
+package com.rentify.rentify_api.common.exception;
+
+import com.rentify.rentify_api.common.response.ApiResponse;
+import com.rentify.rentify_api.user.exception.DuplicateEmailException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.converter.HttpMessageNotReadableException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+@RestControllerAdvice
+@Slf4j
+public class GlobalExceptionHandler {
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<ApiResponse<Void>> handleValidationException(
+            MethodArgumentNotValidException ex
+    ) {
+        String message = ex.getBindingResult()
+                .getFieldErrors()
+                .stream()
+                .findFirst()
+                .map(error -> error.getField() + " : " + error.getDefaultMessage())
+                .orElse("요청 값이 올바르지 않습니다.");
+
+        return ResponseEntity
+                .status(HttpStatus.BAD_REQUEST)
+                .body(ApiResponse.error("INVALID_REQUEST", message));
+    }
+
+    @ExceptionHandler(HttpMessageNotReadableException.class)
+    public ResponseEntity<ApiResponse<Void>> handleJsonParseException(
+            HttpMessageNotReadableException ex
+    ) {
+
+        return ResponseEntity
+                .status(HttpStatus.BAD_REQUEST)
+                .body(ApiResponse.error("INVALID_JSON", "요청 본문(JSON)이 올바르지 않습니다."));
+    }
+
+    @ExceptionHandler(DuplicateException.class)
+    public ResponseEntity<ApiResponse<Void>> handleDuplicateException(
+            DuplicateException ex
+    ) {
+
+        return ResponseEntity
+                .status(HttpStatus.CONFLICT)
+                .body(ApiResponse.error("DUPLICATE", ex.getMessage()));
+    }
+
+    @ExceptionHandler(NotFoundException.class)
+    public ResponseEntity<ApiResponse<Void>> handleNotFoundException(NotFoundException ex) {
+        return ResponseEntity
+                .status(HttpStatus.NOT_FOUND)
+                .body(ApiResponse.error("NOT_FOUND", ex.getMessage()));
+    }
+}

src/main/java/com/rentify/rentify_api/common/exception/NotFoundException.java

@@ -0,0 +1,8 @@
+package com.rentify.rentify_api.common.exception;
+
+public class NotFoundException extends RuntimeException {
+
+    public NotFoundException(String message) {
+        super(message);
+    }
+}

src/main/java/com/rentify/rentify_api/user/controller/UserController.java

@@ -27,11 +27,11 @@ public class UserController {
     private final UserService userService;
 
     @PostMapping
-    public ResponseEntity<ApiResponse<Void>> createUser(@Valid @RequestBody CreateUserRequest request) {
+    public ResponseEntity<ApiResponse<Long>> createUser(@Valid @RequestBody CreateUserRequest request) {
         Long userId = userService.signup(request);
         URI location = URI.create("/api/users/" + userId);
 
-        return ResponseEntity.created(location).body(ApiResponse.success());
+        return ResponseEntity.created(location).body(ApiResponse.success(userId));
     }
 
     @GetMapping("/{id}")

src/main/java/com/rentify/rentify_api/user/dto/UserResponse.java

@@ -14,4 +14,5 @@ public class UserResponse {
     private final String bank;
     private final String account;
     private final String phone;
+    private final Boolean isActive;
 }

src/main/java/com/rentify/rentify_api/user/entity/User.java

@@ -70,6 +70,9 @@ public class User {
     @Column(name = "updated_at", nullable = false)
     private LocalDateTime updateAt;
 
+    @Column(name = "is_active", nullable = false)
+    private Boolean isActive;
+
     public void addPoint(int amount) {
         if (amount < 0) {
             throw new IllegalArgumentException("amount must be >= 0");

src/main/java/com/rentify/rentify_api/user/exception/DuplicateEmailException.java

@@ -0,0 +1,10 @@
+package com.rentify.rentify_api.user.exception;
+
+import com.rentify.rentify_api.common.exception.DuplicateException;
+
+public class DuplicateEmailException extends DuplicateException {
+
+    public DuplicateEmailException() {
+        super("이미 가입된 이메일 주소입니다.");
+    }
+}

src/main/java/com/rentify/rentify_api/user/exception/UserNotFoundException.java

@@ -0,0 +1,10 @@
+package com.rentify.rentify_api.user.exception;
+
+import com.rentify.rentify_api.common.exception.NotFoundException;
+
+public class UserNotFoundException extends NotFoundException {
+
+    public UserNotFoundException() {
+        super("존재하지 않는 사용자입니다.");
+    }
+}

src/main/java/com/rentify/rentify_api/user/service/UserService.java

@@ -3,6 +3,9 @@
 import com.rentify.rentify_api.user.dto.CreateUserRequest;
 import com.rentify.rentify_api.user.dto.UserResponse;
 import com.rentify.rentify_api.user.entity.User;
+import com.rentify.rentify_api.user.entity.UserRole;
+import com.rentify.rentify_api.user.exception.DuplicateEmailException;
+import com.rentify.rentify_api.user.exception.UserNotFoundException;
 import com.rentify.rentify_api.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -20,14 +23,34 @@ public class UserService {
 
     @Transactional
     public Long signup(CreateUserRequest request) {
+        // 멱등성 처리 (나중에 추가)
 
-        return 0L;
+        if (userRepository.existsByEmail(request.getEmail())) {
+            throw new DuplicateEmailException();
+        }
+
+        User user = User.builder()
+                .name(request.getName())
+                .email(request.getEmail())
+                .password(passwordEncoder.encode(request.getPassword()))
+                .address(request.getAddress())
+                .bank(request.getBank())
+                .account(request.getAccount())
+                .point(0)
+                .pointVersion((short) 0)
+                .role(UserRole.USER)
+                .phone(request.getPhone())
+                .isActive(true)
+                .build();
+
+        User saved = userRepository.save(user);
+        return saved.getId();
     }
 
     @Transactional(readOnly = true)
     public UserResponse getUserInfo(Long id) {
         User user = userRepository.findById(id)
-                .orElseThrow(() -> new IllegalArgumentException("사용자를 찾을 수 없습니다."));
+                .orElseThrow(UserNotFoundException::new);
 
         return UserResponse.builder()
                 .id(user.getId())
@@ -37,6 +60,7 @@ public UserResponse getUserInfo(Long id) {
                 .bank(user.getBank())
                 .account(user.getAccount())
                 .phone(user.getPhone())
+                .isActive(user.getIsActive())
                 .build();
     }
 }