From 88cb673966d51189a4e0e8ccd2f5c0e2dd7e4fff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=91=D0=B0=D0=BA=D0=B0?= =?UTF-8?q?=D0=BB=D1=8C=D1=81=D0=BA=D0=B0=D1=8F?= Date: Sun, 12 May 2024 01:18:04 +0400 Subject: [PATCH] =?UTF-8?q?=D1=82=D0=B0=D0=BA,=20=D0=BD=D1=83=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BD=20=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D0=B5=D0=B1=D1=80=D0=B0=D1=81=D1=8B=D0=B2=D0=B0=D0=B5=D1=82=20?= =?UTF-8?q?:=5F)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../favorites/repository/CrudRepository.java | 5 ----- .../example/backend/users/api/UserDTO.java | 21 +++++++++--------- .../users/repository/UserRepository.java | 2 -- .../src/main/resources/templates/login.html | 0 data.mv.db | Bin 40960 -> 61440 bytes 5 files changed, 11 insertions(+), 17 deletions(-) delete mode 100644 backend/src/main/java/com/example/backend/favorites/repository/CrudRepository.java create mode 100644 backend/src/main/resources/templates/login.html diff --git a/backend/src/main/java/com/example/backend/favorites/repository/CrudRepository.java b/backend/src/main/java/com/example/backend/favorites/repository/CrudRepository.java deleted file mode 100644 index 7e63514..0000000 --- a/backend/src/main/java/com/example/backend/favorites/repository/CrudRepository.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.example.backend.favorites.repository; - -public class CrudRepository { - -} 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 66293b5..9ddddab 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 @@ -1,5 +1,6 @@ package com.example.backend.users.api; +import com.example.backend.users.model.UserRole; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotBlank; @@ -13,14 +14,14 @@ public class UserDTO { @NotBlank @Size(min = 2, max = 50) - private String username; + private String login; @NotBlank @Size(min = 2, max = 10) private String password; @NotNull - private boolean isAdmin; + private UserRole role; @JsonProperty(access = JsonProperty.Access.READ_ONLY) public Integer getId() { @@ -31,12 +32,12 @@ public class UserDTO { this.id = id; } - public String getUsername() { - return username; + public String getLogin() { + return login; } - public void setUsername(String username) { - this.username = username; + public void setLogin(String login) { + this.login = login; } public String getPassword() { @@ -47,11 +48,11 @@ public class UserDTO { this.password = password; } - public boolean getIsAdmin() { - return isAdmin; + public UserRole getRole() { + return role; } - public void setIsAdmin(boolean isAdmin) { - this.isAdmin = isAdmin; + public void setRole(UserRole role) { + this.role = role; } } 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 0ecae0e..34bf1c4 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 @@ -6,7 +6,5 @@ import org.springframework.data.repository.CrudRepository; import com.example.backend.users.model.UserEntity; public interface UserRepository extends CrudRepository { - Optional findByUsernameIgnoreCase(String username); - Optional findByLoginIgnoreCase(String login); } diff --git a/backend/src/main/resources/templates/login.html b/backend/src/main/resources/templates/login.html new file mode 100644 index 0000000..e69de29 diff --git a/data.mv.db b/data.mv.db index 75e40e25f7b4cf965f1063bb1eb6175a181096ea..44a4b8dbb726d3d13d96edc83420808c75be9174 100644 GIT binary patch literal 61440 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