diff --git a/src/main/java/sopt/org/HMH/HealthCheckApiController.java b/src/main/java/sopt/org/HMH/HealthCheckApiController.java index 1fa2dc97..5874c27d 100644 --- a/src/main/java/sopt/org/HMH/HealthCheckApiController.java +++ b/src/main/java/sopt/org/HMH/HealthCheckApiController.java @@ -3,9 +3,11 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; + @RequestMapping("/health") @RestController public class HealthCheckApiController { + @GetMapping public String healthCheck() { return "hmh server ok!"; diff --git a/src/main/java/sopt/org/HMH/HmhApplication.java b/src/main/java/sopt/org/HMH/HmhApplication.java index dfdd9036..f3b3896d 100644 --- a/src/main/java/sopt/org/HMH/HmhApplication.java +++ b/src/main/java/sopt/org/HMH/HmhApplication.java @@ -11,5 +11,4 @@ public class HmhApplication { public static void main(String[] args) { SpringApplication.run(HmhApplication.class, args); } - } diff --git a/src/main/java/sopt/org/HMH/domain/user/controller/UserController.java b/src/main/java/sopt/org/HMH/domain/user/controller/UserController.java index 1195d68d..024eaeda 100644 --- a/src/main/java/sopt/org/HMH/domain/user/controller/UserController.java +++ b/src/main/java/sopt/org/HMH/domain/user/controller/UserController.java @@ -9,8 +9,8 @@ import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RestController; import sopt.org.HMH.domain.user.domain.exception.UserSuccess; -import sopt.org.HMH.domain.user.dto.request.SocialLoginRequestDto; -import sopt.org.HMH.domain.user.dto.response.LoginResponseDto; +import sopt.org.HMH.domain.user.dto.request.SocialLoginRequest; +import sopt.org.HMH.domain.user.dto.response.LoginResponse; import sopt.org.HMH.domain.user.service.UserService; import sopt.org.HMH.global.auth.jwt.JwtProvider; import sopt.org.HMH.global.auth.jwt.TokenDto; @@ -23,9 +23,9 @@ public class UserController { private final UserService userService; @PostMapping("/login") - public ResponseEntity> login( + public ResponseEntity> login( @RequestHeader("Authorization") String socialAccessToken, - @RequestBody SocialLoginRequestDto request + @RequestBody SocialLoginRequest request ) { return ResponseEntity .status(UserSuccess.LOGIN_SUCCESS.getHttpStatus()) @@ -48,5 +48,4 @@ public ResponseEntity> logout(Principal principal) { .status(UserSuccess.LOGOUT_SUCCESS.getHttpStatus()) .body(ApiResponse.success(UserSuccess.LOGOUT_SUCCESS)); } - } \ No newline at end of file diff --git a/src/main/java/sopt/org/HMH/domain/user/domain/User.java b/src/main/java/sopt/org/HMH/domain/user/domain/User.java index 0c0adab9..2a0d1698 100644 --- a/src/main/java/sopt/org/HMH/domain/user/domain/User.java +++ b/src/main/java/sopt/org/HMH/domain/user/domain/User.java @@ -23,6 +23,7 @@ @AllArgsConstructor(access = AccessLevel.PRIVATE) @Builder public class User extends BaseTimeEntity { + @Id @Column(name = "user_id") @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/src/main/java/sopt/org/HMH/domain/user/domain/exception/UserError.java b/src/main/java/sopt/org/HMH/domain/user/domain/exception/UserError.java index 669464a9..e615d58d 100644 --- a/src/main/java/sopt/org/HMH/domain/user/domain/exception/UserError.java +++ b/src/main/java/sopt/org/HMH/domain/user/domain/exception/UserError.java @@ -6,6 +6,7 @@ @AllArgsConstructor public enum UserError implements ErrorBase { + // 400 BAD REQUEST INVALID_USER(HttpStatus.BAD_REQUEST, "Principle 객체가 없습니다."), @@ -15,11 +16,11 @@ public enum UserError implements ErrorBase { // 404 NOT FOUND NOT_FOUND_USER(HttpStatus.NOT_FOUND, "User를 찾을 수 없습니다."), - NOT_SIGNUP_USER(HttpStatus.NOT_FOUND, "회원가입된 유저가 아닙니다. 회원가입을 진행해주세요.") - ; + NOT_SIGNUP_USER(HttpStatus.NOT_FOUND, "회원가입된 유저가 아닙니다. 회원가입을 진행해주세요."); private final HttpStatus status; private final String errorMessage; + @Override public int getHttpStatusCode() { return this.status.value(); diff --git a/src/main/java/sopt/org/HMH/domain/user/domain/exception/UserException.java b/src/main/java/sopt/org/HMH/domain/user/domain/exception/UserException.java index 02751ed7..da07f35b 100644 --- a/src/main/java/sopt/org/HMH/domain/user/domain/exception/UserException.java +++ b/src/main/java/sopt/org/HMH/domain/user/domain/exception/UserException.java @@ -1,9 +1,9 @@ package sopt.org.HMH.domain.user.domain.exception; -import sopt.org.HMH.global.auth.jwt.exception.JwtError; import sopt.org.HMH.global.common.exception.base.ExceptionBase; public class UserException extends ExceptionBase { + public UserException(UserError errorBase) { super(errorBase); } diff --git a/src/main/java/sopt/org/HMH/domain/user/domain/exception/UserSuccess.java b/src/main/java/sopt/org/HMH/domain/user/domain/exception/UserSuccess.java index 4757a8f1..8d974384 100644 --- a/src/main/java/sopt/org/HMH/domain/user/domain/exception/UserSuccess.java +++ b/src/main/java/sopt/org/HMH/domain/user/domain/exception/UserSuccess.java @@ -6,6 +6,7 @@ @AllArgsConstructor public enum UserSuccess implements SuccessBase { + LOGIN_SUCCESS(HttpStatus.OK, "로그인에 성공했습니다."), REISSUE_SUCCESS(HttpStatus.OK, "Access 토큰 재발급에 성공했습니다."), LOGOUT_SUCCESS(HttpStatus.OK, "로그아웃에 성공했습니다."), @@ -28,5 +29,4 @@ public HttpStatus getHttpStatus() { public String getSuccessMessage() { return this.successMessage; } - } diff --git a/src/main/java/sopt/org/HMH/domain/user/dto/request/SocialLoginRequestDto.java b/src/main/java/sopt/org/HMH/domain/user/dto/request/SocialLoginRequestDto.java deleted file mode 100644 index 82d44b7b..00000000 --- a/src/main/java/sopt/org/HMH/domain/user/dto/request/SocialLoginRequestDto.java +++ /dev/null @@ -1,13 +0,0 @@ -package sopt.org.HMH.domain.user.dto.request; - -import lombok.AccessLevel; -import lombok.Getter; -import lombok.NoArgsConstructor; -import sopt.org.HMH.global.auth.social.SocialPlatform; - -@Getter -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class SocialLoginRequestDto { - - private SocialPlatform socialPlatform; -} diff --git a/src/main/java/sopt/org/HMH/domain/user/dto/response/LoginResponseDto.java b/src/main/java/sopt/org/HMH/domain/user/dto/response/LoginResponseDto.java deleted file mode 100644 index 5ba2d94f..00000000 --- a/src/main/java/sopt/org/HMH/domain/user/dto/response/LoginResponseDto.java +++ /dev/null @@ -1,24 +0,0 @@ -package sopt.org.HMH.domain.user.dto.response; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import sopt.org.HMH.domain.user.domain.User; -import sopt.org.HMH.global.auth.jwt.TokenDto; - - -@Getter -@NoArgsConstructor -@AllArgsConstructor -@Builder -public class LoginResponseDto { - private Long userId; - - private TokenDto tokenDto; - - public static LoginResponseDto of(User loginUser, TokenDto tokenDto) { - - return new LoginResponseDto(loginUser.getId(), tokenDto); - } -} \ No newline at end of file diff --git a/src/main/java/sopt/org/HMH/domain/user/service/UserService.java b/src/main/java/sopt/org/HMH/domain/user/service/UserService.java index e92b826c..f2f18d8c 100644 --- a/src/main/java/sopt/org/HMH/domain/user/service/UserService.java +++ b/src/main/java/sopt/org/HMH/domain/user/service/UserService.java @@ -6,8 +6,8 @@ import sopt.org.HMH.domain.user.domain.User; import sopt.org.HMH.domain.user.domain.exception.UserError; import sopt.org.HMH.domain.user.domain.exception.UserException; -import sopt.org.HMH.domain.user.dto.request.SocialLoginRequestDto; -import sopt.org.HMH.domain.user.dto.response.LoginResponseDto; +import sopt.org.HMH.domain.user.dto.request.SocialLoginRequest; +import sopt.org.HMH.domain.user.dto.response.LoginResponse; import sopt.org.HMH.domain.user.repository.UserRepository; import sopt.org.HMH.global.auth.jwt.JwtProvider; import sopt.org.HMH.global.auth.jwt.TokenDto; @@ -27,7 +27,7 @@ public class UserService { private final KakaoLoginService kakaoLoginService; @Transactional - public LoginResponseDto login(String socialAccessToken, SocialLoginRequestDto request) { + public LoginResponse login(String socialAccessToken, SocialLoginRequest request) { socialAccessToken = parseTokenString(socialAccessToken); SocialPlatform socialPlatform = request.getSocialPlatform(); Long socialId = getUserIdBySocialAccessToken(socialPlatform, socialAccessToken); @@ -40,7 +40,7 @@ public LoginResponseDto login(String socialAccessToken, SocialLoginRequestDto re TokenDto tokenDto = jwtProvider.issueToken(new UserAuthentication(loginUser.getId(), null, null)); - return LoginResponseDto.of(loginUser, tokenDto); + return LoginResponse.of(loginUser, tokenDto); } @Transactional diff --git a/src/main/java/sopt/org/HMH/global/auth/jwt/JwtProvider.java b/src/main/java/sopt/org/HMH/global/auth/jwt/JwtProvider.java index c2d808ad..81e7856d 100644 --- a/src/main/java/sopt/org/HMH/global/auth/jwt/JwtProvider.java +++ b/src/main/java/sopt/org/HMH/global/auth/jwt/JwtProvider.java @@ -177,7 +177,6 @@ public static Long getUserFromPrincipal(Principal principal) { if (isNull(principal)) { throw new JwtException(JwtError.EMPTY_PRINCIPLE_EXCEPTION); } - return Long.valueOf(principal.getName()); } } diff --git a/src/main/java/sopt/org/HMH/global/auth/jwt/exception/JwtError.java b/src/main/java/sopt/org/HMH/global/auth/jwt/exception/JwtError.java index 385cab04..630b758f 100644 --- a/src/main/java/sopt/org/HMH/global/auth/jwt/exception/JwtError.java +++ b/src/main/java/sopt/org/HMH/global/auth/jwt/exception/JwtError.java @@ -19,12 +19,11 @@ public enum JwtError implements ErrorBase { // 403 FORBIDDEN // 404 NOT FOUND - NOT_FOUND_REFRESH_TOKEN_ERROR(HttpStatus.NOT_FOUND, "존재하지 않는 리프레시 토큰입니다.") - - ; + NOT_FOUND_REFRESH_TOKEN_ERROR(HttpStatus.NOT_FOUND, "존재하지 않는 리프레시 토큰입니다."); private final HttpStatus status; private final String errorMessage; + @Override public int getHttpStatusCode() { return this.status.value(); diff --git a/src/main/java/sopt/org/HMH/global/auth/jwt/exception/JwtException.java b/src/main/java/sopt/org/HMH/global/auth/jwt/exception/JwtException.java index 63ac64cb..e9dd2aaa 100644 --- a/src/main/java/sopt/org/HMH/global/auth/jwt/exception/JwtException.java +++ b/src/main/java/sopt/org/HMH/global/auth/jwt/exception/JwtException.java @@ -3,6 +3,7 @@ import sopt.org.HMH.global.common.exception.base.ExceptionBase; public class JwtException extends ExceptionBase { + public JwtException(JwtError errorBase) { super(errorBase); } diff --git a/src/main/java/sopt/org/HMH/global/auth/redis/RefreshToken.java b/src/main/java/sopt/org/HMH/global/auth/redis/RefreshToken.java index bbaf92cd..0eea6dfe 100644 --- a/src/main/java/sopt/org/HMH/global/auth/redis/RefreshToken.java +++ b/src/main/java/sopt/org/HMH/global/auth/redis/RefreshToken.java @@ -1,5 +1,6 @@ package sopt.org.HMH.global.auth.redis; +import java.util.concurrent.TimeUnit; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -8,8 +9,6 @@ import org.springframework.data.redis.core.RedisHash; import org.springframework.data.redis.core.TimeToLive; -import java.util.concurrent.TimeUnit; - @Getter @RedisHash(value = "refresh") @Builder @@ -19,7 +18,6 @@ public class RefreshToken { @Id private String refreshToken; - private Long userId; @TimeToLive(unit = TimeUnit.SECONDS) diff --git a/src/main/java/sopt/org/HMH/global/auth/security/CustomJwtAuthenticationEntryPoint.java b/src/main/java/sopt/org/HMH/global/auth/security/CustomJwtAuthenticationEntryPoint.java index fc14f333..df798cfe 100644 --- a/src/main/java/sopt/org/HMH/global/auth/security/CustomJwtAuthenticationEntryPoint.java +++ b/src/main/java/sopt/org/HMH/global/auth/security/CustomJwtAuthenticationEntryPoint.java @@ -3,12 +3,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; import org.springframework.http.MediaType; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.stereotype.Component; - -import java.io.IOException; import sopt.org.HMH.global.auth.jwt.exception.JwtError; import sopt.org.HMH.global.common.response.ApiResponse; @@ -22,7 +21,8 @@ public class CustomJwtAuthenticationEntryPoint implements AuthenticationEntryPoi private final ObjectMapper objectMapper = new ObjectMapper(); @Override - public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException { + public void commence(HttpServletRequest request, HttpServletResponse response, + AuthenticationException authException) throws IOException { setResponse(response); } diff --git a/src/main/java/sopt/org/HMH/global/auth/security/UserAuthentication.java b/src/main/java/sopt/org/HMH/global/auth/security/UserAuthentication.java index eaa3fda4..a2823b5a 100644 --- a/src/main/java/sopt/org/HMH/global/auth/security/UserAuthentication.java +++ b/src/main/java/sopt/org/HMH/global/auth/security/UserAuthentication.java @@ -1,13 +1,13 @@ package sopt.org.HMH.global.auth.security; +import java.util.Collection; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.GrantedAuthority; -import java.util.Collection; - public class UserAuthentication extends UsernamePasswordAuthenticationToken { - public UserAuthentication(Object principal, Object credentials, Collection authorities) { + public UserAuthentication(Object principal, Object credentials, + Collection authorities) { super(principal, credentials, authorities); } } diff --git a/src/main/java/sopt/org/HMH/global/auth/social/SocialPlatform.java b/src/main/java/sopt/org/HMH/global/auth/social/SocialPlatform.java index 9fb661d6..357282e4 100644 --- a/src/main/java/sopt/org/HMH/global/auth/social/SocialPlatform.java +++ b/src/main/java/sopt/org/HMH/global/auth/social/SocialPlatform.java @@ -7,6 +7,7 @@ @Getter @RequiredArgsConstructor(access = AccessLevel.PRIVATE) public enum SocialPlatform { + KAKAO("kakao"), ; diff --git a/src/main/java/sopt/org/HMH/global/auth/social/kakao/fegin/KakaoAccessTokenResponse.java b/src/main/java/sopt/org/HMH/global/auth/social/kakao/fegin/KakaoAccessTokenResponse.java index 49682044..75cab6e1 100644 --- a/src/main/java/sopt/org/HMH/global/auth/social/kakao/fegin/KakaoAccessTokenResponse.java +++ b/src/main/java/sopt/org/HMH/global/auth/social/kakao/fegin/KakaoAccessTokenResponse.java @@ -1,8 +1,10 @@ package sopt.org.HMH.global.auth.social.kakao.fegin; -import com.fasterxml.jackson.databind.PropertyNamingStrategies; -import com.fasterxml.jackson.databind.annotation.JsonNaming; -import lombok.*; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; @ToString @Getter diff --git a/src/main/java/sopt/org/HMH/global/auth/social/kakao/fegin/KakaoApiClient.java b/src/main/java/sopt/org/HMH/global/auth/social/kakao/fegin/KakaoApiClient.java index 211d95a0..4c0f258d 100644 --- a/src/main/java/sopt/org/HMH/global/auth/social/kakao/fegin/KakaoApiClient.java +++ b/src/main/java/sopt/org/HMH/global/auth/social/kakao/fegin/KakaoApiClient.java @@ -1,7 +1,7 @@ package sopt.org.HMH.global.auth.social.kakao.fegin; -import org.springframework.http.HttpHeaders; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.HttpHeaders; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestHeader; import sopt.org.HMH.global.auth.social.kakao.response.KakaoUserResponse; diff --git a/src/main/java/sopt/org/HMH/global/auth/social/kakao/fegin/KakaoLoginService.java b/src/main/java/sopt/org/HMH/global/auth/social/kakao/fegin/KakaoLoginService.java index 55fff612..cc9a07dc 100644 --- a/src/main/java/sopt/org/HMH/global/auth/social/kakao/fegin/KakaoLoginService.java +++ b/src/main/java/sopt/org/HMH/global/auth/social/kakao/fegin/KakaoLoginService.java @@ -1,7 +1,6 @@ package sopt.org.HMH.global.auth.social.kakao.fegin; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import sopt.org.HMH.domain.user.domain.User; @@ -33,5 +32,4 @@ public void updateUserInfoByKakao(User loginUser, String socialAccessToken) { loginUser.updateSocialInfo(userResponse.getKakaoAccount().getProfile().getNickname(), userResponse.getKakaoAccount().getProfile().getProfileImageUrl()); } - } \ No newline at end of file diff --git a/src/main/java/sopt/org/HMH/global/auth/social/kakao/response/KakaoAccount.java b/src/main/java/sopt/org/HMH/global/auth/social/kakao/response/KakaoAccount.java index bc720a04..20c1c5c2 100644 --- a/src/main/java/sopt/org/HMH/global/auth/social/kakao/response/KakaoAccount.java +++ b/src/main/java/sopt/org/HMH/global/auth/social/kakao/response/KakaoAccount.java @@ -1,8 +1,10 @@ package sopt.org.HMH.global.auth.social.kakao.response; -import com.fasterxml.jackson.databind.PropertyNamingStrategies; -import com.fasterxml.jackson.databind.annotation.JsonNaming; -import lombok.*; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; @ToString @Getter diff --git a/src/main/java/sopt/org/HMH/global/auth/social/kakao/response/KakaoUserProfile.java b/src/main/java/sopt/org/HMH/global/auth/social/kakao/response/KakaoUserProfile.java index 9eebaafa..399700e0 100644 --- a/src/main/java/sopt/org/HMH/global/auth/social/kakao/response/KakaoUserProfile.java +++ b/src/main/java/sopt/org/HMH/global/auth/social/kakao/response/KakaoUserProfile.java @@ -1,7 +1,5 @@ package sopt.org.HMH.global.auth.social.kakao.response; -import com.fasterxml.jackson.databind.PropertyNamingStrategies; -import com.fasterxml.jackson.databind.annotation.JsonNaming; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/sopt/org/HMH/global/auth/social/kakao/response/KakaoUserResponse.java b/src/main/java/sopt/org/HMH/global/auth/social/kakao/response/KakaoUserResponse.java index a9000deb..a1de07d6 100644 --- a/src/main/java/sopt/org/HMH/global/auth/social/kakao/response/KakaoUserResponse.java +++ b/src/main/java/sopt/org/HMH/global/auth/social/kakao/response/KakaoUserResponse.java @@ -1,7 +1,5 @@ package sopt.org.HMH.global.auth.social.kakao.response; -import com.fasterxml.jackson.databind.PropertyNamingStrategies; -import com.fasterxml.jackson.databind.annotation.JsonNaming; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/sopt/org/HMH/global/common/domain/BaseTimeEntity.java b/src/main/java/sopt/org/HMH/global/common/domain/BaseTimeEntity.java index c2403820..f96f9406 100644 --- a/src/main/java/sopt/org/HMH/global/common/domain/BaseTimeEntity.java +++ b/src/main/java/sopt/org/HMH/global/common/domain/BaseTimeEntity.java @@ -18,5 +18,4 @@ public abstract class BaseTimeEntity { @LastModifiedDate private LocalDateTime updatedAt; - } diff --git a/src/main/java/sopt/org/HMH/global/common/exception/GlobalError.java b/src/main/java/sopt/org/HMH/global/common/exception/GlobalError.java index 1c351070..eface13c 100644 --- a/src/main/java/sopt/org/HMH/global/common/exception/GlobalError.java +++ b/src/main/java/sopt/org/HMH/global/common/exception/GlobalError.java @@ -26,5 +26,4 @@ public HttpStatus getHttpStatus() { public String getErrorMessage() { return this.errorMessage; } - } \ No newline at end of file diff --git a/src/main/java/sopt/org/HMH/global/common/exception/GlobalSuccess.java b/src/main/java/sopt/org/HMH/global/common/exception/GlobalSuccess.java index 4a8c8ae7..0025548b 100644 --- a/src/main/java/sopt/org/HMH/global/common/exception/GlobalSuccess.java +++ b/src/main/java/sopt/org/HMH/global/common/exception/GlobalSuccess.java @@ -26,5 +26,4 @@ public HttpStatus getHttpStatus() { public String getSuccessMessage() { return this.successMessage; } - } \ No newline at end of file diff --git a/src/main/java/sopt/org/HMH/global/common/exception/base/ErrorBase.java b/src/main/java/sopt/org/HMH/global/common/exception/base/ErrorBase.java index fade4614..34475ee6 100644 --- a/src/main/java/sopt/org/HMH/global/common/exception/base/ErrorBase.java +++ b/src/main/java/sopt/org/HMH/global/common/exception/base/ErrorBase.java @@ -3,6 +3,7 @@ import org.springframework.http.HttpStatus; public interface ErrorBase extends RootEnum { + int getHttpStatusCode(); HttpStatus getHttpStatus(); diff --git a/src/main/java/sopt/org/HMH/global/common/exception/base/ExceptionBase.java b/src/main/java/sopt/org/HMH/global/common/exception/base/ExceptionBase.java index 0c407737..59b53907 100644 --- a/src/main/java/sopt/org/HMH/global/common/exception/base/ExceptionBase.java +++ b/src/main/java/sopt/org/HMH/global/common/exception/base/ExceptionBase.java @@ -4,6 +4,7 @@ * 하위 도메인 예외는 본 Exception 클래스를 상속 받습니다. */ public abstract class ExceptionBase extends RuntimeException { + private static final String ERROR_MESSAGE_HEADER = "ERROR : "; private final ErrorBase errorBase; diff --git a/src/main/java/sopt/org/HMH/global/common/exception/base/SuccessBase.java b/src/main/java/sopt/org/HMH/global/common/exception/base/SuccessBase.java index 9a411899..59bd7413 100644 --- a/src/main/java/sopt/org/HMH/global/common/exception/base/SuccessBase.java +++ b/src/main/java/sopt/org/HMH/global/common/exception/base/SuccessBase.java @@ -3,10 +3,10 @@ import org.springframework.http.HttpStatus; public interface SuccessBase extends RootEnum { + int getHttpStatusCode(); HttpStatus getHttpStatus(); String getSuccessMessage(); - } \ No newline at end of file diff --git a/src/main/java/sopt/org/HMH/global/common/response/ApiResponse.java b/src/main/java/sopt/org/HMH/global/common/response/ApiResponse.java index 8d6dd05a..3b04d615 100644 --- a/src/main/java/sopt/org/HMH/global/common/response/ApiResponse.java +++ b/src/main/java/sopt/org/HMH/global/common/response/ApiResponse.java @@ -13,6 +13,7 @@ @RequiredArgsConstructor(access = AccessLevel.PRIVATE) @AllArgsConstructor(access = AccessLevel.PRIVATE) public class ApiResponse { + private final int code; private final String message; diff --git a/src/main/java/sopt/org/HMH/global/common/response/CommonControllerAdvice.java b/src/main/java/sopt/org/HMH/global/common/response/CommonControllerAdvice.java index b9c872b1..d3b4cfa5 100644 --- a/src/main/java/sopt/org/HMH/global/common/response/CommonControllerAdvice.java +++ b/src/main/java/sopt/org/HMH/global/common/response/CommonControllerAdvice.java @@ -20,5 +20,4 @@ public ResponseEntity ExceptionHandler(ExceptionBase exception) { ApiResponse.error(error) ); } - } \ No newline at end of file diff --git a/src/main/java/sopt/org/HMH/global/config/SecurityConfig.java b/src/main/java/sopt/org/HMH/global/config/SecurityConfig.java index 98adcf50..79fba43a 100644 --- a/src/main/java/sopt/org/HMH/global/config/SecurityConfig.java +++ b/src/main/java/sopt/org/HMH/global/config/SecurityConfig.java @@ -35,7 +35,6 @@ public class SecurityConfig { // Authentication "/login", "/reissue", - }; @Bean