From 6c7c81a5a0eae8672240a0e28c64c59102766361 Mon Sep 17 00:00:00 2001 From: Thomas Chazot Date: Thu, 14 Dec 2023 09:06:41 +0100 Subject: [PATCH] =?UTF-8?q?fix=20de=20toutes=20les=20requ=C3=AAtes=20pour?= =?UTF-8?q?=20marcher=20avec=20mysql2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/api/controllers/AuthController.js | 12 +++---- .../api/controllers/ScoreboardController.js | 20 +++++------ .../api/controllers/SessionController.js | 36 +++++++++---------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/cryptide_project/server/api/controllers/AuthController.js b/cryptide_project/server/api/controllers/AuthController.js index 192d1d7..cf587f0 100644 --- a/cryptide_project/server/api/controllers/AuthController.js +++ b/cryptide_project/server/api/controllers/AuthController.js @@ -15,7 +15,7 @@ class AuthController { await databaseService.connect(); // Vérifier que le pseudo n'existe pas déjà - const verif = await databaseService.getUserByPseudo(pseudo); + const [verif, fields] = await databaseService.getUserByPseudo(pseudo); console.log(verif) if (verif.length===0) { res.status(400).json({ error: 'Le pseudo est déjà utilisé.' }); @@ -53,7 +53,7 @@ class AuthController { // Vérifier que le pseudo existe const pseudo = req.body.pseudo; - const user = await databaseService.getUserByPseudo(pseudo); + const [user, fields] = await databaseService.getUserByPseudo(pseudo); if (!user) { res.status(400).json({ error: 'Le pseudo n\'existe pas.' }); return; @@ -106,7 +106,7 @@ class AuthController { try{ await db.connect(); - const user = await db.getUserByPseudo(req.body.pseudo); + const [user, fields] = await db.getUserByPseudo(req.body.pseudo); if(!user){ res.status(400).json({ error: 'Le pseudo n\'existe pas.' }); @@ -129,7 +129,7 @@ class AuthController { try{ await db.connect(); - const user = await db.getUserByPseudo(req.body.pseudo); + const [user, fields] = await db.getUserByPseudo(req.body.pseudo); if(!user){ res.status(400).json({ error: 'Le pseudo n\'existe pas.' }); return; @@ -158,7 +158,7 @@ class AuthController { try{ await db.connect(); - const user = await db.getUserByPseudo(req.body.pseudo); + const [user, fields] = await db.getUserByPseudo(req.body.pseudo); if(!user){ res.status(400).json({ error: 'Le pseudo n\'existe pas.' }); return; @@ -186,7 +186,7 @@ class AuthController { try{ await db.connect(); - const users = await db.getUsers(); + const [user, fields] = await db.getUsers(); res.status(200).json({ tab : users }); } diff --git a/cryptide_project/server/api/controllers/ScoreboardController.js b/cryptide_project/server/api/controllers/ScoreboardController.js index 82e2d7a..2ffdf90 100644 --- a/cryptide_project/server/api/controllers/ScoreboardController.js +++ b/cryptide_project/server/api/controllers/ScoreboardController.js @@ -17,7 +17,7 @@ class SessionController { await db.connect(); - const dailyMastermindStats = await db.getDailyMastermindStats(); + const [dailyMastermindStats, fields] = await db.getDailyMastermindStats(); res.status(200).json({ tab : dailyMastermindStats }); } @@ -36,7 +36,7 @@ class SessionController { try{ await db.connect(); - const dailyEasyEnigmaStats = await db.getDailyEnigmaStats(ENIGME_FACILE); + const [dailyEasyEnigmaStats, fields] = await db.getDailyEnigmaStats(ENIGME_FACILE); res.status(200).json({ tab : dailyEasyEnigmaStats }); } @@ -55,7 +55,7 @@ class SessionController { try{ await db.connect(); - const dailyMediumEnigmaStats = await db.getDailyEnigmaStats(ENIGME_MOYEN); + const [dailyMediumEnigmaStats, fields] = await db.getDailyEnigmaStats(ENIGME_MOYEN); res.status(200).json({ tab : dailyMediumEnigmaStats }); } @@ -74,7 +74,7 @@ class SessionController { try{ await db.connect(); - const dailyHardEnigmaStats = await db.getDailyEnigmaStats(ENIGME_DIFFICILE); + const [dailyHardEnigmaStats, fields] = await db.getDailyEnigmaStats(ENIGME_DIFFICILE); res.status(200).json({ tab : dailyHardEnigmaStats }); } @@ -93,7 +93,7 @@ class SessionController { try{ await db.connect(); - const dailyOnlineStats = await db.getDailyOnlineStats(); + const [dailyOnlineStats, fields] = await db.getDailyOnlineStats(); res.status(200).json({ tab : dailyOnlineStats }); } @@ -116,7 +116,7 @@ class SessionController { try{ await db.connect(); - const weeklyMastermindStats = await db.getWeeklyMastermindStats(); + const [weeklyMastermindStats, fields] = await db.getWeeklyMastermindStats(); res.status(200).json({ tab : weeklyMastermindStats }); } @@ -135,7 +135,7 @@ class SessionController { try{ await db.connect(); - const weeklyEasyEnigmaStats = await db.getWeeklyEnigmaStats(ENIGME_FACILE); + const [weeklyEasyEnigmaStats, fields] = await db.getWeeklyEnigmaStats(ENIGME_FACILE); res.status(200).json({ tab : weeklyEasyEnigmaStats }); } @@ -154,7 +154,7 @@ class SessionController { try{ await db.connect(); - const weeklyMediumEnigmaStats = await db.getWeeklyEnigmaStats(ENIGME_MOYEN); + const [weeklyMediumEnigmaStats, fields] = await db.getWeeklyEnigmaStats(ENIGME_MOYEN); res.status(200).json({ tab : weeklyMediumEnigmaStats }); } @@ -173,7 +173,7 @@ class SessionController { try{ await db.connect(); - const weeklyHardEnigmaStats = await db.getWeeklyEnigmaStats(ENIGME_DIFFICILE); + const [weeklyHardEnigmaStats, fields] = await db.getWeeklyEnigmaStats(ENIGME_DIFFICILE); res.status(200).json({ tab : weeklyHardEnigmaStats }); } @@ -192,7 +192,7 @@ class SessionController { try{ await db.connect(); - const weeklyOnlineStats = await db.getWeeklyOnlineStats(); + const [weeklyOnlineStats, fields] = await db.getWeeklyOnlineStats(); res.status(200).json({ tab : weeklyOnlineStats }); } diff --git a/cryptide_project/server/api/controllers/SessionController.js b/cryptide_project/server/api/controllers/SessionController.js index 1fc1fc4..b45ea58 100644 --- a/cryptide_project/server/api/controllers/SessionController.js +++ b/cryptide_project/server/api/controllers/SessionController.js @@ -21,11 +21,11 @@ class SessionController { } // Récupérer les stats mastermind de l'utilisateur - let nbGamesMM = await db.getNbGamesMastermindByUserId(req.session.user.idUser); + let [nbGamesMM, i] = await db.getNbGamesMastermindByUserId(req.session.user.idUser); nbGamesMM = nbGamesMM.nbGames || 0; - let bestScoreMM = await db.getBestScoreMastermindByUserId(req.session.user.idUser); + let [bestScoreMM, j] = await db.getBestScoreMastermindByUserId(req.session.user.idUser); bestScoreMM = bestScoreMM.bestScore || 0; - let avgNbTryMM = await db.getAvgNbTryMastermindByUserId(req.session.user.idUser); + let [avgNbTryMM, k] = await db.getAvgNbTryMastermindByUserId(req.session.user.idUser); avgNbTryMM = avgNbTryMM.avgNbTry || 0; req.session.user.mastermindStats = {nbGames: nbGamesMM, @@ -33,14 +33,14 @@ class SessionController { avgNbTry: avgNbTryMM}; // Récupérer les stats enigme facile - let nbGamesEF = await db.getNbGamesEnigmeByUserId(req.session.user.idUser, ENIGME_FACILE); + let [nbGamesEF, l] = await db.getNbGamesEnigmeByUserId(req.session.user.idUser, ENIGME_FACILE); nbGamesEF = nbGamesEF.nbGames || 0; - let nbWinsEF = await db.getNbWinsEnigmeByUserId(req.session.user.idUser, ENIGME_FACILE); + let [nbWinsEF, m] = await db.getNbWinsEnigmeByUserId(req.session.user.idUser, ENIGME_FACILE); nbWinsEF = nbWinsEF.nbWins || 0; let ratioEF = (nbWinsEF.nbWins / nbGamesEF.nbGames) * 100 || 0; - let bestTimeEF = await db.getBestTimeEnigmeByUserId(req.session.user.idUser, ENIGME_FACILE); + let [bestTimeEF, n] = await db.getBestTimeEnigmeByUserId(req.session.user.idUser, ENIGME_FACILE); bestTimeEF = bestTimeEF.bestTime || 0; - let avgTimeEF = await db.getAvgTimeEnigmeByUserId(req.session.user.idUser, ENIGME_FACILE); + let [avgTimeEF, o] = await db.getAvgTimeEnigmeByUserId(req.session.user.idUser, ENIGME_FACILE); avgTimeEF = avgTimeEF.avgTime || 0; req.session.user.easyEnigmaStats = {nbGames: nbGamesEF, @@ -50,11 +50,11 @@ class SessionController { avgTime: avgTimeEF}; // Récupérer les stats enigme moyenne - let nbGamesEM = await db.getNbGamesEnigmeByUserId(req.session.user.idUser, ENIGME_MOYEN); + let [nbGamesEM, p] = await db.getNbGamesEnigmeByUserId(req.session.user.idUser, ENIGME_MOYEN); nbGamesEM = nbGamesEM.nbGames || 0; - let bestScoreEM = await db.getBestScoreEnigmeByUserId(req.session.user.idUser, ENIGME_MOYEN); + let [bestScoreEM, q] = await db.getBestScoreEnigmeByUserId(req.session.user.idUser, ENIGME_MOYEN); bestScoreEM = bestScoreEM.bestScore || 0; - let avgNbTryEM = await db.getAvgScoreEnigmeByUserId(req.session.user.idUser, ENIGME_MOYEN); + let [avgNbTryEM, r] = await db.getAvgScoreEnigmeByUserId(req.session.user.idUser, ENIGME_MOYEN); avgNbTryEM = avgNbTryEM.avgScore || 0; req.session.user.mediumEnigmaStats = {nbGames: nbGamesEM, @@ -62,14 +62,14 @@ class SessionController { avgNbTry: avgNbTryEM}; // Récupérer les stats enigme difficile - let nbGamesED = await db.getNbGamesEnigmeByUserId(req.session.user.idUser, ENIGME_DIFFICILE); + let [nbGamesED, s] = await db.getNbGamesEnigmeByUserId(req.session.user.idUser, ENIGME_DIFFICILE); nbGamesED = nbGamesED.nbGames || 0; - let nbWinsED = await db.getNbWinsEnigmeByUserId(req.session.user.idUser, ENIGME_DIFFICILE); + let [nbWinsED, t] = await db.getNbWinsEnigmeByUserId(req.session.user.idUser, ENIGME_DIFFICILE); nbWinsED = nbWinsED.nbWins || 0; let ratioED = (nbWinsED.nbWins / nbGamesED.nbGames) * 100 || 0; - let bestTimeED = await db.getBestTimeEnigmeByUserId(req.session.user.idUser, ENIGME_DIFFICILE); + let [bestTimeED, u] = await db.getBestTimeEnigmeByUserId(req.session.user.idUser, ENIGME_DIFFICILE); bestTimeED = bestTimeED.bestTime || 0; - let avgTimeED = await db.getAvgTimeEnigmeByUserId(req.session.user.idUser, ENIGME_DIFFICILE); + let [avgTimeED, v] = await db.getAvgTimeEnigmeByUserId(req.session.user.idUser, ENIGME_DIFFICILE); avgTimeED = avgTimeED.avgTime || 0; req.session.user.hardEnigmaStats = {nbGames: nbGamesED, @@ -79,9 +79,9 @@ class SessionController { avgTime: avgTimeED}; // Récupérer les stats en ligne de l'utilisateur - let nbGamesOL = await db.getNbGamesOnlineByUserId(req.session.user.idUser); + let [nbGamesOL, w] = await db.getNbGamesOnlineByUserId(req.session.user.idUser); nbGamesOL = nbGamesOL.nbGames || 0; - let nbWinsOL = await db.getNbWinsOnlineByUserId(req.session.user.idUser); + let [nbWinsOL, x] = await db.getNbWinsOnlineByUserId(req.session.user.idUser); nbWinsOL = nbWinsOL.nbWins || 0; let ratioOL = (nbWinsOL.nbWins / nbGamesOL.nbGames) * 100 || 0; req.session.user.onlineStats = {nbGames: nbGamesOL, @@ -105,7 +105,7 @@ class SessionController { try{ await db.connect(); - const user = await db.getUserByPseudo(req.body.pseudo); + const [user, _] = await db.getUserByPseudo(req.body.pseudo); console.log("utilisateur" + user.idUser + " pseudo" + user.pseudo) if (!user) { res.status(200).json({ error: "true", message: 'User not found' }); @@ -114,7 +114,7 @@ class SessionController { await db.updatePseudo(user.idUser, req.body.newPseudo); //* update - const updatedUser = await db.getUserByPseudo(req.body.newPseudo); + const [updatedUser, fields] = await db.getUserByPseudo(req.body.newPseudo); console.log("updaetdutilisateur" + updatedUser.idUser + " pseudo" + updatedUser.pseudo) req.session.user.pseudo = updatedUser.pseudo; console.log("req.session.user.pseudo" + req.session.user.pseudo)