Merge 13dd032 into 2a390ff

Author: gunwoong1630

src/main/java/sevenstar/marineleisure/activity/controller/ActivityController.java

@@ -5,9 +5,9 @@
 import java.util.Map;
 
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -30,7 +30,7 @@ public class ActivityController {
     private final ActivityService activityService;
 
     @GetMapping("/index")
-    public ResponseEntity<BaseResponse<Map<String, ActivitySummaryResponse>>> getActivityIndex(@RequestBody ActivityIndexRequest activityIndexRequest) {
+    public ResponseEntity<BaseResponse<Map<String, ActivitySummaryResponse>>> getActivityIndex(@ModelAttribute ActivityIndexRequest activityIndexRequest) {
         return BaseResponse.success(activityService.getActivitySummary(
             activityIndexRequest.latitude(),
             activityIndexRequest.longitude(),
@@ -39,21 +39,21 @@ public ResponseEntity<BaseResponse<Map<String, ActivitySummaryResponse>>> getAct
     }
 
     @GetMapping("/{activity}/detail")
-    public ResponseEntity<BaseResponse<ActivityDetailResponse>> getActivityDetail(@PathVariable ActivityCategory activity, @RequestBody ActivityDetailRequest activityDetailRequest) {
+    public ResponseEntity<BaseResponse<ActivityDetailResponse>> getActivityDetail(@PathVariable ActivityCategory activity, @ModelAttribute ActivityDetailRequest activityDetailRequest) {
         try {
             return BaseResponse.success(activityService.getActivityDetail(activity, activityDetailRequest.latitude(), activityDetailRequest.longitude()));
         } catch (RuntimeException e) {
-            return BaseResponse.error(WEATHER_NOT_FOUND);
+            return BaseResponse.error(INVALID_ACTIVITY);
         }
     }
 
     @GetMapping("/weather")
-    public ResponseEntity<BaseResponse<ActivityWeatherResponse>> getActivityWeather(@RequestBody ActivityWeatherRequest activityWeatherRequest) {
+    public ResponseEntity<BaseResponse<ActivityWeatherResponse>> getActivityWeather(@ModelAttribute ActivityWeatherRequest activityWeatherRequest) {
         try {
             return BaseResponse.success(activityService.getWeatherBySpot(activityWeatherRequest.latitude(), activityWeatherRequest.longitude()));
         }
         catch (Exception e) {
-            return BaseResponse.error(INVALID_ACTIVITY);
+            return BaseResponse.error(WEATHER_NOT_FOUND);
         }
     }
 

src/main/java/sevenstar/marineleisure/favorite/controller/FavoriteController.java

@@ -51,7 +51,7 @@ public ResponseEntity<BaseResponse<Long>> addFavorite(@PathVariable Long id) {
 	@GetMapping
 	public ResponseEntity<BaseResponse<FavoriteGetListDto>> searchFavorites(
 		@RequestParam(defaultValue = "0") Long cursorId,
-		@RequestParam(defaultValue = "20") @Min(1) @Max(10) int size) {
+		@RequestParam(defaultValue = "20") @Min(1) @Max(20) int size) {
 		List<FavoriteItemVO> result = service.searchFavorite(cursorId, size);
 
 		boolean hasNext = result.size() > size;

src/main/java/sevenstar/marineleisure/global/exception/enums/ActivityErrorCode.java

@@ -22,16 +22,16 @@ public enum ActivityErrorCode implements ErrorCode {
 
 	@Override
 	public int getCode() {
-		return 0;
+		return this.code;
 	}
 
 	@Override
 	public HttpStatus getHttpStatus() {
-		return null;
+		return this.httpStatus;
 	}
 
 	@Override
 	public String getMessage() {
-		return "";
+		return this.message;
 	}
 }