change db again to localhost. Records now have correctAnswers: Number

Arquisoft · Apr 16, 2024 · 8e234f3 · 8e234f3
1 parent 4145632
commit 8e234f3
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 11 deletions.
diff --git a/docker-compose.yml b/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://localhost:27017/users
 
   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://localhost:27017/users
 
   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://localhost:27017/questions
 
   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://localhost:27017/records
 
   gatewayservice:
     container_name: gatewayservice-${teamname:-defaultASW}

diff --git a/questionsgenerator/questionGenerator.js b/questionsgenerator/questionGenerator.js
@@ -88,14 +88,14 @@ class questionGenerator {
 
           const tittle = template.tittle.replace('?', correctLabel);
 
-          const question = {
+          const question = new Question({
             tittle: tittle,
             answers: answers,
             correctAnswer: correctAnswer,
             category: category
-          }
+          });
 
-          await Question.create(question);
+          await question.save();
 
         } else {
           console.error("No templates.");

diff --git a/record/historial-model.js b/record/historial-model.js
@@ -5,6 +5,10 @@ const gameSchema = mongoose.Schema({
         type: mongoose.Schema.Types.ObjectId,
         ref: 'User'
     },
+    correctAnswers : {
+        type: Number,
+        required : true,
+    },
     questions: {
         type: [{
             question: String,

diff --git a/record/historial-service.js b/record/historial-service.js
@@ -14,7 +14,7 @@ const port = 8004;
 app.use(express.json());
 
 //Connect to MongoDB
-mongoose.connect(mongoURI, { useNewUrlParser: true, useUnifiedTopology: true });
+mongoose.connect(mongoURI);
 
 // Temporary storage for game questions
 const gameQuestions = {};
@@ -49,10 +49,17 @@ app.post('/saveGameRecord', async (req, res) => {
       return res.status(400).json({ error: "No game questions found for this user" });
     }
 
+    var correctAnswers = 0;
+    gameQuestions[username].forEach(question => {
+      if(question.selectedAnswer === question.correctAnswer)
+        correctAnswers++;
+    });
+
     const user = await User.findOne({ username });
 
     const game = new Game({
       user: user,
+      correctAnswers: correctAnswers,
       questions: gameQuestions[username]
     });
 

diff --git a/users/authservice/auth-service.js b/users/authservice/auth-service.js
@@ -15,7 +15,7 @@ app.use(express.json());
 const mongoURI = process.env.MONGODB_URI;
 console.log("debajo de la const: " + mongoURI);
 
-mongoose.connect(mongoURI, { useNewUrlParser: true, useUnifiedTopology: true});
+mongoose.connect(mongoURI);
 
 // Function to validate required fields in the request body
 function validateRequiredFields(req, requiredFields) {

diff --git a/users/userservice/user-service.js b/users/userservice/user-service.js
@@ -15,7 +15,7 @@ app.use(bodyParser.json());
 // Connect to MongoDB
 const mongoURI = process.env.MONGODB_URI;
 
-mongoose.connect(mongoURI, { useNewUrlParser: true, useUnifiedTopology: true});
+mongoose.connect(mongoURI);
 
 // Function to validate required fields in the request body
 function validateRequiredFields(req, requiredFields) {
@@ -60,7 +60,7 @@ app.post('/adduser', async (req, res) => {
       password: hashedPassword,
     });
 
-    await User.create(newUser);
+    await newUser.save();
     res.json(newUser);
   } catch (error) {
     res.status(400).json({ error: error.message });