Merge branch 'develop' into jota

Arquisoft · Apr 25, 2024 · baec6d2 · baec6d2
2 parents 1b8efb3 + 402d234
commit baec6d2
Show file tree

Hide file tree

Showing 16 changed files with 1,256 additions and 78 deletions.
diff --git a/gatewayservice/monitoring/prometheus/prometheus.yml b/gatewayservice/monitoring/prometheus/prometheus.yml
@@ -3,4 +3,4 @@ global:
 scrape_configs:
   - job_name: "example-nodejs-app"
     static_configs:
-      - targets: ["gatewayservice:8000"]
+      - targets: ["gatewayservice-wiq5a:8000","userservice-wiq5a:8001","authservice-wiq5a:8002","questionservice-wiq5a:8003"]
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,7 +6,9 @@
     },
     "dependencies": {
         "docker": "^1.0.0",
+        "express-prom-bundle": "^7.0.0",
         "path-browserify": "^1.0.1",
+        "prom-client": "^15.1.2",
         "start-server-and-test": "^2.0.3"
     }
 }
diff --git a/questionservice/package.json b/questionservice/package.json
@@ -26,6 +26,7 @@
     "ee-first": "^1.1.1",
     "encodeurl": "^1.0.2",
     "es-define-property": "^1.0.0",
+    "express-prom-bundle": "^7.0.0",
     "es-errors": "^1.3.0",
     "escape-html": "^1.0.3",
     "etag": "^1.8.1",

diff --git a/questionservice/server.js b/questionservice/server.js
@@ -4,6 +4,7 @@ let express = require('express');
 const axios = require('axios');
 const cors = require('cors');
 const fs = require('fs');
+const promBundle = require('express-prom-bundle');
 
 const crypto = require('crypto');
 
@@ -16,6 +17,10 @@ let app = express();
 app.disable("x-powered-by") //disable default information of express
 app.use(cors(corsOptions));
 
+//Prometheus configuration
+const metricsMiddleware = promBundle({includeMethod: true});
+app.use(metricsMiddleware);
+
 // Cargamos las consultas SPARQL desde el fichero de configuración
 const questions = JSON.parse(fs.readFileSync('questions.json', 'utf8'));
 

diff --git a/userservice/authservice/auth-service.js b/userservice/authservice/auth-service.js
@@ -4,6 +4,8 @@ const mongoose = require('mongoose');
 const bcrypt = require('bcrypt');
 const jwt = require('jsonwebtoken');
 const User = require('./auth-model')
+const promBundle = require('express-prom-bundle');
+
 
 const app = express();
 const port = 8002; 
@@ -15,6 +17,10 @@ app.use(express.json());
 const mongoUri = process.env.MONGODB_URI;
 mongoose.connect(mongoUri);
 
