diff --git a/src/main/java/com/readyvery/readyverydemo/global/exception/ExceptionCode.java b/src/main/java/com/readyvery/readyverydemo/global/exception/ExceptionCode.java index 5e0a852..8f70a77 100644 --- a/src/main/java/com/readyvery/readyverydemo/global/exception/ExceptionCode.java +++ b/src/main/java/com/readyvery/readyverydemo/global/exception/ExceptionCode.java @@ -11,7 +11,7 @@ public enum ExceptionCode { INVALID_OPTION_COUNT(400, "Invalid option count."), INVALID_OPTION(400, "Invalid option."), OPTION_NOT_FOUND(404, "Option does not exists."), - CART_ITEM_NOT_FOUND(404, "Cart item does not exists."), + CART_ITEM_NOT_FOUND(200, "Cart item does not exists."), CART_NOT_FOUND(404, "Cart does not exists."), ITEM_NOT_SAME_STORE(400, "Item is not same store."), TOSS_PAYMENT_SUCCESS_FAIL(400, "Toss payment success fail."), @@ -19,6 +19,7 @@ public enum ExceptionCode { TOSS_PAYMENT_AMOUNT_NOT_MATCH(400, "Toss payment amount not match."), ORDER_NOT_CURRENT(400, "Order is not current."); + private int status; private String message; diff --git a/src/main/java/com/readyvery/readyverydemo/src/user/UserController.java b/src/main/java/com/readyvery/readyverydemo/src/user/UserController.java index 9435bcc..f1a6432 100644 --- a/src/main/java/com/readyvery/readyverydemo/src/user/UserController.java +++ b/src/main/java/com/readyvery/readyverydemo/src/user/UserController.java @@ -33,7 +33,6 @@ public String jwtTest() { */ @GetMapping("/auth") public UserAuthRes userAuth(@AuthenticationPrincipal CustomUserDetails userDetails) { - // 서비스 계층을 호출하여 사용자 정보를 조회합니다. return userServiceImpl.getUserAuthByCustomUserDetails(userDetails); } diff --git a/src/main/java/com/readyvery/readyverydemo/src/user/UserServiceImpl.java b/src/main/java/com/readyvery/readyverydemo/src/user/UserServiceImpl.java index bc0e51b..4908183 100644 --- a/src/main/java/com/readyvery/readyverydemo/src/user/UserServiceImpl.java +++ b/src/main/java/com/readyvery/readyverydemo/src/user/UserServiceImpl.java @@ -29,11 +29,17 @@ public class UserServiceImpl implements UserService { @Override public UserAuthRes getUserAuthByCustomUserDetails(CustomUserDetails userDetails) { - + verifyUserDetails(userDetails); return userMapper.userInfoToUserAuthRes(userDetails); } + private void verifyUserDetails(CustomUserDetails userDetails) { + if (userDetails == null) { + throw new BusinessLogicException(ExceptionCode.USER_NOT_FOUND); + } + } + @Override public UserInfoRes getUserInfoById(Long id) { UserInfo userInfo = getUserInfo(id); diff --git a/src/main/java/com/readyvery/readyverydemo/src/user/dto/UserAuthRes.java b/src/main/java/com/readyvery/readyverydemo/src/user/dto/UserAuthRes.java index 34d9d01..e92b436 100644 --- a/src/main/java/com/readyvery/readyverydemo/src/user/dto/UserAuthRes.java +++ b/src/main/java/com/readyvery/readyverydemo/src/user/dto/UserAuthRes.java @@ -8,5 +8,7 @@ public class UserAuthRes { private Long id; private String email; + private boolean isAuth; + private boolean isAdmin; } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8e59010..2078b44 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,6 +1,9 @@ spring.datasource.url=jdbc:mysql://localhost:3306/readyvery +#spring.datasource.url=jdbc:mysql://test.readyvery.com:33306/readyvery spring.datasource.username=root +#spring.datasource.username=ready spring.datasource.password=12345678 +#spring.datasource.password=readyverytestuser23! spring.jpa.hibernate.ddl-auto=update spring.jpa.generate-ddl=true spring.jpa.show-sql=true