From b4bac0df04eaa9bde8fe46af66c2dc00aaa1fc8d Mon Sep 17 00:00:00 2001 From: nnijgnus Date: Wed, 21 Aug 2024 19:26:50 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EC=BB=A8=ED=8A=B8=EB=A1=A4?= =?UTF-8?q?=EB=9F=AC=20ResponseEntity=20=EB=B0=98=ED=99=98=20=ED=98=95?= =?UTF-8?q?=EC=8B=9D=20=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eventController/EventController.java | 5 ++- .../eventController/RushEventController.java | 33 ++++++++++++++----- .../domain/health/api/HealthController.java | 5 ++- 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/Server/src/main/java/JGS/CasperEvent/domain/event/controller/eventController/EventController.java b/Server/src/main/java/JGS/CasperEvent/domain/event/controller/eventController/EventController.java index 3183dbe5..25628486 100644 --- a/Server/src/main/java/JGS/CasperEvent/domain/event/controller/eventController/EventController.java +++ b/Server/src/main/java/JGS/CasperEvent/domain/event/controller/eventController/EventController.java @@ -4,6 +4,7 @@ import JGS.CasperEvent.domain.event.dto.ResponseDto.TotalEventDateResponseDto; import JGS.CasperEvent.domain.event.service.eventService.EventService; import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -19,6 +20,8 @@ public class EventController { @GetMapping("/total") public ResponseEntity getTotalEventDate() { TotalEventDateResponseDto totalEventDateResponseDto = eventService.getTotalEventDate(); - return ResponseEntity.ok(totalEventDateResponseDto); + return ResponseEntity + .status(HttpStatus.OK) + .body(totalEventDateResponseDto); } } diff --git a/Server/src/main/java/JGS/CasperEvent/domain/event/controller/eventController/RushEventController.java b/Server/src/main/java/JGS/CasperEvent/domain/event/controller/eventController/RushEventController.java index 3ac077e1..9778934e 100644 --- a/Server/src/main/java/JGS/CasperEvent/domain/event/controller/eventController/RushEventController.java +++ b/Server/src/main/java/JGS/CasperEvent/domain/event/controller/eventController/RushEventController.java @@ -9,6 +9,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; import jakarta.servlet.http.HttpServletRequest; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -26,7 +27,9 @@ public RushEventController(RushEventService rushEventService) { @ApiResponse(responseCode = "200", description = "Successfully retrieved the list of rush events.") @GetMapping public ResponseEntity getRushEventListAndServerTime() { - return ResponseEntity.ok(rushEventService.getAllRushEvents()); + return ResponseEntity + .status(HttpStatus.OK) + .body(rushEventService.getAllRushEvents()); } @Operation(summary = "응모 여부 체크", description = "해당 유저가 오늘의 이벤트에 응모했는지 여부를 조회합니다.") @@ -34,7 +37,9 @@ public ResponseEntity getRushEventListAndServerTime() @GetMapping("/applied") public ResponseEntity checkUserParticipationInRushEvent(HttpServletRequest httpServletRequest) { BaseUser user = (BaseUser) httpServletRequest.getAttribute("user"); - return ResponseEntity.ok(rushEventService.isExists(user.getId())); + return ResponseEntity + .status(HttpStatus.OK) + .body(rushEventService.isExists(user.getId())); } @Operation(summary = "선착순 이벤트 응모", description = "해당 유저가 오늘의 이벤트에 응모합니다. optionId 값이 필요합니다. optionId 값이 1이면 왼쪽 선택지, 2이면 오른쪽 선택지에 응모합니다.") @@ -48,7 +53,9 @@ public ResponseEntity applyRushEvent(HttpServletRequest httpServletRequest BaseUser user = (BaseUser) httpServletRequest.getAttribute("user"); rushEventService.apply(user, optionId); - return ResponseEntity.noContent().build(); + return ResponseEntity + .status(HttpStatus.NO_CONTENT) + .build(); } @Operation(summary = "실시간 응모 비율 조회", description = "실시간으로 변경되는 응모 비율을 조회합니다.") @@ -57,7 +64,9 @@ public ResponseEntity applyRushEvent(HttpServletRequest httpServletRequest public ResponseEntity rushEventRate(HttpServletRequest httpServletRequest) { BaseUser user = (BaseUser) httpServletRequest.getAttribute("user"); RushEventRateResponseDto rushEventRateResponseDto = rushEventService.getRushEventRate(user); - return ResponseEntity.ok(rushEventRateResponseDto); + return ResponseEntity + .status(HttpStatus.OK) + .body(rushEventRateResponseDto); } @Operation(summary = "선착순 이벤트 결과를 조회합니다.", description = "이벤트가 끝나고 나서 최종 결과를 조회합니다.") @@ -66,7 +75,9 @@ public ResponseEntity rushEventRate(HttpServletRequest public ResponseEntity rushEventResult(HttpServletRequest httpServletRequest) { BaseUser user = (BaseUser) httpServletRequest.getAttribute("user"); RushEventResultResponseDto result = rushEventService.getRushEventResult(user); - return ResponseEntity.ok(result); + return ResponseEntity + .status(HttpStatus.OK) + .body(result); } @Operation(summary = "오늘의 이벤트를 초기화합니다.", description = "오늘의 이벤트를 전부 초기화하고, 응모 여부도 전부 초기화합니다.") @@ -74,7 +85,9 @@ public ResponseEntity rushEventResult(HttpServletReq @GetMapping("/today/test") public ResponseEntity setTodayEvent() { rushEventService.setRushEvents(); - return ResponseEntity.noContent().build(); + return ResponseEntity + .status(HttpStatus.NO_CONTENT) + .build(); } @Operation(summary = "오늘의 이벤트 옵션을 조회합니다.", description = "이벤트 참여자가 이벤트에 진입했을 때 보여질 옵션 선택지 정보를 조회합니다.") @@ -82,7 +95,9 @@ public ResponseEntity setTodayEvent() { @GetMapping("/today") public ResponseEntity getTodayEvent() { MainRushEventOptionsResponseDto mainRushEventOptionsResponseDto = rushEventService.getTodayRushEventOptions(); - return ResponseEntity.ok(mainRushEventOptionsResponseDto); + return ResponseEntity + .status(HttpStatus.OK) + .body(mainRushEventOptionsResponseDto); } @Operation(summary = "옵션의 결과 Text를 조회합니다.", description = "유저가 응모를 했을 때 보여질 옵션의 상세 Text를 조회합니다.") @@ -93,6 +108,8 @@ public ResponseEntity getTodayEvent() { @GetMapping("/options/{optionId}/result") public ResponseEntity getResultOption(@PathVariable("optionId") int optionId) { ResultRushEventOptionResponseDto resultRushEventOptionResponseDto = rushEventService.getRushEventOptionResult(optionId); - return ResponseEntity.ok(resultRushEventOptionResponseDto); + return ResponseEntity + .status(HttpStatus.OK) + .body(resultRushEventOptionResponseDto); } } diff --git a/Server/src/main/java/JGS/CasperEvent/domain/health/api/HealthController.java b/Server/src/main/java/JGS/CasperEvent/domain/health/api/HealthController.java index 058b61ed..ef9a7664 100644 --- a/Server/src/main/java/JGS/CasperEvent/domain/health/api/HealthController.java +++ b/Server/src/main/java/JGS/CasperEvent/domain/health/api/HealthController.java @@ -1,5 +1,6 @@ package JGS.CasperEvent.domain.health.api; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -11,6 +12,8 @@ public class HealthController { @GetMapping public ResponseEntity health(){ - return ResponseEntity.ok().body("Server OK"); + return ResponseEntity + .status(HttpStatus.OK) + .body("Server OK"); } }