Merge pull request #158 from Arquisoft/develop-sonarcloud-fixes

Fixed multiple sonarcloud issues

gatewayservice/Dockerfile

@@ -2,9 +2,9 @@
 FROM node:20
 
 RUN wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | apt-key add -
-RUN apt-get install apt-transport-https
+RUN apt install apt-transport-https -y --no-install-recommends && apt clean
 RUN echo "deb https://artifacts.elastic.co/packages/8.x/apt stable main" | tee -a /etc/apt/sources.list.d/elastic-8.x.list
-RUN apt-get update && apt-get install filebeat
+RUN apt update && apt install filebeat -y --no-install-recommends && apt clean
 
 COPY filebeat.yml /etc/filebeat/filebeat.yml
 

gatewayservice/gateway-service.js

@@ -1,5 +1,4 @@
 const express = require('express');
-const cors = require('cors');
 const promBundle = require('express-prom-bundle');
 const axios = require('axios');
 const { loggerFactory,  requestLoggerMiddleware,  responseLoggerMiddleware,  errorHandlerMiddleware } = require("cyt-utils")
@@ -42,7 +41,7 @@ require("./routes/authRoutes")(app, axios)
 require("./routes/historyRoutes")(app, axios, authTokenMiddleware)
 
 // Open API
-openapiPath='./GatewayAPI.yaml'
+const openapiPath='./GatewayAPI.yaml'
 if (fs.existsSync(openapiPath)) {
   const file = fs.readFileSync(openapiPath, 'utf8');
 

gatewayservice/package.json

@@ -20,7 +20,6 @@
     "homepage": "https://github.com/arquisoft/wiq_es05b#readme",
     "dependencies": {
         "axios": "^1.6.5",
-        "cors": "^2.8.5",
         "cyt-utils": "*2.0.9",
         "express": "^4.18.2",
         "express-openapi": "^12.1.3",

jordi/Dockerfile

@@ -2,9 +2,9 @@
 FROM node:20
 
 RUN wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | apt-key add -
-RUN apt-get install apt-transport-https
+RUN apt install apt-transport-https -y --no-install-recommends && apt clean
 RUN echo "deb https://artifacts.elastic.co/packages/8.x/apt stable main" | tee -a /etc/apt/sources.list.d/elastic-8.x.list
-RUN apt-get update && apt-get install filebeat
+RUN apt update && apt install filebeat -y --no-install-recommends && apt clean
 
 COPY filebeat.yml /etc/filebeat/filebeat.yml
 

sonar-project.properties

@@ -10,7 +10,8 @@ sonar.host.url=https://sonarcloud.io
 sonar.language=js
 sonar.projectName=wiq_es05b
 
-sonar.coverage.exclusions=**/*.test.js
+sonar.coverage.exclusions=**/*.test.js,**/*.draft.js
+sonar.cpd.exclusions=**/*.test.js,**/*.draft.js
 sonar.sources=users/authservice,users/userservice,gatewayservice,webapp/src,userhistory,jordi
 sonar.sourceEncoding=UTF-8
 sonar.exclusions=node_modules/**

userhistory/Dockerfile

@@ -2,9 +2,9 @@
 FROM node:20
 
 RUN wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | apt-key add -
-RUN apt-get install apt-transport-https
+RUN apt install apt-transport-https -y --no-install-recommends && apt clean
 RUN echo "deb https://artifacts.elastic.co/packages/8.x/apt stable main" | tee -a /etc/apt/sources.list.d/elastic-8.x.list
-RUN apt-get update && apt-get install filebeat
+RUN apt update && apt install filebeat -y --no-install-recommends && apt clean
 
 COPY filebeat.yml /etc/filebeat/filebeat.yml
 

users/authservice/Dockerfile

@@ -2,9 +2,9 @@
 FROM node:20
 
 RUN wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | apt-key add -
-RUN apt-get install apt-transport-https
+RUN apt install apt-transport-https -y --no-install-recommends && apt clean
 RUN echo "deb https://artifacts.elastic.co/packages/8.x/apt stable main" | tee -a /etc/apt/sources.list.d/elastic-8.x.list
-RUN apt-get update && apt-get install filebeat
+RUN apt update && apt install filebeat -y --no-install-recommends && apt clean
 
 COPY filebeat.yml /etc/filebeat/filebeat.yml
 

users/userservice/Dockerfile

@@ -2,9 +2,9 @@
 FROM node:20
 
 RUN wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | apt-key add -
-RUN apt-get install apt-transport-https
+RUN apt install apt-transport-https -y --no-install-recommends && apt clean
 RUN echo "deb https://artifacts.elastic.co/packages/8.x/apt stable main" | tee -a /etc/apt/sources.list.d/elastic-8.x.list
-RUN apt-get update && apt-get install filebeat
+RUN apt update && apt install filebeat -y --no-install-recommends && apt clean
 
 COPY filebeat.yml /etc/filebeat/filebeat.yml
 

webapp/src/__test__/Account.test.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, fireEvent, screen, waitFor, act } from '@testing-library/react';
+import { render, screen, waitFor, act } from '@testing-library/react';
 import axios from 'axios';
 import Account from '../views/Account.jsx';
 import { AuthContext } from "../views/context/AuthContext.jsx";
@@ -9,18 +9,7 @@ import '@testing-library/jest-dom';
 
 jest.mock('axios');
 jest.mock('../views/context/AuthContext');
-
-const localStorageMock = (() => {
-    let store = {};
-    return {
-        getItem: key => store[key],
-        setItem: (key, value) => { store[key] = value },
-        removeItem: key => { delete store[key] },
-        clear: () => { store = {} }
-    };
-})();
-
-Object.defineProperty(window, 'localStorage', { value: localStorageMock });
+require("./utils/localStorageMock")()
 
 // Configura una implementación simulada de axios
 jest.mock('../App.jsx', () => ({

webapp/src/__test__/Error.test.js

@@ -1,27 +1,14 @@
 import React from 'react';
-import { render, fireEvent, screen, waitFor, act } from '@testing-library/react';
+import { render, screen, act } from '@testing-library/react';
 import '@testing-library/jest-dom';
-import axios from 'axios';
 import Error from '../views/Error.jsx';
 import { useAuth } from "../App.jsx";
 import { AuthContext } from "../views/context/AuthContext.jsx";
 import {MemoryRouter} from "react-router";
-import Menu from "../views/Menu";
 
 jest.mock('axios');
 jest.mock('../views/context/AuthContext');
-
-const localStorageMock = (() => {
-    let store = {};
-    return {
-        getItem: key => store[key],
-        setItem: (key, value) => { store[key] = value },
-        removeItem: key => { delete store[key] },
-        clear: () => { store = {} }
-    };
-})();
-
-Object.defineProperty(window, 'localStorage', { value: localStorageMock });
+require("./utils/localStorageMock")()
 
 jest.mock('../App.jsx', () => ({
     useAuth: jest.fn().mockReturnValue({

webapp/src/__test__/Login.test.js

@@ -9,18 +9,7 @@ import '@testing-library/jest-dom';
 
 jest.mock('axios');
 jest.mock('../views/context/AuthContext');
-
-const localStorageMock = (() => {
-  let store = {};
-  return {
-    getItem: key => store[key],
-    setItem: (key, value) => { store[key] = value },
-    removeItem: key => { delete store[key] },
-    clear: () => { store = {} }
-  };
-})();
-
-Object.defineProperty(window, 'localStorage', { value: localStorageMock });
+require("./utils/localStorageMock")()
 
 // Configura una implementación simulada de axios
 jest.mock('../App.jsx', () => ({

webapp/src/__test__/Menu.test.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, fireEvent, screen, waitFor, act } from '@testing-library/react';
+import { render, screen, waitFor, act } from '@testing-library/react';
 import axios from 'axios';
 import Menu from '../views/Menu.jsx';
 import { AuthContext } from "../views/context/AuthContext";
@@ -9,18 +9,7 @@ import '@testing-library/jest-dom';
 
 jest.mock('axios');
 jest.mock('../views/context/AuthContext');
-
-const localStorageMock = (() => {
-    let store = {};
-    return {
-        getItem: key => store[key],
-        setItem: (key, value) => { store[key] = value },
-        removeItem: key => { delete store[key] },
-        clear: () => { store = {} }
-    };
-})();
-
-Object.defineProperty(window, 'localStorage', { value: localStorageMock });
+require("./utils/localStorageMock")()
 
 // Configura una implementación simulada de axios
 jest.mock('../App.jsx', () => ({

webapp/src/__test__/Signup.test.js

@@ -9,18 +9,7 @@ import '@testing-library/jest-dom';
 
 jest.mock('axios');
 jest.mock('../views/context/AuthContext');
-
-const localStorageMock = (() => {
-  let store = {};
-  return {
-    getItem: key => store[key],
-    setItem: (key, value) => { store[key] = value },
-    removeItem: key => { delete store[key] },
-    clear: () => { store = {} }
-  };
-})();
-
-Object.defineProperty(window, 'localStorage', { value: localStorageMock });
+require("./utils/localStorageMock")()
 
 // Configura una implementación simulada de axios
 jest.mock('../App.jsx', () => ({

webapp/src/__test__/components/CustomForm.test.js

@@ -1,5 +1,5 @@
 import React from "react";
-import { render, fireEvent, screen } from "@testing-library/react";
+import { render, screen } from "@testing-library/react";
 import { MemoryRouter } from "react-router-dom";
 import CustomForm from "../../views/components/CustomForm";
 import '@testing-library/jest-dom';

webapp/src/__test__/components/ErrorSnackBar.test.js

@@ -1,7 +1,6 @@
 import React from "react";
 import { render, fireEvent, screen } from "@testing-library/react";
 import ErrorSnackBar from "../../views/components/ErrorSnackBar";
-import { Snackbar } from "@mui/material";
 import '@testing-library/jest-dom';
 
 describe("ErrorSnackBar component", () => {

webapp/src/__test__/components/Footer.test.js

@@ -9,14 +9,14 @@ describe("Footer component", () => {
 
         const currentYear = new Date().getFullYear();
         expect(screen.getByText(`© ${currentYear} ASW - WIQ05b`)).toBeInTheDocument();
-        expect(screen.getByRole("navigation")).toBeInTheDocument();
-        const appBar = screen.getByRole("navigation");
+        expect(screen.getByTestId("footer")).toBeInTheDocument();
+        const appBar = screen.getByTestId("footer");
         expect(appBar).toHaveStyle({ backgroundColor: "primary" });
     });
 
     test("has fixed position at the bottom of the page", () => {
         render(<Footer />);
-        const appBar = screen.getByRole("navigation");
+        const appBar = screen.getByTestId("footer");
         expect(appBar).toHaveStyle({ top: "auto", bottom: 0, position: "fixed" });
     });
 

webapp/src/__test__/components/Nav.draft.js

@@ -1,28 +1,15 @@
-/*
 import React from "react";
 import {render, screen, fireEvent, act} from "@testing-library/react";
 import Nav from "../../views/components/Nav";
 import {AuthContext} from "../../views/context/AuthContext";
 import {MemoryRouter} from "react-router";
-import Menu from "../../views/Menu";
 import { useAuth } from "../../App.jsx";
-import axios from "axios";
-import { ConfigContext } from '../../views/context/ConfigContext';
 
 jest.mock('axios');
 jest.mock('../../views/context/AuthContext');
 
-const localStorageMock = (() => {
-    let store = {};
-    return {
-        getItem: key => store[key],
-        setItem: (key, value) => { store[key] = value },
-        removeItem: key => { delete store[key] },
-        clear: () => { store = {} }
-    };
-})();
+require("../utils/localStorageMock");
 
-Object.defineProperty(window, 'localStorage', { value: localStorageMock });
 jest.mock('../../App.jsx', () => ({
     useAuth: jest.fn().mockReturnValue({
         getUser: jest.fn().mockReturnValue({
@@ -70,4 +57,3 @@ describe("Nav component", () => {
         expect(logoutMenuItem).toBeInTheDocument();
     });
 });
-*/

webapp/src/__test__/components/SaveList.test.js

@@ -8,18 +8,7 @@ import { MemoryRouter } from "react-router";
 
 jest.mock('axios');
 jest.mock('../../views/context/AuthContext');
-
-const localStorageMock = (() => {
-    let store = {};
-    return {
-        getItem: key => store[key],
-        setItem: (key, value) => { store[key] = value },
-        removeItem: key => { delete store[key] },
-        clear: () => { store = {} }
-    };
-})();
-
-Object.defineProperty(window, 'localStorage', { value: localStorageMock });
+require("../utils/localStorageMock")()
 
 describe('SaveList component', () => {
     const mockSaves = [

webapp/src/__test__/utils/localStorageMock.js

@@ -0,0 +1,18 @@
+const localStorageMock = (() => {
+  let store = {};
+  Object.defineProperty(window, 'localStorage', {value: localStorageMock});
+  return {
+    getItem: key => store[key],
+    setItem: (key, value) => {
+      store[key] = value
+    },
+    removeItem: key => {
+      delete store[key]
+    },
+    clear: () => {
+      store = {}
+    }
+  };
+});
+
+module.exports = localStorageMock;

webapp/src/views/Game.jsx

@@ -208,15 +208,18 @@ const Game = () => {
       .catch(e => setHistorialError(e.response.data.error))
   }
 
-  const createSave = () => {
-    axios
-    .post("/history/create", {
-      token: getUser().token,
-      category: category,
-      userId: getUser().userId
-    })
-    .then(response => saveId.current = response.data.id)
-    .catch(err => setHistorialError(err.response.data.error))
+  const createSave = async () => {
+    try {
+      const response = await axios
+        .post("/history/create", {
+          token: getUser().token,
+          category: category,
+          userId: getUser().userId
+        })
+      saveId.current = response.data.id
+    } catch (err) {
+      setHistorialError(err.response.data.error)
+    }
   }
 
   useEffect( () => {