From 148c511b9eed20c810b44158e9b93f523bd452eb Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Sat, 12 Aug 2023 19:43:04 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=BE=D0=B9=D0=BA=D0=B0=20=D0=91=D0=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/ru/ldeloff/servermonitorbot/model/Role.java | 4 ++-- .../java/ru/ldeloff/servermonitorbot/model/User.java | 6 +++--- .../resources/db/scripts/release_0_0_1/changelog.xml | 4 ++++ .../release_0_0_1/scripts/01_create_table_users.sql | 2 +- .../release_0_0_1/scripts/02_create_table_roles.sql | 2 +- .../release_0_0_1/scripts/05_add_anonymous_role.sql | 1 + .../release_0_0_1/scripts/06_refactor_users_table.sql | 9 +++++++++ .../release_0_0_1/scripts/07_refactor_roles_table.sql | 6 ++++++ .../db/scripts/release_0_0_1/scripts/08_add_roles.sql | 4 ++++ 9 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/db/scripts/release_0_0_1/scripts/05_add_anonymous_role.sql create mode 100644 src/main/resources/db/scripts/release_0_0_1/scripts/06_refactor_users_table.sql create mode 100644 src/main/resources/db/scripts/release_0_0_1/scripts/07_refactor_roles_table.sql create mode 100644 src/main/resources/db/scripts/release_0_0_1/scripts/08_add_roles.sql diff --git a/src/main/java/ru/ldeloff/servermonitorbot/model/Role.java b/src/main/java/ru/ldeloff/servermonitorbot/model/Role.java index bdbbccf..d6f800d 100644 --- a/src/main/java/ru/ldeloff/servermonitorbot/model/Role.java +++ b/src/main/java/ru/ldeloff/servermonitorbot/model/Role.java @@ -12,6 +12,6 @@ public class Role { @GeneratedValue(strategy = GenerationType.IDENTITY) private long id; - @Column(name = "role") - private String role; + @Column(name = "name") + private String name; } diff --git a/src/main/java/ru/ldeloff/servermonitorbot/model/User.java b/src/main/java/ru/ldeloff/servermonitorbot/model/User.java index b4a0ddd..c732b3e 100644 --- a/src/main/java/ru/ldeloff/servermonitorbot/model/User.java +++ b/src/main/java/ru/ldeloff/servermonitorbot/model/User.java @@ -12,10 +12,10 @@ public class User { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @Column(name = "login") - private Long login; + @Column(name = "telegram_id") + private Long telegramId; @ManyToOne - @JoinColumn(name = "id_role") + @JoinColumn(name = "role_id") private Role role; } diff --git a/src/main/resources/db/scripts/release_0_0_1/changelog.xml b/src/main/resources/db/scripts/release_0_0_1/changelog.xml index 9607261..1b0334d 100644 --- a/src/main/resources/db/scripts/release_0_0_1/changelog.xml +++ b/src/main/resources/db/scripts/release_0_0_1/changelog.xml @@ -8,5 +8,9 @@ + + + + \ No newline at end of file diff --git a/src/main/resources/db/scripts/release_0_0_1/scripts/01_create_table_users.sql b/src/main/resources/db/scripts/release_0_0_1/scripts/01_create_table_users.sql index 8d5f188..9164f99 100644 --- a/src/main/resources/db/scripts/release_0_0_1/scripts/01_create_table_users.sql +++ b/src/main/resources/db/scripts/release_0_0_1/scripts/01_create_table_users.sql @@ -4,7 +4,7 @@ --comment: Создание таблицы пользователей CREATE TABLE users ( - id integer PRIMARY KEY, + id SERIAL PRIMARY KEY, login VARCHAR(128), id_role integer ); diff --git a/src/main/resources/db/scripts/release_0_0_1/scripts/02_create_table_roles.sql b/src/main/resources/db/scripts/release_0_0_1/scripts/02_create_table_roles.sql index d09119d..e7d5fad 100644 --- a/src/main/resources/db/scripts/release_0_0_1/scripts/02_create_table_roles.sql +++ b/src/main/resources/db/scripts/release_0_0_1/scripts/02_create_table_roles.sql @@ -4,7 +4,7 @@ --comment: Создание таблицы ролей CREATE TABLE roles ( - id integer PRIMARY KEY, + id SERIAL PRIMARY KEY, role VARCHAR(128) ); diff --git a/src/main/resources/db/scripts/release_0_0_1/scripts/05_add_anonymous_role.sql b/src/main/resources/db/scripts/release_0_0_1/scripts/05_add_anonymous_role.sql new file mode 100644 index 0000000..ba5a19a --- /dev/null +++ b/src/main/resources/db/scripts/release_0_0_1/scripts/05_add_anonymous_role.sql @@ -0,0 +1 @@ +INSERT INTO roles (id, role) VALUES (3, 'ANONYMOUS'); \ No newline at end of file diff --git a/src/main/resources/db/scripts/release_0_0_1/scripts/06_refactor_users_table.sql b/src/main/resources/db/scripts/release_0_0_1/scripts/06_refactor_users_table.sql new file mode 100644 index 0000000..4a51d65 --- /dev/null +++ b/src/main/resources/db/scripts/release_0_0_1/scripts/06_refactor_users_table.sql @@ -0,0 +1,9 @@ +ALTER TABLE users + DROP COLUMN login; + +ALTER TABLE users + ADD COLUMN telegram_id INTEGER UNIQUE; + COMMENT ON COLUMN users.telegram_id IS 'Telegram ID пользователя'; + +ALTER TABLE users + DROP COLUMN id_role; \ No newline at end of file diff --git a/src/main/resources/db/scripts/release_0_0_1/scripts/07_refactor_roles_table.sql b/src/main/resources/db/scripts/release_0_0_1/scripts/07_refactor_roles_table.sql new file mode 100644 index 0000000..c39ec05 --- /dev/null +++ b/src/main/resources/db/scripts/release_0_0_1/scripts/07_refactor_roles_table.sql @@ -0,0 +1,6 @@ +ALTER TABLE roles + DROP COLUMN role; + +ALTER TABLE roles + ADD COLUMN name VARCHAR(128); +COMMENT ON COLUMN roles.name IS 'Имя роли'; \ No newline at end of file diff --git a/src/main/resources/db/scripts/release_0_0_1/scripts/08_add_roles.sql b/src/main/resources/db/scripts/release_0_0_1/scripts/08_add_roles.sql new file mode 100644 index 0000000..cdce579 --- /dev/null +++ b/src/main/resources/db/scripts/release_0_0_1/scripts/08_add_roles.sql @@ -0,0 +1,4 @@ +TRUNCATE TABLE roles CASCADE; +INSERT INTO roles (id, name) VALUES (1, 'ADMIN'); +INSERT INTO roles (id, name) VALUES (2, 'USER'); +INSERT INTO roles (id, name) VALUES (3, 'ANONYMOUS'); \ No newline at end of file