refactor: Simplify getLobbies method by removing orderBy parameter and optimizing user filtering logic

Author: fox3000foxy

dist/repositories/LobbyRepository.d.ts

@@ -7,7 +7,7 @@ export declare class LobbyRepository {
     getLobbies(filters?: {
         lobbyId?: string;
         userId?: string;
-    }, orderBy?: string): Promise<Lobby[]>;
+    }): Promise<Lobby[]>;
     getLobby(lobbyId: string): Promise<Lobby | null>;
     getUserLobby(userId: string): Promise<Lobby | null>;
     getUserLobbies(userId: string): Promise<Lobby[]>;

dist/repositories/LobbyRepository.js

@@ -6,27 +6,26 @@ class LobbyRepository {
         this.databaseService = databaseService;
     }
     // Méthode générique pour récupérer les lobbies selon des filtres
-    async getLobbies(filters = {}, orderBy = "lobbyId ASC") {
-        let query = "SELECT lobbyId, users FROM lobbies WHERE 1=1";
-        const params = [];
-        if (filters.lobbyId) {
-            query += " AND lobbyId = ?";
-            params.push(filters.lobbyId);
-        }
-        if (filters.userId) {
-            query += " AND JSON_EXTRACT(users, '$') LIKE ?";
-            params.push(`%"${filters.userId}%"`);
-        }
-        query += ` ORDER BY ${orderBy}`;
-        const rows = await this.databaseService.read(query, params);
+    async getLobbies(filters = {}) {
+        const query = "SELECT lobbyId, users FROM lobbies WHERE 1=1";
+        const rows = await this.databaseService.read(query);
         // Parse users JSON for all lobbies
         const lobbies = [];
         for (const row of rows) {
-            const users = await this.getUsersByIds(JSON.parse(row.users));
-            lobbies.push({
-                lobbyId: row.lobbyId,
-                users
-            });
+            if (filters.userId && row.users.indexOf(filters.userId) !== -1 && filters.userId) {
+                const users = await this.getUsersByIds(row.users);
+                lobbies.push({
+                    lobbyId: row.lobbyId,
+                    users
+                });
+            }
+            else if (filters.lobbyId && row.lobbyId === filters.lobbyId) {
+                const users = await this.getUsersByIds(row.users);
+                lobbies.push({
+                    lobbyId: row.lobbyId,
+                    users
+                });
+            }
         }
         return lobbies;
     }
@@ -37,6 +36,8 @@ class LobbyRepository {
     }
     async getUserLobby(userId) {
         const lobbies = await this.getLobbies({ userId });
+        if (lobbies.length === 0)
+            return null;
         return lobbies ? { lobbyId: lobbies[0].lobbyId, users: lobbies[0].users } : null;
     }
     async getUserLobbies(userId) {

src/repositories/LobbyRepository.ts

@@ -7,29 +7,27 @@ export class LobbyRepository {
 
   // Méthode générique pour récupérer les lobbies selon des filtres
   async getLobbies(
-    filters: { lobbyId?: string; userId?: string } = {},
-    orderBy: string = "lobbyId ASC"
+    filters: { lobbyId?: string; userId?: string } = {}
   ): Promise<Lobby[]> {
-    let query = "SELECT lobbyId, users FROM lobbies WHERE 1=1";
-    const params = [];
-    if (filters.lobbyId) {
-      query += " AND lobbyId = ?";
-      params.push(filters.lobbyId);
-    }
-    if (filters.userId) {
-      query += " AND JSON_EXTRACT(users, '$') LIKE ?";
-      params.push(`%"${filters.userId}%"`);
-    }
-    query += ` ORDER BY ${orderBy}`;
-    const rows = await this.databaseService.read<{ lobbyId: string; users: string }>(query, params);
+    const query = "SELECT lobbyId, users FROM lobbies WHERE 1=1";
+    const rows = await this.databaseService.read<{ lobbyId: string; users: string[] }>(query);
     // Parse users JSON for all lobbies
     const lobbies: Lobby[] = [];
     for (const row of rows) {
-      const users = await this.getUsersByIds(JSON.parse(row.users));
-      lobbies.push({
-        lobbyId: row.lobbyId,
-        users
-      });
+      if(filters.userId && row.users.indexOf(filters.userId) !== -1 && filters.userId) {
+        const users = await this.getUsersByIds(row.users);
+        lobbies.push({
+          lobbyId: row.lobbyId,
+          users
+        });
+      }
+      else if (filters.lobbyId && row.lobbyId === filters.lobbyId) {
+        const users = await this.getUsersByIds(row.users);
+        lobbies.push({
+          lobbyId: row.lobbyId,
+          users
+        });
+      }
     }
     return lobbies;
   }
@@ -42,6 +40,7 @@ export class LobbyRepository {
 
   async getUserLobby(userId: string): Promise<Lobby | null> {
     const lobbies = await this.getLobbies({ userId });
+    if (lobbies.length === 0) return null;
     return lobbies ? { lobbyId: lobbies[0].lobbyId, users: lobbies[0].users } : null;
   }