fix : currentRoom 제거

#8

Author: Chaeyeon1

frontend/app/_components/Header.tsx

@@ -1,7 +1,6 @@
 import { useParams } from 'next/navigation';
 import { useContext, useEffect, useState } from 'react';
 import { HeaderStyled, LogoImage } from '../(root)/_related/root.styled';
-import { useGetRoomStatusFirebaseRoomRoomIdGet } from '../api/room/hooks/useQueryRoom';
 import { HeaderLogoTitle } from '../home/_related/home.styled';
 import { ChatContext } from '../room/[roomId]/_related/ChatProvider';
 import Button from './Button';
@@ -11,9 +10,6 @@ type Props = {
 };
 const PigHeader = ({ onClick }: Props) => {
   const { roomId } = useParams<{ roomId: string }>();
-  const { data: currentRoom } = useGetRoomStatusFirebaseRoomRoomIdGet({
-    roomId,
-  });
   const { background, gameInfo, roomInfo } = useContext(ChatContext);
   const [timer, setTimer] = useState(0);
 

frontend/app/api/room/hooks/useQueryRoom.ts

@@ -1,25 +1,10 @@
 import { QUERY_KEY } from '@/constant';
 import { useQuery } from '@tanstack/react-query';
-import {
-  getAllRoomsFirebaseRoomGet,
-  getRoomStatusFirebaseRoomRoomIdGet,
-} from '../room.api';
-import { ApiGetRoomStatusFirebaseRoomRommIdGetParams } from '../types';
+import { getAllRoomsFirebaseRoomGet } from '../room.api';
 
 export function useGetAllRoomsFirebaseRoomGet() {
   return useQuery({
     queryKey: [QUERY_KEY.GET_ALL_ROOMS],
     queryFn: () => getAllRoomsFirebaseRoomGet(),
   });
 }
-
-export function useGetRoomStatusFirebaseRoomRoomIdGet({
-  roomId,
-  isConnecting,
-}: ApiGetRoomStatusFirebaseRoomRommIdGetParams & { isConnecting?: boolean }) {
-  return useQuery({
-    queryKey: [QUERY_KEY.GET_ROOM_STATUS, roomId, isConnecting],
-    queryFn: () => getRoomStatusFirebaseRoomRoomIdGet({ roomId }),
-    enabled: !!roomId,
-  });
-}

frontend/app/api/room/room.api.ts

@@ -1,19 +1,9 @@
 import { apiClient } from '@/types/apiClient';
 import {
   ApiEndGameFirebaseRoomRoomIdEndPutParams,
-  ApiGetRoomStatusFirebaseRoomRommIdGetParams,
   ApiStartGameFirebaseRoomIdStartPutParams,
 } from './types';
 
-export async function getRoomStatusFirebaseRoomRoomIdGet({
-  roomId,
-}: ApiGetRoomStatusFirebaseRoomRommIdGetParams) {
-  if (!roomId) return;
-  const response =
-    await apiClient.firebase.getRoomStatusFirebaseRoomRoomIdGet(roomId);
-  return response.data;
-}
-
 export async function getAllRoomsFirebaseRoomGet() {
   const response = await apiClient.firebase.getAllRoomsFirebaseRoomGet();
   return response.data;

frontend/app/room/[roomId]/_related/ChatProvider.tsx

@@ -1,6 +1,5 @@
 'use client';
 
-import { useGetRoomStatusFirebaseRoomRoomIdGet } from '@/app/api/room/hooks/useQueryRoom';
 import { GlobalContext } from '@/app/GlobalContext';
 import {
   ALERT,
@@ -89,14 +88,9 @@ export const ChatProvider = ({ children }: { children: ReactNode }) => {
   const [background, setBackground] =
     useState<ChatContextType['background']>(null);
   const [votedId, setVotedId] = useState<string | null>(null);
-  const { data: currentRoom } = useGetRoomStatusFirebaseRoomRoomIdGet({
-    roomId,
-    isConnecting,
-  });
   const [currentUserList, setCurrentUserList] = useState<User[]>([]);
   const [roomInfo, setRoomInfo] = useState<RoomModel | null>(null);
   const [gameInfo, setGameInfo] = useState<GameInfoMessage | null>(null);
-  const isGameStarted = currentRoom?.RoomState;
 
   const handleClearGame = () => {
     setCanSpeak(true);
@@ -116,9 +110,6 @@ export const ChatProvider = ({ children }: { children: ReactNode }) => {
 
   useEffect(() => {
     // 게임이 시작 되지 않은 상태(대기실)면, 말할 수 있음
-    if (!isGameStarted) {
-      setCanSpeak(true);
-    }
 
     if (!roomId || !userId || isConnecting || wsRef.current) return;
 
@@ -130,6 +121,8 @@ export const ChatProvider = ({ children }: { children: ReactNode }) => {
         return;
       }
 
+      console.log(roomName);
+
       wsRef.current = new WebSocket(
         // `ws://localhost:8000/ws/room/${roomId}/${userId}/${roomName}`
         `wss://wam-coin.store/ws/room/${roomId}/${userId}/${roomName}`
@@ -239,7 +232,7 @@ export const ChatProvider = ({ children }: { children: ReactNode }) => {
       }
       setIsConnecting(false);
     };
-  }, [roomId, userId, isConnecting, currentRoom]);
+  }, [roomId, userId, isConnecting]);
 
   const handleChangeUserMemo: ChatContextType['handleChangeUserMemo'] = (
     userID

frontend/app/room/[roomId]/_sections/MyChat.tsx

@@ -1,5 +1,5 @@
-import { useGetRoomStatusFirebaseRoomRoomIdGet } from '@/app/api/room/hooks/useQueryRoom';
-import { useParams } from 'next/navigation';
+import { useContext } from 'react';
+import { ChatContext } from '../_related/ChatProvider';
 import {
   ChatContent,
   ChatImage,
@@ -10,12 +10,9 @@ import {
 import { ChatMessage } from '../_related/type';
 
 const MyChat = ({ message }: { message: ChatMessage }) => {
-  const { roomId } = useParams<{ roomId: string }>();
-  const { data: currentRoom } = useGetRoomStatusFirebaseRoomRoomIdGet({
-    roomId,
-  });
+  const { roomInfo } = useContext(ChatContext);
 
-  const user = currentRoom?.UserList?.find(
+  const user = roomInfo?.UserList?.find(
     (user) => user.UserID === message.userID
   );
 

frontend/app/room/[roomId]/_sections/OtherUserChat.tsx

@@ -1,5 +1,5 @@
-import { useGetRoomStatusFirebaseRoomRoomIdGet } from '@/app/api/room/hooks/useQueryRoom';
-import { useParams } from 'next/navigation';
+import { useContext } from 'react';
+import { ChatContext } from '../_related/ChatProvider';
 import {
   ChatContent,
   ChatImage,
@@ -10,11 +10,9 @@ import {
 import { ChatMessage } from '../_related/type';
 
 const OtherUserChat = ({ message }: { message: ChatMessage }) => {
-  const { roomId } = useParams<{ roomId: string }>();
-  const { data: currentRoom } = useGetRoomStatusFirebaseRoomRoomIdGet({
-    roomId,
-  });
-  const user = currentRoom?.UserList?.find(
+  const { roomInfo } = useContext(ChatContext);
+
+  const user = roomInfo?.UserList?.find(
     (user) => user.UserID === message.userID
   );