merge: enum valid 수정 #136

[FIX] enum valid 수정 #136

cakey-api/build.gradle

@@ -13,6 +13,10 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'org.springframework.boot:spring-boot-starter-security'
 
+    //로깅
+//    implementation group: "ch.qos.logback", name:"logback-classic", version:"1.4.7"
+//    implementation 'org.slf4j:slf4j-api:1.7.36'
+
     implementation 'org.springframework.cloud:spring-cloud-starter-openfeign:4.1.0' //feign
 
     implementation group: 'io.jsonwebtoken', name: 'jjwt-api', version: '0.11.5' //jwt 의존성

cakey-api/src/main/java/com/cakey/cake/controller/CakeController.java

@@ -8,7 +8,6 @@
 import com.cakey.common.response.BaseResponse;
 import com.cakey.rescode.SuccessCode;
 import com.cakey.store.domain.Station;
-import com.cakey.validate.EnumValue;
 import jakarta.validation.constraints.Min;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
@@ -26,7 +25,7 @@ public class CakeController {
     @GetMapping("/station/latest")
     public ResponseEntity<BaseResponse<?>> getLatestCakesByStationStore(
         @UserId final Long userId,
-        @RequestParam(value = "station", required = true) @EnumValue(enumClass = Station.class, message = "유효하지 않는 station입니다.") final Station station,
+        @RequestParam(value = "station", required = true) final Station station,
         @RequestParam(value = "cakeIdCursor", required = false) final Long cakeIdCursor,
         @RequestParam(value = "size", defaultValue = "10", required = false) final int size
     ) {
@@ -38,7 +37,7 @@ public ResponseEntity<BaseResponse<?>> getLatestCakesByStationStore(
     @GetMapping("/station/popularity")
     public ResponseEntity<BaseResponse<?>> getPopularCakesByStationStore(
             @UserId final Long userId,
-            @RequestParam(value = "station", required = true) @EnumValue(enumClass = Station.class, message = "유효하지 않는 station입니다.") final Station station,
+            @RequestParam(value = "station", required = true) final Station station,
             @RequestParam(value = "cakeLikesCursor", required = false) final Integer cakeLikesCursor,
             @RequestParam(value = "cakeIdCursor", required = false) final Long cakeIdCursor,
             @RequestParam(value = "size", defaultValue = "10", required = false) final int size
@@ -62,8 +61,8 @@ public ResponseEntity<BaseResponse<?>> getRankCakesByStationStore(
     public ResponseEntity<BaseResponse<?>> getCakeSelect(
             @UserId final Long userId,
             @PathVariable(value = "cakeId") @Min(1) final long cakeId,
-            @RequestParam(value = "dayCategory") @EnumValue(enumClass = DayCategory.class, message = "유효하지 않는 DayCategory입니다.") final DayCategory dayCategory,
-            @RequestParam(value = "themeName") @EnumValue(enumClass = ThemeName.class, message = "유효하지 않는 ThemeName입니다.") final ThemeName themeName
+            @RequestParam(value = "dayCategory") final DayCategory dayCategory,
+            @RequestParam(value = "themeName") final ThemeName themeName
             ) {
         return ApiResponseUtil.success(
                 SuccessCode.OK,
@@ -75,8 +74,8 @@ public ResponseEntity<BaseResponse<?>> getCakeSelect(
     @GetMapping("/latest")
     public ResponseEntity<BaseResponse<?>> getLatestCakes(
             @UserId final Long userId,
-            @RequestParam(value = "dayCategory") @EnumValue(enumClass = DayCategory.class, message = "유효하지 않는 DayCategory입니다.") final DayCategory dayCategory,
-            @RequestParam(value = "themeName") @EnumValue(enumClass = ThemeName.class, message = "유효하지 않는 ThemeName입니다.") final ThemeName themeName,
+            @RequestParam(value = "dayCategory") final DayCategory dayCategory,
+            @RequestParam(value = "themeName") final ThemeName themeName,
             @RequestParam(value = "cakeIdCursor", required = false) final Long cakeIdCursor,
             @RequestParam(value = "size", required = false, defaultValue = "10") final int size
             ) {
@@ -90,8 +89,8 @@ public ResponseEntity<BaseResponse<?>> getLatestCakes(
     @GetMapping("/popularity")
     public ResponseEntity<BaseResponse<?>> getPopularCakes(
             @UserId final Long userId,
-            @RequestParam(value = "dayCategory") @EnumValue(enumClass = DayCategory.class, message = "유효하지 않는 DayCategory입니다.") final DayCategory dayCategory,
-            @RequestParam(value = "themeName") @EnumValue(enumClass = ThemeName.class, message = "유효하지 않는 ThemeName입니다.") final ThemeName themeName,
+            @RequestParam(value = "dayCategory") final DayCategory dayCategory,
+            @RequestParam(value = "themeName") final ThemeName themeName,
             @RequestParam(value = "cakeIdCursor", required = false) final Long cakeIdCursor,
             @RequestParam(value = "cakeLikesCursor", required = false) final Integer cakeLikesCursor,
             @RequestParam(value = "size", required = false, defaultValue = "10") final int size

cakey-api/src/main/java/com/cakey/cakelikes/controller/CakeLikesController.java

@@ -8,9 +8,11 @@
 import jakarta.validation.constraints.Min;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
+@Validated
 @RequiredArgsConstructor
 @RequestMapping("/api/v1/cake/likes")
 public class CakeLikesController {

cakey-api/src/main/java/com/cakey/common/filter/RequiredAuthenticationFilter.java

@@ -67,6 +67,7 @@ protected void doFilterInternal(
             final Long userId = jwtProvider.getUserIdFromSubject(token);
             SecurityContextHolder.getContext().setAuthentication(new UserAuthentication(userId, null, null));
         } catch (Exception e) {
+            throw new UserBadRequestException(ErrorBaseCode.UNAUTHORIZED);
         }
         filterChain.doFilter(request, response);
     }
@@ -80,6 +81,6 @@ private String getAccessTokenFromCookie(final HttpServletRequest request) throws
                 }
             }
         }
-        throw new UserBadRequestException(ErrorBaseCode.BAD_REQUEST_REQUEST_BODY_VALID);
+        throw new UserBadRequestException(ErrorBaseCode.UNAUTHORIZED);
     }
 }

cakey-api/src/main/java/com/cakey/exception/handler/GlobalExceptionHandler.java

@@ -206,7 +206,13 @@ public ResponseEntity<BaseResponse<?>> handleInvocationTargetException(final Inv
      */
     @ExceptionHandler(Exception.class)
     public ResponseEntity<BaseResponse<?>> handleAllExceptions(final Exception e) {
-        log.error("e.getMessage() + e.getCause().getMessage()");
+        if (e.getCause() == null) {
+            log.error(e.getMessage());
+        } else {
+            log.error("------------------------------------------------------------------------------------------");
+            log.error(e.getMessage() + "\n" + e.getCause().getMessage());
+            log.error("------------------------------------------------------------------------------------------");
+        }
         return ApiResponseUtil.failure(ErrorBaseCode.INTERNAL_SERVER_ERROR, e.getMessage());
     }
 }

cakey-api/src/main/java/com/cakey/store/controller/StoreController.java

@@ -8,13 +8,14 @@
 import com.cakey.store.domain.Station;
 import com.cakey.store.dto.StoreCoordinateListRes;
 import com.cakey.store.service.StoreService;
-import com.cakey.validate.EnumValue;
 import jakarta.validation.constraints.Min;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
+@Validated
 @RequiredArgsConstructor
 @RequestMapping("/api/v1/store")
 public class StoreController {
@@ -24,7 +25,7 @@ public class StoreController {
     //스토어 좌표 리스트 조회
     @GetMapping("/coordinate-list")
     public ResponseEntity<BaseResponse<?>> getStoreCoordinateList(
-            @RequestParam(value = "station", required = true) @EnumValue(enumClass = Station.class, message = "유효하지 않는 station입니다.") final Station station
+            @RequestParam(value = "station", required = true) final Station station
             ) {
         return ApiResponseUtil.success(
                 SuccessCode.OK,
@@ -35,7 +36,7 @@ public ResponseEntity<BaseResponse<?>> getStoreCoordinateList(
     @GetMapping("/popularity")
     public ResponseEntity<BaseResponse<?>> getStoreInfoListByStationAndLikes(
             @UserId final Long userId,
-            @RequestParam(value = "station", required = true)  @EnumValue(enumClass = Station.class, message = "유효하지 않는 Station입니다.")final Station station,
+            @RequestParam(value = "station", required = true) final Station station,
             @RequestParam(value = "likesCursor", required = false) final Integer likesCursor,
             @RequestParam(value = "storeIdCursor", required = false) final Long storeIdCursor,
             @RequestParam(value = "size", defaultValue = "10", required = false) final int size
@@ -54,7 +55,7 @@ public ResponseEntity<BaseResponse<?>> getStoreInfoListByStationAndLikes(
     @GetMapping("/latest")
     public ResponseEntity<BaseResponse<?>> getStoreInfoListByStationAndLatest(
             @UserId final Long userId,
-            @RequestParam(value = "station", required = true) @EnumValue(enumClass = Station.class, message = "유효하지 않는 Station입니다.")final Station station,
+            @RequestParam(value = "station", required = true) final Station station,
             @RequestParam(value = "storeIdCursor", required = false) final Long storeIdCursor,
             @RequestParam(value = "size", defaultValue = "10", required = false) final int size
     ) {
@@ -121,7 +122,7 @@ public ResponseEntity<BaseResponse<?>> getStoreSelectedCoordinate(
     //선택 스토어 조회
     @GetMapping("/select/{storeId}")
     public ResponseEntity<BaseResponse<?>> getStoreSelected(
-            @UserId @Min(value = 1, message = "userId는 1이상이어야합니다.")final Long userId,
+            @UserId final Long userId,
             @PathVariable @Min(value = 1, message = "storeId는 1이상이어야합니다.")final long storeId) {
         return ApiResponseUtil.success(
                 SuccessCode.OK,

cakey-api/src/main/java/com/cakey/user/controller/UserController.java

@@ -28,8 +28,8 @@ public class UserController {
     //로그인
     @PostMapping("/login")
     public ResponseEntity<BaseResponse<?>> login(
-            @RequestHeader(value = "Authorization") @NotBlank(message = "authorization이 잘못되었습니다.") final String authorization,
-            @RequestBody @Valid final LoginReq loginReq,
+            @RequestHeader(value = "Authorization") final String authorization,
+            @RequestBody final LoginReq loginReq,
             HttpServletResponse response
             ) {
         final LoginSuccessRes loginSuccessRes = userService.login(authorization, loginReq.socialType(), loginReq.redirectUri(), response);

cakey-api/src/main/resources/logback-spring.xml

@@ -28,7 +28,7 @@
                 <totalSizeCap>3GB</totalSizeCap>
             </rollingPolicy>
         </appender>
-        <root level="ERROR">
+        <root level="DEBUG">
             <appender-ref ref="DEVROLLFILE"/>
         </root>
     </springProfile>

cakey-auth/src/main/java/com/cakey/client/dto/LoginReq.java

@@ -4,7 +4,7 @@
 import jakarta.validation.constraints.NotBlank;
 
 public record LoginReq(
-        @NotBlank(message = "SocialType이 잘못되었습니다.") SocialType socialType,
-        @NotBlank(message = "redirectUri가 잘못되었습니다.") String redirectUri
+         SocialType socialType,
+         String redirectUri
 ) {
 }

cakey-domain/src/main/java/com/cakey/store/domain/Station.java

@@ -24,7 +24,11 @@ public enum Station {
     YEONSINNAE("연신내역", "YEONSINNAE", 37.619001, 126.921008),
     EWHA("이대역", "EWHA", 37.556733, 126.946013),
     JUNGGOK("중곡역", "JUNGGOK", 37.565923, 127.084350),
-    HANSEONGBAEKJE("한성백제역", "HANSEONGBAEKJE", 37.516078, 127.115655)
+    HANSEONGBAEKJE("한성백제역", "HANSEONGBAEKJE", 37.516078, 127.115655),
+
+
+
+    HONGDAE("홍대입구역", "HONGDAE", 37.526402, 126.864342)
     ;