fix: qa 해결

Author: pepperdad

apps/ticket-admin/src/app/events/[eventId]/edit/_clientBoundary/EventEditFormClient/index.tsx

@@ -697,7 +697,7 @@ export function EventEditFormClient({ eventId }: Props) {
         </Typography>
         <Typography type="body16" color="gray200">
           {eventDetailData.startDate}~{eventDetailData.endDate} / {eventDetailData.startTime}~
-          {eventDetailData.endTime}/{eventDetailData.venue}
+          {eventDetailData.endTime} / {eventDetailData.venue}
         </Typography>
       </div>
       <div className={cx("container")}>

apps/ticket-admin/src/app/events/[eventId]/edit/timeTable/_clientBoundary/TimeTableManagementClient/index.tsx

@@ -1,12 +1,15 @@
 "use client";
 
+import Link from "next/link";
 import classNames from "classnames/bind";
 
 import { Button, Flex, Select, TextField, Typography } from "@permit/design-system";
 import { useSelect, useTextField } from "@permit/design-system/hooks";
 import { useTimeTableSuspenseQuery } from "@/data/admin/getTimeTables/queries";
 import { useTimeTableMutation } from "@/data/admin/patchTimeTables/mutation";
 import { usePostTimeTableInitial } from "@/data/admin/postTimeTable/mutation";
+import { EXTERNAL_PATH } from "@/shared/constants/path";
+import { getPathUrl } from "@/shared/helpers/getPathUrl";
 
 import styles from "./index.module.scss";
 
@@ -24,8 +27,6 @@ export const TimeTableManagementClient = ({ eventId }: Props) => {
     },
   });
 
-  console.log("@@timeTableData", timeTableData);
-
   const { mutateAsync: createTimeTable, isPending } = usePostTimeTableInitial({
     eventId,
   });
