Merge pull request #76 from Arquisoft/Marina

Corrección bug al guardar datos de las partidas.
Arquisoft · Mar 27, 2024 · 73dc301 · 73dc301
2 parents 7c13315 + 471e7cb
commit 73dc301
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 59 deletions.
diff --git a/questiongenerator/question.js b/questiongenerator/question.js
@@ -29,6 +29,7 @@ var question = "";
 var url = 'https://query.wikidata.org/sparql';
 var questionToSave = null;
 var gameId = null;
+var numberOfQuestions = 0;
 // Todas las consultas
 var queries = [`SELECT ?question ?questionLabel ?option ?optionLabel
     WHERE {
@@ -64,14 +65,22 @@ mongoose.connect(mongoUri);
 
 app.get('/generateQuestion', async (req, res) => {
     try {
-        const createNewGame = await req.query.newGame;
+        if(numberOfQuestions == 0){
+            gameId = null;
+        }
         const user = req.query.user;
         await generarPregunta();
+
+        numberOfQuestions++;
+        if(numberOfQuestions>=5){
+            numberOfQuestions = 0;
+        }
+
         var id = await saveData();
-        console.log("CREATE NEW GAME ANTES DE IF DE GAMEID: " + createNewGame);
-        gameId = (createNewGame === true) ? null : gameId;
-        await saveGame(user, id, createNewGame);
-        // Construcción de la respuesta
+
+        await saveGame(user, id);
+
+
         var response = {
             responseQuestion: question,
             responseOptions: options,
@@ -148,73 +157,49 @@ function procesarDatos(data) {
 
 }
 
-async function saveGame(username,id,createNewGame){
+async function saveGame(username,id) {
 
-        console.log("HAY QUE CREAR UN NUEVO JUEGO ? " + createNewGame);
-        console.log( "GAME ID: " + gameId);
+    if (gameId === null) {
 
-        if(gameId === null){
+        try {
+            const newGame = new Game({userId: username, questions: []});
+            newGame.questions.push(questionToSave._id);
+            await newGame.save();
+            gameId = newGame._id;
+            return null;
+        } catch (error) {
+            console.error("Error al guardar datos de la partida: " + error);
+        }
+    } else {
+        const existingGame = await Game.findById(gameId);
 
-            try{
-                console.log("primer  if");
-                console.log("ID DE LA PREGUNTA: " + id);
-                console.log("PREGUNTA: " + questionToSave);
-                console.log("PREGUNTA ID: " + questionToSave._id);
-                const newGame = new Game({ userId: username, questions: [] });
+        if (!existingGame) {
+
+            try {
+                const newGame = new Game({userId: username, questions: []});
                 newGame.questions.push(questionToSave._id);
                 await newGame.save();
-                console.log(" ID AL AÑADIR:  " + newGame._id);
                 gameId = newGame._id;
-                console.log( " EYEYYEY GAME ID: " + gameId);
                 return null;
-            }catch (error){
+            } catch (error) {
                 console.error("Error al guardar datos de la partida: " + error);
             }
-        }else{
-            console.log("HAY QUE CREAR UN NUEVO JUEGO ? " + createNewGame);
-            console.log("primer else");
-            const existingGame = await Game.findById(gameId);
-
-            if(!existingGame){
-
-                try{
-                    console.log("segundo  if");
-                    console.log("ID DE LA PREGUNTA: " + id);
-                    console.log("PREGUNTA: " + questionToSave);
-                    console.log("PREGUNTA ID: " + questionToSave._id);
-                    const newGame = new Game({ userId: username, questions: [] });
-                    newGame.questions.push(questionToSave._id);
-                    await newGame.save();
-                    console.log(" ID AL AÑADIR:  " + newGame._id);
-                    gameId = newGame._id;
-                    console.log( " EYEYYEY GAME ID: " + gameId);
-                    return null;
-                }catch (error){
-                    console.error("Error al guardar datos de la partida: " + error);
-                }
-
-            }else{
-                try{
-                    console.log("segundo  else");
-                    console.log("ID DE LA PREGUNTA: " + id);
-                    console.log("PREGUNTA: " + questionToSave);
-                    console.log("PREGUNTA ID: " + questionToSave._id);
-                    existingGame.questions.push(questionToSave._id);
-                    await existingGame.save();
-                    console.log( " ID AL AÑADIR:  " + existingGame._id);
-                    gameId = existingGame._id;
-                    console.log( " EYEYYEY GAME ID: " + gameId);
-                    return null;
-                }catch (error){
-                    console.error("Error al guardar datos de la partida: " + error);
-                }
 
+        } else {
+            try {
+                existingGame.questions.push(questionToSave._id);
+                await existingGame.save();
+                gameId = existingGame._id;
+                return null;
+            } catch (error) {
+                console.error("Error al guardar datos de la partida: " + error);
             }
-         }
-
 
+        }
+    }
 }
 
+
 async function saveData(){
 
     try {

diff --git a/webapp/src/components/Game.js b/webapp/src/components/Game.js
@@ -37,7 +37,8 @@ const Game = () => {
       const response = await axios.get(`${apiEndpoint}/generateQuestion`, {
           params: {
               user: usernameGlobal,
-              newGame: createNewGame
+              newGame: createNewGame,
+              numberOfQuestiona: answeredQuestionsValue
           }
       });
       setQuestionId(response.data.question_Id);