Merge branch 'develop-beforeMerge22'

docker-compose.yml

@@ -23,7 +23,7 @@ services:
     networks:
       - mynetwork
     environment:
-      MONGODB_URI: mongodb+srv://wiq_es01b_admin:[email protected]/wiq?retryWrites=true&w=majority&appName=WIQ
+      MONGODB_URI: ${MONGODB_URI}
 
   userservice:
     container_name: userservice-${teamname:-defaultASW}
@@ -37,7 +37,7 @@ services:
     networks:
       - mynetwork
     environment:
-      MONGODB_URI: mongodb+srv://wiq_es01b_admin:[email protected]/wiq?retryWrites=true&w=majority&appName=WIQ
+      MONGODB_URI: ${MONGODB_URI}
 
   questionsgenerator:
     container_name: questionsgenerator-${teamname:-defaultASW}
@@ -51,7 +51,7 @@ services:
     networks:
       - mynetwork
     environment:
-      MONGODB_URI: mongodb+srv://wiq_es01b_admin:[email protected]/wiq?retryWrites=true&w=majority&appName=WIQ
+      MONGODB_URI: ${MONGODB_URI}
 
   record:
     container_name: record-${teamname:-defaultASW}
@@ -66,7 +66,7 @@ services:
     networks:
       - mynetwork
     environment:
-      MONGODB_URI: mongodb+srv://wiq_es01b_admin:[email protected]/wiq?retryWrites=true&w=majority&appName=WIQ
+      MONGODB_URI: ${MONGODB_URI}
 
   gatewayservice:
     container_name: gatewayservice-${teamname:-defaultASW}

gatewayservice/openapi.yaml

@@ -194,10 +194,26 @@ paths:
                     type: string
                     description: Error information.
                     example: Internal Server Error
-  /saveHistorial:
+  /generateQuestions:
     post:
-      summary: Saves the data of a question the user answered in the database.
-      operationId: saveHistorial
+      summary: Generates questions from wikidata to the database.
+      operationId: generateQuestions
+      responses:
+        '200':
+          description: Generates questions successfully. Returns a message of success.
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  msg:
+                    type: string
+                    description: Success message.
+                    example: Questions generated successfully
+  /saveQuestion:
+    post:
+      summary: Saves the data of a question the user answered locally.
+      operationId: saveQuestion
       requestBody:
         required: true
         content:
@@ -227,7 +243,7 @@ paths:
                   type: string
                   description: selected answer
                   example: Madrid
-                correct:
+                isCorrect:
                   type: boolean
                   description: true if the answer is correct, false if it is incorrect
                   example: false
@@ -237,7 +253,45 @@ paths:
                   example: user1234
       responses:
         '200':
-          description: Saves the data into the database. Returns a message to confirm it was a success.
+          description: Saves the data successfully. Returns a message to confirm it was a success.
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  msg:
+                    type: string
+                    description: message of success.
+                    example: Question saved successfully
+        '500':
+          description: Internal server error.
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  error:
+                    type: string
+                    description: Error information.
+                    example: Internal Server Error
+  /saveGameRecord:
+    post:
+      summary: Saves the data of a game the user finished.
+      operationId: saveGameRecord
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                username:
+                  type: string
+                  description: username of the user logged in
+                  example: user1234
+      responses:
+        '200':
+          description: Saves the game successfully. Returns a message to confirm it was a success.
           content:
             application/json:
               schema:
@@ -246,7 +300,7 @@ paths:
                   msg:
                     type: string
                     description: message of success.
-                    example: Saves the data correctly
+                    example: Game record saved succesfully
         '500':
           description: Internal server error.
           content:
@@ -258,10 +312,10 @@ paths:
                     type: string
                     description: Error information.
                     example: Internal Server Error
-  /getHistorial:
+  /getGameRecord:
     post:
       summary: gets the data of all games and questions of the user logged in.
-      operationId: getHistorial
+      operationId: getGameRecord
       requestBody:
         required: true
         content:
@@ -281,16 +335,19 @@ paths:
               schema:
                 type: object
                 properties:
-                  games:
+                  user:
+                    type: string
+                    description: ID of the user
+                  questions:
                     type: array
                     items:
                       type: object
                       properties:
-                        title:
+                        question:
                           type: string
                           description: question title 
                           example: What is the capital of France?
-                        answers:
+                        answersArray:
                           type: array
                           items:
                             type: string
@@ -308,11 +365,48 @@ paths:
                           type: string
                           description: selected answer
                           example: Madrid
