Fixed build workflow

.github/workflows/build.yml

@@ -58,14 +58,34 @@ jobs:
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
         EMPATHY_API_KEY: ${{ secrets.EMPATHY_API_KEY }}
+
+  e2e-tests:
+    needs: [unit-tests]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
+      with:
+        node-version: 22
+    - run: npm --prefix users/authservice install
+    - run: npm --prefix users/userservice install
+    - run: npm --prefix users/groupservice install
+    - run: npm --prefix llmservice install
+    - run: npm --prefix mathGame install
+    - run: npm --prefix apiservice install
+    - run: npm --prefix gatewayservice install
+    - run: npm --prefix webapp install
+    - run: npm --prefix wikidata install
+    - run: npm --prefix webapp run build
+    - run: npm --prefix webapp run test:e2e
 
   docker-push-webapp:
     name: Push webapp Docker Image to GitHub Packages
     runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
-    needs: []
+    needs: [e2e-tests]
     if: github.event_name == 'push'
     steps:
     - uses: actions/checkout@v4
@@ -91,7 +111,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-    needs: []
+    needs: [e2e-tests]
     if: github.event_name == 'push'
     steps:
     - uses: actions/checkout@v4
@@ -114,7 +134,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-    needs: []
+    needs: [e2e-tests]
     if: github.event_name == 'push'
     steps:
     - uses: actions/checkout@v4
@@ -137,7 +157,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-    needs: []
+    needs: [e2e-tests]
     if: github.event_name == 'push'
     steps:
     - uses: actions/checkout@v4
@@ -160,7 +180,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-    needs: []
+    needs: [e2e-tests]
     if: github.event_name == 'push'
     steps:
     - uses: actions/checkout@v4
@@ -187,7 +207,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-    needs: []
+    needs: [e2e-tests]
     if: github.event_name == 'push'
     steps:
     - uses: actions/checkout@v4
@@ -210,7 +230,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-    needs: []
+    needs: [e2e-tests]
     if: github.event_name == 'push'
     steps:
     - uses: actions/checkout@v4
@@ -233,7 +253,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-    needs: []
+    needs: [e2e-tests]
     if: github.event_name == 'push'
     steps:
     - uses: actions/checkout@v4
@@ -256,7 +276,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-    needs: []
+    needs: [e2e-tests]
     if: github.event_name == 'push'
     steps:
     - uses: actions/checkout@v4

docker-compose.yml

@@ -9,7 +9,6 @@ services:
       - "27017:27017"
     networks:
       - mynetwork
-
   mathgame:
     container_name: mathgame-wichat_es2a
     image: ghcr.io/arquisoft/wichat_es2a/mathgame:latest
@@ -26,6 +25,7 @@ services:
     environment:
       DEPLOY_HOST: ${DEPLOY_HOST:-localhost}
       WEBAPP_PORT: ${WEBAPP_PORT:-3000}
+      MATHGAME_PORT: 3002
     restart: always
 
   authservice:

mathGame/app.js

@@ -0,0 +1,22 @@
+const express = require('express');
+const cors = require('cors');
+const mathGameRoutes = require('./mathGameRoutes');
+
+// Crear la aplicación Express
+const app = express();
+
+// Middleware
+app.use(cors());
+app.use(express.json());
+app.disable('x-powered-by'); // Para mayor seguridad
+
+// Usar las rutas del mathGame
+app.use('/mathgame', mathGameRoutes);
+
+// Ruta de salud para verificar que el servicio esté funcionando
+app.get('/health', (req, res) => {
+  res.status(200).json({ status: 'OK', message: 'MathGame service is running' });
+});
+
+// Exportamos la aplicación Express
+module.exports = app;

mathGame/mathGameRoutes.js

@@ -1,9 +1,9 @@
 const express = require('express');
-const app = express();
-app.disable('x-powered-by');
+const router = express.Router();
 const service = require('./service/mathGameService');
 
-app.use(express.json());
+// Configuración básica
+router.use(express.json());
 
 
 
@@ -23,7 +23,7 @@ app.use(express.json());
  *   correct: 90
  * }
  */
-app.get('/mathgame/question', (req, res) => {
+router.get('/question', (req, res) => {
   try {
     const raw = req.query.base;
     const base = raw != null && !Number.isNaN(parseInt(raw, 10))
@@ -55,7 +55,7 @@ app.get('/mathgame/question', (req, res) => {
  *   isCorrect: boolean
  * }
  */
-app.post('/mathgame/verify', (req, res) => {
+router.post('/verify', (req, res) => {
   try {
     const { choice, correct } = req.body;
     const isCorrect = Number(choice) === Number(correct);
@@ -66,4 +66,4 @@ app.post('/mathgame/verify', (req, res) => {
   }
 });
 
-module.exports = app;
+module.exports = router;

mathGame/mathGameRoutes.test.js

@@ -1,7 +1,11 @@
 const request = require('supertest');
-const app = require('./mathGameRoutes');
-const service = require('./service/mathGameService');
 const express = require('express');
+const router = require('./mathGameRoutes');
+const service = require('./service/mathGameService');
+
+// Crear una aplicación Express para los tests
+const app = express();
+app.use('/mathgame', router);
 
 jest.mock('./service/mathGameService');
 

mathGame/package.json

@@ -22,6 +22,7 @@
     "supertest": "^7.0.0"
   },
   "dependencies": {
+    "cors": "^2.8.5",
     "express": "^5.1.0",
     "mathgame": "file:"
   }

webapp/e2e/jest.config.js

@@ -1,5 +1,5 @@
 module.exports = {
     testMatch: ["**/steps/*.js"],
-    testTimeout: 120000,
+    testTimeout: 1000000,
     setupFilesAfterEnv: ["expect-puppeteer"]
 }