Merge pull request #56 from Arquisoft/storeQuestionService

Gracias por corregir la parte del front, debería funcionar ya todo
Arquisoft · Mar 13, 2024 · efeb758 · efeb758
2 parents 998a6ee + 1bd09d5
commit efeb758
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 44 deletions.
diff --git a/gatewayservice/gateway-service.js b/gatewayservice/gateway-service.js
@@ -42,15 +42,6 @@ app.post('/adduser', async (req, res) => {
   }
 });
 
-app.post('/history/question', async (req, res) => {
-  try {
-    const response = await axios.post(storeQuestionsServiceUrl+'/history/question', req.body);
-    res.json(response.data);
-  } catch (error) {
-    res.status(error.response.status).json({ error: error.response.data.error });
-  }
-})
-
 app.get('/history/questions', async (req, res) => {
   try {
     const response = await axios.get(storeQuestionsServiceUrl+'/history/questions');

diff --git a/storeQuestionService/store-q-service.js b/storeQuestionService/store-q-service.js
@@ -13,9 +13,9 @@ const mongoUri = process.env.MONGODB_URI || 'mongodb://localhost:27017/storedque
 mongoose.connect(mongoUri);
 
 // Function to validate required fields in the request body
-function validateRequiredFields(req, requiredFields) {
+function validateRequiredFields(body, requiredFields) {
     for (const field of requiredFields) {
-        if (!(field in req.body)) {
+        if (!(field in body)) {
             throw new Error(`Missing required field: ${field}`);
         }
     }
@@ -24,7 +24,7 @@ function validateRequiredFields(req, requiredFields) {
 app.post('/history/question', async (req, res) => {
     try {
         // Check if required fields are present in the request body
-        validateRequiredFields(req, ['pregunta', 'respuesta_correcta','respuestas_incorrectas']);
+        validateRequiredFields(req.body, ['pregunta', 'respuesta_correcta', 'respuestas_incorrectas']);
 
         const newQuestion = new Question({
             pregunta: req.body.pregunta,
@@ -41,33 +41,32 @@ app.post('/history/question', async (req, res) => {
 });
 
 app.post('/history/questions', async (req, res) => {
-  try {
-      // Check if required fields are present in the request body
-      if (!Array.isArray(req.body)) {
-          throw new Error('Invalid request format. Expected an array of questions.');
-      }
-      for (const question of req.body) {
-          validateRequiredFields(question, ['pregunta', 'respuesta_correcta','respuestas_incorrectas']);
-      }
-
-      const newQuestions = [];
-
-      for (const questionData of req.body) {
-        const newQuestion = new Question({
-            pregunta: req.body.pregunta,
-            respuesta_correcta: req.body.respuesta_correcta,
-            respuestas_incorrectas: req.body.respuestas_incorrectas,
-            createdAt: req.body.createdAt
-        });
+    try {
+        // Check if required fields are present in the request body
+        if (!Array.isArray(req.body)) {
+            throw new Error('Invalid request format. Expected an array of questions.');
+        }
+        for (const question of req.body) {
+            validateRequiredFields(question, ['pregunta', 'respuesta_correcta', 'respuestas_incorrectas']);
+        }
+        const newQuestions = [];
+
+        for (const questionData of req.body) {
+            const newQuestion = new Question({
+                pregunta: questionData.pregunta,
+                respuesta_correcta: questionData.respuesta_correcta,
+                respuestas_incorrectas: questionData.respuestas_incorrectas,
+                createdAt: questionData.createdAt
+            });
+
+            await newQuestion.save();
+            newQuestions.push(newQuestion);
+        }
 
-        await newQuestion.save();
-        newQuestions.push(newQuestion);
-      }
-
-      res.json(newQuestions);
-  } catch (error) {
-      res.status(400).json({ error: error.message });
-  }
+        res.json(newQuestions);
+    } catch (error) {
+        res.status(400).json({ error: error.message });
+    }
 });
 
 

diff --git a/webapp/src/storeQuestion/App.jsx b/webapp/src/storeQuestion/App.jsx
@@ -28,22 +28,22 @@ function App(){
 
       const apiEndpoint = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
 
+
       useEffect(() => {
 
         const obtenerPreguntas = async () => {
           try {
-            const response = await axios.get(`${apiEndpoint}/questions`)
-            console.log(response)
+            const response = await axios.get(`${apiEndpoint}/history/questions`)
             setPreguntas(response.data);
           } catch (error) {
             console.error('Error al obtener las preguntas:', error.response.data.error);
           }
         };
 
         obtenerPreguntas();
+        //eslint-disable-next-line
       }, []);
 
-
     return (
       <>
         <h2>Almacén de preguntas</h2>

diff --git a/webapp/src/storeQuestion/components/Question.jsx b/webapp/src/storeQuestion/components/Question.jsx
@@ -5,13 +5,20 @@ function Question(props) {
 
   return (
     <div className='question'>
-      <h3>{newQuestion.question}</h3>
+      <h3>{newQuestion.pregunta}</h3>
         <div className='grid'>
-          <p className='right'>{newQuestion.c_answer}</p>
-          {newQuestion.w_answers.map((answer, index) => (
+          <div className='container'>
+            <p className='right'>{newQuestion.respuesta_correcta}</p>
+          </div>
+          {newQuestion.respuestas_incorrectas.map((answer, index) => (
+            <div className='container'>
               <p>{answer}</p>
+            </div>
           ))}
         </div>
+        <div className='container footer'>
+          <footer>{newQuestion.createdAt.substring(0,10)}</footer>
+        </div>
     </div>
   );
 }

diff --git a/webapp/src/storeQuestion/css/questions.css b/webapp/src/storeQuestion/css/questions.css
@@ -130,9 +130,24 @@ h2{
     text-align: center;
 }
 
+h3{
+    text-align: center;
+}
+
 #root main{
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(40%, 1fr));
     padding: 5px;
     grid-gap: 10px;
 }
+
+.container{
+    display: flex;
+    justify-content: center;
+}
+
+.container.footer{
+    display: flex;
+    justify-content: right;
+    margin-right: 1em;
+}