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

feat(DevWeb): Add getId for Player.java (Else we can't find by id in DB)

Browse Source
This commit is contained in:
Lucàs
2024-03-28 17:39:04 +01:00
parent 29388a96dd
commit e1747e8b1f
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
S2/DevWeb/Projet/src/main/java/uppa/project/pojo/Player.java
+16 -11
View File
@@ -17,7 +17,6 @@ import jakarta.persistence.Table;
import jakarta.persistence.Transient; import jakarta.persistence.Transient;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Objects; import java.util.Objects;
/** /**
@@ -64,10 +63,12 @@ public class Player implements Serializable {
/** /**
* Constructeur par défaut * Constructeur par défaut
*/ */
public Player() {} public Player() {
}
/** /**
* Constructeur d'un joueur * Constructeur d'un joueur
*
* @param game la partie de jeu * @param game la partie de jeu
* @param user l'utilisateur * @param user l'utilisateur
*/ */
@@ -85,6 +86,7 @@ public class Player implements Serializable {
/** /**
* Constructeur d'un joueur * Constructeur d'un joueur
*
* @param game la partie de jeu * @param game la partie de jeu
* @param user l'utilisateur * @param user l'utilisateur
* @param score le score * @param score le score
@@ -165,7 +167,9 @@ public class Player implements Serializable {
* *
* @param points les points à ajouter * @param points les points à ajouter
*/ */
public void addToScore(int points) { this.score += points; } public void addToScore(int points) {
this.score += points;
}
/** /**
* @return si le joueur est gagnant * @return si le joueur est gagnant
@@ -271,14 +275,8 @@ public class Player implements Serializable {
@Override @Override
public String toString() { public String toString() {
return String.format("Player{id=%s, game=%s, user=%s, score=%d, winner=%b, clickCount=%d, rightClickCount=%d, rapidClickCount=%d}", return String.format("Player{id=%s, game=%s, user=%s, score=%d, winner=%b, clickCount=%d, rightClickCount=%d, rapidClickCount=%d}",
id != null ? id.toString() : "null", id != null ? id.toString() : "null", game != null ? game.toString() : "null", user != null ? user.toString() : "null", score,
game != null ? game.toString() : "null", winner, clickCount, rightClickCount, rapidClickCount);
user != null ? user.toString() : "null",
score,
winner,
clickCount,
rightClickCount,
rapidClickCount);
} }
@Override @Override
@@ -288,4 +286,11 @@ public class Player implements Serializable {
Player player = (Player) o; Player player = (Player) o;
return getScore() == player.getScore() && isWinner() == player.isWinner() && getClickCount() == player.getClickCount() && getRightClickCount() == player.getRightClickCount() && getRapidClickCount() == player.getRapidClickCount() && Objects.equals(id, player.id) && Objects.equals(getGame(), player.getGame()) && Objects.equals(getUser(), player.getUser()); return getScore() == player.getScore() && isWinner() == player.isWinner() && getClickCount() == player.getClickCount() && getRightClickCount() == player.getRightClickCount() && getRapidClickCount() == player.getRapidClickCount() && Objects.equals(id, player.id) && Objects.equals(getGame(), player.getGame()) && Objects.equals(getUser(), player.getUser());
} }
/**
* @return l'identifiant
*/
public BigDecimal getId() {
return id;
}
} }