Correction if aucune salle est selectionner

client/src/pages/Teacher/ManageRoom/ManageRoom.tsx

@@ -42,10 +42,10 @@ const ManageRoom: React.FC = () => {
     const [roomName, setRoomName] = useState<string>(selectedRoom?.title || '');
 
     useEffect(() => {
-        if (selectedRoom) {
+        if (selectedRoom && !socket) {
-            setRoomName(selectedRoom.title);
+          createWebSocketRoom();
         }
-    }, [selectedRoom]);
+      }, [selectedRoom]);
 
     useEffect(() => {
         const fetchData = async () => {
@@ -110,7 +110,7 @@ const ManageRoom: React.FC = () => {
         console.log('Creating WebSocket room...');
 
         if (!selectedRoom) {
-            setConnectingError('Aucune salle sélectionnée.');
+            setConnectingError('Veuillez sélectionner une salle.');
             return;
         }
 

client/src/pages/Teacher/ManageRoom/RoomContext.tsx

@@ -21,16 +21,31 @@ export const RoomProvider = ({ children }: { children: React.ReactNode }) => {
       const userRooms = await ApiService.getUserRooms();
       const roomsList = userRooms as RoomType[];
       setRooms(roomsList);
-      if (roomsList.length > 0) {
+  
-        const defaultRoom = roomsList[1]; // Set the first created room as the selected one
+      const savedRoomId = localStorage.getItem('selectedRoomId');
-        setSelectedRoom(defaultRoom);  
+      if (savedRoomId) {
-        localStorage.setItem('selectedRoomId', defaultRoom._id);
+        const savedRoom = roomsList.find(r => r._id === savedRoomId);
-      } else {
+        if (savedRoom) {
+          setSelectedRoom(savedRoom);
+          return;
+        }
+      }
+  
+      if (roomsList.length === 0) {
         const randomRoomName = `Room-${Math.floor(Math.random() * 1000000)}`;
-        await createRoom(randomRoomName);
+        const newRoomId = await ApiService.createRoom(randomRoomName);
+        const newRoom = await ApiService.getRoomContent(newRoomId);
+        setSelectedRoom(newRoom);
+        localStorage.setItem('selectedRoomId', newRoomId);
+        
+        const updatedRooms = await ApiService.getUserRooms();
+        setRooms(updatedRooms as RoomType[]);
+      } else {
+        setSelectedRoom(roomsList[0]);
+        localStorage.setItem('selectedRoomId', roomsList[0]._id);
       }
     };
-    
+  
     loadRooms();
   }, []);
 
@@ -43,12 +58,16 @@ export const RoomProvider = ({ children }: { children: React.ReactNode }) => {
 
   // Créer une salle
   const createRoom = async (title: string) => {
-    const newRoomId = await ApiService.createRoom(title);
+    // Créer la salle et récupérer l'objet complet
+    const newRoom = await ApiService.createRoom(title);
+    
+    // Mettre à jour la liste des salles
     const updatedRooms = await ApiService.getUserRooms();
     setRooms(updatedRooms as RoomType[]);
-    selectRoom(newRoomId);
+    
+    // Sélectionner la nouvelle salle avec son ID
+    selectRoom(newRoom); // Utiliser l'ID de l'objet retourné
   };
-
   return (
     <RoomContext.Provider value={{ rooms, selectedRoom, selectRoom, createRoom }}>
       {children}

client/src/services/ApiService.tsx

@@ -408,7 +408,27 @@ class ApiService {
         }
     }
 
-
+    public async getRoomContent(roomId: string): Promise<RoomType> {
+        try {
+          const url = this.constructRequestUrl(`/room/${roomId}`);
+          const headers = this.constructRequestHeaders();
+          
+          const response = await axios.get<{ data: RoomType }>(url, { headers });
+          
+          if (response.status !== 200) {
+            throw new Error(`Failed to get room: ${response.status}`);
+          }
+      
+          return response.data.data;
+          
+        } catch (error) {
+          if (axios.isAxiosError(error)) {
+            const serverError = error.response?.data?.error;
+            throw new Error(serverError || 'Erreur serveur inconnue');
+          }
+          throw new Error('Erreur réseau');
+        }
+      }
 
     public async getRoomTitleByUserId(userId: string): Promise<string[] | string> {
         try {

server/controllers/room.js

@@ -64,13 +64,6 @@ class RoomsController {
       if (!roomId) {
         throw new AppError(MISSING_REQUIRED_PARAMETER);
       }
-
-      const owner = await this.rooms.getOwner(roomId);
-
-      if (owner != req.user.userId) {
-        throw new AppError(ROOM_NOT_FOUND);
-      }
-
       const content = await this.rooms.getContent(roomId);
 
       if (!content) {

server/models/room.js

@@ -58,15 +58,18 @@ class Rooms {
     }
 
     async getContent(roomId) {
-        await this.db.connect()
+        await this.db.connect();
         const conn = this.db.getConnection();
-
+        const roomsCollection = conn.collection('rooms');
-        const filesCollection = conn.collection('files');
+        if (!ObjectId.isValid(roomId)) {
-
+            return null; // Évite d'envoyer une requête invalide
-        const result = await filesCollection.find({ roomId: roomId }).toArray();
+        }
+    
+        const result = await roomsCollection.findOne({ _id: new ObjectId(roomId) });
 
         return result;
     }
+    
 
     async delete(roomId) {
         await this.db.connect()