From d4f61438eb953f9e9a830f39faa76a72e0e141ae Mon Sep 17 00:00:00 2001 From: Velixeor <126388806+Velixeor@users.noreply.github.com> Date: Sat, 19 Oct 2024 22:13:50 +0300 Subject: [PATCH] Update role --- server/src/main/java/ru/tubryansk/tdms/dto/UserDTO.java | 4 ++-- server/src/main/java/ru/tubryansk/tdms/entity/Role.java | 8 +++----- server/src/main/java/ru/tubryansk/tdms/entity/User.java | 8 ++++---- server/src/main/resources/application-dev.yml | 4 ++-- .../resources/db.migration/V00001__Create__role_table.sql | 3 ++- .../resources/db.migration/V00010__Create__user_table.sql | 4 ++-- .../db.migration/V0060__Insert_base_cases_in__user.sql | 2 +- .../db.migration/V0070__Insert_base_cases_in__role.sql | 4 ++-- 8 files changed, 18 insertions(+), 19 deletions(-) diff --git a/server/src/main/java/ru/tubryansk/tdms/dto/UserDTO.java b/server/src/main/java/ru/tubryansk/tdms/dto/UserDTO.java index 63638d1..f53401f 100644 --- a/server/src/main/java/ru/tubryansk/tdms/dto/UserDTO.java +++ b/server/src/main/java/ru/tubryansk/tdms/dto/UserDTO.java @@ -35,8 +35,8 @@ public record UserDTO( .fullName(user.getFullName()) .email(user.getMail()) .phoneNumber(user.getNumberPhone()) - .createdAt(user.getCreateAt()) - .updatedAt(user.getUpdateAt()) + .createdAt(user.getCreatedAt()) + .updatedAt(user.getUpdatedAt()) .authorities(user.getRoles().stream().map(Role::getAuthority).toList()) .build(); } diff --git a/server/src/main/java/ru/tubryansk/tdms/entity/Role.java b/server/src/main/java/ru/tubryansk/tdms/entity/Role.java index bea25a1..357f3e1 100644 --- a/server/src/main/java/ru/tubryansk/tdms/entity/Role.java +++ b/server/src/main/java/ru/tubryansk/tdms/entity/Role.java @@ -9,6 +9,7 @@ import lombok.Setter; import org.springframework.security.core.GrantedAuthority; + @Entity @Getter @Setter @@ -22,9 +23,6 @@ public class Role implements GrantedAuthority { private Integer id; @Column(name = "name", nullable = false) private String name; - - @Override - public String getAuthority() { - return name; - } + @Column(name = "authority", nullable = false) + private String authority; } diff --git a/server/src/main/java/ru/tubryansk/tdms/entity/User.java b/server/src/main/java/ru/tubryansk/tdms/entity/User.java index d98938f..99edcc2 100644 --- a/server/src/main/java/ru/tubryansk/tdms/entity/User.java +++ b/server/src/main/java/ru/tubryansk/tdms/entity/User.java @@ -36,10 +36,10 @@ public class User implements UserDetails { private String mail; @Column(name = "number_phone", nullable = false, unique = true) private String numberPhone; - @Column(name = "create_at", nullable = false) - private ZonedDateTime createAt; - @Column(name = "update_at") - private ZonedDateTime updateAt; + @Column(name = "created_at", nullable = false) + private ZonedDateTime createdAt; + @Column(name = "updated_at") + private ZonedDateTime updatedAt; @ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER) @JoinTable(name = "user_role",schema = "vkr", joinColumns = @JoinColumn(name = "user_id", referencedColumnName = "id"), diff --git a/server/src/main/resources/application-dev.yml b/server/src/main/resources/application-dev.yml index f35c7fd..611b58e 100644 --- a/server/src/main/resources/application-dev.yml +++ b/server/src/main/resources/application-dev.yml @@ -8,10 +8,10 @@ spring: out-of-order: true web: resources: - static-locations: file://${user.dir}/web/dist/ + static-locations: file:///${user.dir}/web/dist/ chain: cache: false compressed: false server: compression: - enabled: false \ No newline at end of file + enabled: false diff --git a/server/src/main/resources/db.migration/V00001__Create__role_table.sql b/server/src/main/resources/db.migration/V00001__Create__role_table.sql index 6099afb..f36f64e 100644 --- a/server/src/main/resources/db.migration/V00001__Create__role_table.sql +++ b/server/src/main/resources/db.migration/V00001__Create__role_table.sql @@ -1,5 +1,6 @@ create table vkr.role ( id integer primary key generated by default as identity, - name text not null unique + name text not null unique, + authority text not null unique ) diff --git a/server/src/main/resources/db.migration/V00010__Create__user_table.sql b/server/src/main/resources/db.migration/V00010__Create__user_table.sql index 7a69caf..9e29fde 100644 --- a/server/src/main/resources/db.migration/V00010__Create__user_table.sql +++ b/server/src/main/resources/db.migration/V00010__Create__user_table.sql @@ -6,7 +6,7 @@ create table vkr.user full_name text not null, mail text not null unique, number_phone text not null unique, - create_at timestamp(6) with time zone not null, - update_at timestamp(6) with time zone + created_at timestamp(6) with time zone not null, + updated_at timestamp(6) with time zone ) diff --git a/server/src/main/resources/db.migration/V0060__Insert_base_cases_in__user.sql b/server/src/main/resources/db.migration/V0060__Insert_base_cases_in__user.sql index 426de77..7c73a32 100644 --- a/server/src/main/resources/db.migration/V0060__Insert_base_cases_in__user.sql +++ b/server/src/main/resources/db.migration/V0060__Insert_base_cases_in__user.sql @@ -1,4 +1,4 @@ -INSERT INTO vkr.user (login, password, full_name, mail, number_phone, create_at, update_at) +INSERT INTO vkr.user (login, password, full_name, mail, number_phone, created_at, updated_at) VALUES ('akulenko_mikhail', 'password123', 'Акуленко Михаил Вячеславович', 'akulenko.mikhail@example.com', '+79110000001', NOW(), NOW()), ('borovikov_artem', 'password123', 'Боровиков Артём Викторович', 'borovikov.artem@example.com', '+79110000002', diff --git a/server/src/main/resources/db.migration/V0070__Insert_base_cases_in__role.sql b/server/src/main/resources/db.migration/V0070__Insert_base_cases_in__role.sql index 7a4230d..a764327 100644 --- a/server/src/main/resources/db.migration/V0070__Insert_base_cases_in__role.sql +++ b/server/src/main/resources/db.migration/V0070__Insert_base_cases_in__role.sql @@ -1,2 +1,2 @@ -INSERT INTO vkr.role (name) -VALUES('Руководитель'),('Куратор'),('Студент'); +INSERT INTO vkr.role (name,authority) +VALUES('Руководитель','ROLE_DIRECTOR'),('Куратор','ROLE_TUTOR'),('Студент','ROLE_STUDENT');