From e865488ab57b26511a5ca37f2f9115a4350005df Mon Sep 17 00:00:00 2001 From: ekallin Date: Sun, 14 Apr 2024 23:26:52 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B8=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D1=8B=20?= =?UTF-8?q?=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D1=8B=20=D1=8E=D0=B7=D0=B5=D1=80?= =?UTF-8?q?=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/backend/users/api/UserDTO.java | 4 ++++ .../com/example/backend/users/model/UserEntity.java | 12 +++++++++++- .../backend/users/repository/UserRepository.java | 9 ++++----- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/backend/src/main/java/com/example/backend/users/api/UserDTO.java b/backend/src/main/java/com/example/backend/users/api/UserDTO.java index 7acdef3..66293b5 100644 --- a/backend/src/main/java/com/example/backend/users/api/UserDTO.java +++ b/backend/src/main/java/com/example/backend/users/api/UserDTO.java @@ -4,15 +4,19 @@ import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; public class UserDTO { + @JsonProperty(access = JsonProperty.Access.READ_ONLY) private Integer id; @NotBlank + @Size(min = 2, max = 50) private String username; @NotBlank + @Size(min = 2, max = 10) private String password; @NotNull diff --git a/backend/src/main/java/com/example/backend/users/model/UserEntity.java b/backend/src/main/java/com/example/backend/users/model/UserEntity.java index 05b43dc..997bea7 100644 --- a/backend/src/main/java/com/example/backend/users/model/UserEntity.java +++ b/backend/src/main/java/com/example/backend/users/model/UserEntity.java @@ -4,10 +4,21 @@ import java.util.Objects; import com.example.backend.core.model.BaseEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; + +@Entity +@Table(name = "users") public class UserEntity extends BaseEntity { + @Column(nullable = false, unique = true, length = 15) private String username; + + @Column(nullable = false, unique = true, length = 5) private String password; + + @Column(nullable = false) private boolean isAdmin; public UserEntity() { @@ -15,7 +26,6 @@ public class UserEntity extends BaseEntity { } public UserEntity(Integer id, String username, String password, boolean isAdmin) { - super(id); this.username = username; this.password = password; this.isAdmin = isAdmin; diff --git a/backend/src/main/java/com/example/backend/users/repository/UserRepository.java b/backend/src/main/java/com/example/backend/users/repository/UserRepository.java index 4b698bf..f873c56 100644 --- a/backend/src/main/java/com/example/backend/users/repository/UserRepository.java +++ b/backend/src/main/java/com/example/backend/users/repository/UserRepository.java @@ -1,11 +1,10 @@ package com.example.backend.users.repository; -import org.springframework.stereotype.Repository; +import java.util.Optional; +import org.springframework.data.repository.CrudRepository; -import com.example.backend.core.repository.MapRepository; import com.example.backend.users.model.UserEntity; -@Repository -public class UserRepository extends MapRepository { - +public interface UserRepository extends CrudRepository { + Optional findByUsernameIgnoreCase(String username); }