10 questions and restart logic add

API/src/socket.io/ServerIO.ts

 import * as IO from 'socket.io';
 import logger from '../logging/WinstonLogger';
 import http from 'http';
-import Server, {SocketIoInfo} from "../express/Server";
+import {SocketIoInfo} from "../express/Server";
 import {UserInfo} from "./UserInfo"
 import {Database} from "../database/Database";
 import {Question} from "../database/models/Question";
-import {response} from "express";
 
 
 //TODO: In this file you can add/edit all things about socket.io
@@ -33,6 +32,15 @@ class ServerIO extends IO.Server {
         this.on('connection', (socket: SocketIoInfo) => {
             logger.info(`Nouveau socket vers ${socket.client.conn.remoteAddress}`);
             console.log(`Socket info: ${socket.user.username} // ${socket.user.firstname} // ${socket.user.lastname}`);
+            this.initializeGame(socket);
+            this.testNumberofPlayer();
+            this.registerEventsOnSocket(socket);
+        });
+
+
+    }
+
+    initializeGame(socket: SocketIoInfo){
         const playerKey = socket.user.username;
         // Vérifiez si le joueur existe déjà dans le dictionnaire
         if (this.players[playerKey]) {
@@ -45,19 +53,16 @@ class ServerIO extends IO.Server {
                 socket.user.firstname,
                 socket.user.lastname
             );
+            if(!this.playersReady.hasOwnProperty(playerKey)){
                 this.playersReady[playerKey] = false;
+            }
+            if(!this.playersScore.hasOwnProperty(playerKey)) {
                 this.playersScore[playerKey] = 0;
+            }
             this.nbQuestion=0;
             console.log(`Player ${playerKey} is connected.`);
         }
-
-            this.testNumberofPlayer();
-            this.registerEventsOnSocket(socket);
-        });
-
-
     }
-
     private registerEventsOnSocket(socket: SocketIoInfo) {
         const playerKey = socket.user.username;
         socket.on("player-ready", ()=>{
@@ -91,26 +96,27 @@ class ServerIO extends IO.Server {
                 }
                 else{
                     let question={...this.currentQuestion};
-                    question=question.dataValues as Question;
+                    question.correctResponse=-1;
                     randomQuestion = question;
                 }
-                console.log("send question", randomQuestion);
                 this.emit("question", randomQuestion);
-                this.nbQuestion++;
             }
         });
 
         socket.on("validate-question", async (responseSelected) => {
-            let randomQuestion = await this.getRandomQuestion();
+            console.log("current question:", this.currentQuestion);
             if (responseSelected === this.currentQuestion.correctResponse) {
                 // le joueur gagne 1 point
+                console.log(`joueur ${playerKey} gagne 1 point`)
                 this.playersScore[playerKey]+=1;
             }else{
+                console.log(`joueur ${playerKey} perd 2 point`)
                 // le joueur perd deux points
                 this.playersScore[playerKey]-=2;
             }
-            this.nbQuestion++;
-            if(this.nbQuestion<10){
+            console.log("playerScore:", this.playersScore);
+            let randomQuestion = await this.getRandomQuestion();
+            if(this.nbQuestion<=10){
                 this.emit("question", randomQuestion);
             }else{
                 const playersScoreFormatted = Object.keys(this.playersScore).reduce((formatted:any, key) => {
@@ -119,7 +125,13 @@ class ServerIO extends IO.Server {
                 }, {});
                 this.emit("game-finished", playersScoreFormatted);
             }
+            this.nbQuestion++;
 
+        });
+        socket.on("restart-game", ()=>{
+            if(Object.keys(this.players).length === 3)
+                this.players={};
+            this.initializeGame(socket);
         })
 
         socket.on('disconnect', () => {
@@ -133,6 +145,7 @@ class ServerIO extends IO.Server {
                 // Le joueur est connecté, retirez-le du dictionnaire
                 delete this.players[playerKey];
                 delete this.playersReady[playerKey];
+                delete this.playersScore[playerKey];
                 console.log(`Player ${playerKey} is disconnected.`);
             } else {
                 // Le joueur n'est pas trouvé dans le dictionnaire, cela peut être un cas anormal
@@ -170,12 +183,10 @@ class ServerIO extends IO.Server {
         }
 
         const randomIndex = Math.floor(Math.random() * this.questions.length);
-        this.currentQuestion = this.questions[randomIndex];
+        this.currentQuestion = this.questions[randomIndex].dataValues;
         this.questions.splice(randomIndex, 1);
         // pour ne pas envoyer au frontend la reponse attendue
-        let randomQuestion={...this.currentQuestion};
-        randomQuestion=randomQuestion.dataValues as Question;
-        return randomQuestion;
+        return {...this.currentQuestion};
     }
 
     private testNumberOfReady() {