From 2fc922d01fec95de9166d0abd9367729f25d5a90 Mon Sep 17 00:00:00 2001
From: NouhailaAater <nouhaila.aater.1@ens.etsmtl.ca>
Date: Fri, 28 Feb 2025 02:28:47 -0500
Subject: [PATCH] Fix existing room error handling with AppError

---
 server/controllers/room.js | 18 +++++++++++++-----
 server/models/room.js      | 34 +++++++++++++++++-----------------
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/server/controllers/room.js b/server/controllers/room.js
index aa3c188..1226cb7 100644
--- a/server/controllers/room.js
+++ b/server/controllers/room.js
@@ -29,13 +29,12 @@ class RoomsController {
 
       const roomExists = await this.rooms.roomExists(normalizedTitle);
 
-
       if (roomExists) {
-        const error = new AppError(ROOM_ALREADY_EXISTS);
-        error.message = "Cette salle existe déjà";
+        const error = new Error("Room already exists");
         error.statusCode = 409;
         throw error;
       }
+
       const result = await this.rooms.create(normalizedTitle, req.user.userId);
 
       return res.status(201).json({
@@ -43,10 +42,17 @@ class RoomsController {
         roomId: result.insertedId,
       });
     } catch (error) {
-      next(Object.assign(error, { message: error.message }));
+      if (error instanceof Error) {
+        if (error.message === "Room already exists") {
+          return next(new AppError(ROOM_ALREADY_EXISTS));
+        } 
+      }
+
+      next(error);
     }
   };
 
+  
   getUserRooms = async (req, res, next) => {
     try {
       const rooms = await this.rooms.getUserRooms(req.user.userId);
@@ -200,7 +206,9 @@ class RoomsController {
       if (!title) {
         throw new AppError(MISSING_REQUIRED_PARAMETER);
       }
-      const exists = await this.rooms.roomExists(title);
+      const userId = req.user.userId;
+
+      const exists = await this.rooms.roomExists(title, userId);
 
       return res.status(200).json({
         exists: exists,
diff --git a/server/models/room.js b/server/models/room.js
index 2029a92..eb3f334 100644
--- a/server/models/room.js
+++ b/server/models/room.js
@@ -7,35 +7,34 @@ class Rooms
         this.db = db;
     }
 
-    async create(title, userId)
-    {
+    async create(title, userId) {
         if (!title || !userId) {
-            throw new Error('Missing required parameter(s)', 400);
+            throw new Error('Missing required parameter(s)');
         }
-
+    
         await this.db.connect();
         const conn = this.db.getConnection();
         const roomsCollection = conn.collection('rooms');
-        const normalizedTitle = title.toLowerCase();
-
-        const existingRoom = await roomsCollection.findOne({ title: normalizedTitle, userId: userId });
-
+        const normalizedTitle = title.toUpperCase();
+    
+        const existingRoom = await roomsCollection.findOne({ title: normalizedTitle });
+    
         if (existingRoom) {
-            throw new Error('Room already exists', 409);
+            // Lancer une erreur générique ici
+            throw new Error('Room already exists');
         }
-
+    
         const newRoom = {
             userId: userId,
             title: title,
             created_at: new Date()
         };
-
+    
         const result = await roomsCollection.insertOne(newRoom);
-
+    
         return result.insertedId;
-
     }
-
+    
 
     async getUserRooms(userId)
     {
@@ -119,14 +118,15 @@ class Rooms
         return true;
     }
 
-    async roomExists(title)
-    { // Ajouter userId en paramètre
+    async roomExists(title, userId)
+    {
         try
         {
             await this.db.connect();
             const conn = this.db.getConnection();
             const existingRoom = await conn.collection('rooms').findOne({
-                title: title.toLowerCase()
+                title: title.toUpperCase(), 
+                userId: userId 
             });
             return existingRoom ? true : false;
         } catch (error)