From a1d5985affde34c34f34a72bb506d26e13081dea Mon Sep 17 00:00:00 2001 From: Yeolyi Date: Mon, 18 Sep 2023 15:45:21 +0900 Subject: [PATCH] =?UTF-8?q?=EC=98=88=EC=95=BD=20=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95,=20ReservationDetail=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/index.ts | 11 ++++++-- apis/reservation.ts | 14 +++++++--- app/[locale]/layout.tsx | 2 +- components/layout/header/Header.tsx | 2 -- .../reservations/calendar/CalendarColumn.tsx | 2 ++ .../reservations/calendar/CalendarContent.tsx | 1 - .../modals/AddReservationModal.tsx | 26 ++++++++++++++----- .../modals/ReservationDetailModal.tsx | 25 ++++++++++++++---- 8 files changed, 62 insertions(+), 21 deletions(-) diff --git a/apis/index.ts b/apis/index.ts index 0835610ed..6dcfa257d 100644 --- a/apis/index.ts +++ b/apis/index.ts @@ -57,7 +57,14 @@ export const deleteRequestWithCookie: typeof deleteRequest = async (url, init) = const checkError = (response: Response) => { if (!response.ok) { - throw new Error(`네트워크 에러 -status: ${response.status}`); + throw new NetworkError(response.status); } }; + +export class NetworkError extends Error { + statusCode: number; + constructor(statusCode: number) { + super(`네트워크 에러\nstatus: ${statusCode}`); + this.statusCode = statusCode; + } +} diff --git a/apis/reservation.ts b/apis/reservation.ts index 0b9f6d015..66091bdbb 100644 --- a/apis/reservation.ts +++ b/apis/reservation.ts @@ -13,12 +13,20 @@ export const postReservation = async (body: ReservationPostBody) => { }); }; -export const getWeeklyReservation = (params: { +export const getWeeklyReservation = async (params: { roomId: number; year: number; month: number; day: number; -}) => getRequestWithCookie(`${reservationPath}/week`, params) as Promise; +}) => { + const jsessionId = cookies().get('JSESSIONID'); + return (await getRequest(`${reservationPath}/week`, params, { + credentials: 'include', + headers: { + Cookie: `JSESSIONID=${jsessionId?.value}`, + }, + })) as ReservationPreview[]; +}; export const getReservation = async (id: number) => getRequestWithCookie(`${reservationPath}/${id}`) as Promise; @@ -27,7 +35,7 @@ export const deleteSingleReservation = async (id: number) => { await deleteRequest(`${reservationPath}/${id}`); }; -export const deleteAllRecurringReservation = async (id: number) => { +export const deleteAllRecurringReservation = async (id: string) => { await deleteRequest(`${reservationPath}/recurring/${id}`); }; diff --git a/app/[locale]/layout.tsx b/app/[locale]/layout.tsx index cd46f9833..ad3f421ff 100644 --- a/app/[locale]/layout.tsx +++ b/app/[locale]/layout.tsx @@ -49,7 +49,7 @@ export default async function RootLayout({ -
+
{children}
diff --git a/components/layout/header/Header.tsx b/components/layout/header/Header.tsx index de4f3982a..c97dd3cc2 100644 --- a/components/layout/header/Header.tsx +++ b/components/layout/header/Header.tsx @@ -39,8 +39,6 @@ function HeaderRight() { const langButtonText = isEnglish ? '한국어' : 'english'; - console.log(user); - return (
diff --git a/components/reservations/calendar/CalendarColumn.tsx b/components/reservations/calendar/CalendarColumn.tsx index cc3078ebe..4c19fc961 100644 --- a/components/reservations/calendar/CalendarColumn.tsx +++ b/components/reservations/calendar/CalendarColumn.tsx @@ -78,6 +78,8 @@ const CalendarCell = ({ reservation }: { reservation: ReservationPreview }) => { endTime.getHours(), )}:${padZero(endTime.getMinutes())}`; + console.log(reservation.id); + return ( { }; const isSameDay = (date1: Date, date2: Date) => { - console.log(date1, date2); return ( date1.getFullYear() === date2.getFullYear() && date1.getMonth() === date2.getMonth() && diff --git a/components/reservations/modals/AddReservationModal.tsx b/components/reservations/modals/AddReservationModal.tsx index d8584f561..d3cccef60 100644 --- a/components/reservations/modals/AddReservationModal.tsx +++ b/components/reservations/modals/AddReservationModal.tsx @@ -3,6 +3,8 @@ import Link from 'next-intl/link'; import { FormEventHandler, ReactNode, useReducer, useState } from 'react'; +import { NetworkError } from '@/apis'; + import { postReservation } from '@/apis/reservation'; import Dropdown from '@/components/common/Dropdown'; @@ -20,21 +22,31 @@ export default function AddReservationModal({ roomId }: { roomId: number }) { const [privacyChecked, togglePrivacyChecked] = useReducer((x) => !x, false); const [body, setBody] = useState(getDefaultBodyValue(roomId)); - const canSubmit = - privacyChecked && body.title !== '' && body.contactEmail !== '' && body.professor !== ''; - const handleSubmit: FormEventHandler = async (e) => { e.preventDefault(); + + const canSubmit = + privacyChecked && body.title !== '' && body.contactEmail !== '' && body.professor !== ''; + if (!canSubmit) { infoToast('모든 필수 정보를 입력해주세요'); return; } try { await postReservation(body); - closeModal(); + window.location.reload(); } catch (e) { - if (e instanceof Error) errorToast(e.message); - else errorToast('알 수 없는 에러'); + if (e instanceof NetworkError) { + if (e.statusCode === 409) { + errorToast('해당 위치에 예약이 존재합니다.'); + } else { + errorToast(e.message); + } + } else if (e instanceof Error) { + errorToast(e.message); + } else { + errorToast('알 수 없는 에러'); + } } }; @@ -103,7 +115,7 @@ export default function AddReservationModal({ roomId }: { roomId: number }) { contents={Array(14) .fill(0) .map((_, i) => i + 1 + '회')} - selectedIndex={body.recurringWeeks} + selectedIndex={body.recurringWeeks - 1} onClick={(x) => buildBodyValueSetter('recurringWeeks')(x + 1)} /> diff --git a/components/reservations/modals/ReservationDetailModal.tsx b/components/reservations/modals/ReservationDetailModal.tsx index 505616b93..e07975dc5 100644 --- a/components/reservations/modals/ReservationDetailModal.tsx +++ b/components/reservations/modals/ReservationDetailModal.tsx @@ -1,6 +1,9 @@ 'use client'; import { ButtonHTMLAttributes, DetailedHTMLProps, useState } from 'react'; +import useSWR from 'swr'; + +import { getRequestWithCookie } from '@/apis'; import { deleteAllRecurringReservation, deleteSingleReservation } from '@/apis/reservation'; @@ -13,9 +16,15 @@ import { Reservation } from '@/types/reservation'; import ModalFrame from '../../modal/ModalFrame'; import BasicButton from '../BasicButton'; -export default function ReservationDetailModal({ reservation }: { reservation: Reservation }) { +export default function ReservationDetailModal({ reservationId }: { reservationId: number }) { + const { data: reservation } = useSWR( + `/reservation/${reservationId}`, + getRequestWithCookie, + ); const { closeModal } = useModal(); + if (reservation === undefined) return <>; + const dateStr = new Date(reservation.startTime).toLocaleString('ko-kr', { year: '2-digit', month: '2-digit', @@ -47,7 +56,7 @@ export default function ReservationDetailModal({ reservation }: { reservation: R

이메일: {reservation.contactEmail}

핸드폰: {reservation.contactPhone}

- +
{ +const DeleteButtons = ({ + reservationId, + recurrenceId, +}: { + reservationId: number; + recurrenceId: number; +}) => { const [submitting, setSubmitting] = useState(false); const { closeModal } = useModal(); @@ -68,7 +83,7 @@ const DeleteButtons = ({ reservationId }: { reservationId: number }) => { if (submitting) return; setSubmitting(true); try { - await deleteAllRecurringReservation(reservationId); + await deleteAllRecurringReservation(recurrenceId); closeModal(); } catch { errorToast('문제가 발생했습니다'); @@ -111,7 +126,7 @@ export const ReservationDetailModalButton = ({ return (