Merge pull request #123 from Arquisoft/quality

Backend refactoring

gatewayservice/Dockerfile

@@ -22,4 +22,4 @@ ENV WEBAPP_ENDPOINT=$WEBAPP_URI
 RUN npm run tsc
 
 # Define the command to run your app
-CMD ["npm", "start"]
+CMD ["npm", "start"]

gatewayservice/src/utils/constants.ts

@@ -1,11 +1,11 @@
 const AUTH_SERVICE_URL =
-  process.env.AUTH_SERVICE_URL || 'http://localhost:8002';
+  process.env.AUTH_SERVICE_URL ?? 'http://localhost:8002';
 const USER_SERVICE_URL =
-  process.env.USER_SERVICE_URL || 'http://localhost:8001';
+  process.env.USER_SERVICE_URL ?? 'http://localhost:8001';
 const HISTORY_SERVICE_URL =
-  process.env.HISTORY_SERVICE_URL || 'http://localhost:8001';
+  process.env.HISTORY_SERVICE_URL ?? 'http://localhost:8001';
 const QUESTION_SERVICE_URL =
-  process.env.QUESTION_SERVICE_URL || 'http://localhost:8004';
+  process.env.QUESTION_SERVICE_URL ?? 'http://localhost:8004';
 
 export {
   AUTH_SERVICE_URL,

gatewayservice/test/gateway-service.test.ts

@@ -17,8 +17,7 @@ const getMocks = (url: string) => {
   } else if (url.endsWith('/profile')) {
     return Promise.resolve({data: { bio: 'Test' }});
   }
-
-  return;
+  return Promise.resolve({});
 };
 
 const postMocks = (url: string) => {
@@ -33,8 +32,7 @@ const postMocks = (url: string) => {
   } else if (url.endsWith('/profile')) {
     return Promise.resolve({data: { bio: 'Test' }});
   }
-
-  return;
+  return Promise.resolve({});
 };
 
 describe('Gateway Service', () => {
@@ -363,15 +361,15 @@ describe('Gateway Service', () => {
 
 async function testWithoutServices(paramFunc : Function) {
   // Clear the mocks
-  await (axios.get as jest.Mock).mockImplementation((url: string) => { if (url) return; })
+  (axios.get as jest.Mock).mockImplementation((url: string) => { if (url) return; })
   await (axios.post as jest.Mock).mockImplementation((url: string) => { if (url) return; })
 
   // Execute the function
   const response: Response = await paramFunc();
 
   // Restore original mocks
-  await (axios.get as jest.Mock).mockImplementation(getMocks);
-  await (axios.post as jest.Mock).mockImplementation(postMocks);
+  (axios.get as jest.Mock).mockImplementation(getMocks);
+  (axios.post as jest.Mock).mockImplementation(postMocks);
 
   return response;
 }

questionservice/Dockerfile

@@ -24,4 +24,4 @@ EXPOSE 8004
 RUN npm run tsc
 
 # Define the command to run your app
-CMD ["npm", "start"]
+CMD ["npm", "start"]

questionservice/src/index.ts

@@ -4,7 +4,8 @@ import app from './app';
 const port = 8004;
 
 // mongodb://127.0.0.1:27018/questiondb
-const mongoUri = process.env.MONGODB_URI??'mongodb://127.0.0.1:27017';
+const mongoUri = process.env.MONGODB_URI ?? 'mongodb://127.0.0.1:27017';
+
 mongoose.connect(mongoUri);
 
 const server = app.listen(port, () => {

questionservice/src/services/question-generator.ts

@@ -26,7 +26,6 @@ async function generateQuestions(
   size: number,
   lang: any
 ): Promise<object[] | void> {
-
   let numberQuestionsDB = Math.min(Math.floor(size / 2), await QuestionModel.countDocuments());
   let questionsToGenerate = size - numberQuestionsDB;
   console.log('------------------');
@@ -61,7 +60,6 @@ async function generateQuestions(
   if (lang && lang.toLowerCase() !== 'en') {
     return await translateQuestionsArray(questionsArray, lang);
   }
-
   return questionsArray;
 }
 

questionservice/test/question-generator.test.ts

@@ -158,7 +158,7 @@ describe("Question Service - Question Generator", () => {
         const aggregateMock = await mocktemplateModelAggregate(defaultNumberQuestions);
         await mockWikidataSparql(defaultNumberQuestions)
         await mockQuestionCount();
-        await mockResponseTranslationRequest()
+        mockResponseTranslationRequest()
 
         const response = await generateQuestions(2, "es") as any;
         console.log(response)

sonar-project.properties

@@ -9,7 +9,7 @@ sonar.projectVersion=1.0
 sonar.host.url=https://sonarcloud.io
 sonar.language=js
 
-sonar.coverage.exclusions=**/*.test.ts,**/*.test.js,**/jest.config.js
+sonar.coverage.exclusions=**/*.test.ts,**/*.test.js,**/jest.config.js,**/index.ts
 sonar.sources=webapp/src/components,users/authservice,users/userservice,gatewayservice,users/utils,questionservice
 sonar.sourceEncoding=UTF-8
 sonar.exclusions=node_modules/**

users/authservice/Dockerfile

@@ -20,4 +20,4 @@ EXPOSE 8002
 RUN npm run tsc
 
 # Define the command to run your app
-CMD ["npm", "start"]
+CMD ["npm", "start"]

users/authservice/src/index.ts

@@ -3,7 +3,7 @@ import app from './app';
 
 const port = 8002;
 
-const mongoUri = process.env.MONGODB_URI || 'mongodb://127.0.0.1:27017/userdb';
+const mongoUri = process.env.MONGODB_URI ?? 'mongodb://127.0.0.1:27017/userdb';
 mongoose.connect(mongoUri);
 
 const server = app.listen(port, () => {

users/userservice/src/controllers/history-controller.ts

@@ -29,7 +29,7 @@ const getHistory = async (req: Request, res: Response) => {
 
     if (!user) {
       throw new Error(
-        `The provided user \'${username}\' is not registered in the application`
+        `The provided user '${username}' is not registered in the application`
       );
     }
 

users/userservice/src/middlewares/protect-middleware.ts

@@ -6,7 +6,7 @@ const protect = async (req: Request, res: Response, next: NextFunction) => {
   try {
     const { authorization } = req.headers;
 
-    if (!authorization || !authorization.startsWith('Bearer')) {
+    if (!authorization?.startsWith('Bearer')) {
       throw new Error('You must be logged in to update your data');
     }
 

users/userservice/test/user-service.test.ts

@@ -280,7 +280,7 @@ describe('User Service', () => {
     } as Request;
     const user = await User.find({ username:'testuser' });
 
-    expect(() => validateHistoryBody(mockRequest, user[0])).toThrowError();
+    expect(() => validateHistoryBody(mockRequest, user[0])).toThrow();
   });
 
   // Body validation util, non-numeric
@@ -294,7 +294,7 @@ describe('User Service', () => {
     } as Request;
     const user = await User.find({ username:'testuser' });
 
-    expect(() => validateHistoryBody(mockRequest, user[0])).toThrowError();
+    expect(() => validateHistoryBody(mockRequest, user[0])).toThrow();
   });
 
   // Body validation util, negative
@@ -308,7 +308,7 @@ describe('User Service', () => {
     } as Request;
     const user = await User.find({ username:'testuser' });
 
-    expect(() => validateHistoryBody(mockRequest, user[0])).toThrowError();
+    expect(() => validateHistoryBody(mockRequest, user[0])).toThrow();
   });
 
   // Token validator
@@ -506,7 +506,7 @@ describe('User Service', () => {
       } as Request;
       const user = await User.find({ username:'testuser' });
 
-      expect(() => validateProfileBody(mockRequest, user[0])).toThrowError();
+      expect(() => validateProfileBody(mockRequest, user[0])).toThrow();
     });
 
     // Body validation util, not a string
@@ -520,7 +520,7 @@ describe('User Service', () => {
       } as Request;
       const user = await User.find({ username:'testuser' });
 
-      expect(() => validateProfileBody(mockRequest, user[0])).toThrowError();
+      expect(() => validateProfileBody(mockRequest, user[0])).toThrow();
     });
 });
 

users/utils/test/users-utils.test.ts

@@ -9,7 +9,7 @@ describe('Users Utils', () => {
         } as Request;
         mockRequest.body['history'] = '';
 
-        expect(() => validateNotEmpty(mockRequest, ['history'])).toThrowError();
+        expect(() => validateNotEmpty(mockRequest, ['history'])).toThrow();
 
         // Should ignore field if does not exist
         try {
@@ -26,7 +26,7 @@ describe('Users Utils', () => {
         } as Request;
         mockRequest.body['test'] = '123456789';
 
-        expect(() => validateRequiredLength(mockRequest, ['test'], 10)).toThrowError();
+        expect(() => validateRequiredLength(mockRequest, ['test'], 10)).toThrow();
 
         // Should ignore field if does not exist
         try {
@@ -58,6 +58,6 @@ describe('Users Utils', () => {
         mockRequest.body['test'] = 'test';
 
         // Should get an error when the field does not exist
-        expect(() => validateRequiredFields(mockRequest, ['nonexistent'])).toThrowError();
+        expect(() => validateRequiredFields(mockRequest, ['nonexistent'])).toThrow();
     });
 });

webapp/Dockerfile

@@ -15,4 +15,6 @@ RUN npm install serve
 
 #Execute npm run prod to run the server
 CMD [ "npm", "run", "prod" ]
-#CMD ["npm", "start"]
+#CMD ["npm", "start"]
+
+USER node

webapp/src/components/Base.css

@@ -21,7 +21,6 @@
   padding: 15px;
   margin-bottom: 20px;
   border: 1px solid transparent;
-  border-radius: 4px;
   background-color: #f2dede;
   border-color: #ebccd1;
   color: #a94442;