Merge pull request #58 from Arquisoft/develop

Develop a master para deployment

.github/workflows/build.yml

@@ -18,7 +18,11 @@ 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
     - run: npm --prefix users/authservice test -- --coverage
     - run: npm --prefix users/userservice test -- --coverage
     - run: npm --prefix gatewayservice test -- --coverage

.github/workflows/release.yml

@@ -16,6 +16,7 @@ jobs:
     - run: npm --prefix users/userservice ci
     - run: npm --prefix gatewayservice ci
     - run: npm --prefix webapp ci
+    - run: npm --prefix questionservice ci
     - run: npm --prefix users/authservice test -- --coverage
     - run: npm --prefix users/userservice test -- --coverage
     - run: npm --prefix gatewayservice test -- --coverage
@@ -36,6 +37,8 @@ jobs:
     - run: npm --prefix users/authservice install
     - run: npm --prefix users/userservice install
     - run: npm --prefix gatewayservice install
+    - run: npm --prefix questionservice install
+    - run: npm --prefix statsservice install
     - run: npm --prefix webapp install
     - run: npm --prefix webapp run build
     - run: npm --prefix webapp run test:e2e
@@ -93,6 +96,40 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
         registry: ghcr.io
         workdir: users/userservice
+  docker-push-statsservice:
+    name: Push stats service Docker Image to GitHub Packages
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    needs: [e2e-tests]
+    steps:
+    - uses: actions/checkout@v4
+    - name: Publish to Registry
+      uses: elgohr/Publish-Docker-Github-Action@v5
+      with:
+        name: arquisoft/wiq_es1a/statsservice
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+        registry: ghcr.io
+        workdir: statsservice
+  docker-push-questionservice:
+    name: Push questions service Docker Image to GitHub Packages
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    needs: [e2e-tests]
+    steps:
+    - uses: actions/checkout@v4
+    - name: Publish to Registry
+      uses: elgohr/Publish-Docker-Github-Action@v5
+      with:
+        name: arquisoft/wiq_es1a/questionservice
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+        registry: ghcr.io
+        workdir: questionservice
   docker-push-gatewayservice:
     name: Push gateway service Docker Image to GitHub Packages
     runs-on: ubuntu-latest
@@ -113,7 +150,7 @@ jobs:
   deploy:
     name: Deploy over SSH
     runs-on: ubuntu-latest
-    needs: [docker-push-userservice,docker-push-authservice,docker-push-gatewayservice,docker-push-webapp]
+    needs: [docker-push-userservice,docker-push-authservice,docker-push-gatewayservice,docker-push-webapp,docker-push-questionservice, docker-push-statsservice]
     steps:
     - name: Deploy over SSH
       uses: fifsky/ssh-action@master

docker-compose.yml

@@ -11,6 +11,32 @@ services:
     networks:
       - mynetwork
 
+  questionservice:
+      container_name: questionservice-${teamname:-defaultASW}
+      image: ghcr.io/arquisoft/wiq_es1a/questionservice:latest
+      profiles: ["dev", "prod"]
+      build: ./questionservice
+      ports:
+        - "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
+      - userservice
+    ports:
+      - "8004:8004"
+    networks:
+      - mynetwork
+    environment:
+      MONGODB_URI: mongodb://mongodb:27017/userdb
+      USER_SERVICE_URL: http://userservice:8001
+
   authservice:
     container_name: authservice-${teamname:-defaultASW}
     image: ghcr.io/arquisoft/wiq_es1a/authservice:latest
@@ -46,13 +72,17 @@ services:
     build: ./gatewayservice
     depends_on:
       - mongodb
+      - statsservice
       - userservice
       - authservice
+      - questionservice
     ports:
       - "8000:8000"
     networks:
       - mynetwork
     environment:
+      STATS_SERVICE_URL: http://statsservice:8004
+      QUESTION_SERVICE_URL: http://questionservice:8003
       AUTH_SERVICE_URL: http://authservice:8002
       USER_SERVICE_URL: http://userservice:8001
 

gatewayservice/gateway-service.js

@@ -1,43 +1,128 @@
-const express = require('express');
-const axios = require('axios');
-const cors = require('cors');
-const promBundle = require('express-prom-bundle');
+const express = require("express");
+const axios = require("axios");
+const cors = require("cors");
+const promBundle = require("express-prom-bundle");
 
 const app = express();
 const port = 8000;
 
