generated from pricelees/issue-pr-template
[#44] 매장 기능 도입 #45
@ -17,11 +17,11 @@ export const confirmReservation = async (reservationId: string): Promise<void> =
|
|||||||
|
|
||||||
|
|
||||||
export const cancelReservation = async (id: string, cancelReason: string): Promise<void> => {
|
export const cancelReservation = async (id: string, cancelReason: string): Promise<void> => {
|
||||||
return await apiClient.post(`/reservations/${id}/cancel`, { cancelReason }, true);
|
return await apiClient.post(`/reservations/${id}/cancel`, { cancelReason });
|
||||||
};
|
};
|
||||||
|
|
||||||
export const fetchSummaryByMember = async (): Promise<ReservationOverviewListResponse> => {
|
export const fetchAllOverviewByUser = async (): Promise<ReservationOverviewListResponse> => {
|
||||||
return await apiClient.get<ReservationOverviewListResponse>('/reservations/summary');
|
return await apiClient.get<ReservationOverviewListResponse>('/reservations/overview');
|
||||||
}
|
}
|
||||||
|
|
||||||
export const fetchDetailById = async (reservationId: string): Promise<ReservationDetailRetrieveResponse> => {
|
export const fetchDetailById = async (reservationId: string): Promise<ReservationDetailRetrieveResponse> => {
|
||||||
|
|||||||
@ -85,9 +85,9 @@
|
|||||||
/* --- Status Badge --- */
|
/* --- Status Badge --- */
|
||||||
.card-status-badge {
|
.card-status-badge {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 15px;
|
top: 30px;
|
||||||
right: 15px;
|
right: 10px;
|
||||||
padding: 4px 10px;
|
padding: 3px 10px;
|
||||||
border-radius: 12px;
|
border-radius: 12px;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
import { cancelPayment } from '@_api/payment/paymentAPI';
|
import { cancelPayment } from '@_api/payment/paymentAPI';
|
||||||
import type { PaymentRetrieveResponse } from '@_api/payment/PaymentTypes';
|
import type { PaymentRetrieveResponse } from '@_api/payment/PaymentTypes';
|
||||||
import { cancelReservation, fetchDetailById, fetchSummaryByMember } from '@_api/reservation/reservationAPI';
|
import { cancelReservation, fetchDetailById, fetchAllOverviewByUser } from '@_api/reservation/reservationAPI';
|
||||||
import {
|
import {
|
||||||
ReservationStatus,
|
ReservationStatus,
|
||||||
type ReservationDetail,
|
type ReservationDetail,
|
||||||
@ -191,7 +191,7 @@ const MyReservationPage: React.FC = () => {
|
|||||||
const loadReservations = async () => {
|
const loadReservations = async () => {
|
||||||
try {
|
try {
|
||||||
setIsLoading(true);
|
setIsLoading(true);
|
||||||
const data = await fetchSummaryByMember();
|
const data = await fetchAllOverviewByUser();
|
||||||
setReservations(data.reservations);
|
setReservations(data.reservations);
|
||||||
setError(null);
|
setError(null);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
|||||||
@ -48,7 +48,7 @@ interface ReservationAPI {
|
|||||||
|
|
||||||
@Operation(summary = "회원별 예약 요약 목록 조회")
|
@Operation(summary = "회원별 예약 요약 목록 조회")
|
||||||
@ApiResponses(ApiResponse(responseCode = "200", useReturnTypeSchema = true))
|
@ApiResponses(ApiResponse(responseCode = "200", useReturnTypeSchema = true))
|
||||||
fun findSummaryByMemberId(
|
fun findOverviewByUser(
|
||||||
@User user: CurrentUserContext,
|
@User user: CurrentUserContext,
|
||||||
): ResponseEntity<CommonApiResponse<ReservationOverviewListResponse>>
|
): ResponseEntity<CommonApiResponse<ReservationOverviewListResponse>>
|
||||||
|
|
||||||
|
|||||||
@ -54,8 +54,8 @@ class ReservationController(
|
|||||||
return ResponseEntity.ok().body(CommonApiResponse())
|
return ResponseEntity.ok().body(CommonApiResponse())
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/summary")
|
@GetMapping("/overview")
|
||||||
override fun findSummaryByMemberId(
|
override fun findOverviewByUser(
|
||||||
@User user: CurrentUserContext,
|
@User user: CurrentUserContext,
|
||||||
): ResponseEntity<CommonApiResponse<ReservationOverviewListResponse>> {
|
): ResponseEntity<CommonApiResponse<ReservationOverviewListResponse>> {
|
||||||
val response = reservationService.findAllUserReservationOverview(user)
|
val response = reservationService.findAllUserReservationOverview(user)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user