Merge pull request #162 from Arquisoft/develop_samuel

Added changes in statistics and user registration
Arquisoft · Mar 29, 2024 · 7ea1de0 · 7ea1de0
2 parents 9b59fd6 + a3242c2
commit 7ea1de0
Show file tree

Hide file tree

Showing 17 changed files with 170 additions and 52 deletions.
diff --git a/questions/index.js b/questions/index.js
@@ -2,7 +2,7 @@
 const express = require('express');
 const cors = require('cors');
 // Routes:
-const questionRoutes = require('./routes/question-routes.js');
+const questionRoutes = require('./routes/question-routes-api.js');
 
 // App definition and
 const app = express();

diff --git a/questions/routes/question-routes.js → questions/routes/question-routes-api.js b/questions/routes/question-routes.js → questions/routes/question-routes-api.js
diff --git a/users/__tests/routes/statistics-routes.test.js b/users/__tests/routes/statistics-routes.test.js
@@ -3,7 +3,7 @@ const request = require('supertest');
 const express = require('express');
 const bodyParser = require('body-parser');
 const statisticsRoutes = require('../../routes/statistics-routes.js');
-const { User } = require('../../models/user-model.js');
+const { User } = require('../../services/user-model.js');
 
 const app = express();
 app.use(bodyParser.json());

diff --git a/users/__tests/routes/user-routes.test.js b/users/__tests/routes/user-routes.test.js
@@ -1,4 +1,4 @@
-const { User, Statistics, sequelize } = require('../../models/user-model.js');
+const { User, Statistics, sequelize } = require('../../services/user-model.js');
 const bcrypt = require('bcrypt');
 const request = require('supertest');
 const express = require('express');

diff --git a/users/__tests/services/statistics-api.test.js b/users/__tests/services/statistics-api.test.js
@@ -3,7 +3,7 @@ const request = require('supertest');
 const express = require('express');
 const bodyParser = require('body-parser');
 const statisticsRoutes = require('../../routes/statistics-routes.js');
-const { User } = require('../../models/user-model.js');
+const { User } = require('../../services/user-model.js');
 
 const app = express();
 app.use(bodyParser.json());

diff --git a/users/routes/auth-routes.js b/users/routes/auth-routes.js
@@ -1,7 +1,7 @@
 const express = require('express');
 const router = express.Router();
 const bcrypt = require('bcrypt');
-const { User } = require('../models/user-model');
+const { User } = require('../services/user-model');
 
 
 require('dotenv').config();

diff --git a/users/services/group-api.js → users/routes/group-routes-api.js b/users/services/group-api.js → users/routes/group-routes-api.js
@@ -1,6 +1,6 @@
 const express = require('express');
 const router = express.Router();
-const { Group,User,UserGroup } = require('../models/user-model');
+const { Group,User,UserGroup } = require('../services/user-model');
 
 
 // Getting the list of groups in the database

diff --git a/users/routes/group-routes.js b/users/routes/group-routes.js
@@ -1,9 +1,9 @@
 const express = require('express');
 const router = express.Router();
-const { Group,UserGroup } = require('../models/user-model');
+const { Group,UserGroup } = require('../services/user-model');
 
 //Group internal routes
