Merge pull request #142 from Arquisoft/group-service-tests

Group service tests
Arquisoft · May 1, 2024 · 94f6b5c · 94f6b5c
2 parents 4c6b259 + f56e49a
commit 94f6b5c
Show file tree

Hide file tree

Showing 6 changed files with 372 additions and 169 deletions.
diff --git a/game/gameservice/GameController.js b/game/gameservice/GameController.js
@@ -1,6 +1,5 @@
 let Game = require('./game-model');
 const { createGame } = require('./queries/CreateGame');
-const mongoose = require('mongoose');
 
 let GameController = {
     /* HACER EN USER - GET LAST GAME BY USER
@@ -11,10 +10,9 @@ let GameController = {
     },*/
     create: async (req, res) => {
         try{
-        const { questions, players } = req.body;
-        console.log(questions, players)
-        const game = await createGame(questions, players);
-        res.json(game);
+            const { questions, players } = req.body;
+            const game = await createGame(questions, players);
+            res.json(game);
         } catch(error){
             res.status(500).json({ message: error.message });
         }

diff --git a/game/gameservice/gameservice.js b/game/gameservice/gameservice.js
@@ -1,15 +1,13 @@
 // gameservice.js
 const express = require('express');
-const axios = require('axios');
 const mongoose = require('mongoose');
-const { createGame } = require('./queries/CreateGame');
+const bodyParser = require('body-parser');
 const GameController = require('./GameController');
 
 const app = express();
 const port = 8004;
 
-// app.use(bodyParser.json());
-app.use(express.json());
+app.use(bodyParser.json());
 
 const mongoUri = process.env.MONGODB_URI || 'mongodb://localhost:27017/userdb';
 mongoose.connect(mongoUri);
@@ -29,4 +27,8 @@ const server = app.listen(port, () => {
   console.log(`Question generator Service listening at http://localhost:${port}`);
 });
 
+server.on('close', () => {
+  mongoose.connection.close();
+});
+
 module.exports = server;
diff --git a/game/gameservice/queries/CreateGame.js b/game/gameservice/queries/CreateGame.js
@@ -5,10 +5,10 @@ const uuid = require('uuid')
 async function createGame(questions, players) {
     try {
         // Create a new Game instance
-        if(players.length == 0){
+        if(players.length === 0){
           throw new Error('No players found')
         }
-        if(players[0].uuid == null || players[0].uuid == undefined){
+        if(players[0].uuid === null || players[0].uuid === undefined){
           throw new Error('No players found')
         }
         const game = new Game({

diff --git a/game/groupservice/GroupController.js b/game/groupservice/GroupController.js
@@ -35,20 +35,17 @@ let GroupController = {
           res.json(response);
 
         }catch(error){
-          console.log(error)
-          res.status(400).json({error: error.message})
+          res.status(500).json({error: error.message})
         }
 
       },
       leaveGroup: async (req,res) => {
         try{
-          console.log(req.body)
           requiredFields = ['expelledUUID','groupName', 'adminUUID']
           validateRequiredFields(req, requiredFields);
           const group = await getGroupByName(req.body.groupName);
-          console.log(req.body.adminUUID +" - "+ req.body.expelledUUID)
+
           if(req.body.adminUUID != group.admin && req.body.adminUUID != req.body.expelledUUID){
-            console.log("entra en la condicion")
             res.json({ message: 'User is unable to perform this operation' });
             return;
           }
@@ -76,12 +73,11 @@ let GroupController = {
       createGroup: async (req,res) =>{
         try{
 
-          requiredFields =['groupName','creatorUUID','description','isPublic']
+          let requiredFields =['groupName','creatorUUID','description','isPublic']
           validateRequiredFields(req,requiredFields);
-
           let newGroup;
-          if(req.body.isPublic){
 
+          if(req.body.isPublic){
             newGroup = new Group({
               admin: req.body.creatorUUID,
               members: [req.body.creatorUUID],
@@ -92,25 +88,22 @@ let GroupController = {
               groupName: req.body.groupName,
               uuid: uuid.v4(),
             })
-            await newGroup.save();
-
-          } else {
-          const joinCode = generateJoinCode();
-
-          newGroup = new Group({
-            groupName: req.body.groupName,
-            admin: req.body.creatorUUID,
-            members: [req.body.creatorUUID],
-            maxNumUsers: maxNumUsers,
-            description: req.body.description,
-            isPublic: false,
-            joinCode: joinCode,
-            creationDate: Date(),
-            uuid: uuid.v4(),
-          });
-          await newGroup.save();
-        }
-          res.json(newGroup);
+            } else {
+            const joinCode = generateJoinCode();
+            newGroup = new Group({
+              groupName: req.body.groupName,
+              admin: req.body.creatorUUID,
+              members: [req.body.creatorUUID],
+              maxNumUsers: maxNumUsers,
+              description: req.body.description,
+              isPublic: false,
+              joinCode: joinCode,
+              creationDate: Date(),
+              uuid: uuid.v4(),
+            });
+          }
+          const savedGroup = await newGroup.save()
+          res.json(savedGroup);
 
         } catch(error){
           res.status(500).json({error: error.message})
@@ -144,9 +137,8 @@ let GroupController = {
 async function getGroupByName(name) {
     try {
         const group = await Group.findOne({ groupName: name });
-
         if (!group) {
-        throw new Error('This group does not exist');
+          throw new Error('This group does not exist');
         }
 
         return group;
@@ -164,4 +156,4 @@ function validateRequiredFields(req, requiredFields) {
     }
 }
 
-module.exports = GroupController;
+module.exports = {GroupController, getGroupByName};
diff --git a/game/groupservice/group-service.js b/game/groupservice/group-service.js
@@ -1,6 +1,6 @@
 const express = require('express');
 const mongoose = require('mongoose');
-const GroupController = require('./GroupController');
+const {GroupController} = require('./GroupController');
 
 const app = express();
 const port = 8005;