-const authServiceUrl = process.env.AUTH_SERVICE_URL || 'http://localhost:8002';
-const userServiceUrl = process.env.USER_SERVICE_URL || 'http://localhost:8001';
+const authServiceUrl = process.env.AUTH_SERVICE_URL || "http://localhost:8002";
+const userServiceUrl = process.env.USER_SERVICE_URL || "http://localhost:8001";
+const questionServiceUrl =
+  process.env.QUESTION_SERVICE_URL || "http://localhost:8003";
+const statsServiceUrl = process.env.AUTH_SERVICE_URL || "http://localhost:8004";
+
 
 app.use(cors());
 app.use(express.json());
 
 //Prometheus configuration
-const metricsMiddleware = promBundle({includeMethod: true});
+const metricsMiddleware = promBundle({ includeMethod: true });
 app.use(metricsMiddleware);
 
+app.set("json spaces", 40);
+
 // Health check endpoint
-app.get('/health', (req, res) => {
-  res.json({ status: 'OK' });
+app.get("/health", (req, res) => {
+  res.json({ status: "OK" });
 });
 
-app.post('/login', async (req, res) => {
+app.post("/login", async (req, res) => {
   try {
     // Forward the login request to the authentication service
-    const authResponse = await axios.post(authServiceUrl+'/login', req.body);
+    const authResponse = await axios.post(authServiceUrl + "/login", req.body);
     res.json(authResponse.data);
   } catch (error) {
-    res.status(error.response.status).json({ error: error.response.data.error });
+    res
+      .status(error.response.status)
+      .json({ error: error.response.data.error });
   }
 });
 
-app.post('/adduser', async (req, res) => {
+app.post("/adduser", async (req, res) => {
   try {
     // Forward the add user request to the user service
-    const userResponse = await axios.post(userServiceUrl+'/adduser', req.body);
+    const userResponse = await axios.post(
+      userServiceUrl + "/adduser",
+      req.body
+    );
     res.json(userResponse.data);
   } catch (error) {
-    res.status(error.response.status).json({ error: error.response.data.error });
+    res
+      .status(error.response.status)
+      .json({ error: error.response.data.error });
+  }
+});
+
+app.get("/questions", async (req, res) => {
+  try {
+    // Forward the question request to the question service
+    const questionResponse = await axios.get(
+      questionServiceUrl + "/questions",
+      { params: req.query }
+    );
+    res.json(questionResponse.data);
+  } catch (error) {
+    res
+      .status(error.response.status)
+      .json({ error: error.response.data.error });
+  }
+});
+
+app.get("/stats", async (req, res) => {
+  try {
+    // Forward the stats request to the stats service
+    const statsResponse = await axios.get(statsServiceUrl + "/stats", req.body);
+    res.json(statsResponse.data);
+  } catch (error) {
+    res
+      .status(error.response.status)
+      .json({ error: error.response.data.error });
+  }
+});
+
+app.post("/saveGame", async (req, res) => {
+  try {
+    // Forward the save game request to the stats service
+    const gameResponse = await axios.post(
+      statsServiceUrl + "/saveGame",
+      req.body
+    );
+    res.json(gameResponse.data);
+  } catch (error) {
+    res
+      .status(error.response.status)
+      .json({ error: error.response.data.error });
+  }
+});
+
+app.get("/getstats", async (req, res) => {
+  try {
+    // Forward the stats request to the stats service
+    const statsResponse = await axios.get(
+      userServiceUrl + "/getstats",
+      req.body
+    );
+    res.json(statsResponse.data);
+  } catch (error) {
+    res
+      .status(error.response.status)
+      .json({ error: error.response.data.error });
+  }
+});
+
+app.post("/userSaveGame", async (req, res) => {
+  try {
+    // Forward the save game request to the stats service
+    const gameResponse = await axios.post(
+      userServiceUrl + "/userSaveGame",
+      req.body
+    );
+    res.json(gameResponse.data);
+  } catch (error) {
+    res
+      .status(error.response.status)
+      .json({ error: error.response.data.error });
   }
 });
 
@@ -46,4 +131,4 @@ const server = app.listen(port, () => {
   console.log(`Gateway Service listening at http://localhost:${port}`);
 });
 
-module.exports = server
+module.exports = server;

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"
+      }
+    ]);
+  });
 });