From 74de642f93e07b8a84bd636b0a507dbb9f92ee00 Mon Sep 17 00:00:00 2001
From: imeureka <lky062@naver.com>
Date: Fri, 15 Mar 2024 23:52:23 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=EC=84=A0=EB=AC=BC=20=EC=82=AD=EC=A0=9C?=
 =?UTF-8?q?=20api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TournamentDeleteButton.tsx                | 12 +++++-----
 .../Intro/TournamentIntroContainer.tsx        | 16 +++++++-------
 .../queries/tournament/useDeleteRoom.tsx      | 22 +++++++++++++------
 3 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/components/Tournament/Intro/TournamentDeleteButton/TournamentDeleteButton.tsx b/src/components/Tournament/Intro/TournamentDeleteButton/TournamentDeleteButton.tsx
index fb916d83..c7e0bd93 100644
--- a/src/components/Tournament/Intro/TournamentDeleteButton/TournamentDeleteButton.tsx
+++ b/src/components/Tournament/Intro/TournamentDeleteButton/TournamentDeleteButton.tsx
@@ -1,11 +1,11 @@
 import BtnFill from '../../../common/Button/Cta/fill/BtnFill';
 import * as S from './TournamentDeleteButton.style';
-
-interface TournamentStartButtonProps {
-  onClick: () => void;
+interface TournamentDeleteButtonProps {
+  onClick: (roomId: number) => void;
+  roomId: number; // roomId를 props로 받음
 }
 
-const TournamentDeleteButton = ({ onClick }: TournamentStartButtonProps) => {
+const TournamentDeleteButton = ({ onClick, roomId }: TournamentDeleteButtonProps) => {
   return (
     <S.TournamentStartButtonWrapper>
       <BtnFill
@@ -15,7 +15,7 @@ const TournamentDeleteButton = ({ onClick }: TournamentStartButtonProps) => {
           backgroundColor: '#FF2176',
           border: 'none',
         }}
-        onClick={onClick}
+        onClick={() => onClick(roomId)} // props로 받은 roomId를 사용
       >
         선물방 종료하기
       </BtnFill>
@@ -23,4 +23,4 @@ const TournamentDeleteButton = ({ onClick }: TournamentStartButtonProps) => {
   );
 };
 
-export default TournamentDeleteButton;
\ No newline at end of file
+export default TournamentDeleteButton;
diff --git a/src/components/Tournament/Intro/TournamentIntroContainer.tsx b/src/components/Tournament/Intro/TournamentIntroContainer.tsx
index 011e0452..babd4725 100644
--- a/src/components/Tournament/Intro/TournamentIntroContainer.tsx
+++ b/src/components/Tournament/Intro/TournamentIntroContainer.tsx
@@ -19,12 +19,14 @@ const TournamentIntroContainer = () => {
   const navigate = useNavigate();
   const params = useParams();
   const giftee = params.giftee;
+
   const roomIdString = params.roomId || '';
   const roomId = parseInt(roomIdString || '', 10);
+
   const memberData = useGetItem({ roomId: Number(roomId) });
   let tournamentData: GiftData[] = [];
 
-  const { mutation } = useDeleteRoom(roomId);
+  const { mutation } = useDeleteRoom({ roomId: Number(roomId) });
 
   const { showTournamentContainer, handleStartClick } = useTournament();
   const handleClearRoom = () => {};
@@ -43,12 +45,10 @@ const TournamentIntroContainer = () => {
     console.log(tournamentData);
   }
 
-  console.log('룸디는 : ' + roomId);
-  const handleClickConfirmDeleteBtn = (roomId?: number) => {
-    if (roomId !== undefined) {
-      mutation.mutate(roomId);
-      navigate(`/mypage`);
-    }
+  const handleClickConfirmDeleteBtn = (roomId: number) => {
+    // console.log('룸디는 : ' + roomId);
+    mutation.mutate(roomId);
+    navigate(`/mypage`);
   };
 
   return (
@@ -64,7 +64,7 @@ const TournamentIntroContainer = () => {
                     <S.TournamentImg>
                       <TrophyNone />
                     </S.TournamentImg>
-                    <TournamentDeleteButton onClick={handleClickConfirmDeleteBtn} />
+                    <TournamentDeleteButton roomId={roomId} onClick={handleClickConfirmDeleteBtn} />
                   </>
                 ) : (
                   <>
diff --git a/src/hooks/queries/tournament/useDeleteRoom.tsx b/src/hooks/queries/tournament/useDeleteRoom.tsx
index b0f90f90..c48516c4 100644
--- a/src/hooks/queries/tournament/useDeleteRoom.tsx
+++ b/src/hooks/queries/tournament/useDeleteRoom.tsx
@@ -1,23 +1,31 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { post } from '../../../apis/client';
 
-export async function deleteMyGift(roomId: number) {
+export const MY_TOURNAMENT_QUERY_KEY: string[] = ['myRoomData'];
+
+export async function deleteRoom(roomId: number) {
   await post(`/gift/tournament-end/${roomId}`);
 }
 
-export const useDeleteRoom = (roomId: number) => {
-  const MY_TOURNAMENT_QUERY_KEY: string[] = ['myRoomData'];
-
+// export const deleteRoom = async (roomId: number): Promise<any> => {
+//   try {
+//     const response = await post(`/gift/tournament-end/${roomId}`);
+//     return response;
+//   } catch (error) {
+//     return '중복입니다';
+//   }
+// };
+export const useDeleteRoom = ({ roomId }: { roomId: number }) => {
   const queryClient = useQueryClient();
 
-  const mutation = useMutation({
-    mutationFn: deleteMyGift,
+  const mutation: any = useMutation({
+    mutationFn: deleteRoom,
     onSuccess() {
       console.log('선물 삭제 성공');
       queryClient.invalidateQueries({ queryKey: [MY_TOURNAMENT_QUERY_KEY[0], roomId] });
     },
     onError: (error) => {
-      console.log(roomId);
+      console.log('삭제에러:' + roomId);
       console.log('선물 삭제 중 에러가 발생했습니다.', error.message);
     },
   });