lucasvbr/Cards-Rush
1
0
Fork 0
mirror of https://github.com/kmitresse/Cards-Rush.git synced 2026-05-13 17:11:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

refacto: devWeb - unify language used for comments (back)

Browse Source
This commit is contained in:
kmitresse
2024-05-01 15:32:17 +02:00
parent 1270077aef
commit 97bfa17a70
10 changed files with 33 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
S2/DevWeb/Projet/src/main/java/uppa/project/bean/PlayerBean.java
+5 -7
View File
@@ -15,7 +15,7 @@ import uppa.project.database.pojo.Player;
public class PlayerBean {
private Player player;
public PlayerBean(Player player){
public PlayerBean(Player player) {
this.player = player;
}
@@ -24,12 +24,11 @@ public class PlayerBean {
*
* @return true si tous les joueurs sont gérés, false sinon
*/
public boolean validate(){
public boolean validate() {
EntityManager em = EntityManagerProvider.getInstance();
em.getTransaction().begin();
try{
DAO<Player> playerDAO = new Game_JPA_DAO_Factory().getDAOPlayer();
Player dbPlayer = new Player(player.getGame(),player.getUser());
try {
Player dbPlayer = new Player(player.getGame(), player.getUser());
dbPlayer.setScore(player.getScore());
if (player.isWinner()) dbPlayer.setWinner();
dbPlayer.setClickCount(player.getClickCount());
@@ -39,8 +38,7 @@ public class PlayerBean {
player.getUser().addPlayedGame(dbPlayer);
em.getTransaction().commit();
return true;
} catch (DAOException e) {
System.out.println("Player :" + this.player.getUser().getUsername() +"n'a pas pu être enregistré en base de données");
} catch (Exception e) {
em.getTransaction().rollback();
return false;
}
S2/DevWeb/Projet/src/main/java/uppa/project/bean/ProfileBean.java
+4 -4
View File
@@ -37,21 +37,21 @@ public class ProfileBean {
DAO<User> userDAO;
try {
userDAO= new Game_JPA_DAO_Factory().getDAOUser();
//Check if the user is valid
// Vérification de l'existence de l'utilisateur
user = userDAO.findById(Integer.parseInt(id));
if (user == null) {
error = new HttpResponse(HttpResponseCode.UNAUTHORIZED, "Utilisateur non trouvé");
entityManager.getTransaction().rollback();
return false;
}
//Check if the email is not already taken
// Vérification de l'unicité de l'adresse e-mail
User[] users = userDAO.findByField("email", email);
if (!oldEmail.equals(email) && users.length > 0) {
error = new HttpResponse(HttpResponseCode.UNAUTHORIZED, "Cet email est déjà utilisé");
entityManager.getTransaction().rollback();
return false;
}
//Check if the oldPassword is correct
// Verification de l'ancien mot de passe
if(!oldPassword.isEmpty() && !user.verifyPassword(oldPassword)) {
error = new HttpResponse(HttpResponseCode.UNAUTHORIZED, "Ancien mot de passe incorrect");
entityManager.getTransaction().rollback();
@@ -62,7 +62,7 @@ public class ProfileBean {
entityManager.getTransaction().rollback();
return false;
}
//Update the user
// Mise à jour des informations de l'utilisateur
user.setEmail(email);
if (!password.isEmpty()) {
user.setPassword(password);
S2/DevWeb/Projet/src/main/java/uppa/project/bean/RegisterBean.java
+6 -6
View File
@@ -39,18 +39,18 @@ public class RegisterBean implements Serializable {
Game_JPA_DAO_Factory jpaDaoFactory = new Game_JPA_DAO_Factory();
DAO<User> userDAO;
// Check if the user is valid
// Vérification de l'unicité du nom d'utilisateur et de l'adresse e-mail
try {
userDAO = jpaDaoFactory.getDAOUser();
// Check if the username is already taken
// Vérification de l'unicité du nom d'utilisateur
User[] users = userDAO.findByField("username", username);
if (users.length > 0) {
error = new HttpResponse(HttpResponseCode.UNAUTHORIZED, "Ce nom d'utilisateur est déjà pris");
return false;
}
// Check if the email is already taken
// Vérification de l'unicité de l'adresse e-mail
users = userDAO.findByField("email", email);
if (users.length > 0) {
error = new HttpResponse(HttpResponseCode.UNAUTHORIZED, "Cet email est déjà utilisé");
@@ -61,7 +61,7 @@ public class RegisterBean implements Serializable {
return false;
}
// Create a new User
// Creation de l'utilisateur
User user = new User();
user.setUsername(username);
user.setPassword(password);
@@ -73,7 +73,7 @@ public class RegisterBean implements Serializable {
return false;
}
// convert the birthdate from String as YYYY-MM-DD to Date object
// Convertion de la date de naissance de String au format YYYY-MM-DD en objet Date
try {
LocalDate localDate = LocalDate.parse(birth);
ZoneId defaultZoneId = ZoneId.systemDefault();
@@ -84,7 +84,7 @@ public class RegisterBean implements Serializable {
return false;
}
// Send the user to the database
// Sauvegarde de l'utilisateur en base de données
EntityManager entityManager = EntityManagerProvider.getInstance();
entityManager.getTransaction().begin();
try {
S2/DevWeb/Projet/src/main/java/uppa/project/bean/ResetPasswordBean.java
+3 -3
View File
@@ -32,14 +32,14 @@ public class ResetPasswordBean implements Serializable {
DAO<User> userDAO;
DAO<RecoveryPasswordToken> recoveryPasswordTokenDAO;
// Check if the user is valid
// Vérification du lien entre le token et un utilisateur
EntityManager entityManager = EntityManagerProvider.getInstance();
entityManager.getTransaction().begin();
try {
userDAO = jpaDaoFactory.getDAOUser();
recoveryPasswordTokenDAO = jpaDaoFactory.getDAORecoveryPasswordToken();
// Check if the token is valid
// Vériier l'existence du token
RecoveryPasswordToken[] tokens = recoveryPasswordTokenDAO.findByField("token", token);
if (tokens.length == 0) {
errorMessage = "Ce token n'est pas valide";
@@ -47,7 +47,7 @@ public class ResetPasswordBean implements Serializable {
}
RecoveryPasswordToken token = tokens[0];
//Recuperer l'utilisateur associé au token
// Récupéreration de l'utilisateur associé au token
User user = token.getUser();
if (user == null) {
errorMessage = "Erreur: Aucun utilisateur associé à ce token";
S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/ForgottenPasswordServlet.java
-1
View File
@@ -63,7 +63,6 @@ public class ForgottenPasswordServlet extends HttpServlet {
Gson gson = new Gson();
HttpResponse httpResponse;
String url = request.getRequestURL().toString();
//retirer le dernier segment de l'url pour avoir le contextPath
String uri = url.substring(0, url.lastIndexOf("/"));
if (forgottenPasswordBean.validate(uri)) {
httpResponse = new HttpResponse(HttpResponseCode.OK, "Mail sent");
S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/GameStatisticsServlet.java
+1 -2
View File
@@ -31,8 +31,7 @@ public class GameStatisticsServlet extends HttpServlet {
try {
DAO<Game> gameDAO = new Game_JPA_DAO_Factory().getDAOGame();
game = gameDAO.findById(Integer.parseInt(request.getParameter("id")));
ArrayList<Player> players = new ArrayList<>();
players.addAll(game.getPlayers());
ArrayList<Player> players = new ArrayList<>(game.getPlayers());
request.setAttribute("players", players);
request.setAttribute("game", game);
request.getRequestDispatcher("/WEB-INF/pages/game-statistics.jsp").forward(request, response);
S2/DevWeb/Projet/src/main/java/uppa/project/web/websocket/ConnectedUsersWS.java
+1 -1
View File
@@ -99,7 +99,7 @@ public class ConnectedUsersWS {
if (message.getType().equals("invite")) {
SimpleInvitation invitation = gson.fromJson(message.getData(), SimpleInvitation.class);
// Find session of the user who receive
// Récupérer la session de l'utilisateur invité
for (Session s : users.keySet()) {
if (users.get(s).getId().intValue() == invitation.getTo().getId()) {
try {
S2/DevWeb/Projet/src/main/java/uppa/project/web/websocket/GameWS.java
+13 -14
View File
@@ -80,7 +80,7 @@ public class GameWS {
ArrayList<SimplePlayer> simplePlayerList = new ArrayList<>();
for (Player p : games.get(game)) simplePlayerList.add(new SimplePlayer(p));
// Broadcast the new player
// Diffusion de la nouvelle liste de joueurs
broadcast(new Message("updatePlayerList", gson.toJson(simplePlayerList)).toJson());
}
@@ -88,12 +88,11 @@ public class GameWS {
game.setGameState(Game.GameState.STARTED);
broadcast(new Message("start", gson.toJson(new SimpleGame(game, games.get(game)))).toJson());
// TODO Start the timer
Timer timer = new Timer();
timer.schedule(new TimerTask() {
@Override
public void run() {
// Broadcast the end of the game
// Fin du timer
broadcast(new Message("timerEnd", gson.toJson(new SimpleGame(game, games.get(game)))).toJson());
timer.cancel();
}
@@ -110,19 +109,19 @@ public class GameWS {
player.setCurrentClick(choice);
// get the number of players who clicked
// Récupérer le nombre de joueurs ayant cliqué
int gameClickCount = 0;
for (Player player : games.get(game)) {
if (player.getCurrentClick() != null) gameClickCount++;
}
// Click count
// Compteur de clics
player.incrementClickCount();
// Right click count
// Compteur de clics rapides
if (gameClickCount == 1) player.incrementRapidClickCount();
// Check if the player has clicked on the right card
// Vérifier le choix du joueur et attribuer les points
if (game.getDifficulty().equals(Game.Difficulty.EASY)) {
switch (choice) {
case COLOR_VALUE -> {
@@ -213,18 +212,18 @@ public class GameWS {
}
}
// Broadcast the player choice with score
// Diffuser le score du joueur
broadcast(new Message("updatePlayer", gson.toJson(new SimplePlayer(player))).toJson());
System.out.println(gameClickCount + " / " + games.get(game).size());
// If all players have clicked
// Si tous les joueurs ont cliqué
if (gameClickCount >= games.get(game).size()) {
// Stop the timer if it's running
// Stopper le timer
timers.get(game).cancel();
// Reset the current click for all players
// Réinitialiser les clics courrants
for (Player p : games.get(game)) p.setCurrentClick(null);
List<Player> players = games.get(game);
@@ -238,14 +237,14 @@ public class GameWS {
Player theoricWinner = players.get(0);
Player second = players.get(1);
// Check if the game is over
// Vérifier si la partie est terminée
if (game.nextRound() || (second.getScore() == theoricWinner.getScore() && second.getRapidClickCount() == theoricWinner.getRapidClickCount())) {
broadcast(new Message("nextRound", gson.toJson(new SimpleGame(game, games.get(game)))).toJson());
Timer timer = new Timer();
timer.schedule(new TimerTask() {
@Override
public void run() {
// Broadcast the end of the game
// Diffuser la fin du timer
broadcast(new Message("timerEnd", gson.toJson(new SimpleGame(game, games.get(game)))).toJson());
timer.cancel();
}
@@ -263,7 +262,7 @@ public class GameWS {
}
em.getTransaction().commit();
// Broadcast the end of the game
// Diffusion de la fin de la partie
broadcast(new Message("end", gson.toJson(new SimpleGame(game, games.get(game)))).toJson());
}
}
S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/game.jsp
-1
View File
@@ -97,7 +97,6 @@
<jsp:useBean id="user" scope="session" type="uppa.project.database.pojo.User"/>
<script defer type="module">
// Modal
// Modal
document.querySelectorAll('.modal-trigger').forEach(($el) => {
S2/DevWeb/Projet/src/main/webapp/static/js/Message.js
-2
View File
@@ -1,12 +1,10 @@
export default class Message {
constructor(rawMessage) {
// Parse the message
const message = JSON.parse(rawMessage);
message.data = JSON.parse(message.data);
console.log(message);
// Set the message properties
this.type = message.type;
this.data = message.data;
}