Merge pull request #136 from Arquisoft/dev

Cambios para versión 0.1
Arquisoft · Mar 14, 2024 · 32a1ee4 · 32a1ee4
2 parents 94d8db9 + f7ac14a
commit 32a1ee4
Show file tree

Hide file tree

Showing 13 changed files with 155 additions and 47 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -23,7 +23,7 @@ services:
     networks:
       - mynetwork
     environment:
-      MONGODB_URI: mongodb://mongodb:27017/userdb
+      MONGODB_URI: mongodb+srv://aswuser:aswuser@wiq06b.hsfgpcm.mongodb.net/userdb?retryWrites=true&w=majority&appName=wiq06b
 
   userservice:
     container_name: userservice-${teamname:-wiq_es06b}
@@ -37,7 +37,7 @@ services:
     networks:
       - mynetwork
     environment:
-      MONGODB_URI: mongodb://mongodb:27017/userdb
+      MONGODB_URI: mongodb+srv://aswuser:aswuser@wiq06b.hsfgpcm.mongodb.net/userdb?retryWrites=true&w=majority&appName=wiq06b
 
   answerservice:
     container_name: answerservice-${teamname:-wiq_es06b}
@@ -51,7 +51,7 @@ services:
     networks:
       - mynetwork
     environment:
-      MONGODB_URI: mongodb://mongodb:27017/questiondb
+      MONGODB_URI: mongodb+srv://aswuser:aswuser@wiq06b.hsfgpcm.mongodb.net/questiondb?retryWrites=true&w=majority&appName=wiq06b
 
   createservice:
     container_name: createservice-${teamname:-wiq_es06b}
@@ -65,7 +65,7 @@ services:
     networks:
       - mynetwork
     environment:
-      MONGODB_URI: mongodb://mongodb:27017/questiondb
+      MONGODB_URI: mongodb+srv://aswuser:aswuser@wiq06b.hsfgpcm.mongodb.net/questiondb?retryWrites=true&w=majority&appName=wiq06b
 
   recordservice:
     container_name: recordservice-${teamname:-wiq_es06b}
@@ -79,7 +79,7 @@ services:
     networks:
       - mynetwork
     environment:
-      MONGODB_URI: mongodb://mongodb:27017/recorddb
+      MONGODB_URI: mongodb+srv://aswuser:aswuser@wiq06b.hsfgpcm.mongodb.net/recorddb?retryWrites=true&w=majority&appName=wiq06b
 
   generatedquestservice:
     container_name: generatedquestservice-${teamname:-wiq_es06b}
@@ -89,11 +89,11 @@ services:
     depends_on:
       - mongodb
     ports:
-      - "8007:8007"
+      - "8003:8003"
     networks:
       - mynetwork
     environment:
-      MONGODB_URI: mongodb://mongodb:27017/questiondb
+      MONGODB_URI: mongodb+srv://aswuser:aswuser@wiq06b.hsfgpcm.mongodb.net/questiondb?retryWrites=true&w=majority&appName=wiq06b
 
   gatewayservice:
     container_name: gatewayservice-${teamname:-wiq_es06b}
@@ -118,7 +118,7 @@ services:
       ANSW_SERVICE_URL: http://answerservice:8004
       QUES_SERVICE_URL: http://createservice:8005
       REC_SERVICE_URL: http://recordservice:8006
-      GEN_SERVICE_URL: http://generatedquestservice:8007
+      GEN_SERVICE_URL: http://generatedquestservice:8003
 
   webapp:
     container_name: webapp-${teamname:-wiq_es06b}

diff --git a/gatewayservice/gateway-service.js b/gatewayservice/gateway-service.js
@@ -10,7 +10,7 @@ const authServiceUrl = process.env.AUTH_SERVICE_URL || 'http://localhost:8002';
 const userServiceUrl = process.env.USER_SERVICE_URL || 'http://localhost:8001';
 const questionServiceUrl = process.env.QUES_SERVICE_URL || 'http://localhost:8005';
 const recordServiceUrl = process.env.REC_SERVICE_URL || 'http://localhost:8006';
