johanleroy/ENI-enchere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

patch

Browse Source
This commit is contained in:
jleroy
2024-04-23 16:52:09 +02:00
parent 93e5739ea0
commit 5c2b72ddf5
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/fr/eni/enchere/dal/UserRepository.java
View File

@@ -7,7 +7,7 @@ import java.util.List;
public interface UserRepository {
List<UserProfil> findAll();
UserProfil findById(int id);
UserProfil findByUsername(String username, String email);
UserProfil findByUsername(String username);
void save(UserProfil utilisateur);
void delete(int id);
}

24
src/main/java/fr/eni/enchere/dal/UserRepositoryImpl.java
View File

@@ -57,17 +57,10 @@ public class UserRepositoryImpl implements UserRepository {
}
@Override
public UserProfil findByUsername(String username, String email) {
UserProfil user = null;
if (username != null) {
String sql = "SELECT * FROM UTILISATEURS WHERE pseudo = ? AND isDelete = 0";
user = jdbcTemplate.queryForObject(sql, new UserRowMapper(), username);
} else if (email != null) {
String sql = "SELECT * FROM UTILISATEURS WHERE email = ? AND isDelete = 0";
user = jdbcTemplate.queryForObject(sql, new UserRowMapper(), email);
}
System.out.println(user.getPassword());
return user;
public UserProfil findByUsername(String username) {
String sql = "SELECT * FROM UTILISATEURS WHERE pseudo = ? OR email = ? AND isDelete = 0";
UserProfil useruser = jdbcTemplate.queryForObject(sql, new UserRowMapper(), username, username);
return useruser;
}
@@ -105,8 +98,14 @@ public class UserRepositoryImpl implements UserRepository {
}
}else {
//Mettre à jour
String sql = "UPDATE UTILISATEURS SET pseudo = :pseudo, nom = :nom, prenom = :prenom, email = :email, telephone = :telephone, rue = :rue, code_postal = :code_postal, ville = :ville, mot_de_passe = :mot_de_passe WHERE no_utilisateur = :id";
String sql;
MapSqlParameterSource parameters = new MapSqlParameterSource();
if(utilisateur.getPassword().isEmpty()){
sql = "UPDATE UTILISATEURS SET pseudo = :pseudo, nom = :nom, prenom = :prenom, email = :email, telephone = :telephone, rue = :rue, code_postal = :code_postal, ville = :ville WHERE no_utilisateur = :id";
}else{
sql = "UPDATE UTILISATEURS SET pseudo = :pseudo, nom = :nom, prenom = :prenom, email = :email, telephone = :telephone, rue = :rue, code_postal = :code_postal, ville = :ville, mot_de_passe = :mot_de_passe WHERE no_utilisateur = :id";
parameters.addValue("mot_de_passe", passwordEncoder.encode(utilisateur.getPassword()));
}
parameters.addValue("pseudo", utilisateur.getPseudo());
parameters.addValue("nom", utilisateur.getNom());
parameters.addValue("prenom", utilisateur.getPrenom());
@@ -115,7 +114,6 @@ public class UserRepositoryImpl implements UserRepository {
parameters.addValue("rue", utilisateur.getRue());
parameters.addValue("code_postal", utilisateur.getCode_postal());
parameters.addValue("ville", utilisateur.getVille());
parameters.addValue("mot_de_passe", passwordEncoder.encode(utilisateur.getPassword())); // Assurez-vous de hasher le nouveau mot de passe si nécessaire
parameters.addValue("id", utilisateur.getId());
namedParameterJdbcTemplate.update(sql, parameters);
}