Crypteam
/
Cryptid
4
0
Fork 0
Code Issues 10 Pull Requests Packages Projects 9 Releases Wiki Activity

fix de toutes les requêtes pour marcher avec mysql2
continuous-integration/drone/push Build was killed Details

Browse Source
CI/CD
Thomas Chazot 1 year ago
parent 96e4d50db4
commit 6c7c81a5a0
3 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File

12
cryptide_project/server/api/controllers/AuthController.js
Unescape View File

@ -15,7 +15,7 @@ class AuthController {
await databaseService.connect(); await databaseService.connect();
// Vérifier que le pseudo n'existe pas déjà // 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) console.log(verif)
if (verif.length===0) { if (verif.length===0) {
res.status(400).json({ error: 'Le pseudo est déjà utilisé.' }); res.status(400).json({ error: 'Le pseudo est déjà utilisé.' });
@ -53,7 +53,7 @@ class AuthController {
// Vérifier que le pseudo existe // Vérifier que le pseudo existe
const pseudo = req.body.pseudo; const pseudo = req.body.pseudo;
const user = await databaseService.getUserByPseudo(pseudo); const [user, fields] = await databaseService.getUserByPseudo(pseudo);
if (!user) { if (!user) {
res.status(400).json({ error: 'Le pseudo n\'existe pas.' }); res.status(400).json({ error: 'Le pseudo n\'existe pas.' });
return; return;
@ -106,7 +106,7 @@ class AuthController {
try{ try{
await db.connect(); await db.connect();
const user = await db.getUserByPseudo(req.body.pseudo); const [user, fields] = await db.getUserByPseudo(req.body.pseudo);
if(!user){ if(!user){
res.status(400).json({ error: 'Le pseudo n\'existe pas.' }); res.status(400).json({ error: 'Le pseudo n\'existe pas.' });
@ -129,7 +129,7 @@ class AuthController {
try{ try{
await db.connect(); await db.connect();
const user = await db.getUserByPseudo(req.body.pseudo); const [user, fields] = await db.getUserByPseudo(req.body.pseudo);
if(!user){ if(!user){
res.status(400).json({ error: 'Le pseudo n\'existe pas.' }); res.status(400).json({ error: 'Le pseudo n\'existe pas.' });
return; return;
@ -158,7 +158,7 @@ class AuthController {
try{ try{
await db.connect(); await db.connect();
const user = await db.getUserByPseudo(req.body.pseudo); const [user, fields] = await db.getUserByPseudo(req.body.pseudo);
if(!user){ if(!user){
res.status(400).json({ error: 'Le pseudo n\'existe pas.' }); res.status(400).json({ error: 'Le pseudo n\'existe pas.' });
return; return;
@ -186,7 +186,7 @@ class AuthController {
try{ try{
await db.connect(); await db.connect();
const users = await db.getUsers(); const [user, fields] = await db.getUsers();
res.status(200).json({ tab : users }); res.status(200).json({ tab : users });
} }

20
cryptide_project/server/api/controllers/ScoreboardController.js
Unescape View File

@ -17,7 +17,7 @@ class SessionController {
await db.connect(); await db.connect();
const dailyMastermindStats = await db.getDailyMastermindStats(); const [dailyMastermindStats, fields] = await db.getDailyMastermindStats();
res.status(200).json({ tab : dailyMastermindStats }); res.status(200).json({ tab : dailyMastermindStats });
} }
@ -36,7 +36,7 @@ class SessionController {
try{ try{
await db.connect(); await db.connect();
const dailyEasyEnigmaStats = await db.getDailyEnigmaStats(ENIGME_FACILE); const [dailyEasyEnigmaStats, fields] = await db.getDailyEnigmaStats(ENIGME_FACILE);
res.status(200).json({ tab : dailyEasyEnigmaStats }); res.status(200).json({ tab : dailyEasyEnigmaStats });
} }
@ -55,7 +55,7 @@ class SessionController {
try{ try{
await db.connect(); await db.connect();
const dailyMediumEnigmaStats = await db.getDailyEnigmaStats(ENIGME_MOYEN); const [dailyMediumEnigmaStats, fields] = await db.getDailyEnigmaStats(ENIGME_MOYEN);
res.status(200).json({ tab : dailyMediumEnigmaStats }); res.status(200).json({ tab : dailyMediumEnigmaStats });
} }
@ -74,7 +74,7 @@ class SessionController {
try{ try{
await db.connect(); await db.connect();
const dailyHardEnigmaStats = await db.getDailyEnigmaStats(ENIGME_DIFFICILE); const [dailyHardEnigmaStats, fields] = await db.getDailyEnigmaStats(ENIGME_DIFFICILE);
res.status(200).json({ tab : dailyHardEnigmaStats }); res.status(200).json({ tab : dailyHardEnigmaStats });
} }
@ -93,7 +93,7 @@ class SessionController {
try{ try{
await db.connect(); await db.connect();
const dailyOnlineStats = await db.getDailyOnlineStats(); const [dailyOnlineStats, fields] = await db.getDailyOnlineStats();
res.status(200).json({ tab : dailyOnlineStats }); res.status(200).json({ tab : dailyOnlineStats });
} }
@ -116,7 +116,7 @@ class SessionController {
try{ try{
await db.connect(); await db.connect();
const weeklyMastermindStats = await db.getWeeklyMastermindStats(); const [weeklyMastermindStats, fields] = await db.getWeeklyMastermindStats();
res.status(200).json({ tab : weeklyMastermindStats }); res.status(200).json({ tab : weeklyMastermindStats });
} }
@ -135,7 +135,7 @@ class SessionController {
try{ try{
await db.connect(); await db.connect();
const weeklyEasyEnigmaStats = await db.getWeeklyEnigmaStats(ENIGME_FACILE); const [weeklyEasyEnigmaStats, fields] = await db.getWeeklyEnigmaStats(ENIGME_FACILE);
res.status(200).json({ tab : weeklyEasyEnigmaStats }); res.status(200).json({ tab : weeklyEasyEnigmaStats });
} }
@ -154,7 +154,7 @@ class SessionController {
try{ try{
await db.connect(); await db.connect();
const weeklyMediumEnigmaStats = await db.getWeeklyEnigmaStats(ENIGME_MOYEN); const [weeklyMediumEnigmaStats, fields] = await db.getWeeklyEnigmaStats(ENIGME_MOYEN);
res.status(200).json({ tab : weeklyMediumEnigmaStats }); res.status(200).json({ tab : weeklyMediumEnigmaStats });
} }
@ -173,7 +173,7 @@ class SessionController {
try{ try{
await db.connect(); await db.connect();
const weeklyHardEnigmaStats = await db.getWeeklyEnigmaStats(ENIGME_DIFFICILE); const [weeklyHardEnigmaStats, fields] = await db.getWeeklyEnigmaStats(ENIGME_DIFFICILE);
res.status(200).json({ tab : weeklyHardEnigmaStats }); res.status(200).json({ tab : weeklyHardEnigmaStats });
} }
@ -192,7 +192,7 @@ class SessionController {
try{ try{
await db.connect(); await db.connect();
const weeklyOnlineStats = await db.getWeeklyOnlineStats(); const [weeklyOnlineStats, fields] = await db.getWeeklyOnlineStats();
res.status(200).json({ tab : weeklyOnlineStats }); res.status(200).json({ tab : weeklyOnlineStats });
} }

36
cryptide_project/server/api/controllers/SessionController.js
Unescape View File

@ -21,11 +21,11 @@ class SessionController {
} }
// Récupérer les stats mastermind de l'utilisateur // 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; 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; 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; avgNbTryMM = avgNbTryMM.avgNbTry || 0;
req.session.user.mastermindStats = {nbGames: nbGamesMM, req.session.user.mastermindStats = {nbGames: nbGamesMM,
@ -33,14 +33,14 @@ class SessionController {
avgNbTry: avgNbTryMM}; avgNbTry: avgNbTryMM};
// Récupérer les stats enigme facile // 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; 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; nbWinsEF = nbWinsEF.nbWins || 0;
let ratioEF = (nbWinsEF.nbWins / nbGamesEF.nbGames) * 100 || 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; 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; avgTimeEF = avgTimeEF.avgTime || 0;
req.session.user.easyEnigmaStats = {nbGames: nbGamesEF, req.session.user.easyEnigmaStats = {nbGames: nbGamesEF,
@ -50,11 +50,11 @@ class SessionController {
avgTime: avgTimeEF}; avgTime: avgTimeEF};
// Récupérer les stats enigme moyenne // 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; 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; 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; avgNbTryEM = avgNbTryEM.avgScore || 0;
req.session.user.mediumEnigmaStats = {nbGames: nbGamesEM, req.session.user.mediumEnigmaStats = {nbGames: nbGamesEM,
@ -62,14 +62,14 @@ class SessionController {
avgNbTry: avgNbTryEM}; avgNbTry: avgNbTryEM};
// Récupérer les stats enigme difficile // 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; 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; nbWinsED = nbWinsED.nbWins || 0;
let ratioED = (nbWinsED.nbWins / nbGamesED.nbGames) * 100 || 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; 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; avgTimeED = avgTimeED.avgTime || 0;
req.session.user.hardEnigmaStats = {nbGames: nbGamesED, req.session.user.hardEnigmaStats = {nbGames: nbGamesED,
@ -79,9 +79,9 @@ class SessionController {
avgTime: avgTimeED}; avgTime: avgTimeED};
// Récupérer les stats en ligne de l'utilisateur // 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; 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; nbWinsOL = nbWinsOL.nbWins || 0;
let ratioOL = (nbWinsOL.nbWins / nbGamesOL.nbGames) * 100 || 0; let ratioOL = (nbWinsOL.nbWins / nbGamesOL.nbGames) * 100 || 0;
req.session.user.onlineStats = {nbGames: nbGamesOL, req.session.user.onlineStats = {nbGames: nbGamesOL,
@ -105,7 +105,7 @@ class SessionController {
try{ try{
await db.connect(); 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) console.log("utilisateur" + user.idUser + " pseudo" + user.pseudo)
if (!user) { if (!user) {
res.status(200).json({ error: "true", message: 'User not found' }); 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 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) console.log("updaetdutilisateur" + updatedUser.idUser + " pseudo" + updatedUser.pseudo)
req.session.user.pseudo = updatedUser.pseudo; req.session.user.pseudo = updatedUser.pseudo;
console.log("req.session.user.pseudo" + req.session.user.pseudo) console.log("req.session.user.pseudo" + req.session.user.pseudo)

Write Preview
Loading…
Cancel
Save