Merge pull request #42 from Arquisoft/laura

Laura

questions/answerservice/answer-service.test.js

@@ -0,0 +1,47 @@
+const request = require('supertest');
+const { MongoMemoryServer } = require('mongodb-memory-server');
+const bcrypt = require('bcrypt');
+const Answer = require('./answer-model');
+
+let mongoServer;
+let app;
+
+//test answer
+const answerTest = {
+
+  answerBody: "Cervantes",
+  typeAnswer: "autor"
+};
+
+async function addanswer(answerTest){
+  const newAnswer = new Answer({
+    answerBody: answerTest.answerBody,
+    typeAnswer: answerTest.typeAnswer
+  });
+
+  await newAnswer.save();
+}
+
+beforeAll(async () => {
+  mongoServer = await MongoMemoryServer.create();
+  const mongoUri = mongoServer.getUri();
+  process.env.MONGODB_URI = mongoUri;
+  app = require('./answer-service'); 
+  //Load database with initial conditions
+  await addanswer(answerTest);
+});
+
+afterAll(async () => {
+  app.close();
+  await mongoServer.stop();
+});
+
+describe('Answer Service', () => {
+  it('Should perform an addRecord operation /addAnswer', async () => {
+    const response = await request(app).post('/addAnswer').send(answerTest);
+    expect(response.status).toBe(200);
+    expect(response.body).toHaveProperty('answerBody', 'Cervantes');
+    expect(response.body).toHaveProperty('typeAnswer', 'autor');
+  });
+
+});

questions/createservice/create-service.js

@@ -1,7 +1,9 @@
 const express = require('express');
 const mongoose = require('mongoose');
 const bodyParser = require('body-parser');
-const Question = require('./create-model')
+const Question = require('./create-model');
+
+
 
 const app = express();
 const port = 8005;
@@ -30,6 +32,7 @@ app.post('/addQuestion', async (req, res) => {
   }
 });
 
+
 //obtiene una pregunta de forma aleatoria
 app.post('/getQuestionBody', async (req, res) => {
   try {
@@ -39,25 +42,6 @@ app.post('/getQuestionBody', async (req, res) => {
     //saco una pregunta de forma aleatoria
     const rQuestion = await Question.aggregate([{ $sample: { size: 1 } }]);
 
-    /*const rQuestionResult=null;
-    if (rQuestion && rQuestion.length > 0) {
-
-      //obtengo la pregunta
-      const rQuestionResult = rQuestion[0];
-
-      const newQuestion1 = new Question({
-        questionBody: rQuestionResult.questionBody,
-        typeQuestion: rQuestionResult.typeQuestion,
-        typeAnswer: rQuestionResult.typeAnswer,
-    });
-    
-      res.json(newQuestion1);
-      
-   
-    } else {
-      console.log("No hay preguntas");
-    }*/
-
     res.json(rQuestion[0]);
   } catch (error) {
     res.status(500).json({ error: 'Internal Server Error' });

webapp/src/components/Game.js

@@ -25,24 +25,21 @@ const Game=() =>{
         try {
 
             const response = await axios.post(`${apiEndpoint}/getQuestionBody`);
-           // const { questionBody: questionBodyData } = response.data;
+
 
             setquestionBody(response.data.questionBody);//obtengo los datos del cuerpo de la pregunta
-            //setQuestionType(response.data.typeQuestion);
-            //setQuestionType(response.data.typeAnswer);
+            setQuestionType(response.data.typeQuestion);
+            setAnswerType(response.data.typeAnswer);
 
         } catch (error) {
           console.error("Error al obtener la pregunta aleatoria", error);
         }
       };
-
-
-
-
+
 
       // Obtener info de wikidata segun el tipo de la pregunta y la respuesta para esa pregunta
       //questionType, answerType
-      const obtenerInformacionWikidata = async () => {
+      const obtenerPais = async () => {
 
         try {
           // Consulta SPARQL//obtengo  
@@ -76,45 +73,43 @@ const Game=() =>{
           const index = Math.floor(Math.random() * numEles);//index al azar
           const result = data.results.bindings[index];
 
-          setInformacionWikidata(result.countryLabel.value);
+          setInformacionWikidata(result.countryLabel.value+`?`);
 
            } else {
             console.error("Error al realizar la consulta en Wikidata. Estado de respuesta:", respuestaWikidata.status);
           }
         } catch (error) {
           console.error("Error al realizar la consulta en Wikidata", error);
         }
+
       };
 
-
-
-      //obtenerInformacionWikidata();
-   /* useEffect(() => {
-      obtenerPreguntaAleatoria();
-  }, []);*/ 
-
-
-    //obtenerPreguntaAleatoria();
+      const handleButtonClick = () => {
+        obtenerPreguntaAleatoria();
+        //pais, libro,actor, edificio 
+        if (questionType=='pais'){
+        obtenerPais();}
+        else if (questionType =='libro'){
+          obtenerPais();}
+        else if (questionType ==='actor'){
+            obtenerPais();}
+        else if (questionType=='edificio'){
+              obtenerPais();}
+        //etc...
+        obtenerPais();//para que de momento genere un pais hasta tener el resto de queries
+      };
 
     return (
 
         <div>
-        <h1>Pregunta</h1>
+        <h1>Pregunta: </h1>
         <div>
         <Typography component="h1" variant="h5" sx={{ textAlign: 'center' }}>
-           Base de pregunta al azar de mongo: {questionBody} 
-          </Typography>
-
-          <Button variant="contained" color="primary" onClick={obtenerPreguntaAleatoria}>
-            pregunta
-          </Button>
-
-          <Typography component="h1" variant="h5" sx={{ textAlign: 'center' }}>
-            Prueba de Wikidata, pais al azar:{informacionWikidata} 
+           {questionBody} {informacionWikidata} 
           </Typography>
 
-          <Button variant="contained" color="primary" onClick={obtenerInformacionWikidata}>
-            Wikidata
+          <Button variant="contained" color="primary" onClick={handleButtonClick}>
+            Generar pregunta
           </Button>
         </div>
       </div>