From b9f23e6481cf0015a3cc8f3104d3bdbd76058ff5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luc=C3=A0s?= <vabrelucas@gmail.com>
Date: Sat, 20 Apr 2024 21:14:20 +0200
Subject: [PATCH] fix(DevWeb): Use List for foreigth key instead of ArrayList
 to prevent OneToMany ManyToMany errors

---
 .../src/main/java/uppa/project/database/pojo/Deck.java   | 5 +++--
 .../src/main/java/uppa/project/database/pojo/Game.java   | 5 +++--
 .../src/main/java/uppa/project/database/pojo/User.java   | 9 +++++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Deck.java b/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Deck.java
index 3278729..e4c5c42 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Deck.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Deck.java
@@ -8,6 +8,7 @@ package uppa.project.database.pojo;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 
 /**
  * Représentation d'un paquet de cartes
@@ -29,7 +30,7 @@ public class Deck {
    * Ensemble de cartes du paquet
    * @see Card
    */
-  private ArrayList<Card> cards;
+  private final List<Card> cards;
 
   /**
    * Constructeur par défaut
@@ -69,7 +70,7 @@ public class Deck {
   /**
    * @return l'ensemble de cartes du paquet
    */
-  public ArrayList<Card> getCards() {
+  public List<Card> getCards() {
     return cards;
   }
 
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Game.java b/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Game.java
index 97454b6..fa3e15c 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Game.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Game.java
@@ -24,6 +24,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -60,7 +61,7 @@ public class Game implements Serializable {
   private int nbValuesPerColor;
 
   @OneToMany(mappedBy = "game", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-  private ArrayList<Player> players;
+  private List<Player> players;
 
   @Transient
   private Deck deck;
@@ -234,7 +235,7 @@ public class Game implements Serializable {
   /**
    * @return les joueurs de la partie
    */
-  public ArrayList<Player> getPlayers() {
+  public List<Player> getPlayers() {
     return players;
   }
 
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/User.java b/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/User.java
index 96810e4..1a76121 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/User.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/User.java
@@ -26,6 +26,7 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -61,10 +62,10 @@ public class User implements Serializable {
   private Gender gender;
 
   @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-  private ArrayList<Player> playedGames;
+  private List<Player> playedGames;
 
   @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-  private ArrayList<RecoveryPasswordToken> recoveryPasswordTokens;
+  private List<RecoveryPasswordToken> recoveryPasswordTokens;
 
   @Transient
   private int nbPlayedGame;
@@ -310,12 +311,12 @@ public class User implements Serializable {
    *
    * @return  la liste des parties jouées
    */
-  public ArrayList<Player> getPlayedGames() {
+  public List<Player> getPlayedGames() {
     return playedGames;
   }
 
   /**
-   * ajoute un partie dans la liste des parties jouées
+   * Ajoute une partie dans la liste des parties jouées
    *
    * @param player la nouvelle partie jouée
    */