kmitresse/cards-rush
1
0
Fork 0
mirror of https://github.com/kmitresse/Cards-Rush.git synced 2026-07-09 13:27:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(DevWeb): Use List for foreigth key instead of ArrayList to prevent OneToMany ManyToMany errors

Browse Source
This commit is contained in:
Lucàs
2024-04-20 21:14:20 +02:00
parent 462690d696
commit b9f23e6481
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Deck.java
+3 -2
View File
@@ -8,6 +8,7 @@ package uppa.project.database.pojo;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List;
/** /**
* Représentation d'un paquet de cartes * Représentation d'un paquet de cartes
@@ -29,7 +30,7 @@ public class Deck {
* Ensemble de cartes du paquet * Ensemble de cartes du paquet
* @see Card * @see Card
*/ */
private ArrayList<Card> cards; private final List<Card> cards;
/** /**
* Constructeur par défaut * Constructeur par défaut
@@ -69,7 +70,7 @@ public class Deck {
/** /**
* @return l'ensemble de cartes du paquet * @return l'ensemble de cartes du paquet
*/ */
public ArrayList<Card> getCards() { public List<Card> getCards() {
return cards; return cards;
} }
S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Game.java
+3 -2
View File
@@ -24,6 +24,7 @@ import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List;
import java.util.Objects; import java.util.Objects;
/** /**
@@ -60,7 +61,7 @@ public class Game implements Serializable {
private int nbValuesPerColor; private int nbValuesPerColor;
@OneToMany(mappedBy = "game", cascade = CascadeType.ALL, fetch = FetchType.LAZY) @OneToMany(mappedBy = "game", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
private ArrayList<Player> players; private List<Player> players;
@Transient @Transient
private Deck deck; private Deck deck;
@@ -234,7 +235,7 @@ public class Game implements Serializable {
/** /**
* @return les joueurs de la partie * @return les joueurs de la partie
*/ */
public ArrayList<Player> getPlayers() { public List<Player> getPlayers() {
return players; return players;
} }
S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/User.java
+5 -4
View File
@@ -26,6 +26,7 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List;
import java.util.Objects; import java.util.Objects;
/** /**
@@ -61,10 +62,10 @@ public class User implements Serializable {
private Gender gender; private Gender gender;
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, fetch = FetchType.LAZY) @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) @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
private ArrayList<RecoveryPasswordToken> recoveryPasswordTokens; private List<RecoveryPasswordToken> recoveryPasswordTokens;
@Transient @Transient
private int nbPlayedGame; private int nbPlayedGame;
@@ -310,12 +311,12 @@ public class User implements Serializable {
* *
* @return la liste des parties jouées * @return la liste des parties jouées
*/ */
public ArrayList<Player> getPlayedGames() { public List<Player> getPlayedGames() {
return playedGames; 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 * @param player la nouvelle partie jouée
*/ */