-                        answeredRight:
+                        isCorrect:
                           type: boolean
                           description: true if the answer is correct, false if it is incorrect
                           example: false
+        '500':
+          description: Internal server error.
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  error:
+                    type: string
+                    description: Error information.
+                    example: Internal Server Error
+  /deleteTempQuestions:
+    post:
+      summary: Deletes the locally saved answers of the games.
+      operationId: deleteTempQuestions
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                username:
+                  type: string
+                  description: username of the user logged in
+                  example: user1234
+      responses:
+        '200':
+          description: Deletes succesfully the data. Returns a message to confirm it was a success.
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  msg:
+                    type: string
                     description: message of success.
+                    example: Temp questions deleted successfully
         '500':
           description: Internal server error.
           content:

questionsgenerator/questions-service.js

@@ -4,7 +4,8 @@ const mongoose = require('mongoose');
 const bodyParser = require('body-parser');
 const QuestionGenerator = require('./questionGenerator.js');
 const Question = require('./question-model')
-const mongoURI = process.env.MONGODB_URI || 'mongodb+srv://wiq_es01b_admin:[email protected]/wiq?retryWrites=true&w=majority&appName=WIQ';
+const mongoURI = process.env.MONGODB_URI;
+//|| 'mongodb+srv://wiq_es01b_admin:[email protected]/wiq?retryWrites=true&w=majority&appName=WIQ';
 
 const app = express();
 app.disable('x-powered-by');
@@ -51,6 +52,7 @@ app.post('/generateQuestions', async (req, res) => {
   const generator = new QuestionGenerator();
   await generator.loadTemplates();
   await generator.generate10Questions();
+  res.status(200).json({ msg: "Questions generated successfully" });
 })
 
 async function getRandomQuestionByCategory(category) {

record/historial-service.js

@@ -4,7 +4,7 @@ const mongoose = require('mongoose');
 const bodyParser = require('body-parser');
 const User = require('./auth-model');
 const Game = require('./historial-model');
-const mongoURI = process.env.MONGODB_URI || 'mongodb+srv://wiq_es01b_admin:[email protected]/wiq?retryWrites=true&w=majority&appName=WIQ';
+const mongoURI = process.env.MONGODB_URI;
 
 const app = express();
 app.disable('x-powered-by');
@@ -35,7 +35,7 @@ app.post('/saveQuestion', async (req, res) => {
       isCorrect
     });
 
-    res.json({ msg: "Question saved successfully" });
+    res.status(200).json({ msg: "Question saved successfully" });
   } catch (error) {
     res.status(500).json({ error: 'Internal Server Error' });
   }
@@ -60,7 +60,7 @@ app.post('/saveGameRecord', async (req, res) => {
 
     delete gameQuestions[username];
 
-    res.json("Game record saved succesfully");
+    res.status(200).json("Game record saved succesfully");
   } catch (error) {
     res.status(500).json({ error: "Internal Server Error" });
   }
@@ -76,7 +76,7 @@ app.post('/getGameRecord', async (req, res) => {
     const games = await Game.find({ user: user._id });
 
 
-    res.json({ games: games });
+    res.status(200).json({ games: games });
   } catch (error) {
     res.status(500).json({ error: "Internal Server Error" });
   }

users/authservice/auth-service.js

@@ -12,7 +12,7 @@ const port = 8002;
 app.use(express.json());
 
 // Connect to MongoDB
-const mongoURI = process.env.MONGODB_URI || 'mongodb+srv://wiq_es01b_admin:[email protected]/wiq?retryWrites=true&w=majority&appName=WIQ';
+const mongoURI = process.env.MONGODB_URI;
 
 mongoose.connect(mongoURI, { useNewUrlParser: true, useUnifiedTopology: true});
 //const userCollection = mongoose.connection.useDb("WIQ").collection("users");

users/userservice/user-service.js

@@ -13,10 +13,9 @@ const port = 8001;
 app.use(bodyParser.json());
 
 // Connect to MongoDB
-const mongoURI = process.env.MONGODB_URI || 'mongodb+srv://wiq_es01b_admin:[email protected]/wiq?retryWrites=true&w=majority&appName=WIQ';
+const mongoURI = process.env.MONGODB_URI;
 
 mongoose.connect(mongoURI, { useNewUrlParser: true, useUnifiedTopology: true});
-//const userCollection = mongoose.connection.useDb("WIQ").collection("users");
 
 // Function to validate required fields in the request body
 function validateRequiredFields(req, requiredFields) {