Merge branch 'develop' into develop-hugo

Arquisoft · Apr 27, 2024 · 2ea80b4 · 2ea80b4
2 parents 1a51a64 + c3af4e2
commit 2ea80b4
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/users/__tests/routes/user-routes.test.js b/users/__tests/routes/user-routes.test.js
@@ -1023,13 +1023,6 @@ describe('User Routes', () => {
             .expect(403);
 
         expect(responseWithoutLoggedUser.body).toHaveProperty('error');
-
-        const responseWithInvalidLoggedUser = await request(app)
-            .get('/user/statistics/testuser2')
-            .query({ loggedUser: 'testuser1' })
-            .expect(403);
-
-        expect(responseWithInvalidLoggedUser.body).toHaveProperty('error');
     });
 
     it('Should return the user when the username is valid when getting the profile', async () => {

diff --git a/users/routes/user-routes.js b/users/routes/user-routes.js
@@ -588,12 +588,14 @@ router.get('/statistics/:username', async (req,res) => {
                 }
             });
 
-            const hasCommonGroup = userGroups.some(userGroup => {
-                return loggedUserGroups.some(loggedUserGroup => loggedUserGroup.groupName === userGroup.groupName);
-            });
-
-            if(!hasCommonGroup){
-                return res.status(403).json({ error: 'You are not allowed to see this user statistics' });
+            if (loggedUserGroups.length != 0 && userGroups != 0){
+                const hasCommonGroup = userGroups.some(userGroup => {
+                    return loggedUserGroups.some(loggedUserGroup => loggedUserGroup.groupName === userGroup.groupName);
+                });
+
+                if(!hasCommonGroup){
+                    return res.status(403).json({ error: 'You are not allowed to see this user statistics' });
+                }
             }
         }
 

diff --git a/users/services/user-model.js b/users/services/user-model.js
@@ -208,7 +208,7 @@ const QuestionsRecord = sequelize.define('QuestionsRecord', {
 });
 
 // Synchronize the model with the database
-sequelize.sync()
+sequelize.sync({force:true})
     .then(() => {
         console.log('Model synchronized successfully with the database');
     })

diff --git a/webapp/src/pages/Home.js b/webapp/src/pages/Home.js
@@ -3,12 +3,17 @@ import {Box, Button, useTheme } from "@mui/material";
 import useMediaQuery from '@mui/material/useMediaQuery';
 import { useTranslation } from 'react-i18next';
 import AndroidIcon from '@mui/icons-material/Android';
+import { SessionContext } from '../SessionContext';
+import { useContext } from 'react';
 
 const Home = () => {
     const xxl = useMediaQuery('(min-width:1920px)');
     const { t } = useTranslation();
     const theme = useTheme();
     const isMobile = useMediaQuery(theme.breakpoints.down('sm'));
+    const {username} = useContext(SessionContext) || {};
+
+    const redirectPath = username === '' ? "/login" : "/homepage";
 
     const styles = {
         logo:{
@@ -100,7 +105,7 @@ const Home = () => {
                 <img src="./home/HomeLogo.png" alt="Logo" style={{ width: '100%' }} />
             </Box>
 
-            <Button variant='contained' href={"/login"} sx={styles.playButton}> {t("Home")} </Button>
+            <Button variant='contained' href={redirectPath} sx={styles.playButton}> {t("Home")} </Button>
 
             <video data-testid="video" ref={videoRef} autoPlay muted loop style={{ ...styles.video}}>
                 <source src="./home/Background-White.webm" type="video/mp4" />

diff --git a/webapp/src/pages/games/TheChallengeGame.js b/webapp/src/pages/games/TheChallengeGame.js
@@ -246,7 +246,7 @@ const TheChallengeGame = () => {
                             <Typography fontWeight="bold" color="primary" fontSize="1.5em">
                                 {numRounds}
                             </Typography>
-                            <IconButton size="large" color="success" onClick={() => setNumRounds(numRounds + 1)} variant="outlined" data-testId="addRound">
+                            <IconButton size="large" color="success" disabled={numRounds === 30} onClick={() => setNumRounds(numRounds + 1)} variant="outlined" data-testId="addRound">
                                 <AddIcon fontSize="inherit" />
                             </IconButton>
                         </Box>
@@ -255,13 +255,13 @@ const TheChallengeGame = () => {
                             <Typography htmlFor="questionTime" variant="h5">
                                 {t("Game.config.time")}:
                             </Typography>
-                            <IconButton size="large" color="error" disabled={timerConfig === 1} onClick={() => setTimerConfig(timerConfig - 1)} variant="outlined" data-testId="removeSecond">
+                            <IconButton size="large" color="error" disabled={timerConfig === 5} onClick={() => setTimerConfig(timerConfig - 1)} variant="outlined" data-testId="removeSecond">
                                 <RemoveIcon fontSize="inherit" />
                             </IconButton>
                             <Typography fontWeight="bold" color="primary" fontSize="1.5em">
                                 {timerConfig}
                             </Typography>
-                            <IconButton size="large" color="success" onClick={() => setTimerConfig(timerConfig + 1)} variant="outlined" data-testId="addSecond">
+                            <IconButton size="large" color="success" disabled={numRounds === 99} onClick={() => setTimerConfig(timerConfig + 1)} variant="outlined" data-testId="addSecond">
                                 <AddIcon fontSize="inherit" />
                             </IconButton>
                         </Box>