no participation data

Arquisoft · Apr 8, 2024 · d94b5cf · d94b5cf
1 parent 7a34cff
commit d94b5cf
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 14 deletions.
diff --git a/gameservice/game-service.js b/gameservice/game-service.js
@@ -156,9 +156,9 @@ app.get('/getParticipation/:userId', async (req, res) => {
       },
     ]);
 
-    if (participationData.length === 0) {
+    if (participationData.length === 0 || (participationData.length > 0 && participationData[0].totalGames === 0)) {
       // No se encontraron datos para el usuario
-      res.status(404).json({ error: 'No participation data found for the user.' });
+      res.status(204).send();
       return;
     }
 

diff --git a/gameservice/game-service.test.js b/gameservice/game-service.test.js
@@ -39,7 +39,6 @@ beforeEach(async () => {
     totalTime: 1200,
     gameMode: 'normal'
   });
-
 });
 
 afterEach(async () => {
@@ -82,7 +81,6 @@ describe('Game Service', () => {
       totalTime: 1200,
     };
 
-
     const response = await request(app).get(`/getParticipation/${userId}`);
 
     expect(response.status).toBe(200);
@@ -95,7 +93,19 @@ describe('Game Service', () => {
     const response = await request(app).get(`/getParticipation/${nonExistentUserId}`);
 
     expect(response.status).toBe(404);
-    expect(response.body).toEqual({ error: 'No participation data found for the user.' });
+    expect(response.body).toEqual({ error: 'User not found.' });
+  });
+  it('should return 204 when getting participation data for user with totalGames equal to 0', async () => {
+    const userNoGames = await User.create({
+      username: 'noGames',
+      profileImage: 'defaultProfileImg',
+      password: 'password123'
+    });
+    userNGId = userNoGames._id;
+
+    const response = await request(app).get(`/getParticipation/${userNGId}`);
+
+    expect(response.status).toBe(204);
   });
 });
 describe('Api info users', () => {

diff --git a/webapp/src/components/Participation.jsx b/webapp/src/components/Participation.jsx
@@ -7,15 +7,22 @@ const gatewayUrl = process.env.REACT_APP_API_ENDPOINT || "http://localhost:8000"
 export const Participation = ({ goTo }) => {
   const { sessionData } = useContext(SessionContext); // Obtener datos de sesión del contexto
   const [participationData, setParticipationData] = useState(null);
+  const [loading, setLoading] = useState(true);
 
   useEffect(() => {
     // Realizar la solicitud al servidor para obtener los datos de participación
     const fetchData = async () => {
       try { 
         const response = await axios.get(`${gatewayUrl}/getParticipation/${sessionData.userId}`); 
-        setParticipationData(response.data);
+        if (response.status === 204) {
+          setLoading(false);
+        } else {
+          setParticipationData(response.data);
+          setLoading(false);
+        }
       } catch (error) {
         console.error('Error al obtener los datos de participación:', error);
+        setLoading(false);
       }
     };
 
@@ -28,15 +35,19 @@ export const Participation = ({ goTo }) => {
     <main>
       <div>
         <h1>Participación</h1>
-        {participationData !== null ? (
-          <div>
-            <p>Número de partidas jugadas: {participationData.totalGames}</p>
-            <p>Preguntas acertadas: {participationData.correctAnswers}</p>
-            <p>Preguntas falladas: {participationData.incorrectAnswers}</p>
-            <p>Tiempo total jugando: {participationData.totalTime} segundos</p>
-          </div>
+        {loading ? (
+          <p>{participationData ? 'Cargando datos de participación...' : 'No hay datos de participación'}</p>
         ) : (
-          <p>Cargando datos de participación...</p>
+          participationData !== null ? (
+            <div>
+              <p>Número de partidas jugadas: {participationData.totalGames}</p>
+              <p>Preguntas acertadas: {participationData.correctAnswers}</p>
+              <p>Preguntas falladas: {participationData.incorrectAnswers}</p>
+              <p>Tiempo total jugando: {participationData.totalTime} segundos</p>
+            </div>
+          ) : (
+            <p>No hay datos de participación</p>
+          )
         )}
       </div>
     </main>