Merge branch 'develop' into stats-ui

.github/workflows/build.yml

@@ -18,6 +18,8 @@ jobs:
     - run: npm --prefix users/authservice ci
     - run: npm --prefix users/userservice ci
     - run: npm --prefix gatewayservice ci
+    - run: npm --prefix questionservice ci
+    - run: npm --prefix statsservice ci
     - run: npm --prefix webapp ci
     - run: npm --prefix questionservice ci
     - run: npm --prefix statsservice ci

docker-compose.yml

@@ -20,6 +20,20 @@ services:
         - "8003:8003"
       networks:
         - mynetwork
+
+  statsservice:
+      container_name: statsservice-${teamname:-defaultASW}
+      image: ghcr.io/arquisoft/wiq_es1a/statsservice:latest
+      profiles: ["dev", "prod"]
+      build: ./statsservice
+      depends_on:
+        - mongodb
+      ports:
+        - "8004:8004"
+      networks:
+        - mynetwork
+      environment:
+        MONGODB_URI: mongodb://mongodb:27017/userdb
 
   statsservice:
     container_name: statsservice-${teamname:-defaultASW}
@@ -72,6 +86,7 @@ services:
     build: ./gatewayservice
     depends_on:
       - mongodb
+      - statsservice
       - userservice
       - authservice
       - questionservice

gatewayservice/gateway-service.js

@@ -43,10 +43,10 @@ app.post('/adduser', async (req, res) => {
   }
 });
 
-app.get('/randomQuestion', async (req, res) => {
+app.get('/questions', async (req, res) => {
   try {
     // Forward the question request to the question service
-    const questionResponse = await axios.get(questionServiceUrl+'/randomQuestion', req.body);
+    const questionResponse = await axios.get(questionServiceUrl+'/questions', req.body);
     res.json(questionResponse.data);
   } catch (error) {
     res.status(error.response.status).json({ error: error.response.data.error });

gatewayservice/gateway-service.test.js

@@ -18,6 +18,30 @@ describe('Gateway Service', () => {
     }
   });
 
+  axios.get.mockImplementation((url, data) => {
+    if (url.endsWith("/questions")) {
+      return Promise.resolve({
+        data: [
+          {
+            pregunta: "¿Cuál es la capital de Finlandia?",
+            respuestas: ["Ámsterdam", "Pretoria", "Lima", "Helsinki"],
+            correcta: "Helsinki"
+          }
+        ],
+      });
+    } else if (url.endsWith("/questions?n=1&tematica=all")) {
+      return Promise.resolve({
+        data: [
+          {
+            pregunta: "¿Cuál es la capital de Finlandia?",
+            respuestas: ["Ámsterdam", "Pretoria", "Lima", "Helsinki"],
+            correcta: "Helsinki"
+          }
+        ],
+      });
+    }
+  });
+
   // Test /login endpoint
   it('should forward login request to auth service', async () => {
     const response = await request(app)
@@ -37,4 +61,32 @@ describe('Gateway Service', () => {
     expect(response.statusCode).toBe(200);
     expect(response.body.userId).toBe('mockedUserId');
   });
+
+  // Prueba de la ruta /questions
+  it("should return a question", async () => {
+    const response = await request(app).get("/questions");
+
+    expect(response.statusCode).toBe(200);
+    expect(response.body).toEqual([
+      {
+        pregunta: "¿Cuál es la capital de Finlandia?",
+        respuestas: ["Ámsterdam", "Pretoria", "Lima", "Helsinki"],
+        correcta: "Helsinki",
+      },
+    ]);
+  });
+
+  // Prueba de la ruta /questions?n=1&tematica=all
+  it("should return a question", async () => {
+    const response = await request(app).get("/questions?n=1&tematica=all");
+
+    expect(response.statusCode).toBe(200);
+    expect(response.body).toEqual([
+      {
+        pregunta: "¿Cuál es la capital de Finlandia?",
+        respuestas: ["Ámsterdam", "Pretoria", "Lima", "Helsinki"],
+        correcta: "Helsinki"
+      }
+    ]);
+  });
 });

questionservice/data/tematicas.json

@@ -12,6 +12,7 @@
             "¿Cuál es la esperanza de vida media de ",
             "¿En qué fecha se fundó ",
             "¿Cuál es la forma de gobierno de ",
+
             "¿Cuál es el lema de "
         ]
     },