Merge pull request #79 from Arquisoft/develop

Entregable 3

Author: iyanfdezz

.env

@@ -2,6 +2,7 @@ teamname="wiq_es1a"
 AUTH_SERVICE_URL=http://localhost:8002
 USER_SERVICE_URL=http://localhost:8001
 QUESTION_SERVICE_URL=http://localhost:8003
-AUTH_SERVICE_URL=http://localhost:8004
+STATS_SERVICE_URL=http://localhost:8004
 GATEWAY_SERVICE_URL=http://gatewayservice:8000
-MONGODB_URI=mongodb://localhost:27017/userdb
+MONGODB_URI=mongodb://localhost:27017/userdb
+MONGODB_STATS_URI=mongodb://localhost:27017/statsdb

.github/workflows/release.yml

@@ -139,6 +139,10 @@ jobs:
     needs: [e2e-tests]
     steps:
       - uses: actions/checkout@v4
+      - name: Update OpenAPI configuration
+        run: |
+          DEPLOY_HOST=${{ secrets.DEPLOY_HOST }}
+          sed -i "s/SOMEIP/${DEPLOY_HOST}/g" gatewayservice/openapi.yaml
       - name: Publish to Registry
         uses: elgohr/Publish-Docker-Github-Action@v5
         with:
@@ -170,4 +174,4 @@ jobs:
             wget https://raw.githubusercontent.com/arquisoft/wiq_es1a/master/docker-compose.yml -O docker-compose.yml
             wget https://raw.githubusercontent.com/arquisoft/wiq_es1a/master/.env -O .env
             docker compose --profile prod down
-            docker compose --profile prod up -d
+            docker compose --profile prod up -d --pull always

docker-compose.yml

@@ -28,14 +28,12 @@ services:
     build: ./statsservice
     depends_on:
       - mongodb
-      - userservice
     ports:
       - "8004:8004"
     networks:
       - mynetwork
     environment:
-      MONGODB_URI: mongodb://mongodb:27017/userdb
-      USER_SERVICE_URL: http://userservice:8001
+      MONGODB_STATS_URI: mongodb://mongodb:27017/statsdb
 
   authservice:
     container_name: authservice-${teamname:-defaultASW}

gatewayservice/gateway-service.js

@@ -2,15 +2,17 @@ const express = require("express");
 const axios = require("axios");
 const cors = require("cors");
 const promBundle = require("express-prom-bundle");
-
+const YAML = require('yaml');
+const fs = require("fs");
+const swaggerUi = require('swagger-ui-express'); 
 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 questionServiceUrl =
   process.env.QUESTION_SERVICE_URL || "http://localhost:8003";
-const statsServiceUrl = process.env.AUTH_SERVICE_URL || "http://localhost:8004";
+const statsServiceUrl = process.env.STATS_SERVICE_URL || "http://localhost:8004";
 
 app.use(cors());
 app.use(express.json());
@@ -53,6 +55,36 @@ app.post("/adduser", async (req, res) => {
   }
 });
 
+app.get("/userInfo", async (req, res) => {
+  try {
+    // Forward the question request to the user service
+    const userResponse = await axios.get(
+      userServiceUrl + "/userInfo",
+      { params: req.query }
+    );
+    res.json(userResponse.data);
+  } catch (error) {
+    res
+      .status(error.response.status)
+      .json({ error: error.response.data.error });
+  }
+});
+
+app.post("/saveGameList", async (req, res) => {
+  try {
+    // Forward the save game request to the stats service
+    const gameResponse = await axios.post(
+      userServiceUrl + "/saveGameList",
+      req.body
+    );
+    res.json(gameResponse.data);
+  } catch (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
@@ -68,6 +100,21 @@ app.get("/questions", async (req, res) => {
   }
 });
 
+app.post("/questions", async (req, res) => {
+  try {
+    // Forward the question request to the question service
+    const questionResponse = await axios.post(
+      questionServiceUrl + "/questions",
+      { body: req.body }
+    );
+    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
@@ -97,10 +144,9 @@ app.post("/saveGame", async (req, res) => {
   }
 });
 
-app.get("/getstats", async (req, res) => {
+app.get("/ranking", async (req, res) => {
   try {
-    // Forward the stats request to the stats service
-    const statsResponse = await axios.get(userServiceUrl + "/getstats", {
+    const statsResponse = await axios.get(statsServiceUrl + "/ranking", {
       params: req.query,
     });
     res.json(statsResponse.data);
@@ -111,20 +157,20 @@ app.get("/getstats", async (req, res) => {
   }
 });
 
-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 });
-  }
-});
+openapiPath='./openapi.yaml'
+if (fs.existsSync(openapiPath)) {
+  const file = fs.readFileSync(openapiPath, 'utf8');
+
+  // Parse the YAML content into a JavaScript object representing the Swagger document
+  const swaggerDocument = YAML.parse(file);
+
+  // Serve the Swagger UI documentation at the '/api-doc' endpoint
+  // This middleware serves the Swagger UI files and sets up the Swagger UI page
+  // It takes the parsed Swagger document as input
+  app.use('/api-doc', swaggerUi.serve, swaggerUi.setup(swaggerDocument));
+} else {
+  console.log("Not configuring OpenAPI. Configuration file not present.")
+}
 
 // Start the gateway service
 const server = app.listen(port, () => {

gatewayservice/gateway-service.test.js

@@ -39,6 +39,12 @@ describe('Gateway Service', () => {
           }
         ],
       });
+    } else if (url.endsWith('/stats')) {
+      return Promise.resolve({ data: { stats: 'mockedStats' } });
+    } else if (url.endsWith('/userInfo')) {
+      return Promise.resolve({ data: { userInfo: 'mockedUserInfo' } });
+    } else if (url.endsWith('/ranking')) {
+      return Promise.resolve({ data: { ranking: 'mockedRanking' } });
     }
   });
 
@@ -89,4 +95,30 @@ describe('Gateway Service', () => {
       }
     ]);
   });
+
+  // Test /userInfo endpoint
+  it('should forward userInfo request to user service', async () => {
+    const response = await request(app)
+      .get('/userInfo')
+      .query({ user: 'testuser' });
+
+    expect(response.statusCode).toBe(200);
+    expect(response.body).toEqual({ userInfo: 'mockedUserInfo' });
+  });
+
+  // Test /stats endpoint
+  it('should forward stats request to stats service', async () => {
+    const response = await request(app).get("/stats").query({ user: 'testuser', gamemode: 'classic' });
+
+    expect(response.statusCode).toBe(200);
+    expect(response.body).toEqual({ stats: 'mockedStats' });
+  });
+
+  // Test /ranking endpoint
+  it('should forward ranking request to stats service', async () => {
+    const response = await request(app).get("/ranking").query({ gamemode: 'classic', filterBy: 'all' });
+
+    expect(response.statusCode).toBe(200);
+    expect(response.body).toEqual({ ranking: 'mockedRanking' });
+  });
 });