JoeKung/Progetto-m152-Java
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

User entity fix previous name variable

Browse Source
This commit is contained in:
Joe Küng
2023-05-05 09:26:55 +02:00
parent 80d6d3e7fd
commit 66f0e66333
4 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/ch/progetto152/entity/UserEntity.java
View File

@@ -18,9 +18,6 @@ public class UserEntity {
@Column(name = "id") @Column(name = "id")
private int id; private int id;
@Basic @Basic
@Column(name = "name")
private String name;
@Basic
@Column(name = "username") @Column(name = "username")
private String username; private String username;
@Basic @Basic
@@ -31,7 +28,6 @@ public class UserEntity {
private Byte admin; private Byte admin;
public UserEntity(String name, String username, String password) { public UserEntity(String name, String username, String password) {
this.name = name;
this.username = username; this.username = username;
this.password = password; this.password = password;
} }
@@ -69,12 +65,12 @@ public class UserEntity {
return false; return false;
} }
UserEntity that = (UserEntity) o; UserEntity that = (UserEntity) o;
return id == that.id && Objects.equals(name, that.name) && Objects.equals(username, that.username) && Objects.equals(password, that.password); return id == that.id && Objects.equals(username, that.username) && Objects.equals(password, that.password);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(id, name, username, password); return Objects.hash(id, username, password);
} }
public Byte getAdmin() { public Byte getAdmin() {

2
src/main/java/ch/progetto152/repository/UserRepository.java
View File

@@ -9,8 +9,6 @@ import java.util.Optional;
@Repository @Repository
public interface UserRepository extends JpaRepository<UserEntity, Long> { public interface UserRepository extends JpaRepository<UserEntity, Long> {
Optional<UserEntity> findUserByName(String name);
Optional<UserEntity> findUserByUsername(String username); Optional<UserEntity> findUserByUsername(String username);
} }

4
src/main/java/ch/progetto152/services/UserService.java
View File

@@ -28,9 +28,6 @@ public class UserService {
return userRepository.findById(id).orElse(null); return userRepository.findById(id).orElse(null);
} }
public UserEntity getUserByName(String name){
return userRepository.findUserByName(name).orElse(null);
}
public UserEntity getUserByUsername(String username){ public UserEntity getUserByUsername(String username){
return userRepository.findUserByUsername(username).orElse(null); return userRepository.findUserByUsername(username).orElse(null);
@@ -47,7 +44,6 @@ public class UserService {
public UserEntity updateUser(Long id, UserEntity user) { public UserEntity updateUser(Long id, UserEntity user) {
UserEntity user1 = getUserById(id); UserEntity user1 = getUserById(id);
if (user1 != null) { if (user1 != null) {
user1.setName(user.getName());
user1.setUsername(user.getUsername()); user1.setUsername(user.getUsername());
user1.setPassword(user.getPassword()); user1.setPassword(user.getPassword());
return userRepository.save(user1); return userRepository.save(user1);

1
src/main/java/ch/progetto152/utility/ErrorChecking.java
View File

@@ -10,7 +10,6 @@ public class ErrorChecking {
public boolean checkUser(UserEntity user){ public boolean checkUser(UserEntity user){
return user != null && return user != null &&
isNotEmpty(user.getName()) &&
isNotEmpty(user.getUsername()) && isNotEmpty(user.getUsername()) &&
isNotEmpty(user.getPassword()); isNotEmpty(user.getPassword());
} }