@@ -147,6 +148,13 @@ export const TimeTableManagementClient = ({ eventId }: Props) => {
     <div className={cx("container")}>
       <Typography type="title24">TimeTable</Typography>
       {/* TODO: 최초 등록에만 사용해주세요. */}
+      {timeTableData?.eventId && (
+        <Link href={getPathUrl(EXTERNAL_PATH.TIMETABLE, { eventId: timeTableData.eventId })}>
+          <Typography type="body16" weight="bold" style={{ marginTop: "12px", color: "#5640ff" }}>
+            TimeTable 로 이동하기
+          </Typography>
+        </Link>
+      )}
 
       <Flex direction="column" gap={24} style={{ marginTop: 32 }}>
         <Flex gap={24}>
@@ -162,28 +170,29 @@ export const TimeTableManagementClient = ({ eventId }: Props) => {
           </Flex>
           <Flex className={cx("row")} direction="column" gap={12}>
             <Typography type="body16" weight="bold">
-              TimeTable End Date
+              Start Time
             </Typography>
-            <Select
-              type="calendar"
-              placeholder="타임테이블 종료 날짜를 선택해주세요"
-              {...timeTableEndDateField.selectProps}
+            <TextField
+              placeholder="타임테이블 시작 시간을 입력해주세요 (HH:MM)"
+              value={timeTableStartTimeField.value}
+              onChange={timeTableStartTimeField.handleChange}
+              error={timeTableStartTimeField.error}
             />
           </Flex>
         </Flex>
 
         <Flex gap={24}>
           <Flex className={cx("row")} direction="column" gap={12}>
             <Typography type="body16" weight="bold">
-              Start Time
+              TimeTable End Date
             </Typography>
-            <TextField
-              placeholder="타임테이블 시작 시간을 입력해주세요 (HH:MM)"
-              value={timeTableStartTimeField.value}
-              onChange={timeTableStartTimeField.handleChange}
-              error={timeTableStartTimeField.error}
+            <Select
+              type="calendar"
+              placeholder="타임테이블 종료 날짜를 선택해주세요"
+              {...timeTableEndDateField.selectProps}
             />
           </Flex>
+
           <Flex className={cx("row")} direction="column" gap={12}>
             <Typography type="body16" weight="bold">
               End Time

apps/ticket-admin/src/data/admin/getTimeTables/queries.ts

@@ -17,15 +17,16 @@ import { TimeTableParams, TimeTableResponse } from "./types";
 /** 행사 타임테이블 조회 API */
 export const timeTableOptions = (
   params: TimeTableParams,
-): PermitQueryOptions<TimeTableResponse> => {
+): PermitQueryOptions<TimeTableResponse | null> => {
   return {
     queryKey: [ADMIN_QUERY_KEYS.TICEKTS, params.eventId],
     queryFn: () => {
       const url = getPathUrl(API_URL.ADMIN.TIME_TABLE, { eventId: params.eventId });
 
-      return instance.get<TimeTableResponse>(url).then((res) => {
-        return res?.data || null;
-      });
+      return instance
+        .get<TimeTableResponse>(url)
+        .then((res) => res.data)
+        .catch(() => null);
     },
   };
 };
@@ -34,7 +35,7 @@ export const timeTableOptions = (
 export const useTimeTableQuery = ({
   eventId,
   options,
-}: TimeTableParams & OptionsObject<UsePermitQueryOptions<TimeTableResponse>>) => {
+}: TimeTableParams & OptionsObject<UsePermitQueryOptions<TimeTableResponse | null>>) => {
   return useQuery({
     ...timeTableOptions({ eventId }),
     ...options,
@@ -45,7 +46,7 @@ export const useTimeTableQuery = ({
 export const useTimeTableSuspenseQuery = ({
   eventId,
   options,
-}: TimeTableParams & OptionsObject<UsePermitSuspenseQueryOptions<TimeTableResponse>>) => {
+}: TimeTableParams & OptionsObject<UsePermitSuspenseQueryOptions<TimeTableResponse | null>>) => {
   return useSuspenseQuery({
     ...timeTableOptions({ eventId }),
     ...options,

apps/ticket-admin/src/data/admin/getTimeTables/types.ts

@@ -3,6 +3,7 @@ export type TimeTableParams = {
 };
 
 export type TimeTableResponse = {
+  eventId: string;
   timetableId: number;
   timetableStartDate: string;
   timetableStartTime: string;

apps/ticket-admin/src/lib/axios/index.ts

@@ -115,6 +115,6 @@ instance.interceptors.response.use(
       }
     }
 
-    return Promise.reject(error.response?.data);
+    return Promise.reject(error?.response?.data);
   },
 );

apps/ticket-admin/src/shared/constants/path.ts

@@ -8,4 +8,5 @@ const phase =
 export const EXTERNAL_PATH = {
   HOME: `https://${phase}.permitseoul.com`,
   LOGIN: `https://${phase}.permitseoul.com/login`,
+  TIMETABLE: `https://${phase}.permitseoul.com/event/:eventId/time-table`,
 } as const;

apps/ticket/src/app/(pages)/entry/[ticketCode]/_clientBounday/EntryClient/index.tsx

@@ -18,6 +18,7 @@ const cx = classNames.bind(styles);
 
 const NO_ENTRY_TIME = 40013;
 const ALREADY_USED_TICKET = 40906;
+const CANCELED_TICKET = 40015;
 
 type Props = {
   ticketCode: string;
@@ -89,6 +90,19 @@ export const EntryClient = ({ ticketCode }: Props) => {
     );
   }
 
+  if (error?.code === CANCELED_TICKET) {
+    return (
+      <Flex direction="column" justify="center" align="center" style={{ height: "100vh" }}>
+        <Link className={cx("logo")} href="/">
+          <Image src={permitLogo} alt="PERMIT" className={cx("logo_image")} />
+        </Link>
+        <Typography type="title20" weight="bold" color="white">
+          취소된 티켓입니다.
+        </Typography>
+      </Flex>
+    );
+  }
+
   if (error) {
     throw error;
   }

apps/ticket/src/app/(pages)/event/[eventId]/_clientBoundray/DesktopTicketSectionClient/index.tsx

@@ -36,8 +36,8 @@ export const DesktopTicketSectionClient = ({ eventId, eventName }: Props) => {
 
   const [isLoading, setIsLoading] = useState(false);
   const selectedRound = eventTicketsData.rounds.find((round) => round.roundAvailable);
-  const [selectedRoundId, setSelectedRoundId] = useState<number>(
-    selectedRound?.roundId || eventTicketsData.rounds[0].roundId,
+  const [selectedRoundId, setSelectedRoundId] = useState<number | undefined>(
+    selectedRound?.roundId,
   );
   const [selectedTickets, setSelectedTickets] = useState<SelectedTicket[]>([]);
   const [isPromocodeOpen, setIsPromocodeOpen] = useState(false);

apps/ticket/src/lib/axios/index.ts

@@ -120,7 +120,7 @@ instance.interceptors.response.use(
       }
     }
 
-    return Promise.reject(error.response?.data);
+    return Promise.reject(error?.response?.data);
   },
 );