diff --git a/WEB/Controller/PartieGateway.php b/WEB/Controller/PartieGateway.php
index afb471df..d51fe7f0 100644
--- a/WEB/Controller/PartieGateway.php
+++ b/WEB/Controller/PartieGateway.php
@@ -1,6 +1,6 @@
 <?php
 
-include_once "EnigmeGateway";
+include_once "../Factory/PartieFactory.php";
 class PartieGateway
 {
     private Connection $con;
@@ -12,15 +12,47 @@ class PartieGateway
     {
         $this->con = $con;
     }
-    public function insert(Partie $partie){
-        
-        $query= "INSERT INTO Game VALUES (:idPartie)";
+    public function creerPartie(){
+        $query = "SELECT * FROM Enigme";
+        $this->con->executeQuery($query);
+        $results = $this->con->getResults();
+        $query= "SELECT max(p.id)
+        FROM PARTIE p;";
+        $this->con->executeQuery($query);
+        $max=$this->con->getResults()[0];
+        $partie=PartieFactory::createPartie($max,$results);
+        $query= "INSERT INTO Partie VALUES (:idPartie,:idEnigme)";
         $this->con->executeQuery($query, array(':idPartie' => array($partie->getIdPartie(), PDO::PARAM_STR)));
+        foreach($partie->getListeEnigme() as $Enigme){
+            $query= "INSERT INTO Contenir VALUES (:idPartie, :idEnigme)";
+            $this->con->executeQuery($query, array(
+            ':idPartie' => array($partie->getIdPartie(), PDO::PARAM_STR),
+            ':idEnigme' => array($Enigme->getIdEnigme(), PDO::PARAM_STR)));
+        }
     }
     public function delete(string $idPartie){
-        $query= "DELETE FROM Game WHERE idGame = :idPartie";
+        $query= "DELETE FROM Partie WHERE id = :idPartie";
         $this->con->executeQuery($query, array(':idPartie' => array($idPartie, PDO::PARAM_STR)));
     }
+
+    public function findOldListeEnigme(string $partie) : array{
+        $query= "SELECT * FROM Enigme e,Contenir c
+            AND c.partie = :idPartie  
+            AND c.enigme = e.id";
+        $this->con->executeQuery($query, array(':idPartie' => array(
+            ':idPartie' => array($partie, PDO::PARAM_STR),
+        )));
+        $results=$this->con->getResults();
+        $tabEnigme=EnigmeFactory::create($results);
+        return $tabEnigme;
+    }
+    public function findIdMax(){
+        $query= "SELECT max(p.id)
+        FROM PARTIE p;";
+        $this->con->executeQuery($query);
+        $results=$this->con->getResults();
+        return $results[0]->max;
+    }
     public function showAll() : void{
         $query= "SELECT * FROM Partie";
         $this->con->executeQuery($query);
diff --git a/WEB/Factory/PartieFactory.php b/WEB/Factory/PartieFactory.php
index 0a43d733..64f7774b 100644
--- a/WEB/Factory/PartieFactory.php
+++ b/WEB/Factory/PartieFactory.php
@@ -1,12 +1,22 @@
 <?php
+include_once "EnigmeFactory.php";
+include_once "../Model/Partie.php";
 class PartieFactory{
-    public static function create($results)
+    public static function createPartie($idMax,$resultsEnigme) : Partie
     {
-        $tabPartie=array();
-        foreach($results as $row)
+        $tempsResolutionPartie=0;
+        $tabEnigme=array();
+        $tabIndex=range(0,strlen($resultsEnigme)-1);
+        $randomNumber=0;
+        while($tempsResolutionPartie <= 30)
         {
-            $tabPartie= new Partie($row['id']);
+            $randomNumber=$tabIndex[array_rand($tabIndex)];
+            $tabEnigme=EnigmeFactory::create($resultsEnigme[$randomNumber]);
+            $TempsResolutionPartie+=$resultsEnigme[$randomNumber]['tempsDeResolution'];
+            unset($tabIndex[$randomNumber]);
         }
-        return $tabPartie;
+        $partie=new Partie($idMax,$resultsEnigme);
+        return $partie;
     }
+    //public static function createListePartie()
 }
\ No newline at end of file
diff --git a/WEB/Model/Partie.php b/WEB/Model/Partie.php
index d0113343..860f4cf5 100644
--- a/WEB/Model/Partie.php
+++ b/WEB/Model/Partie.php
@@ -12,11 +12,11 @@ class Partie
      * @param string $idPartie
      * @param array $datePartie
      */
-    public function __construct(string $idPartie)
+    public function __construct(string $idPartie, array $listeEnigme)
     {
         $this->idPartie = $idPartie;
         $this->datePartie = getdate();
-        $listeEnigme = [];
+        $this->$listeEnigme = $listeEnigme;
     }
 
     /**
@@ -50,4 +50,17 @@ class Partie
     {
         $this->datePartie = $datePartie;
     }
+
+    /**
+     * @param array $listeEnigme
+     */
+
+    public function getListeEnigme(): array
+    {
+        return $this->listeEnigme;
+    }
+    public function setListeEnigme(array $listeEnigme): void
+    {
+        $this->listeEnigme = $listeEnigme;
+    }
 }
\ No newline at end of file
diff --git a/WEB/Model/bd.sql b/WEB/Model/bd.sql
index 667225ff..1e4f8eca 100644
--- a/WEB/Model/bd.sql
+++ b/WEB/Model/bd.sql
@@ -26,18 +26,19 @@ mdp varchar(50)
 );
 
 CREATE TABLE Enigme(
-id char(5) PRIMARY KEY,
+id int PRIMARY KEY AUTO_INCREMENT,
 admin varchar(50) REFERENCES Admin(email),
 enonce varchar(250) NOT NULL,
 aide varchar(250),
 rappel varchar(250),
 solution varchar(250) NOT NULL,
 test varchar(250) NOT NULL,
-tempsDeResolution numeric CHECK (tempsDeResolution >0)
+tempsDeResolution numeric CHECK (tempsDeResolution >0),
+points numeric
 );
 
 CREATE TABLE Partie(
-id char(5) PRIMARY KEY
+id int PRIMARY KEY AUTO_INCREMENT,
 );
 
 CREATE TABLE ResoudreEnSolo(
@@ -52,6 +53,7 @@ joueur varchar(50) REFERENCES Joueur(email),
 enigme char(5) REFERENCES Enigme(id),
 partie char(5) REFERENCES Partie(id),
 indexEnigme numeric UNIQUE,
+temps time,
 PRIMARY KEY(joueur, enigme, partie)
 );