Merge pull request #158 from Arquisoft/users_info_api

gatewayservice/gateway-service.js

@@ -53,7 +53,7 @@ app.post('/login', async (req, res) => {
     const authResponse = await axios.post(authServiceUrl+'/login', req.body);
     res.json(authResponse.data);
   } catch (error) {
-    res.status(500).json({ error: "Service down" });
+    res.status(500).json({ error: error.message||'Service down' });
   }
 });
 
@@ -63,7 +63,7 @@ app.post('/adduser', async (req, res) => {
     const userResponse = await axios.post(userServiceUrl+'/adduser', req.body);
     res.json(userResponse.data);
   } catch (error) {
-    res.status(500).json({ error: "Service down" });
+    res.status(500).json({ error: error.message||'Service down' });
   }
 });
 

package.json

@@ -1,10 +1,10 @@
 {
   "dependencies": {
     "chart.js": "^4.4.1",
+    "node": "^18.20.1",
     "react-chartjs-2": "^5.2.0"
   },
   "devDependencies": {
     "serve": "^14.2.1"
   }
 }
-

webapp/e2e/test-environment-setup.js

@@ -1,21 +1,35 @@
 const { MongoMemoryServer } = require('mongodb-memory-server');
+const { default: mongoose } = require('mongoose');
 
 
 let mongoserver;
 let userservice;
 let authservice;
 let gatewayservice;
 let questionservice;
+let questiongenerationservice;
+let gameservice;
 
 async function startServer() {
     console.log('Starting MongoDB memory server...');
     mongoserver = await MongoMemoryServer.create();
     const mongoUri = mongoserver.getUri();
     process.env.MONGODB_URI = mongoUri;
+    const connection = await mongoose.createConnection(mongoUri);
+    const User = await require('../../users/userservice/user-model')(connection);
     userservice = await require("../../users/userservice/user-service");
     authservice = await require("../../users/authservice/auth-service");
     gatewayservice = await require("../../gatewayservice/gateway-service");
     questionservice = await require("../../questionservice/question-service");
+    questiongenerationservice = await require("../../question_generator/questionGenerationService");
+    gameservice = await require("../../gameservice/game-service");
+    // Add a user to the database
+    await User.create({
+      username: 'defaultuser',
+      password: 'defaultpassword',
+      profileImage: 'default.jpg',
+    });
+
   }
 
   startServer();

webapp/locales/en.json

@@ -0,0 +1 @@
+{}

webapp/locales/es.json

@@ -0,0 +1 @@
+{}