From 5f87aa1b7a68817844b10eaac91be9fa4d61f5d7 Mon Sep 17 00:00:00 2001
From: NouhailaAater <nouhaila.aater.1@ens.etsmtl.ca>
Date: Fri, 21 Feb 2025 22:51:42 -0500
Subject: [PATCH] Correction ajout salle

---
 .../pages/Teacher/ManageRoom/ManageRoom.tsx   | 71 +++++++++++--------
 1 file changed, 42 insertions(+), 29 deletions(-)

diff --git a/client/src/pages/Teacher/ManageRoom/ManageRoom.tsx b/client/src/pages/Teacher/ManageRoom/ManageRoom.tsx
index a6fe94e..c0c6bb3 100644
--- a/client/src/pages/Teacher/ManageRoom/ManageRoom.tsx
+++ b/client/src/pages/Teacher/ManageRoom/ManageRoom.tsx
@@ -88,9 +88,8 @@ const ManageRoom: React.FC = () => {
                 const updatedRooms = await ApiService.getUserRooms();
                 setRooms(updatedRooms as RoomType[]);
 
-                if (createdRoom && createdRoom) {
+                if (createdRoom) {
                     setSelectedRoomId(createdRoom);
-                    setRoomName(createdRoom);
                 }
                 setOpenDialog(false);
                 setNewRoomTitle('');
@@ -171,35 +170,49 @@ const ManageRoom: React.FC = () => {
     const createWebSocketRoom = () => {
         console.log('Creating WebSocket room...');
         setConnectingError('');
-
-        const targetRoom = rooms.find((room) => room._id === selectedRoomId) || rooms[0];
-        if (!targetRoom) {
-            setConnectingError('Aucune salle disponible');
-            return;
+    
+        const handleRoomCreation = (socket: Socket, roomToCreate?: string) => {
+            socket.on('connect', () => {
+                if (roomToCreate) {
+                    webSocketService.createRoom(roomToCreate);
+                } else {
+                    socket.emit("create-room");
+                }
+            });
+    
+            socket.on('create-success', (createdRoomName: string) => {
+                console.log('Salle créée/jointe:', createdRoomName);
+                setRoomName(createdRoomName);
+            });
+    
+            socket.on('create-failure', (errorMessage: string) => {
+                setConnectingError(errorMessage);
+                console.error('Erreur création salle:', errorMessage);
+            });
+        };
+    
+        if (rooms.length === 0) {
+            console.log('Tentative de création de salle automatique...');
+            const newSocket = webSocketService.connect(ENV_VARIABLES.VITE_BACKEND_SOCKET_URL);
+            handleRoomCreation(newSocket);
+            setSocket(newSocket);
+        } else {
+            const targetRoom = rooms.find((room) => room._id === selectedRoomId) || rooms[0];
+            if (!targetRoom) {
+                setConnectingError('Aucune salle disponible');
+                return;
+            }
+    
+            console.log('Utilisation de la salle:', targetRoom.title);
+            const newSocket = webSocketService.connect(ENV_VARIABLES.VITE_BACKEND_SOCKET_URL);
+            handleRoomCreation(newSocket, targetRoom.title);
+            setSocket(newSocket);
         }
-
-        console.log('Création WebSocket pour:', targetRoom.title);
-        const socket = webSocketService.connect(ENV_VARIABLES.VITE_BACKEND_SOCKET_URL);
-
-        socket.on('connect', () => {
-            webSocketService.createRoom(targetRoom.title);
-            setRoomName(targetRoom.title);
+    
+        socket?.on('connect_error', (error) => {
+            setConnectingError('Erreur de connexion au serveur...');
+            console.error('Connection error:', error);
         });
-        socket.on('connect_error', (error) => {
-            setConnectingError('Erreur lors de la connexion... Veuillez réessayer');
-            console.error('ManageRoom: WebSocket connection error:', error);
-        });
-
-        socket.on('create-success', (roomName: string) => {
-            console.log('create-success', roomName);
-            setRoomName(roomName);
-        });
-
-        socket.on('create-failure', () => {
-            console.log('Error creating room.');
-        });
-
-        setSocket(socket);
     };
 
     useEffect(() => {