-const genQuestServiceUrl = process.env.GEN_SERVICE_URL || 'http://localhost:8007';
+const genQuestServiceUrl = process.env.GEN_SERVICE_URL || 'http://localhost:8003';
 
 app.use(cors());
 app.use(express.json());
@@ -122,6 +122,22 @@ app.get('/getAllGeneratedQuestions', async (req, res) => {
   }
 })
 
+app.get('/getRecords/:userId', async (req, res) => {
+  try {
+
+    const userId = req.params.userId;
+
+    const recordsResponse = await axios.get(`${recordServiceUrl}/getRecords/${userId}`);
+    res.json(recordsResponse.data);
+  } catch (error) {
+    if (error.response) {
+      res.status(error.response.status).json({ error: error.response.data.error });
+    } else {
+      res.status(500).json({ error: 'Error interno del servidor' });
+    }
+  }
+});
+
 
 // Start the gateway service
 const server = app.listen(port, () => {

diff --git a/questions/answerservice/answer-service.js b/questions/answerservice/answer-service.js
@@ -11,7 +11,7 @@ const port = 8004;
 app.use(bodyParser.json());
 
 // Connect to MongoDB
-const mongoUri = process.env.MONGODB_URI || 'mongodb://localhost:27017/questiondb';
+const mongoUri = process.env.MONGODB_URI || 'mongodb+srv://aswuser:aswuser@wiq06b.hsfgpcm.mongodb.net/questiondb?retryWrites=true&w=majority&appName=wiq06b';
 mongoose.connect(mongoUri);
 
 

diff --git a/questions/createservice/create-service.js b/questions/createservice/create-service.js
@@ -10,7 +10,7 @@ const port = 8005;
 app.use(bodyParser.json());
 
 // Connect to MongoDB
-const mongoUri = process.env.MONGODB_URI || 'mongodb://localhost:27017/questiondb';
+const mongoUri = process.env.MONGODB_URI || 'mongodb+srv://aswuser:aswuser@wiq06b.hsfgpcm.mongodb.net/questiondb?retryWrites=true&w=majority&appName=wiq06b';
 mongoose.connect(mongoUri);
 
 

diff --git a/questions/generatedquestservice/generatedquest-model.js b/questions/generatedquestservice/generatedquest-model.js
@@ -4,11 +4,11 @@ const generatedQuest = new mongoose.Schema({
 
     generatedQuestionBody: {
         type: String,
-        required: true,
+        required: false,
       },
       correctAnswer: {
         type: String,
-        required: true,
+        required: false,
       },
 });
 

diff --git a/questions/generatedquestservice/generatedquest-service.js b/questions/generatedquestservice/generatedquest-service.js
@@ -4,13 +4,13 @@ const bodyParser = require('body-parser');
 const GeneratedQuestion = require('./generatedquest-model');
 
 const app = express();
-const port = 8007;
+const port = 8003;
 
 // Middleware to parse JSON in request body
 app.use(bodyParser.json());
 
 // Connect to MongoDB
-const mongoUri = process.env.MONGODB_URI || 'mongodb://localhost:27017/generatedquestdb';
+const mongoUri = process.env.MONGODB_URI || 'mongodb+srv://aswuser:aswuser@wiq06b.hsfgpcm.mongodb.net/questiondb?retryWrites=true&w=majority&appName=wiq06b';
 mongoose.connect(mongoUri);
 
   // Route for user login

diff --git a/questions/recordservice/record-service.js b/questions/recordservice/record-service.js
@@ -10,7 +10,7 @@ const port = 8006;
 app.use(bodyParser.json());
 
 // Connect to MongoDB
-const mongoUri = process.env.MONGODB_URI || 'mongodb://localhost:27017/recorddb';
+const mongoUri = process.env.MONGODB_URI || 'mongodb+srv://aswuser:aswuser@wiq06b.hsfgpcm.mongodb.net/recorddb?retryWrites=true&w=majority&appName=wiq06b';
 mongoose.connect(mongoUri);
 
 // Function to validate required fields in the request body

diff --git a/users/authservice/auth-service.js b/users/authservice/auth-service.js
@@ -11,7 +11,7 @@ const port = 8002;
 app.use(express.json());
 
 // Connect to MongoDB
-const mongoUri = process.env.MONGODB_URI || 'mongodb://localhost:27017/userdb';
+const mongoUri = process.env.MONGODB_URI || 'mongodb+srv://aswuser:aswuser@wiq06b.hsfgpcm.mongodb.net/userdb?retryWrites=true&w=majority&appName=wiq06b';
 mongoose.connect(mongoUri);
 
 // Function to validate required fields in the request body

diff --git a/users/userservice/user-service.js b/users/userservice/user-service.js
@@ -12,7 +12,7 @@ const port = 8001;
 app.use(bodyParser.json());
 
 // Connect to MongoDB
-const mongoUri = process.env.MONGODB_URI || 'mongodb://localhost:27017/userdb';
+const mongoUri = process.env.MONGODB_URI || 'mongodb+srv://aswuser:aswuser@wiq06b.hsfgpcm.mongodb.net/userdb?retryWrites=true&w=majority&appName=wiq06b';
 mongoose.connect(mongoUri);
 
 

diff --git a/webapp/src/App.js b/webapp/src/App.js
@@ -23,7 +23,6 @@ function App() {
     <Container component="main" maxWidth="lg" style={{ marginTop: '2rem', display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
 
   <Paper elevation={3} style={{ padding: '2rem', textAlign: 'center', height: '500px', width: '800px', overflow: 'auto' }}>
-
 
       {showLogin ? <Login setLogged={handleIsLogged}/> : <AddUser />}
         {!isLogged ? (<Typography component="div" align="center" sx={{ marginTop: 4 }}>

diff --git a/webapp/src/components/Game.js b/webapp/src/components/Game.js
@@ -1,11 +1,6 @@
-// src/components/Game.js
 import axios from 'axios';
 import React, { useState, useEffect, useCallback, useMemo } from 'react';
-//import { Container, Typography, TextField, Button, Snackbar } from '@mui/material';
-import { Container, Typography, Button, Snackbar } from '@mui/material';
-
-
-//import Link from '@mui/material/Link';
+import { Container, Typography, Button, Snackbar, CircularProgress } from '@mui/material';
 
 const Game = ({username}) => {
   const [questionBody, setQuestionBody] = useState('');
@@ -18,6 +13,7 @@ const Game = ({username}) => {
   const [error, setError] = useState('');
   const [finish, setFinish] = useState(false);
   const [buttons, setButtons] = useState([]);
+  const [isLoading, setIsLoading] = useState(true); // Nuevo estado para controlar la pantalla de carga
 
   const apiEndpoint = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
 
@@ -111,6 +107,7 @@ const Game = ({username}) => {
     try{
       setNumberClics(numberClics + 1);
       await obtenerPreguntaAleatoria();
+
       addGeneratedQuestionBody();
     }catch(error)
     {
@@ -150,6 +147,7 @@ const Game = ({username}) => {
   useEffect(() => {
     const fetchData = async () => {
       await obtenerPreguntaAleatoria();
+      setIsLoading(false); // Cuando se carga la pregunta, se cambia el estado para dejar de mostrar la pantalla de carga
     };
     fetchData();
   }, [obtenerPreguntaAleatoria]);
@@ -188,28 +186,39 @@ const Game = ({username}) => {
   return (
     <Container maxWidth="lg">
     <div>
-      {numberClics > 10 || timer > 180 ? (
-        <p>Fin de la partida</p>
+      {isLoading ? ( // Mostrar la pantalla de carga si isLoading es verdadero
+        <div style={{ textAlign: 'center', marginTop: '50px' }}>
+          <CircularProgress />
+          <Typography variant="h6" gutterBottom>
+            Cargando...
+          </Typography>
+        </div>
       ) : (
         <>
-          <Typography component="h1" variant='h5' sx={{ textAlign: 'center' }}>
-            Pregunta Número {numberClics} :
-          </Typography>
-          <Typography component="h2" sx={{ textAlign: 'center', color: (timer > 120 && (timer % 60) % 2 === 0) ? 'red' : 'inherit', fontStyle: 'italic', fontWeight: (timer > 150 && (timer % 60) % 2 === 0) ? 'bold' : 'inherit' }}>
-            ¡Tiempo restante {handleTimeRemaining()}!
-          </Typography>
-          <div style={{ display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center' }}>
-            <Typography component="h1" variant="h5" sx={{ textAlign: 'center' }}>
-              {questionBody} {informacionWikidata}
-            </Typography>
-
-            { buttons.map((button) => (
-                <Button variant="contained" color="primary" onClick={button.handler} >
-                  {button.answer}
-                </Button>
-            ))}
-
-          </div>
+          {numberClics > 10 || timer > 180 ? (
+            <p>Fin de la partida</p>
+          ) : (
+            <>
+              <Typography component="h1" variant='h5' sx={{ textAlign: 'center' }}>
+                Pregunta Número {numberClics} :
+              </Typography>
+              <Typography component="h2" sx={{ textAlign: 'center', color: (timer > 120 && (timer % 60) % 2 === 0) ? 'red' : 'inherit', fontStyle: 'italic', fontWeight: (timer > 150 && (timer % 60) % 2 === 0) ? 'bold' : 'inherit' }}>
+                ¡Tiempo restante {handleTimeRemaining()}!
+              </Typography>
+              <div style={{ display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center' }}>
+                <Typography component="h1" variant="h5" sx={{ textAlign: 'center' }}>
+                  {questionBody} {informacionWikidata}
+                </Typography>
+
+                { buttons.map((button) => (
+                    <Button variant="contained" color="primary" onClick={button.handler} >
+                      {button.answer}
+                    </Button>
+                ))}
+
+              </div>
+            </>
+          )}
         </>
       )}
     {error && (

diff --git a/webapp/src/components/Login.js b/webapp/src/components/Login.js
@@ -7,6 +7,7 @@ import { Container, Typography, TextField, Button, Snackbar, AppBar, Toolbar } f
 import Game from './Game';
 import UsersList from './UsersList';
 import GeneratedQuestionsList from './GeneratedQuestionsList';
+import RecordList from './RecordList';
 
 //import Link from '@mui/material/Link';
 
@@ -20,6 +21,7 @@ const Login = ({setLogged}) => {
   const [showGame, setShowGame] = useState(false);
   const [showUsersList, setShowUsersList] = useState(false);
   const [showQuestionList, setShowQuestionList] = useState(false);
+  const [showRecordList, setShowRecordList] = useState(false);
 
   const apiEndpoint = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
 
@@ -32,7 +34,7 @@ const Login = ({setLogged}) => {
 
       setCreatedAt(userCreatedAt);
       setLoginSuccess(true);
-
+      setLogged();
       setOpenSnackbar(true);
     } catch (error) {
       setError(error.response.data.error);
@@ -43,17 +45,33 @@ const Login = ({setLogged}) => {
     setLogged();
     setShowGame(true);
     setShowUsersList(false);
+    setShowQuestionList(false);
+    setShowRecordList(false);
   };
 
   const handleShowUsersList = () => {
+    setLogged();
     setShowUsersList(true);
     setShowGame(false);
+    setShowQuestionList(false);
+    setShowRecordList(false);
+  };
+
+  const handleShowRecordList = () => {
+    setLogged();
+    setShowRecordList(true);
+    setShowGame(false);
+    setShowUsersList(false);
+    setShowQuestionList(false);
   };
 
 
   const handleShowQuestionList = () => {
+    setLogged();
     setShowQuestionList(true);
     setShowGame(false);
+    setShowUsersList(false);
+    setShowRecordList(false);
   };
   const handleCloseSnackbar = () => {
     setOpenSnackbar(false);
@@ -77,6 +95,11 @@ const Login = ({setLogged}) => {
           Historial de Preguntas Generadas
         </Button>
       )}
+
+        <Button color="inherit" onClick={handleShowRecordList}>
+        Historial de jugadas
+      </Button>
+
     </Toolbar>
   </AppBar>
 )}
@@ -94,8 +117,13 @@ const Login = ({setLogged}) => {
       showQuestionList ? (
         <GeneratedQuestionsList />
       ) : 
-
+      showRecordList ? (
+        <RecordList username={username} />
+      )
+
+      :
       (
+
         <div>
           <Typography component="h1" variant="h5" sx={{ textAlign: 'center' }}>
             Hello {username}!