+//Prometheus configuration
+const metricsMiddleware = promBundle({includeMethod: true});
+app.use(metricsMiddleware);
+
 // Function to validate required fields in the request body
 function validateRequiredFields(req, requiredFields) {
     for (const field of requiredFields) {

diff --git a/userservice/authservice/package.json b/userservice/authservice/package.json
@@ -22,6 +22,7 @@
         "body-parser": "^1.20.2",
         "dotenv": "^16.4.5",
         "express": "^4.18.2",
+        "express-prom-bundle": "^7.0.0",
         "jsonwebtoken": "^9.0.2",
         "mongodb": "^6.5.0",
         "mongoose": "^8.0.4"

diff --git a/userservice/userservice/package.json b/userservice/userservice/package.json
@@ -22,6 +22,7 @@
     "body-parser": "^1.20.2",
     "dotenv": "^16.4.5",
     "express": "^4.18.2",
+    "express-prom-bundle": "^7.0.0",
     "mongodb": "^6.5.0",
     "mongoose": "^8.0.4"
   },

diff --git a/userservice/userservice/user-service.js b/userservice/userservice/user-service.js
@@ -5,13 +5,18 @@ const mongoose = require('mongoose');
 const bcrypt = require('bcrypt');
 const bodyParser = require('body-parser');
 const User = require('./user-model');
+const promBundle = require('express-prom-bundle');
 
 const app = express();
 const port = 8001;
 
 // Middleware to parse JSON in request body
 app.use(bodyParser.json());
 
+//Prometheus configuration
+const metricsMiddleware = promBundle({includeMethod: true});
+app.use(metricsMiddleware);
+
 // Connect to MongoDB
 //const mongoUri = process.env.MONGODB_URI || 'mongodb://localhost:27017/userdb';
 const mongoUri = process.env.MONGODB_URI;

diff --git a/webapp/e2e/steps/01-register-form.steps.js b/webapp/e2e/steps/01-register-form.steps.js
@@ -37,11 +37,11 @@ defineFeature(feature, test => {
     when('I fill the data in the form and press submit', async () => {
       await expect(page).toFill('input[name="username"]', username);
       await expect(page).toFill('input[name="password"]', password);
-      await expect(page).toClick('button', { text: 'Add User' })
+      await expect(page).toClick('button', { text: 'Crear' })
     });
 
     then('A confirmation message should be shown in the screen', async () => {
-        await expect(page).toMatchElement("div", { text: "User added successfully" });
+        await expect(page).toMatchElement("div", { text: "Usuario creado correctamente" });
     });
   })
 

diff --git a/webapp/e2e/steps/02-login.steps.js b/webapp/e2e/steps/02-login.steps.js
@@ -37,11 +37,11 @@ defineFeature(feature, test => {
     when('I enter valid username and password', async () => {
       await expect(page).toFill('input[name="username"]', username);
       await expect(page).toFill('input[name="password"]', password);
-      await expect(page).toClick('button', { text: 'Login' })
+      await expect(page).toClick('button', { text: 'Iniciar Sesión' })
     });
 
     then('A confirmation message should be shown in the screen', async () => {
-        await expect(page).toMatchElement("div", { text: "Hello "+username+"!" });
+        await expect(page).toMatchElement("div", { text: "¡Buenas, "+username+"!" });
     });
   })
 

diff --git a/webapp/e2e/steps/03-home.steps.js b/webapp/e2e/steps/03-home.steps.js
@@ -37,7 +37,7 @@ defineFeature(feature, test => {
     when('I navigate to the Home page', async () => {
       await expect(page).toFill('input[name="username"]', username);
       await expect(page).toFill('input[name="password"]', password);
-      await expect(page).toClick('button', { text: 'Login' })
+      await expect(page).toClick('button', { text: 'Iniciar Sesión' })
 
       await expect(page).toClick('a[href="/"]', { text: 'WIQ 5A' });
       await page.waitForNavigation();

diff --git a/webapp/src/components/AddUser.js b/webapp/src/components/AddUser.js
@@ -27,29 +27,29 @@ const AddUser = () => {
   return (
     <Container component="main" maxWidth="xs" sx={{ marginTop: 4 }}>
       <Typography component="h1" variant="h5">
-        Add User
+        Registrar Usuario
       </Typography>
       <TextField
         name="username"
         margin="normal"
         fullWidth
-        label="Username"
+        label="Usuario"
         value={username}
         onChange={(e) => setUsername(e.target.value)}
       />
       <TextField
         name="password"
         margin="normal"
         fullWidth
-        label="Password"
+        label="Contraseña"
         type="password"
         value={password}
         onChange={(e) => setPassword(e.target.value)}
       />
       <Button variant="contained" color="primary" onClick={addUser}>
-        Add User
+        Crear
       </Button>
-      <Snackbar open={openSnackbar} autoHideDuration={6000} onClose={handleCloseSnackbar} message="User added successfully" />
+      <Snackbar open={openSnackbar} autoHideDuration={6000} onClose={handleCloseSnackbar} message="Usuario creado correctamente" />
       {error && (
         <Snackbar open={!!error} autoHideDuration={6000} onClose={() => setError('')} message={`Error: ${error}`} />
       )}

diff --git a/webapp/src/components/Login.js b/webapp/src/components/Login.js
@@ -47,13 +47,13 @@ const Login = ({isLogged, setIsLogged, username, setUsername}) => {
       ) : (
         <div>
           <Typography component="h1" variant="h5">
-            Login
+            Iniciar Sesión
           </Typography>
           <TextField
             name="username"
             margin="normal"
             fullWidth
-            label="Username"
+            label="Usuario"
             value={username}
 
             onChange={(e) => setUsername(e.target.value)}
@@ -62,15 +62,15 @@ const Login = ({isLogged, setIsLogged, username, setUsername}) => {
             name="password"
             margin="normal"
             fullWidth
-            label="Password"
+            label="Contraseña"
             type="password"
             value={password}
             onChange={(e) => setPassword(e.target.value)}
           />
           <Button variant="contained" color="primary" onClick={loginUser}>
-            Login
+            Iniciar Sesión
           </Button>
-          <Snackbar open={openSnackbar} autoHideDuration={6000} onClose={handleCloseSnackbar} message="Login successful" />
+          <Snackbar open={openSnackbar} autoHideDuration={6000} onClose={handleCloseSnackbar} message="Iniciada sesión exitosamente" />
           {error && (
             <Snackbar open={!!error} autoHideDuration={6000} onClose={() => setError('')} message={`Error: ${error}`} />
           )}

diff --git a/webapp/src/components/tests/AddUser.test.js b/webapp/src/components/tests/AddUser.test.js
@@ -14,9 +14,9 @@ describe('AddUser component', () => {
   it('should add user successfully', async () => {
     render(<AddUser />);
 
-    const usernameInput = screen.getByLabelText(/Username/i);
-    const passwordInput = screen.getByLabelText(/Password/i);
-    const addUserButton = screen.getByRole('button', { name: /Add User/i });
+    const usernameInput = screen.getByLabelText(/Usuario/i);
+    const passwordInput = screen.getByLabelText(/Contraseña/i);
+    const addUserButton = screen.getByRole('button', { name: /Crear/i });
 
     // Mock the axios.post request to simulate a successful response
     mockAxios.onPost('http://localhost:8000/adduser').reply(200);
@@ -30,16 +30,16 @@ describe('AddUser component', () => {
 
     // Wait for the Snackbar to be open
     await waitFor(() => {
-      expect(screen.getByText(/User added successfully/i)).toBeInTheDocument();
+      expect(screen.getByText(/Usuario creado correctamente/i)).toBeInTheDocument();
     });
   });
 
   it('should handle error when adding user', async () => {
     render(<AddUser />);
 
-    const usernameInput = screen.getByLabelText(/Username/i);
-    const passwordInput = screen.getByLabelText(/Password/i);
-    const addUserButton = screen.getByRole('button', { name: /Add User/i });
+    const usernameInput = screen.getByLabelText(/Usuario/i);
+    const passwordInput = screen.getByLabelText(/Contraseña/i);
+    const addUserButton = screen.getByRole('button', { name: /Crear/i });
 
     // Mock the axios.post request to simulate an error response
     mockAxios.onPost('http://localhost:8000/adduser').reply(500, { error: 'Internal Server Error' });

diff --git a/webapp/src/components/tests/Login.test.js b/webapp/src/components/tests/Login.test.js
@@ -15,17 +15,17 @@ describe('Login component', () => {
   it('should render correctly', async () => {
     render(<Login isLogged={false} setIsLogged={jest.fn()} username={''} setUsername={jest.fn()}/>);
 
-    expect(screen.getByLabelText(/Username/i)).toBeInTheDocument();
-    expect(screen.getByLabelText(/Password/i)).toBeInTheDocument();
-    expect(screen.getByRole('button', { name: /Login/i })).toBeInTheDocument();
+    expect(screen.getByLabelText(/Usuario/i)).toBeInTheDocument();
+    expect(screen.getByLabelText(/Contraseña/i)).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: /Iniciar Sesión/i })).toBeInTheDocument();
   })
 
   it('should log in successfully', async () => {
     render(<Login isLogged={false} setIsLogged={jest.fn()} username={'testUser'} setUsername={jest.fn()}/>);
 
-    const usernameInput = screen.getByLabelText(/Username/i);
-    const passwordInput = screen.getByLabelText(/Password/i);
-    const loginButton = screen.getByRole('button', { name: /Login/i });
+    const usernameInput = screen.getByLabelText(/Usuario/i);
+    const passwordInput = screen.getByLabelText(/Contraseña/i);
+    const loginButton = screen.getByRole('button', { name: /Iniciar Sesión/i });
 
     // Mock the axios.post request to simulate a successful response
     mockAxios.onPost('http://localhost:8000/login').reply(200, { createdAt: '2024-01-01T12:34:56Z' });
@@ -38,7 +38,7 @@ describe('Login component', () => {
       });
 
     // Verify that the user information is displayed
-    expect(screen.getByText(/Login successful/i)).toBeInTheDocument(); 
+    expect(screen.getByText(/Iniciada sesión exitosamente/i)).toBeInTheDocument(); 
     //expect(screen.getByText(/Your account was created on 1\/1\/2024/i)).toBeInTheDocument();
   });
 
@@ -53,9 +53,9 @@ describe('Login component', () => {
   it('should handle error when logging in', async () => {
     render(<Login isLogged={false} setIsLogged={jest.fn()} username={'testUer'} setUsername={jest.fn()}/>);
 
-    const usernameInput = screen.getByLabelText(/Username/i);
-    const passwordInput = screen.getByLabelText(/Password/i);
-    const loginButton = screen.getByRole('button', { name: /Login/i });
+    const usernameInput = screen.getByLabelText(/Usuario/i);
+    const passwordInput = screen.getByLabelText(/Contraseña/i);
+    const loginButton = screen.getByRole('button', { name: /Iniciar Sesión/i });
 
 
     mockAxios.onPost('http://localhost:8000/login').reply(401, { error: 'Unauthorized' });