diff --git a/frontend/src/api/reservation/reservationAPI.ts b/frontend/src/api/reservation/reservationAPI.ts index 2f3127ff..30a8dfd2 100644 --- a/frontend/src/api/reservation/reservationAPI.ts +++ b/frontend/src/api/reservation/reservationAPI.ts @@ -17,11 +17,11 @@ export const confirmReservation = async (reservationId: string): Promise = export const cancelReservation = async (id: string, cancelReason: string): Promise => { - return await apiClient.post(`/reservations/${id}/cancel`, { cancelReason }, true); + return await apiClient.post(`/reservations/${id}/cancel`, { cancelReason }); }; -export const fetchSummaryByMember = async (): Promise => { - return await apiClient.get('/reservations/summary'); +export const fetchAllOverviewByUser = async (): Promise => { + return await apiClient.get('/reservations/overview'); } export const fetchDetailById = async (reservationId: string): Promise => { diff --git a/frontend/src/css/my-reservation-v2.css b/frontend/src/css/my-reservation-v2.css index c0a1931c..afaa66ea 100644 --- a/frontend/src/css/my-reservation-v2.css +++ b/frontend/src/css/my-reservation-v2.css @@ -85,9 +85,9 @@ /* --- Status Badge --- */ .card-status-badge { position: absolute; - top: 15px; - right: 15px; - padding: 4px 10px; + top: 30px; + right: 10px; + padding: 3px 10px; border-radius: 12px; font-size: 12px; font-weight: 700; diff --git a/frontend/src/pages/MyReservationPage.tsx b/frontend/src/pages/MyReservationPage.tsx index 9fc7cb0d..539f2b8b 100644 --- a/frontend/src/pages/MyReservationPage.tsx +++ b/frontend/src/pages/MyReservationPage.tsx @@ -1,6 +1,6 @@ import { cancelPayment } from '@_api/payment/paymentAPI'; import type { PaymentRetrieveResponse } from '@_api/payment/PaymentTypes'; -import { cancelReservation, fetchDetailById, fetchSummaryByMember } from '@_api/reservation/reservationAPI'; +import { cancelReservation, fetchDetailById, fetchAllOverviewByUser } from '@_api/reservation/reservationAPI'; import { ReservationStatus, type ReservationDetail, @@ -191,7 +191,7 @@ const MyReservationPage: React.FC = () => { const loadReservations = async () => { try { setIsLoading(true); - const data = await fetchSummaryByMember(); + const data = await fetchAllOverviewByUser(); setReservations(data.reservations); setError(null); } catch (err) { diff --git a/src/main/kotlin/roomescape/reservation/docs/ReservationAPI.kt b/src/main/kotlin/roomescape/reservation/docs/ReservationAPI.kt index 15ffcbb1..bd32e862 100644 --- a/src/main/kotlin/roomescape/reservation/docs/ReservationAPI.kt +++ b/src/main/kotlin/roomescape/reservation/docs/ReservationAPI.kt @@ -48,7 +48,7 @@ interface ReservationAPI { @Operation(summary = "회원별 예약 요약 목록 조회") @ApiResponses(ApiResponse(responseCode = "200", useReturnTypeSchema = true)) - fun findSummaryByMemberId( + fun findOverviewByUser( @User user: CurrentUserContext, ): ResponseEntity> diff --git a/src/main/kotlin/roomescape/reservation/web/ReservationController.kt b/src/main/kotlin/roomescape/reservation/web/ReservationController.kt index 63970bf5..68117ff9 100644 --- a/src/main/kotlin/roomescape/reservation/web/ReservationController.kt +++ b/src/main/kotlin/roomescape/reservation/web/ReservationController.kt @@ -54,8 +54,8 @@ class ReservationController( return ResponseEntity.ok().body(CommonApiResponse()) } - @GetMapping("/summary") - override fun findSummaryByMemberId( + @GetMapping("/overview") + override fun findOverviewByUser( @User user: CurrentUserContext, ): ResponseEntity> { val response = reservationService.findAllUserReservationOverview(user)