-
Notifications
You must be signed in to change notification settings - Fork 82
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[3 - 4단계 방탈출 예약 대기] 카피(김상혁) 미션 제출합니다. (#107)
* fix: 불필요 ddl 컬럼 삭제 * refactor: jpa 자동 ddl 생성 none 설정 * feat: 3단계 클라이언트 코드 추가 * chore: jpa ddl auto를 validate로 변경 * refactor: 예약 여부 객체 이름 명확히 변경 * feat: 예약 엔티티에 예약 상태 필드 추가 및 예약 생성 시 예약,대기 여부 받도록 변경 * feat: 예약 대기 요청 api 구현 * feat: 예약 상태 출력 시 예약, 예약대기를 구분하여 출력하는 기능 구현 * feat: 이미 요청한 예약, 예약대기가 존재하는지 검증하는 기능 구현 * feat: 예약페이지 시간 출력 시 시,분만 출력되도록 기능 추가 * feat: 기본 예약 대기 데이터 추가 * feat: 예약 대기 취소 api 구현 * refactor: 예약 대기 api 엔드포인트 waitings로 변경 * refactor: 예약 삭제 api 메서드 명 올바르게 수정 * feat: 모든 엔티티 생성시간 저장하도록 컬럼 추가 * refactor: 작성 쿼리 가독성있게 변경 * feat: 내 예약 목록의 예약 대기 상태에 몇번째 대기인지 포함하는 기능 구현 * feat: 4단계 예약 대기 관리 기능 클라이언트 코드 추가 * feat: 예약 대기 관리 페이지 렌더링 기능 구현 * refactor: 예약대기 엔드포인트 waiting 으로 변경 * feat: 예약 대기 목록 조회하는 api 구현 * feat: 어드민 예약 대기 조회 페이지 네비게이션 바 추가 * feat: 예약 대기 취소 api 구현 * feat: 예약 취소 발생시 예약 대기 자동으로 승인하는 기능 구현 * style: 전체 코드 가독성 있게 줄바꿈 적용 * refactor: api 엔드포인트 맨앞에 /api를 붙여 구분하도록 변경 * feat: 예약 삭제를 관리자만 가능하도록 기능 추가 * feat: 예약 시간 추가, 삭제를 관리자만 가능하도록 기능 추가 * feat: 테마 추가, 삭제를 관리자만 가능하도록 기능 추가 * test: 실패하는 테스트 수정 * feat: 예약 대기 삭제 시 본인, 관리자만 삭제할 수 있도록 기능 추가 * refactor: 특정 날짜, 테마의 시간 별 예약 여부를 찾는 메서드 이름 명확히 변경 * refactor: 예약 상태 변경 메서드 파라미터 받아서 적용하도록 변경 * refactor: enum 비교 ==로 하도록 변경 * refactor: User를 Member로 명명 통일 * refactor: 서비스 CRD로 분류하지 않고 하나로 통일 * refactor: 예약, 대기 요청 여부을 클라이언트에서 request로 넘기도록 변경하여 하나의 예약 api에서 처리하도록 변경 * feat: 사용자가 예약 삭제 시 예약 대기만 삭제할 수 있도록 검증 * refactor: 사용자 예약 대기 취소 api 엔드포인트 reservations으로 변경 * fix: 잘못된 테마 삭제 엔드포인트 수정 * refactor: 모든 예약, 예약 대기 삭제 api를 예약 삭제 api 하나로 통일 * refactor: 관리자 예약 목록 리스트 조회 api 엔드포인트 리소스를 예약으로 변경 * refactor: 중복되는 api RequestMapping으로 공통 처리 * refactor: 예약 대기 목록 조회 메서드 대신 예약 상태에 따라 조회할 수 있도록 변경 * refactor: 예약 여부 반환하는 메서드 equals 대신 contains 사용 * style: sql 들여쓰기 * refactor: reservation 버튼 클릭시 홈으로 가지 않고 예약 페이지로 이동하도록 변경
- Loading branch information
1 parent
fcf4785
commit 15a18e3
Showing
97 changed files
with
1,549 additions
and
902 deletions.
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
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
63 changes: 18 additions & 45 deletions
63
src/main/java/roomescape/controller/api/ReservationTimeApiController.java
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,84 +1,57 @@ | ||
| package roomescape.controller.api; | ||
|
|
||
| import jakarta.validation.Valid; | ||
| import jakarta.validation.constraints.Positive; | ||
| import org.springframework.http.ResponseEntity; | ||
| import org.springframework.validation.annotation.Validated; | ||
| 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.RequestMapping; | ||
| import org.springframework.web.bind.annotation.RequestParam; | ||
| import org.springframework.web.bind.annotation.RestController; | ||
| import roomescape.domain.ReservationStatus; | ||
| import roomescape.domain.BookingStatus; | ||
| import roomescape.domain.ReservationTime; | ||
| import roomescape.service.dto.request.ReservationTimeSaveRequest; | ||
| import roomescape.service.dto.response.ReservationStatusResponse; | ||
| import roomescape.service.dto.response.BookingStatusResponse; | ||
| import roomescape.service.dto.response.ReservationTimeResponse; | ||
| import roomescape.service.reservationtime.ReservationTimeCreateService; | ||
| import roomescape.service.reservationtime.ReservationTimeDeleteService; | ||
| import roomescape.service.reservationtime.ReservationTimeFindService; | ||
| import roomescape.service.reservationtime.ReservationTimeService; | ||
|
|
||
| import java.net.URI; | ||
| import java.time.LocalDate; | ||
| import java.util.List; | ||
|
|
||
| @Validated | ||
| @RequestMapping("/api/times") | ||
| @RestController | ||
| public class ReservationTimeApiController { | ||
|
|
||
| private final ReservationTimeCreateService reservationTimeCreateService; | ||
| private final ReservationTimeFindService reservationTimeFindService; | ||
| private final ReservationTimeDeleteService reservationTimeDeleteService; | ||
| private final ReservationTimeService reservationTimeService; | ||
|
|
||
| public ReservationTimeApiController(ReservationTimeCreateService reservationTimeCreateService, | ||
| ReservationTimeFindService reservationTimeFindService, | ||
| ReservationTimeDeleteService reservationTimeDeleteService) { | ||
| this.reservationTimeCreateService = reservationTimeCreateService; | ||
| this.reservationTimeFindService = reservationTimeFindService; | ||
| this.reservationTimeDeleteService = reservationTimeDeleteService; | ||
| public ReservationTimeApiController(ReservationTimeService reservationTimeService) { | ||
| this.reservationTimeService = reservationTimeService; | ||
| } | ||
|
|
||
| @GetMapping("/times") | ||
| @GetMapping | ||
| public ResponseEntity<List<ReservationTimeResponse>> getReservationTimes() { | ||
| List<ReservationTime> reservationTimes = reservationTimeFindService.findReservationTimes(); | ||
| List<ReservationTime> reservationTimes = reservationTimeService.findReservationTimes(); | ||
| return ResponseEntity.ok( | ||
| reservationTimes.stream() | ||
| .map(ReservationTimeResponse::new) | ||
| .toList() | ||
| ); | ||
| } | ||
|
|
||
| @GetMapping("/times/available") | ||
| public ResponseEntity<List<ReservationStatusResponse>> getReservationTimesIsBooked( | ||
| @RequestParam LocalDate date, | ||
| @RequestParam @Positive(message = "1 이상의 값만 입력해주세요.") long themeId) { | ||
| ReservationStatus reservationStatus = reservationTimeFindService.findIsBooked(date, themeId); | ||
| @GetMapping("/available") | ||
| public ResponseEntity<List<BookingStatusResponse>> getReservationTimesIsBooked(@RequestParam LocalDate date, | ||
| @RequestParam | ||
| @Positive(message = "1 이상의 값만 입력해주세요.") | ||
| long themeId) { | ||
| BookingStatus bookingStatus = reservationTimeService.findTimeSlotsBookingStatus(date, themeId); | ||
| return ResponseEntity.ok( | ||
| reservationStatus.getReservationStatus() | ||
| bookingStatus.getReservationStatus() | ||
| .entrySet() | ||
| .stream() | ||
| .map(status -> new ReservationStatusResponse( | ||
| .map(status -> new BookingStatusResponse( | ||
| status.getKey(), | ||
| status.getValue() | ||
| ) | ||
| ).toList() | ||
| ); | ||
| } | ||
|
|
||
| @PostMapping("/times") | ||
| public ResponseEntity<ReservationTimeResponse> addReservationTime( | ||
| @RequestBody @Valid ReservationTimeSaveRequest request) { | ||
| ReservationTime reservationTime = reservationTimeCreateService.createReservationTime(request); | ||
| return ResponseEntity.created(URI.create("times/" + reservationTime.getId())) | ||
| .body(new ReservationTimeResponse(reservationTime)); | ||
| } | ||
|
|
||
| @DeleteMapping("/times/{id}") | ||
| public ResponseEntity<Void> deleteReservationTime(@PathVariable | ||
| @Positive(message = "1 이상의 값만 입력해주세요.") long id) { | ||
| reservationTimeDeleteService.deleteReservationTime(id); | ||
| return ResponseEntity.noContent().build(); | ||
| } | ||
| } |
51 changes: 12 additions & 39 deletions
51
src/main/java/roomescape/controller/api/ThemeApiController.java
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,71 +1,44 @@ | ||
| package roomescape.controller.api; | ||
|
|
||
| import jakarta.validation.Valid; | ||
| import jakarta.validation.constraints.Positive; | ||
| import java.net.URI; | ||
| import java.util.List; | ||
| import org.springframework.http.ResponseEntity; | ||
| import org.springframework.validation.annotation.Validated; | ||
| 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.RequestMapping; | ||
| import org.springframework.web.bind.annotation.RestController; | ||
| import roomescape.domain.Theme; | ||
| import roomescape.service.dto.request.ThemeSaveRequest; | ||
| import roomescape.service.dto.response.ThemeResponse; | ||
| import roomescape.service.theme.ThemeCreateService; | ||
| import roomescape.service.theme.ThemeDeleteService; | ||
| import roomescape.service.theme.ThemeFindService; | ||
| import roomescape.service.theme.ThemeService; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| @Validated | ||
| @RequestMapping("/api/themes") | ||
| @RestController | ||
| public class ThemeApiController { | ||
|
|
||
| private final ThemeCreateService themeCreateService; | ||
| private final ThemeFindService themeFindService; | ||
| private final ThemeDeleteService themeDeleteService; | ||
| private final ThemeService themeService; | ||
|
|
||
| public ThemeApiController(ThemeCreateService themeCreateService, | ||
| ThemeFindService themeFindService, | ||
| ThemeDeleteService themeDeleteService) { | ||
| this.themeCreateService = themeCreateService; | ||
| this.themeFindService = themeFindService; | ||
| this.themeDeleteService = themeDeleteService; | ||
| public ThemeApiController(ThemeService themeService) { | ||
| this.themeService = themeService; | ||
| } | ||
|
|
||
| @GetMapping("/themes") | ||
| @GetMapping | ||
| public ResponseEntity<List<ThemeResponse>> getThemes() { | ||
| List<Theme> themes = themeFindService.findThemes(); | ||
| List<Theme> themes = themeService.findThemes(); | ||
| return ResponseEntity.ok( | ||
| themes.stream() | ||
| .map(ThemeResponse::new) | ||
| .toList() | ||
| ); | ||
| } | ||
|
|
||
| @GetMapping("/themes/ranks") | ||
| @GetMapping("/ranks") | ||
| public ResponseEntity<List<ThemeResponse>> getThemeRanks() { | ||
| List<Theme> themes = themeFindService.findThemeRanks(); | ||
| List<Theme> themes = themeService.findThemeRanks(); | ||
| return ResponseEntity.ok( | ||
| themes.stream() | ||
| .map(ThemeResponse::new) | ||
| .toList() | ||
| ); | ||
| } | ||
|
|
||
| @PostMapping("/themes") | ||
| public ResponseEntity<ThemeResponse> addTheme(@RequestBody @Valid ThemeSaveRequest request) { | ||
| Theme theme = themeCreateService.createTheme(request); | ||
| return ResponseEntity.created(URI.create("/themes/" + theme.getId())) | ||
| .body(new ThemeResponse(theme)); | ||
| } | ||
|
|
||
| @DeleteMapping("/themes/{id}") | ||
| public ResponseEntity<Void> deleteTheme(@PathVariable | ||
| @Positive(message = "1 이상의 값만 입력해주세요.") long id) { | ||
| themeDeleteService.deleteTheme(id); | ||
| return ResponseEntity.noContent().build(); | ||
| } | ||
| } |
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
Oops, something went wrong.