-const apiRoutes = require('../services/group-api');
+const apiRoutes = require('../routes/group-routes-api');
 
 // Adding a group to the database and creating the relationship with the creator
 router.post('/add', async (req, res) => {

diff --git a/users/services/statistics-api.js → users/routes/statistics-routes-api.js b/users/services/statistics-api.js → users/routes/statistics-routes-api.js
@@ -1,6 +1,6 @@
 const express = require('express');
 const router = express.Router();
-const { Statistics } = require('../models/user-model');
+const { Statistics } = require('../services/user-model');
 
 //Get user statics by username
 router.get('/:username', async (req,res) => {

diff --git a/users/routes/statistics-routes.js b/users/routes/statistics-routes.js
@@ -1,9 +1,9 @@
 const express = require('express');
 const router = express.Router();
-const { Statistics } = require('../models/user-model');
+const { Statistics } = require('../services/user-model');
 
 //Group internal routes
-const apiRoutes = require('../services/statistics-api');
+const apiRoutes = require('../routes/statistics-routes-api');
 
 // Route for edit the statics of a user
 router.post('/edit', async (req, res) => {
@@ -25,13 +25,13 @@ router.post('/edit', async (req, res) => {
         }
 
         // Update the user's fields with the provided values
-        statisticsUserToUpdate.earned_money = statisticsUserToUpdate.earned_money  + earned_money;
-        statisticsUserToUpdate.classic_correctly_answered_questions = statisticsUserToUpdate.classic_correctly_answered_questions 
+        statisticsUserToUpdate.the_callenge_earned_money = statisticsUserToUpdate.the_callenge_earned_money  + earned_money;
+        statisticsUserToUpdate.the_callenge_correctly_answered_questions = statisticsUserToUpdate.the_callenge_correctly_answered_questions 
         + classic_correctly_answered_questions;
-        statisticsUserToUpdate.classic_incorrectly_answered_questions = statisticsUserToUpdate.classic_incorrectly_answered_questions 
+        statisticsUserToUpdate.the_callenge_incorrectly_answered_questions = statisticsUserToUpdate.the_callenge_incorrectly_answered_questions 
         + classic_incorrectly_answered_questions;
-        statisticsUserToUpdate.classic_total_time_played = statisticsUserToUpdate.classic_total_time_played + classic_total_time_played;
-        statisticsUserToUpdate.classic_games_played = statisticsUserToUpdate.classic_games_played + classic_games_played;
+        statisticsUserToUpdate.the_callenge_total_time_played = statisticsUserToUpdate.the_callenge_total_time_played + classic_total_time_played;
+        statisticsUserToUpdate.the_callenge_games_played = statisticsUserToUpdate.the_callenge_games_played + classic_games_played;
 
         // Save the changes to the database
         await statisticsUserToUpdate.save();

diff --git a/users/services/user-api.js → users/routes/user-routes-api.js b/users/services/user-api.js → users/routes/user-routes-api.js
@@ -1,6 +1,6 @@
 const express = require('express');
 const router = express.Router();
-const { User } = require('../models/user-model');
+const { User } = require('../services/user-model');
 
 //Get all users
 router.get('/allUsers', async (req,res) => {

diff --git a/users/routes/user-routes.js b/users/routes/user-routes.js
@@ -1,10 +1,10 @@
 const express = require('express');
 const router = express.Router();
 const bcrypt = require('bcrypt');
-const { User, Statistics } = require('../models/user-model');
+const { User, Statistics } = require('../services/user-model');
 
 //User internal routes
-const apiRoutes = require('../services/user-api');
+const apiRoutes = require('../routes/user-routes-api');
 
 // Route for add a user
 router.post('/add', async (req, res) => {

diff --git a/users/services/authVerifyMiddleWare → users/services/authVerifyMiddleWare.js b/users/services/authVerifyMiddleWare → users/services/authVerifyMiddleWare.js
diff --git a/users/models/user-model.js → users/services/user-model.js b/users/models/user-model.js → users/services/user-model.js
@@ -93,27 +93,78 @@ const Statistics = sequelize.define('Statistics', {
         primaryKey: true,
         allowNull: false
     },
-    earned_money: {
+    the_callenge_earned_money: {
         type: DataTypes.INTEGER,
         defaultValue: 0,
     },
-    classic_correctly_answered_questions: {
+    the_callenge_correctly_answered_questions: {
         type: DataTypes.INTEGER,
         defaultValue: 0,
     },
-    classic_incorrectly_answered_questions: {
+    the_callenge_incorrectly_answered_questions: {
         type: DataTypes.INTEGER,
         defaultValue: 0,
     },
-    classic_total_time_played: {
+    the_callenge_total_time_played: {
         type: DataTypes.INTEGER,
         defaultValue: 0,
     },
-    classic_games_played: {
+    the_callenge_games_played: {
+        type: DataTypes.INTEGER,
+        defaultValue: 0,
+    },
+    wise_men_stack_earned_money: {
+        type: DataTypes.INTEGER,
+        defaultValue: 0,
+    },
+    wise_men_stack_correctly_answered_questions: {
+        type: DataTypes.INTEGER,
+        defaultValue: 0,
+    },
+    wise_men_stack_incorrectly_answered_questions: {
+        type: DataTypes.INTEGER,
+        defaultValue: 0,
+    },
+    wise_men_stack_games_played: {
+        type: DataTypes.INTEGER,
+        defaultValue: 0,
+    },
+    warm_question_earned_money: {
+        type: DataTypes.INTEGER,
+        defaultValue: 0,
+    },
+    warm_question_correctly_answered_questions: {
+        type: DataTypes.INTEGER,
+        defaultValue: 0,
+    },
+    warm_question_incorrectly_answered_questions: {
+        type: DataTypes.INTEGER,
+        defaultValue: 0,
+    },
+    warm_question_passed_questions: {
+        type: DataTypes.INTEGER,
+        defaultValue: 0,
+    },
+    warm_question_games_played: {
+        type: DataTypes.INTEGER,
+        defaultValue: 0,
+    },
+    discovering_cities_earned_money: {
+        type: DataTypes.INTEGER,
+        defaultValue: 0,
+    },
+    discovering_cities_correctly_answered_questions: {
+        type: DataTypes.INTEGER,
+        defaultValue: 0,
+    },
+    discovering_cities_incorrectly_answered_questions: {
+        type: DataTypes.INTEGER,
+        defaultValue: 0,
+    },
+    discovering_cities_games_played: {
         type: DataTypes.INTEGER,
         defaultValue: 0,
     }
-    //we have to add more statics for more games
 })
 
 // Define the relationship between User and Statics

diff --git a/webapp/src/pages/AddUser.js b/webapp/src/pages/AddUser.js
@@ -1,7 +1,8 @@
-import React, { useState } from 'react';
+import React, { useState,useContext } from 'react';
 import axios from 'axios';
 import { Container, Typography, TextField, Button, Snackbar, Box, Divider } from '@mui/material';
-import { Link } from 'react-router-dom';
+import { Link,useNavigate } from 'react-router-dom';
+import { SessionContext } from '../SessionContext';
 
 const apiEndpoint = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
 
@@ -13,6 +14,10 @@ const AddUser = () => {
   const [error, setError] = useState('');
   const [openSnackbar, setOpenSnackbar] = useState(false);
 
+  const navigate = useNavigate();
+
+  const { createSession } = useContext(SessionContext);
+
   const addUser = async () => {
     try {
       await axios.post(`${apiEndpoint}/user/add`, {
@@ -21,7 +26,13 @@ const AddUser = () => {
         name, 
         surname
       });
+
+
+      await axios.post(`${apiEndpoint}/login`, { username, password });
+
       setOpenSnackbar(true);
+      createSession(username);
+      navigate('/homepage');
     } catch (error) {
       setError(error.response.data.error);
     }

diff --git a/webapp/src/pages/Game.js b/webapp/src/pages/Game.js
@@ -64,6 +64,7 @@ const Game = () => {
             setTimerRunning(false);
             setShouldRedirect(true);
             setQuestionCountdownRunning(false);
+            updateStatistics();
         }
     }, [round]);
 
@@ -92,6 +93,21 @@ const Game = () => {
 
     };
 
+    const updateStatistics = async() => {
+        try {
+            await axios.post(`${apiEndpoint}/statistics/edit`, {
+                username:username,
+                earned_money:totalScore,
+                classic_correctly_answered_questions:correctlyAnsweredQuestions,
+                classic_incorrectly_answered_questions:incorrectlyAnsweredQuestions,
+                classic_total_time_played:totalTimePlayed,
+                classic_games_played:1
+            });
+        } catch (error) {
+            console.error("Error:", error);
+        };
+    }
+
     // this function is called when a user selects a response. 
     const selectResponse = async (index, response) => {
         setAnswered(true);
@@ -130,26 +146,10 @@ const Game = () => {
 
         setButtonStates(newButtonStates);
 
-        if (round >= 3) {
-            // Update user data before redirecting
-            try {
-                await axios.post(`${apiEndpoint}/statistics/edit`, {
-                    username:username,
-                    earned_money:totalScore,
-                    classic_correctly_answered_questions:correctlyAnsweredQuestions,
-                    classic_incorrectly_answered_questions:incorrectlyAnsweredQuestions,
-                    classic_total_time_played:totalTimePlayed,
-                    classic_games_played:1
-                  });
-              } catch (error) {
-                console.error("Error:", error);
-              }
-        }
-
-        setTimeout(() => {
+        setTimeout(async() => {
             setRound(round + 1);
             setButtonStates([]);
-        }, 2000);
+        }, 4000);
     };
 
     const questionHistorialBar = () => {

diff --git a/webapp/src/pages/Statistics.js b/webapp/src/pages/Statistics.js
@@ -30,27 +30,83 @@ const Statistics = () => {
                 Statistics
             </Typography>
             <Box>
-                <Typography variant="h5" align="center" gutterBottom>
-                    Classic Game
+                <Typography variant="h5" align="center" gutterBottom style={{ marginTop: '20px'}}>
+                    The Challenge
                 </Typography>
                 <List sx={{ width: '100%', maxWidth: 360, margin: 'auto' }}>
                     <Divider style={{ marginTop:'3%'}}/>
                     <ListItem>
-                        <ListItemText primary={`Earned Money: ${userStatics.earned_money}€`} />
+                        <ListItemText primary={`Earned Money: ${userStatics.the_callenge_earned_money}€`} />
                     </ListItem>
                     <ListItem>
-                        <ListItemText primary={`Correctly Answered Questions: ${userStatics.classic_correctly_answered_questions}`} />
+                        <ListItemText primary={`Correctly Answered Questions: ${userStatics.the_callenge_correctly_answered_questions}`} />
                     </ListItem>
                     <ListItem>
-                        <ListItemText primary={`Incorrectly Answered Questions: ${userStatics.classic_incorrectly_answered_questions}`} />
+                        <ListItemText primary={`Incorrectly Answered Questions: ${userStatics.the_callenge_incorrectly_answered_questions}`} />
                     </ListItem>
                     <ListItem>
-                        <ListItemText primary={`Total Time Played: ${userStatics.classic_total_time_played}''`} />
+                        <ListItemText primary={`Total Time Played: ${userStatics.the_callenge_total_time_played}''`} />
                     </ListItem>
                     <ListItem>
-                        <ListItemText primary={`Games Played: ${userStatics.classic_games_played}`} />
+                        <ListItemText primary={`Games Played: ${userStatics.the_callenge_games_played}`} />
                     </ListItem>
+                </List>
+                <Typography variant="h5" align="center" gutterBottom style={{ marginTop: '20px'}}>
+                    Wise Men Stack
+                </Typography>
+                <List sx={{ width: '100%', maxWidth: 360, margin: 'auto' }}>
                     <Divider style={{ marginTop:'3%'}}/>
+                    <ListItem>
+                        <ListItemText primary={`Earned Money: ${userStatics.wise_men_stack_earned_money}€`} />
+                    </ListItem>
+                    <ListItem>
+                        <ListItemText primary={`Correctly Answered Questions: ${userStatics.wise_men_stack_correctly_answered_questions}`} />
+                    </ListItem>
+                    <ListItem>
+                        <ListItemText primary={`Incorrectly Answered Questions: ${userStatics.wise_men_stack_incorrectly_answered_questions}`} />
+                    </ListItem>
+                    <ListItem>
+                        <ListItemText primary={`Games Played: ${userStatics.wise_men_stack_games_played}`} />
+                    </ListItem>
+                </List>
+                <Typography variant="h5" align="center" gutterBottom style={{ marginTop: '20px'}}>
+                    Warm Question
+                </Typography>
+                <List sx={{ width: '100%', maxWidth: 360, margin: 'auto' }}>
+                    <Divider style={{ marginTop:'3%'}}/>
+                    <ListItem>
+                        <ListItemText primary={`Earned Money: ${userStatics.warm_question_earned_money}€`} />
+                    </ListItem>
+                    <ListItem>
+                        <ListItemText primary={`Correctly Answered Questions: ${userStatics.warm_question_correctly_answered_questions}`} />
+                    </ListItem>
+                    <ListItem>
+                        <ListItemText primary={`Incorrectly Answered Questions: ${userStatics.warm_question_incorrectly_answered_questions}`} />
+                    </ListItem>
+                    <ListItem>
+                        <ListItemText primary={`Passed Questions: ${userStatics.warm_question_passed_questions}`} />
+                    </ListItem>
+                    <ListItem>
+                        <ListItemText primary={`Games Played: ${userStatics.warm_question_games_played}`} />
+                    </ListItem>
+                </List>
+                <Typography variant="h5" align="center" gutterBottom style={{ marginTop: '20px'}}>
+                    Discovering Cities
+                </Typography>
+                <List sx={{ width: '100%', maxWidth: 360, margin: 'auto' }}>
+                    <Divider style={{ marginTop:'3%'}}/>
+                    <ListItem>
+                        <ListItemText primary={`Earned Money: ${userStatics.discovering_cities_earned_money}€`} />
+                    </ListItem>
+                    <ListItem>
+                        <ListItemText primary={`Correctly Answered Cities: ${userStatics.discovering_cities_correctly_answered_questions}`} />
+                    </ListItem>
+                    <ListItem>
+                        <ListItemText primary={`Incorrectly Answered Cities: ${userStatics.discovering_cities_incorrectly_answered_questions}`} />
+                    </ListItem>
+                    <ListItem>
+                        <ListItemText primary={`Games Played: ${userStatics.discovering_cities_games_played}`} />
+                    </ListItem>
                 </List>
             </Box>
         </Container>