Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 44 additions & 18 deletions src/app/reservations/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import BottomSheet from '@/components/common/BottomSheet';
import Tabs from '@/components/common/Tabs';
import LoginRequired from '@/components/common/LoginRequired';
import { formatDate } from '@/lib/utils';
import { useReservationsQuery, useCancelReservationMutation } from '@/lib/reservationQuery';
import { useReservationsQuery, useCancelReservationMutation, useMarkVisitedMutation } from '@/lib/reservationQuery';
import {
useCreateReviewMutation,
useMyReviewsQuery,
Expand Down Expand Up @@ -48,12 +48,16 @@ const STATUS_CONFIG: Record<
function ReservationCard({
reservation,
onCancel,
onMarkVisited,
isMarkingVisited,
onWriteReview,
onEditReview,
isReviewed,
}: {
reservation: Reservation;
onCancel: (id: number) => void;
onMarkVisited: (id: number) => void;
isMarkingVisited: boolean;
onWriteReview: (reservation: Reservation) => void;
onEditReview: (reservation: Reservation) => void;
isReviewed: boolean;
Expand Down Expand Up @@ -105,23 +109,34 @@ function ReservationCard({

{/* 액션 버튼 */}
{isUpcoming && (
<div className="mt-4 flex gap-2">
<button
onClick={() =>
router.push(
`/stores/${reservation.storeId}?changeFrom=${reservation.id}`
)
}
className="flex-1 rounded-lg border border-blue-200 py-2 text-sm font-medium text-blue-500 hover:bg-blue-50"
>
예약 변경
</button>
<button
onClick={() => onCancel(reservation.id)}
className="flex-1 rounded-lg border border-red-200 py-2 text-sm font-medium text-red-500 hover:bg-red-50"
>
예약 취소
</button>
<div className="mt-4 flex flex-col gap-2">
{reservation.status === 'CONFIRMED' && (
<button
onClick={() => onMarkVisited(reservation.id)}
disabled={isMarkingVisited}
className="w-full rounded-lg bg-orange-500 py-2 text-sm font-medium text-white hover:bg-orange-600 disabled:opacity-50 disabled:cursor-not-allowed"
>
{isMarkingVisited ? '처리 중...' : '방문 확정'}
</button>
)}
<div className="flex gap-2">
<button
onClick={() =>
router.push(
`/stores/${reservation.storeId}?changeFrom=${reservation.id}`
)
}
className="flex-1 rounded-lg border border-blue-200 py-2 text-sm font-medium text-blue-500 hover:bg-blue-50"
>
예약 변경
</button>
<button
onClick={() => onCancel(reservation.id)}
className="flex-1 rounded-lg border border-red-200 py-2 text-sm font-medium text-red-500 hover:bg-red-50"
>
예약 취소
</button>
</div>
</div>
)}

Expand Down Expand Up @@ -166,6 +181,7 @@ export default function ReservationsPage() {
const userId = useAuthStore((s) => s.userId) ?? 0;
const { data: reservations = [], isLoading } = useReservationsQuery();
const { mutate: cancelReservation } = useCancelReservationMutation();
const { mutate: markVisited, isPending: isMarkingVisited } = useMarkVisitedMutation();
const { data: vacancies = [], isLoading: isVacancyLoading } = useMyVacanciesQuery();
const { mutate: cancelVacancy } = useCancelVacancyMutation();
const [cancelTarget, setCancelTarget] = useState<number | null>(null);
Expand Down Expand Up @@ -199,6 +215,14 @@ export default function ReservationsPage() {
setCancelTarget(id);
};

const handleMarkVisited = (id: number) => {
markVisited(id, {
onSuccess: () => {
toast.success('방문 처리되었습니다.');
},
});
};

const confirmCancel = () => {
if (cancelTarget === null) return;
cancelReservation(cancelTarget, {
Expand Down Expand Up @@ -370,6 +394,8 @@ export default function ReservationsPage() {
key={reservation.id}
reservation={reservation}
onCancel={handleCancel}
onMarkVisited={handleMarkVisited}
isMarkingVisited={isMarkingVisited}
onWriteReview={openReviewModal}
onEditReview={openEditReviewModal}
isReviewed={reviewedReservationIds.has(reservation.id)}
Expand Down
8 changes: 8 additions & 0 deletions src/lib/reservationApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,11 @@ export const updateReservation = async (
const response = await api.patch(`/reservations/${reservationId}`, payload);
return unwrap<Reservation>(response, {} as Reservation);
};

/**
* 사용자가 직접 "방문 확정" 버튼을 눌러 예약을 VISITED 상태로 전환한다.
* 백엔드는 CONFIRMED 상태에서만 허용하며 ReservationVisitedEvent로 알림이 자동 발송된다.
*/
export const markReservationVisited = async (reservationId: number): Promise<void> => {
await api.patch(`/reservations/${reservationId}/visit`);
};
14 changes: 13 additions & 1 deletion src/lib/reservationQuery.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
import { useAuthStore } from '@/stores/authStore';
import { createReservation, getReservations, cancelReservation, updateReservation } from './reservationApi';
import { createReservation, getReservations, cancelReservation, updateReservation, markReservationVisited } from './reservationApi';
import type { ReservationRequest, ReservationUpdateRequest } from './reservationApi';

const reservationsKey = (userId: number | null) => ['reservations', userId];
Expand Down Expand Up @@ -55,3 +55,15 @@ export const useCancelReservationMutation = () => {
},
});
};

export const useMarkVisitedMutation = () => {
const queryClient = useQueryClient();
const userId = useAuthStore((s) => s.userId);

return useMutation({
mutationFn: (reservationId: number) => markReservationVisited(reservationId),
onSuccess: () => {
queryClient.invalidateQueries({ queryKey: reservationsKey(userId) });
},
});
};