[1 - 3단계 방탈출 사용자 예약] 이든(최승준) 미션 제출합니다. #57
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,61 +1,65 @@ | ||
| package roomescape.controller; | ||
|
|
||
| import jakarta.servlet.http.HttpServletResponse; | ||
| import org.springframework.format.annotation.DateTimeFormat; | ||
| import org.springframework.http.HttpStatus; | ||
| import org.springframework.web.bind.annotation.DeleteMapping; | ||
| import org.springframework.web.bind.annotation.GetMapping; | ||
| import org.springframework.web.bind.annotation.PathVariable; | ||
| import org.springframework.web.bind.annotation.PostMapping; | ||
| import org.springframework.web.bind.annotation.RequestBody; | ||
| import org.springframework.web.bind.annotation.RequestParam; | ||
| import org.springframework.web.bind.annotation.ResponseStatus; | ||
| import org.springframework.web.bind.annotation.RestController; | ||
| import roomescape.dto.reservation.ReservationRequest; | ||
| import roomescape.dto.reservation.ReservationResponse; | ||
| import roomescape.dto.reservation.ReservationTimeInfosResponse; | ||
| import roomescape.dto.reservation.ReservationsResponse; | ||
| import roomescape.global.dto.response.ApiResponse; | ||
| import roomescape.service.ReservationService; | ||
|
|
||
| import java.time.LocalDate; | ||
|
|
||
| @RestController | ||
| public class ReservationController { | ||
|
|
||
| private final ReservationService reservationService; | ||
|
|
||
| public ReservationController(final ReservationService reservationService) { | ||
| this.reservationService = reservationService; | ||
| } | ||
|
|
||
| @GetMapping("/reservations") | ||
| @ResponseStatus(HttpStatus.OK) | ||
| public ApiResponse<ReservationsResponse> getAllReservations() { | ||
| return ApiResponse.success(reservationService.findAllReservations()); | ||
| } | ||
|
|
||
| @GetMapping("/reservations/themes/{themeId}/times") | ||
| @ResponseStatus(HttpStatus.OK) | ||
| public ApiResponse<ReservationTimeInfosResponse> getReservationTimeInfos( | ||
| @PathVariable final Long themeId, | ||
| @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") final LocalDate date) { | ||
| return ApiResponse.success(reservationService.findReservationsByDateAndThemeId(date, themeId)); | ||
| } | ||
|
|
||
| @PostMapping("/reservations") | ||
| @ResponseStatus(HttpStatus.CREATED) | ||
| public ApiResponse<ReservationResponse> saveReservation( | ||
| @RequestBody final ReservationRequest reservationRequest, | ||
| HttpServletResponse response | ||
| ) { | ||
| ReservationResponse reservationResponse = reservationService.addReservation(reservationRequest); | ||
|
|
||
| response.setHeader("Location", "/reservations/" + reservationResponse.id()); | ||
|
There was a problem hiding this comment. Location이라는 변수명이 실수할 여지가 있어서 수정 전 방식대로 활용하시는 것도 좋다고 생각합니다 ㅎ 이런 방법도 있습니다. @PostMapping("/reservations")
public ResponseEntity<ApiResponse<ReservationResponse>> saveReservation(
@RequestBody final ReservationRequest reservationRequest
) {
ReservationResponse reservationResponse = reservationService.addReservation(reservationRequest);
URI location = ServletUriComponentsBuilder.fromCurrentRequest()
.path("/{id}")
.buildAndExpand(reservationResponse.id())
.toUri();
return ResponseEntity.created(location).body(ApiResponse.success(reservationResponse));
}There was a problem hiding this comment. 지금처럼 일반 문자열로 관리하면 충분히 실수할 여지가 있을 것 같습니다..! 그런데 로직이 너무 길어지는 느낌이 있어서 response.setHeader(HttpHeaders.LOCATION, "/reservations/" + reservationResponse.id());이렇게 변경해볼 수 있을 것 같습니다! |
||
| return ApiResponse.success(reservationResponse); | ||
| } | ||
|
|
||
| @DeleteMapping("/reservations/{id}") | ||
| @ResponseStatus(HttpStatus.NO_CONTENT) | ||
| public ApiResponse<Void> removeReservation(@PathVariable final Long id) { | ||
| reservationService.removeReservationById(id); | ||
|
|
||
| return ApiResponse.success(); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,56 +1,67 @@ | ||
| package roomescape.controller; | ||
|
|
||
| import jakarta.servlet.http.HttpServletResponse; | ||
| import org.springframework.format.annotation.DateTimeFormat; | ||
| import org.springframework.http.HttpStatus; | ||
| import org.springframework.web.bind.annotation.DeleteMapping; | ||
| import org.springframework.web.bind.annotation.GetMapping; | ||
| import org.springframework.web.bind.annotation.PathVariable; | ||
| import org.springframework.web.bind.annotation.PostMapping; | ||
| import org.springframework.web.bind.annotation.RequestBody; | ||
| import org.springframework.web.bind.annotation.RequestParam; | ||
| import org.springframework.web.bind.annotation.ResponseStatus; | ||
| import org.springframework.web.bind.annotation.RestController; | ||
| import roomescape.dto.theme.ThemeRequest; | ||
| import roomescape.dto.theme.ThemeResponse; | ||
| import roomescape.dto.theme.ThemesResponse; | ||
| import roomescape.global.dto.response.ApiResponse; | ||
| import roomescape.service.ThemeService; | ||
|
|
||
| import java.time.LocalDate; | ||
|
|
||
| @RestController | ||
| public class ThemeController { | ||
|
|
||
| private final ThemeService themeService; | ||
|
|
||
| public ThemeController(final ThemeService themeService) { | ||
| this.themeService = themeService; | ||
| } | ||
|
|
||
| @GetMapping("/themes") | ||
| @ResponseStatus(HttpStatus.OK) | ||
| public ApiResponse<ThemesResponse> getAllThemes() { | ||
|
|
||
| return ApiResponse.success(themeService.findAllThemes()); | ||
| } | ||
|
|
||
| @GetMapping("/themes/top") | ||
| @ResponseStatus(HttpStatus.OK) | ||
| public ApiResponse<ThemesResponse> getTopNThemesBetweenDate( | ||
| @RequestParam final int count, | ||
| @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") final LocalDate startAt, | ||
| @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") final LocalDate endAt | ||
| ) { | ||
| return ApiResponse.success(themeService.findTopNThemes(count, startAt, endAt)); | ||
| } | ||
|
|
||
| @PostMapping("/themes") | ||
| @ResponseStatus(HttpStatus.CREATED) | ||
| public ApiResponse<ThemeResponse> saveTheme( | ||
| @RequestBody final ThemeRequest request, | ||
| HttpServletResponse response | ||
| ) { | ||
| ThemeResponse themeResponse = themeService.addTheme(request); | ||
| response.setHeader("Location", "/themes/" + themeResponse.id()); | ||
|
|
||
| return ApiResponse.success(themeResponse); | ||
| } | ||
|
|
||
| @DeleteMapping("/themes/{id}") | ||
| @ResponseStatus(HttpStatus.NO_CONTENT) | ||
| public ApiResponse<Void> removeTheme(@PathVariable final Long id) { | ||
| themeService.removeThemeById(id); | ||
|
|
||
| return ApiResponse.success(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,53 @@ | ||
| package roomescape.controller; | ||
|
|
||
| import jakarta.servlet.http.HttpServletResponse; | ||
| import org.springframework.http.HttpStatus; | ||
| import org.springframework.web.bind.annotation.DeleteMapping; | ||
| import org.springframework.web.bind.annotation.GetMapping; | ||
| import org.springframework.web.bind.annotation.PathVariable; | ||
| import org.springframework.web.bind.annotation.PostMapping; | ||
| import org.springframework.web.bind.annotation.RequestBody; | ||
| import org.springframework.web.bind.annotation.ResponseStatus; | ||
| import org.springframework.web.bind.annotation.RestController; | ||
| import roomescape.dto.time.TimeRequest; | ||
| import roomescape.dto.time.TimeResponse; | ||
| import roomescape.dto.time.TimesResponse; | ||
| import roomescape.global.dto.response.ApiResponse; | ||
| import roomescape.service.TimeService; | ||
|
|
||
| @RestController | ||
| public class TimeController { | ||
|
|
||
| private final TimeService timeService; | ||
|
|
||
| public TimeController(final TimeService timeService) { | ||
| this.timeService = timeService; | ||
| } | ||
|
|
||
| @GetMapping("/times") | ||
| @ResponseStatus(HttpStatus.OK) | ||
| public ApiResponse<TimesResponse> getAllTimes() { | ||
|
|
||
| return ApiResponse.success(timeService.findAllTimes()); | ||
| } | ||
|
|
||
| @PostMapping("/times") | ||
| @ResponseStatus(HttpStatus.CREATED) | ||
| public ApiResponse<TimeResponse> saveTime( | ||
| @RequestBody final TimeRequest timeRequest, | ||
| HttpServletResponse response | ||
| ) { | ||
| TimeResponse timeResponse = timeService.addTime(timeRequest); | ||
| response.setHeader("Location", "/times/" + timeResponse.id()); | ||
|
|
||
| return ApiResponse.success(timeResponse); | ||
| } | ||
|
|
||
| @DeleteMapping("/times/{id}") | ||
| @ResponseStatus(HttpStatus.NO_CONTENT) | ||
| public ApiResponse<Void> removeTime(@PathVariable final Long id) { | ||
| timeService.removeTimeById(id); | ||
|
|
||
| return ApiResponse.success(); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
꼼꼼한 API 문서네요 ㅎ 👍