Webapp interface

.github/workflows/build.yml

@@ -21,12 +21,14 @@ jobs:
     - run: npm --prefix webapp ci
     - run: npm --prefix storeQuestionService ci
     - run: npm --prefix userStatsService ci
+    - run: npm --prefix gameservice ci
     - run: npm --prefix users/authservice test -- --coverage
     - run: npm --prefix users/userservice test -- --coverage
     - run: npm --prefix gatewayservice test -- --coverage
     - run: npm --prefix webapp test -- --coverage
     - run: npm --prefix storeQuestionService test -- --coverage
     - run: npm --prefix userStatsService test -- --coverage
+   # - run: npm --prefix gameservice test -- --coverage
     - name: Analyze with SonarCloud
       uses: sonarsource/sonarcloud-github-action@master
       env:

.github/workflows/release.yml

@@ -19,12 +19,14 @@ jobs:
     - run: npm --prefix storeQuestionService ci
     - run: npm --prefix userStatsService ci
     - run: npm --prefix webapp ci
+    - run: npm --prefix gameservice ci
     - run: npm --prefix users/authservice test -- --coverage
     - run: npm --prefix users/userservice test -- --coverage
     - run: npm --prefix gatewayservice test -- --coverage
     - run: npm --prefix webapp test -- --coverage
     - run: npm --prefix storeQuestionService test -- --coverage
     - run: npm --prefix userStatsService test -- --coverage
+    #- run: npm --prefix gameservice test -- --coverage
     - name: Analyze with SonarCloud
       uses: sonarsource/sonarcloud-github-action@master
       env:
@@ -207,6 +209,26 @@ jobs:
         registry: ghcr.io
         workdir: userStatsService
         platforms: linux/arm64
+  docker-push-gameservice:
+    name: Push game service Docker Image to GitHub Packages
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    needs: [e2e-tests]
+    steps:
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+    - uses: actions/checkout@v4
+    - name: Publish to Registry
+      uses: elgohr/Publish-Docker-Github-Action@v5
+      with:
+        name: arquisoft/wiq_es6c/gameservice
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+        registry: ghcr.io
+        workdir: gameservice
+        platforms: linux/arm64
   deploy:
     name: Deploy over SSH
     runs-on: ubuntu-latest

docker-compose.yml

@@ -50,6 +50,21 @@ services:
     environment:
       MONGODB_URI: mongodb://mongodb:27017/userdb
 
+  gameservice:
+    container_name: gameservice-${teamname:-defaultASW}
+    image: ghcr.io/arquisoft/wiq_es6c/gameservice:latest
+    profiles: ["dev", "prod"]
+    build: ./gameservice
+    depends_on:
+      - questiongeneratorservice
+    ports:
+      - "8005:8005"
+    networks:
+      - mynetwork
+    environment:
+      QUESTIONS_GENERATOR_SERVICE_URL: http://questiongeneratorservice:8007
+      STORE_STATS_SERVICE: http://userstatsservice:8003
+
   questiongeneratorservice:
     container_name: questiongeneratorservice-${teamname:-defaultASW}
     image: ghcr.io/arquisoft/wiq_es6c/questiongeneratorservice:latest
@@ -99,6 +114,8 @@ services:
       USER_STATS_SERVICE_URL: http://userstatsservice:8003 
       STORE_QUESTION_SERVICE_URL: http://storequestionservice:8004
       QUESTIONS_GENERATOR_SERVICE_URL: http://questiongeneratorservice:8007
+      GAME_SERVICE_URL: http://gameservice:8005
+
 
   webapp:
     container_name: webapp-${teamname:-defaultASW}

gameservice/.dockerignore

@@ -0,0 +1,2 @@
+node_modules
+coverage

gameservice/Dockerfile

@@ -0,0 +1,20 @@
+# Use an official Node.js runtime as a parent image
+FROM node:20
+
+# Set the working directory in the container
+WORKDIR /usr/src/gameService
+
+# Copy package.json and package-lock.json to the working directory
+COPY package*.json ./
+
+# Install app dependencies
+RUN npm install
+
+# Copy the app source code to the working directory
+COPY . .
+
+# Expose the port the app runs on
+EXPOSE 8005
+
+# Define the command to run your app
+CMD ["node", "game-service.js"]

gameservice/game-service.js

