Merge pull request #7 from Block-Guard/refactor/#6/Global-Handler-Exception

yeonju73 · web-flow · commit 59e358d1decf · 2025-07-09T17:39:07.000+09:00
[Refactor] global handler exception 추가
diff --git a/build.gradle b/build.gradle
@@ -38,7 +38,7 @@ dependencies {
 	implementation 'io.jsonwebtoken:jjwt-impl:0.11.5'
 	implementation 'io.jsonwebtoken:jjwt-jackson:0.11.5'
 
-	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
+	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0'
 
 }
 
diff --git a/src/main/java/com/blockguard/server/domain/auth/api/AuthApi.java b/src/main/java/com/blockguard/server/domain/auth/api/AuthApi.java
@@ -5,6 +5,11 @@
 import com.blockguard.server.domain.user.dto.request.RegisterRequest;
 import com.blockguard.server.domain.user.dto.response.LoginResponse;
 import com.blockguard.server.domain.user.dto.response.RegisterResponse;
+import com.blockguard.server.global.common.codes.SuccessCode;
+import com.blockguard.server.global.common.response.BaseResponse;
+import com.blockguard.server.global.config.swagger.CustomExceptionDescription;
+import com.blockguard.server.global.config.swagger.SwaggerResponseDescription;
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.AllArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -18,25 +23,22 @@
 public class AuthApi {
     private final AuthService authService;
 
+    @Operation(summary = "회원가입")
+    @CustomExceptionDescription(SwaggerResponseDescription.REGISTER_FAIL)
     @PostMapping("/register")
-    public ResponseEntity<RegisterResponse> register(@RequestBody RegisterRequest registerRequest) {
-        try {
-            RegisterResponse registerResponse = authService.register(registerRequest);
-            return ResponseEntity.ok(registerResponse);
-        } catch (IllegalStateException e) {
-            return ResponseEntity.internalServerError().build();
-        }
+    public ResponseEntity<BaseResponse<RegisterResponse>> register(@RequestBody RegisterRequest registerRequest) {
+        RegisterResponse registerResponse = authService.register(registerRequest);
+        return ResponseEntity.ok(BaseResponse.of(SuccessCode.USER_REGISTERED, registerResponse));
+
     }
 
+
+    @Operation(summary = "로그인")
+    @CustomExceptionDescription(SwaggerResponseDescription.LOGIN_FAIL)
     @PostMapping("/login")
-    public ResponseEntity<LoginResponse> register(@RequestBody LoginRequest loginRequest) {
-        try {
-            LoginResponse loginResponse = authService.login(loginRequest);
-            return ResponseEntity.ok(loginResponse);
-        } catch (IllegalStateException e) {
-            return ResponseEntity.internalServerError().build();
-        }
+    public ResponseEntity<BaseResponse<LoginResponse>> login(@RequestBody LoginRequest loginRequest) {
+        LoginResponse loginResponse = authService.login(loginRequest);
+        return ResponseEntity.ok(BaseResponse.of(SuccessCode.LOGIN_SUCCESS, loginResponse));
     }
 
-
 }
diff --git a/src/main/java/com/blockguard/server/domain/auth/application/AuthService.java b/src/main/java/com/blockguard/server/domain/auth/application/AuthService.java
@@ -8,6 +8,8 @@
 import com.blockguard.server.domain.user.dto.request.RegisterRequest;
 import com.blockguard.server.domain.user.dto.response.LoginResponse;
 import com.blockguard.server.domain.user.dto.response.RegisterResponse;
+import com.blockguard.server.global.common.codes.ErrorCode;
+import com.blockguard.server.global.exception.BusinessExceptionHandler;
 import lombok.AllArgsConstructor;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -22,7 +24,7 @@ public class AuthService {
 
     public RegisterResponse register(RegisterRequest registerRequest) {
         if (userRepository.findByEmail((registerRequest.getEmail())).isPresent()) {
-            throw new IllegalArgumentException("이미 가입되어 있는 아이디입니다.");
+            throw new BusinessExceptionHandler(ErrorCode.DUPLICATED_EMAIL);
         }
 
         User user = User.builder()
@@ -37,23 +39,21 @@ public RegisterResponse register(RegisterRequest registerRequest) {
         userRepository.save(user);
 
         return RegisterResponse.builder()
-                .msg("회원가입에 성공하였습니다.")
                 .userId(user.getId())
                 .build();
     }
 
     public LoginResponse login(LoginRequest loginRequest) {
         User user = userRepository.findByEmail(loginRequest.getEmail())
-                .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 이메일입니다. 다시 한 번 확인해주세요."));
+                .orElseThrow(() ->  new BusinessExceptionHandler(ErrorCode.INVALID_EMAIL));
 
         if (!passwordEncoder.matches(loginRequest.getPassword(), user.getPassword())){
-            throw new BadCredentialsException("비밀번호가 일치하지 않습니다.");
+            throw new BusinessExceptionHandler(ErrorCode.INVALID_PASSWORD);
         }
 
         JwtToken jwtToken = jwtTokenGenerator.generateToken(user.getId(), "Bearer");
 
         return LoginResponse.builder()
-                .msg("로그인에 성공하였습니다.")
                 .userId(user.getId())
                 .jwtToken(jwtToken)
                 .build();
diff --git a/src/main/java/com/blockguard/server/domain/auth/enums/JwtTokenExpireTime.java b/src/main/java/com/blockguard/server/domain/auth/enums/JwtTokenExpireTime.java
@@ -5,7 +5,7 @@
 @Getter
 public enum JwtTokenExpireTime {
     ACCESS_TOKEN_EXPIRE_TIME(86400000),
-    REFRESH_TOKEN_EXPIRE_TIME(86400000);
+    REFRESH_TOKEN_EXPIRE_TIME(100000000);
 
     private final long expireTime;
 
diff --git a/src/main/java/com/blockguard/server/domain/auth/infra/JwtTokenGenerator.java b/src/main/java/com/blockguard/server/domain/auth/infra/JwtTokenGenerator.java
@@ -1,5 +1,6 @@
 package com.blockguard.server.domain.auth.infra;
 
+import com.blockguard.server.domain.auth.enums.JwtTokenExpireTime;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
 import io.jsonwebtoken.io.Decoders;
@@ -28,8 +29,13 @@ public JwtToken generateToken(Long userId, String grantType) {
         // 권한 가져오기
         long now = (new Date()).getTime();
 
+        // Jwt token time
+        long accessTokenExpireTime = JwtTokenExpireTime.ACCESS_TOKEN_EXPIRE_TIME.getExpireTime();
+        long refreshTokenExpireTime = JwtTokenExpireTime.REFRESH_TOKEN_EXPIRE_TIME.getExpireTime();
+
+
         // Access Token 생성
-        Date accessTokenExpiresIn = new Date(now + 86400000);
+        Date accessTokenExpiresIn = new Date(now + accessTokenExpireTime);
         String accessToken = Jwts.builder()
                 .setSubject(String.valueOf(userId))
                 .setExpiration(accessTokenExpiresIn)
@@ -38,7 +44,7 @@ public JwtToken generateToken(Long userId, String grantType) {
 
         // Refresh Token 생성
         String refreshToken = Jwts.builder()
-                .setExpiration(new Date(now + 86400000))
+                .setExpiration(new Date(now + refreshTokenExpireTime))
                 .signWith(key, SignatureAlgorithm.HS256)
                 .compact();
 
diff --git a/src/main/java/com/blockguard/server/domain/user/dto/response/LoginResponse.java b/src/main/java/com/blockguard/server/domain/user/dto/response/LoginResponse.java
@@ -9,7 +9,6 @@
 @AllArgsConstructor
 @Builder
 public class LoginResponse {
-    private String msg;
     private Long userId;
     private JwtToken jwtToken;
 }
diff --git a/src/main/java/com/blockguard/server/domain/user/dto/response/RegisterResponse.java b/src/main/java/com/blockguard/server/domain/user/dto/response/RegisterResponse.java
@@ -8,6 +8,5 @@
 @AllArgsConstructor
 @Builder
 public class RegisterResponse {
-    private String msg;
     private Long userId;
 }
diff --git a/src/main/java/com/blockguard/server/global/common/codes/ErrorCode.java b/src/main/java/com/blockguard/server/global/common/codes/ErrorCode.java
@@ -0,0 +1,23 @@
+package com.blockguard.server.global.common.codes;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.springframework.http.HttpStatus;
+
+@Getter
+@AllArgsConstructor
+public enum ErrorCode {
+    /// 4000 ~ : client error
+    DUPLICATED_EMAIL(HttpStatus.BAD_REQUEST, 4001, "이미 가입된 이메일입니다."),
+    INVALID_EMAIL(HttpStatus.BAD_REQUEST, 4002, "존재하지 않는 이메일입니다."),
+    INVALID_PASSWORD(HttpStatus.BAD_REQUEST, 4003, "비밀번호가 일치하지 않습니다."),
+    INVALID_TOKEN(HttpStatus.UNAUTHORIZED, 4004, "유효하지 않은 토큰입니다."),
+
+    // 5000~ : server error
+    INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, 5000, "서버 오류가 발생했습니다.");
+
+    private final HttpStatus status;
+    private final int code;
+    private final String msg;
+
+}
diff --git a/src/main/java/com/blockguard/server/global/common/codes/SuccessCode.java b/src/main/java/com/blockguard/server/global/common/codes/SuccessCode.java
@@ -0,0 +1,18 @@
+package com.blockguard.server.global.common.codes;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.springframework.http.HttpStatus;
+
+@Getter
+@AllArgsConstructor
+public enum SuccessCode {
+
+    OK(HttpStatus.OK, 2000, "OK"),
+    USER_REGISTERED(HttpStatus.CREATED, 2001, "회원가입이 완료되었습니다."),
+    LOGIN_SUCCESS(HttpStatus.OK, 2002, "로그인 성공");
+
+    private final HttpStatus status;
+    private final int code;
+    private final String msg;
+}
diff --git a/src/main/java/com/blockguard/server/global/common/response/BaseResponse.java b/src/main/java/com/blockguard/server/global/common/response/BaseResponse.java
@@ -0,0 +1,31 @@
+package com.blockguard.server.global.common.response;
+
+import com.blockguard.server.global.common.codes.SuccessCode;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+@AllArgsConstructor
+public class BaseResponse<T> {
+    private int code;
+    private String msg;
+    private T data;
+
+    public static <T> BaseResponse<T> of(SuccessCode code, T data) {
+        return BaseResponse.<T>builder()
+                .code(code.getCode())
+                .msg(code.getMsg())
+                .data(data)
+                .build();
+    }
+
+    public static BaseResponse<Void> of(SuccessCode code) {
+        return BaseResponse.<Void>builder()
+                .code(code.getCode())
+                .msg(code.getMsg())
+                .data(null)
+                .build();
+    }
+}
diff --git a/src/main/java/com/blockguard/server/global/common/response/ErrorResponse.java b/src/main/java/com/blockguard/server/global/common/response/ErrorResponse.java
@@ -0,0 +1,32 @@
+package com.blockguard.server.global.common.response;
+
+import com.blockguard.server.global.common.codes.ErrorCode;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+@AllArgsConstructor
+@Schema(description = "에러 응답")
+public class ErrorResponse {
+    @Schema(description = "에러 코드", example = "xxxx")
+    private final int code;
+    @Schema(description = "에러 메세지", example = "예시 에러 메세지입니다.")
+    private final String msg;
+
+    public static ErrorResponse of(ErrorCode errorCode) {
+        return ErrorResponse.builder()
+                .code(errorCode.getCode())
+                .msg(errorCode.getMsg())
+                .build();
+    }
+
+    public static ErrorResponse of(ErrorCode errorCode, String customMsg) {
+        return ErrorResponse.builder()
+                .code(errorCode.getCode())
+                .msg(customMsg)
+                .build();
+    }
+}
diff --git a/src/main/java/com/blockguard/server/global/config/SwaggerConfig.java b/src/main/java/com/blockguard/server/global/config/SwaggerConfig.java
diff --git a/src/main/java/com/blockguard/server/global/config/swagger/CustomExceptionDescription.java b/src/main/java/com/blockguard/server/global/config/swagger/CustomExceptionDescription.java
@@ -0,0 +1,12 @@
+package com.blockguard.server.global.config.swagger;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface CustomExceptionDescription {
+    SwaggerResponseDescription value();
+}
diff --git a/src/main/java/com/blockguard/server/global/config/swagger/ExampleHolder.java b/src/main/java/com/blockguard/server/global/config/swagger/ExampleHolder.java
@@ -0,0 +1,13 @@
+package com.blockguard.server.global.config.swagger;
+
+import io.swagger.v3.oas.models.examples.Example;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+public class ExampleHolder {
+    private Example holder;
+    private String name;
+    private int code;
+}
diff --git a/src/main/java/com/blockguard/server/global/config/swagger/SwaggerConfig.java b/src/main/java/com/blockguard/server/global/config/swagger/SwaggerConfig.java
diff --git a/src/main/java/com/blockguard/server/global/config/swagger/SwaggerResponseDescription.java b/src/main/java/com/blockguard/server/global/config/swagger/SwaggerResponseDescription.java
diff --git a/src/main/java/com/blockguard/server/global/exception/BusinessExceptionHandler.java b/src/main/java/com/blockguard/server/global/exception/BusinessExceptionHandler.java
diff --git a/src/main/java/com/blockguard/server/global/exception/GlobalExceptionHandler.java b/src/main/java/com/blockguard/server/global/exception/GlobalExceptionHandler.java

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ dependencies {`
`38`	`38`	`implementation 'io.jsonwebtoken:jjwt-impl:0.11.5'`
`39`	`39`	`implementation 'io.jsonwebtoken:jjwt-jackson:0.11.5'`
`40`	`40`
`41`		`- implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'`
	`41`	`+ implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0'`
`42`	`42`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`@AllArgsConstructor`
`10`	`10`	`@Builder`
`11`	`11`	`public class LoginResponse {`
`12`		`- private String msg;`
`13`	`12`	`private Long userId;`
`14`	`13`	`private JwtToken jwtToken;`
`15`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,5 @@`
`8`	`8`	`@AllArgsConstructor`
`9`	`9`	`@Builder`
`10`	`10`	`public class RegisterResponse {`
`11`		`- private String msg;`
`12`	`11`	`private Long userId;`
`13`	`12`	`}`