Merge branch 'ui_enchancements' of https://github.com/Arquisoft/wiq_en3a into front_end_angel and format fix, visual enhancements, stats improvement

Author: angelmaciasr

.github/workflows/release.yml

@@ -41,8 +41,7 @@ jobs:
       with:
         node-version: 20
     - run: npm --prefix wikidataservice install
-    - run: npm --prefix users/authservice install
-    - run: npm --prefix users/userservice install
+    - run: npm --prefix users install
     - run: npm --prefix gatewayservice install
     - run: npm --prefix webapp install
     - run: npm --prefix webapp run build
@@ -109,7 +108,7 @@ jobs:
   deploy:
     name: Deploy over SSH
     runs-on: ubuntu-latest
-    needs: [docker-push-gatewayservice,docker-push-webapp, docker-push-users, docker-push-wikidataservice]
+    needs: [docker-push-gatewayservice, docker-push-webapp, docker-push-users, docker-push-wikidataservice]
     steps:
     - name: Deploy over SSH
       uses: fifsky/ssh-action@master

gatewayservice/gateway-service.js

@@ -46,10 +46,20 @@ app.post('/adduser', async (req, res) => {
   }
 });
 
-app.post('/edituser', async (req, res) => {
+app.post('/sumNormalStats', async (req, res) => {
   try {
-    // Forward the edit user request to the user service
-    const userResponse = await axios.post(userServiceUrl + '/user/edituser', req.body);
+    // Forward the edit user with normal stats request to the user service
+    const userResponse = await axios.post(userServiceUrl + '/user/sumNormalStats', req.body);
+    res.json(userResponse.data);
+  } catch (error) {
+    console.error(error);
+  }
+});
+
+app.post('/sumTrivialStats', async (req, res) => {
+  try {
+    // Forward the edit user with trivial stats request to the user service
+    const userResponse = await axios.post(userServiceUrl + '/user/sumTrivialStats', req.body);
     res.json(userResponse.data);
   } catch (error) {
     console.error(error);
@@ -67,6 +77,15 @@ app.get('/getAllUsers', async (req, res) => {
   }
 });
 
+app.post('/getUser', async (req, res) => {
+  try {
+    const usersResponse = await axios.get(userServiceUrl + '/user/getUser', req.body);
+    res.json(usersResponse.data);
+  } catch (error) {
+    console.error(error);
+  }
+});
+
 
 app.get('/GetQuestions', async (_req, res) => {
   try {

gatewayservice/gateway-service.test.js

@@ -11,7 +11,8 @@ afterAll(() => {
 describe('Gateway Service', () => {
 
   axios.get.mockImplementation((url) => {
-    if (url.endsWith('Questions')) {
+    if (url.endsWith('getQuestions') || url.endsWith('getCapitalsQuestions') 
+    || url.endsWith('getMovieDirectorsQuestions') || url.endsWith('getElementSymbolsQuestions')) {
       return Promise.resolve({
         status: 200,
         data: {
@@ -68,7 +69,20 @@ describe('Gateway Service', () => {
               }],
         }
       });
-    } 
+    } else if(url.endsWith('Questions')){
+      return Promise.resolve({
+        status: 200,
+        data: {
+          questions: [
+            {
+            "text": "What is the capital of France?",
+            "answers": ["London", "Berlin", "Paris", "Madrid"],
+            "correctAnswer": 2
+            }
+          ],
+        }
+      });
+    }
 
 
     return Promise.resolve({
@@ -141,9 +155,34 @@ describe('Gateway Service', () => {
   });
 
   it('should retrieve 10 movie directors questions with their corresponding answers', async () => {
-    await checkCorrectQuestionsResponse('/getMovieDirectorsQuestions', 10);
+    await checkCorrectQuestionsResponse('/GetMovieDirectorsQuestions', 10);
   });
 
+  it('should retrieve 1 history question with its corresponding answer', async () => {
+    
+    await checkCorrectQuestionsResponse('/GetHistoryQuestions', 1);
+  }, 60000);
+
+  it('should retrieve 1 sports-related question with its corresponding answer', async () => {
+  
+    await checkCorrectQuestionsResponse('/GetSportQuestions', 1);
+  }, 60000);
+
+  it('should retrieve 1 geography question with its corresponding answer', async () => {
+  
+    await checkCorrectQuestionsResponse('/GetGeographyQuestions', 1);
+  }, 60000);
+
+  it('should retrieve 1 geography question with its corresponding answer', async () => {
+  
+    await checkCorrectQuestionsResponse('/GetEntertainmentQuestions', 1);
+  }, 60000);
+
+  it('should retrieve 1 geography question with its corresponding answer', async () => {
+  
+    await checkCorrectQuestionsResponse('/GetChemistryQuestions', 1);
+  }, 60000);
+
 
   async function checkCorrectQuestionsResponse(endpoint, retrieved){
     const response = await request(app).get(endpoint);