@@ -0,0 +1,109 @@
+const express = require('express');
+const cors = require('cors');
+const axios = require('axios');
+
+const app = express();
+const port = 8005;
+
+const questionService = process.env.QUESTIONS_GENERATOR_SERVICE_URL || 'http://localhost:8007';
+const userStatsService = process.env.STORE_STATS_SERVICE ||'http://localhost:8003';
+
+function generateAleatoryString() {
+  let characters = 'abcdefghijklmnopqrstuvwxyz0123456789'; // Caracteres alfanuméricos
+  let len = 24;
+  let result = '';
+  for (let i = 0; i < len; i++) {
+    result += characters.charAt(Math.floor(Math.random() * characters.length));
+  }
+  return result;
+}
+
+
+// Middleware to parse JSON in request body
+app.use(express.json());
+
+// Middleware to enable CORS (cross-origin resource sharing). In order for the API to be accessible by other origins (domains).
+app.use(cors());
+
+var gameId = 0;
+
+app.get('/generateGameUnlimitedQuestions', async (req, res) => {
+  try {
+    console.log("Llegamos a crear un id del juego")
+    var gameId = generateAleatoryString()
+    res.json(gameId)
+  } catch (error) {
+    res.status(500).json({ error: 'Internal Server Error' })
+  }
+})
+
+
+// Route for getting questions
+app.get('/gameUnlimitedQuestions', async (req, res) => {
+  try {
+    // TODO: Implement logic to fetch questions from MongoDB and send response 
+    // const questions = await Question.find()
+    console.log("Llegamos a pedir preguntas")
+    const questionGenerated = await axios.get(`${questionService}/questions?n_preguntas=${1}`);
+    console.log("Pedimos las preguntas")
+    res.json(questionGenerated.data);
+  } catch (error) {
+    // res.status(500).json({ message: error.message })
+    res.status(500).json({ error: 'Internal Server Error' });
+  }
+});
+
+app.post('/storeGame', async (req, res) => {
+  try {
+    //hay que preparar los datos para enviarlos al servicio
+    var id = req.body.id
+    var username = req.body.username
+    var points = req.body.points
+    var questions = req.body.questions
+    console.log("Vamos a guardar resultado")
+    const store = await axios.post(`${userStatsService}/history/game`, {id, username,  points, questions})
+    console.log("Guardamos resultado")
+    res.json(store.data)
+  } catch (error) {
+    res.status(500).json({ error: 'Internal Server Error' });
+  }
+})
+
+app.use((err, req, res, next) => {
+  console.error(`An error occurred: ${err}`);
+  res.status(500).send(`An error occurred: ${err.message}`);
+});
+
+
+
+//libraries required for OpenAPI-Swagger
+const swaggerUi = require('swagger-ui-express'); 
+const fs = require("fs")
+const YAML = require('yaml')
+
+// Read the OpenAPI YAML file synchronously
+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 server
+const server = app.listen(port, () => {
+  console.log(`Game Service listening at http://localhost:${port}`);
+});
+
+server.on('close', () => {
+  // Close the Mongoose connection
+});
+
+module.exports = server

gameservice/openapi.yaml

@@ -0,0 +1,146 @@
+openapi: 3.0.0
+info:
+  title: GameService API
+  description: Gateway OpenAPI specification.
+  version: 0.2.0
+servers:
+  - url: http://localhost:8005
+    description: Development server
+  - url: http://gameservice:8005
+    description: Production server
+paths:
+  /generateGameUnlimitedQuestions:
+    get:
+      summary: Generate the id for the unlimited game questions.
+      operationId: generateGameUnlimitedQuestions
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+      responses:
+        '200':
+          description: Create the id of the game and returned successfuly.
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  id:
+                    type: string
+                    description: The id of the game created.
+        '500':
+          description: Internal server error.
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  error:
+                    type: string
+                    description: Error information.
+                    example: Internal Server Error
+  /gameUnlimitedQuestion:
+    get:
+      summary: Generate questions for the unlimited game questions.
+      operationId: gameUnlimitedQuestions
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                id:
+                  type: string
+                  description: Game Id.
+                  example: sqeweg12er56yg46u89k
+      responses:
+        '200':
+          description: Question created and returned successfuly.
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  answers:
+                    type: List<String>
+                    description: List with the possible answers.
+                    example: 
+                  question:
+                    type: String
+                    description: The question that is going to be done
+                  correctAnswer:
+                    type: String
+                    description: The correct answer for the question       
+        '500':
+          description: Internal server error.
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  error:
+                    type: string
+                    description: Error information.
+                    example: Internal Server Error
+  /storeGame:
+    post:
+      summary: Stores the actual game in the database.
+      operationId: storeGame
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                id:
+                  type: string
+                  description: Game Id.
+                  example: sqeweg12er56yg46u89k
+                username:
+                  type: string
+                  description: The name if the user.
+                points:
+                  type: integer
+                  description: The number of points that the user score.
+                questions:
+                  answers:
+                    type: List<String>
+                    description: List with the possible answers.
+                    example: 
+                  question:
+                    type: String
+                    description: The question that is going to be done
+                  correctAnswer:
+                    type: String
+                    description: The correct answer for the question
+      responses:
+        '200':
+          description: Question created and returned successfuly.
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  id:
+                    type: string
+                    description: The question that is going to bre realized.
+                    example: 
+                  answers:
+                    type: List<String>
+                    description: List with the possible answers.
+                    example: 
+        '500':
+          description: Internal server error.
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  error:
+                    type: string
+                    description: Error information.
+                    example: Internal Server Error