diff --git a/src/main/java/ch/progetto152/entity/UserEntity.java b/src/main/java/ch/progetto152/entity/UserEntity.java index 2ca166a..3ab34fa 100644 --- a/src/main/java/ch/progetto152/entity/UserEntity.java +++ b/src/main/java/ch/progetto152/entity/UserEntity.java @@ -18,9 +18,6 @@ public class UserEntity { @Column(name = "id") private int id; @Basic - @Column(name = "name") - private String name; - @Basic @Column(name = "username") private String username; @Basic @@ -31,7 +28,6 @@ public class UserEntity { private Byte admin; public UserEntity(String name, String username, String password) { - this.name = name; this.username = username; this.password = password; } @@ -69,12 +65,12 @@ public class UserEntity { return false; } 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 public int hashCode() { - return Objects.hash(id, name, username, password); + return Objects.hash(id, username, password); } public Byte getAdmin() { diff --git a/src/main/java/ch/progetto152/repository/UserRepository.java b/src/main/java/ch/progetto152/repository/UserRepository.java index 5da9bd0..d292457 100644 --- a/src/main/java/ch/progetto152/repository/UserRepository.java +++ b/src/main/java/ch/progetto152/repository/UserRepository.java @@ -9,8 +9,6 @@ import java.util.Optional; @Repository public interface UserRepository extends JpaRepository { - Optional findUserByName(String name); - Optional findUserByUsername(String username); } diff --git a/src/main/java/ch/progetto152/services/UserService.java b/src/main/java/ch/progetto152/services/UserService.java index 74d2802..ff2c479 100644 --- a/src/main/java/ch/progetto152/services/UserService.java +++ b/src/main/java/ch/progetto152/services/UserService.java @@ -28,9 +28,6 @@ public class UserService { return userRepository.findById(id).orElse(null); } - public UserEntity getUserByName(String name){ - return userRepository.findUserByName(name).orElse(null); - } public UserEntity getUserByUsername(String username){ return userRepository.findUserByUsername(username).orElse(null); @@ -47,7 +44,6 @@ public class UserService { public UserEntity updateUser(Long id, UserEntity user) { UserEntity user1 = getUserById(id); if (user1 != null) { - user1.setName(user.getName()); user1.setUsername(user.getUsername()); user1.setPassword(user.getPassword()); return userRepository.save(user1); diff --git a/src/main/java/ch/progetto152/utility/ErrorChecking.java b/src/main/java/ch/progetto152/utility/ErrorChecking.java index bddacd2..1993d19 100644 --- a/src/main/java/ch/progetto152/utility/ErrorChecking.java +++ b/src/main/java/ch/progetto152/utility/ErrorChecking.java @@ -10,7 +10,6 @@ public class ErrorChecking { public boolean checkUser(UserEntity user){ return user != null && - isNotEmpty(user.getName()) && isNotEmpty(user.getUsername()) && isNotEmpty(user.getPassword()); }