From 172aeab0b56d399dfcc66c6eaed4e0614793cfa4 Mon Sep 17 00:00:00 2001
From: aguilhot <Alban.GUILHOT@etu.uca.fr>
Date: Wed, 4 Jan 2023 14:09:35 +0100
Subject: [PATCH] =?UTF-8?q?Pr=C3=A9vention=20bugs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bob_party/socketConfig.js                     |  2 +-
 .../loaderConversationApi.ts                  |  4 +-
 .../src/services/gameService/loaderGameApi.ts | 48 ++++++++++---------
 3 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/bob_party/socketConfig.js b/bob_party/socketConfig.js
index 053c3f2..5fe5458 100644
--- a/bob_party/socketConfig.js
+++ b/bob_party/socketConfig.js
@@ -1,4 +1,4 @@
 const { io } = require("socket.io-client");
 
 
-export const socket = io("http://192.168.1.54:3000");
\ No newline at end of file
+export const socket = io("http://172.20.10.2:3000");
\ No newline at end of file
diff --git a/bob_party/src/services/conversationService/loaderConversationApi.ts b/bob_party/src/services/conversationService/loaderConversationApi.ts
index 7150acc..e0ef596 100644
--- a/bob_party/src/services/conversationService/loaderConversationApi.ts
+++ b/bob_party/src/services/conversationService/loaderConversationApi.ts
@@ -24,7 +24,9 @@ export class LoaderConversationApi implements ILoaderConversation{
             url: url,
          })
          .then(async function (response: any) {
-            tabConv=await jsonToConversation(response);
+            if (response.data != null || response.data != undefined){
+                tabConv=await jsonToConversation(response);
+            }
         });
         return tabConv;
     }
diff --git a/bob_party/src/services/gameService/loaderGameApi.ts b/bob_party/src/services/gameService/loaderGameApi.ts
index 3d27e3e..599f6f8 100644
--- a/bob_party/src/services/gameService/loaderGameApi.ts
+++ b/bob_party/src/services/gameService/loaderGameApi.ts
@@ -18,29 +18,31 @@ export default class LoaderGameApi implements ILoaderGame{
 
          })
          .then(function (response: any) {
-            response.data.forEach(game => {
-                switch(game.type){
-                    case "GameSolo":
-                        let mapSolo = new Map();
-                        for (let i=0; i<game.keys.length; i++){
-                            mapSolo.set(new Number(game.keys[i]), new Number(game.values[i]))
-                        }
-                        tab.push(new GameSolo(game.id, game.name, game.image, game.nmbPlayerMin, game.nbPlayerMax, mapSolo));
-                        break;
-                    case "GameMulti":
-                        const mapMulti = new Map();
-                        for (let i=0; i<game.keys.length; i++){
-                            mapMulti.set(new Number(game.keys[i]), new Number(game.values[i]));
-                        }
-                        tab.push(new GameMulti(game.id, game.name, game.image, game.nmbPlayerMin, game.nbPlayerMax, mapMulti));
-                        break;
-                    case "GameCasino":
-                        tab.push(new GameCasino(game.id, game.name, game.image, game.nmbPlayerMin, game.nbPlayerMax));
-                        break;
-                }
-            });
-            
-        });
+            if (response.data != null || response.data != undefined){
+
+                response.data.forEach(game => {
+                    switch(game.type){
+                        case "GameSolo":
+                            let mapSolo = new Map();
+                            for (let i=0; i<game.keys.length; i++){
+                                mapSolo.set(new Number(game.keys[i]), new Number(game.values[i]))
+                            }
+                            tab.push(new GameSolo(game.id, game.name, game.image, game.nmbPlayerMin, game.nbPlayerMax, mapSolo));
+                            break;
+                        case "GameMulti":
+                            const mapMulti = new Map();
+                            for (let i=0; i<game.keys.length; i++){
+                                mapMulti.set(new Number(game.keys[i]), new Number(game.values[i]));
+                            }
+                            tab.push(new GameMulti(game.id, game.name, game.image, game.nmbPlayerMin, game.nbPlayerMax, mapMulti));
+                            break;
+                        case "GameCasino":
+                            tab.push(new GameCasino(game.id, game.name, game.image, game.nmbPlayerMin, game.nbPlayerMax));
+                            break;
+                    }
+                });
+            }
+         });
         return tab;
         
     }