add _id property to schemas and create game

docker-compose.yml

@@ -85,7 +85,7 @@ services:
     environment:
       AUTH_SERVICE_URL: http://authservice:8002
       USER_SERVICE_URL: http://userservice:8001
-      GQ_SERVICE_URL: http://questiongeneratorservice:8003
+      QG_SERVICE_URL: http://questiongeneratorservice:8003
       GAME_SERVICE_URL: http://gameservice:8004
 
   webapp:

game/gameservice/game-model.js

@@ -3,10 +3,7 @@ const mongoose = require('mongoose');
 
 
 const gameSchema = new mongoose.Schema({
-    id: {
-      type: String,
-      required: true,
-    },
+    _id: mongoose.Schema.Types.ObjectId,
     players:[{
         type: mongoose.Schema.Types.ObjectId,ref:'User',
         required: true,

game/gameservice/gameLogic.js

@@ -1,10 +1,11 @@
 const Game = require("./game-model")
+const mongoose = require('mongoose');
 
 async function createGame(questions, users) {
     try {
         // Create a new Game instance
         const game = new Game({
-          id: mongoose.Types.ObjectId(),
+          _id: new mongoose.Types.ObjectId(),
           players: users,
           questions: questions,
         });

game/qgservice/MathQuestions.js

@@ -1,4 +1,5 @@
 const Question4Answers = require("./Question4Answers");
+const mongoose = require("mongoose");
 
 function generateRandomMathQuestion() {
     const operators = ['+', '-', '*', '/'];
@@ -26,6 +27,7 @@ function generateRandomMathQuestion() {
     }
 
     return {
+      _id: new mongoose.Types.ObjectId(),
       question,
       correctAnswer,
       incorrectAnswer1: incorrectAnswers[0],
@@ -34,7 +36,7 @@ function generateRandomMathQuestion() {
     };
   }
 
-  async function saveMathQuestions(numberOfQuestions) {
+  async function createMathQuestions(numberOfQuestions) {
     const questions = [];
 
     for (let i = 0; i < numberOfQuestions; i++) {
@@ -51,4 +53,4 @@ function generateRandomMathQuestion() {
     }
   }
 
-module.exports = { saveMathQuestions };
+module.exports = { createMathQuestions };

game/qgservice/Question4Answers.js

@@ -1,6 +1,7 @@
 const mongoose = require('mongoose');
 
 const question4AnswersSchema = new mongoose.Schema({
+  _id: mongoose.Schema.Types.ObjectId,
   question: {
     type: String,
     required: true,

game/qgservice/qg-service.js

@@ -7,7 +7,7 @@ const axios = require('axios');
 const mongoose = require('mongoose');
 const { worldPopulationQuery, spainPopulationQuery, spainCapitalQuery, worldCapitalQuery } = require('./queries');
 const { generateQuestionPopulation, generateQuestionCapital } = require('./questiongenerator');
-const { saveMathQuestions } = require('./MathQuestions');
+const { createMathQuestions } = require('./MathQuestions');
 
 const app = express();
 const port = 8003;
@@ -101,12 +101,13 @@ app.get('/game', async (req, res) => {
       questions.push(question);
     }
 
-    const mathquestions = await saveMathQuestions(5)
+    const mathquestions = await createMathQuestions(5)
     questions.push(...mathquestions)
 
 
     res.json(questions);
   } catch (error) {
+    console.log(error)
     res.status(500).json({ error: 'Internal Server Error' });
   }
 })

game/qgservice/questiongenerator.js

@@ -1,4 +1,5 @@
 const Question4Answers = require('./Question4Answers');
+const mongoose = require('mongoose');
 
 function generateQuestionPopulation(cityPopulationMap) {
   const cityPopulationArray = Array.from(cityPopulationMap);
@@ -17,6 +18,7 @@ function generateQuestionPopulation(cityPopulationMap) {
 
   // Create the question object
   const question = {
+    _id: new mongoose.Types.ObjectId(), 
     question: `What is the population of ${city}?`,
     correctAnswer: population.toString(),
     incorrectAnswer1: incorrectAnswers[0].toString(),
@@ -54,6 +56,7 @@ function generateQuestionCapital(countryCapitalMap) {
 
   // Create the question object
   const question = {
+    _id: new mongoose.Types.ObjectId(),
     question: `What is the capital of ${country}?`,
     correctAnswer: capital,
     incorrectAnswer1: incorrectAnswers[0],

gatewayservice/gateway-service.js

@@ -8,8 +8,8 @@ const port = 8000;
 
 const authServiceUrl = process.env.AUTH_SERVICE_URL || 'http://localhost:8002';
 const userServiceUrl = process.env.USER_SERVICE_URL || 'http://localhost:8001';
-const qgServiceUrl = process.env.GQ_SERVICE_URL || 'http://localhost:8003';
-const gameServiceUrl = process.env.GQ_SERVICE_URL || 'http://localhost:8004';
+const qgServiceUrl = process.env.QG_SERVICE_URL || 'http://localhost:8003';
+const gameServiceUrl = process.env.GAME_SERVICE_URL || 'http://localhost:8004';
 
 app.use(cors());
 app.use(express.json());
@@ -47,6 +47,8 @@ app.post('/adduser', async (req, res) => {
 app.get('/questionsGame', async (req, res) => {
   try {
     const response = await axios.get( qgServiceUrl+"/game");
+    // coger los usuarios y crear el game con preguntas y usuarios
+
     res.json(response.data);
   } catch (error) {
     console.error(error);
@@ -56,7 +58,7 @@ app.get('/questionsGame', async (req, res) => {
 
 app.post('/addgame', async (req, res) => {
   try {
-    const response = await axios.get(gameServiceUrl+'/addgame', req.body);
+    const response = await axios.post(gameServiceUrl+'/createGame', req.body);
     res.json(response.data);
   } catch (error) {
     res.status(500).json({ error: 'Internal server error' });

users/authservice/auth-model.js

@@ -1,6 +1,7 @@
 const mongoose = require('mongoose');
 
 const userSchema = new mongoose.Schema({
+    _id: mongoose.Schema.Types.ObjectId,
     username: String,
     password: String,
     createdAt: Date,

users/userservice/user-service.js

@@ -30,6 +30,7 @@ app.post('/adduser', async (req, res) => {
         const hashedPassword = await bcrypt.hash(req.body.password, 10);
 
         const newUser = new User({
+            _id: new mongoose.Types.ObjectId(),
             username: req.body.username,
             password: hashedPassword,
         });