From c512e87a0df1085df7e89408d1be66ece1591148 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9=20Garnier?= <Noe.GARNIER@etu.uca.fr>
Date: Tue, 17 Jan 2023 13:48:24 +0100
Subject: [PATCH] =?UTF-8?q?Correction=20de=20bug=20dans=20le=20calcul=20de?=
 =?UTF-8?q?s=20pints=20en=20cas=20d'=C3=A9nigme=20passer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Controller/ResoudreGateway.php | 12 +++++++++---
 Model/UserModel.php            |  4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Controller/ResoudreGateway.php b/Controller/ResoudreGateway.php
index 11ced673..a41a6b0a 100644
--- a/Controller/ResoudreGateway.php
+++ b/Controller/ResoudreGateway.php
@@ -342,28 +342,34 @@ class ResoudreGateway
         $query = "UPDATE Resoudre
         SET ended=:ended
         WHERE utilisateur=:utilisateur
-        AND partie=:partie";
+        AND partie=:partie
+        AND enigme=:enigme";
         $this->con->executeQuery($query, array(
             "utilisateur" => array($mailUtilisateur, SQLITE3_TEXT),
             "partie" => array($idPartie, SQLITE3_INTEGER),
+            "enigme" => array($idEnigme, SQLITE3_INTEGER),
             "ended" => array(1, SQLITE3_INTEGER)));
 
         $query = "UPDATE Resoudre
         SET temps=:temps
         WHERE utilisateur=:utilisateur
-        AND partie=:partie";
+        AND partie=:partie
+        AND enigme=:enigme";
         $this->con->executeQuery($query, array(
             "utilisateur" => array($mailUtilisateur, SQLITE3_TEXT),
             "partie" => array($idPartie, SQLITE3_INTEGER),
+            "enigme" => array($idEnigme, SQLITE3_INTEGER),
             "temps" => array(null, SQLITE3_NULL)));
         
         $query = "UPDATE Resoudre
         SET classement=:classement
         WHERE utilisateur=:utilisateur
-        AND partie=:partie";
+        AND partie=:partie
+        AND enigme=:enigme";
         $this->con->executeQuery($query, array(
             "utilisateur" => array($mailUtilisateur, SQLITE3_TEXT),
             "partie" => array($idPartie, SQLITE3_INTEGER),
+            "enigme" => array($idEnigme, SQLITE3_INTEGER),
             "classement" => array($playerNumberPerGame, SQLITE3_INTEGER)));
 
     }
diff --git a/Model/UserModel.php b/Model/UserModel.php
index 523c013e..bab3c204 100644
--- a/Model/UserModel.php
+++ b/Model/UserModel.php
@@ -202,11 +202,11 @@ class UserModel
 
     public function getPointsAtTheEnd(string $mailUtilisateur, int $idPartie) : int{
         global $playerNumberPerGame;
-        $points = 10;
+        $points = 0;
         $result = $this->resoudre_gateway->getAllByPartieAndUtilisateur($mailUtilisateur, $idPartie);
         foreach ($result as $row){
             if ($row['temps'] == 0 || $row['ended'] == 0){
-                $points += 1000;
+                $points += 0;
             }
             else if ($row['classement'] == 1){
                 $points += $this->enigme_gateway->findById($row['enigme'])[0]->getPoints();