Перестройка БД

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;
 }

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;
 }

src/main/resources/db/scripts/release_0_0_1/changelog.xml

@@ -8,5 +8,9 @@
     <include file="scripts/02_create_table_roles.sql" relativeToChangelogFile="true"/>
     <include file="scripts/03_add_FK_users_to_roles.sql" relativeToChangelogFile="true"/>
     <include file="scripts/04_add_roles.sql" relativeToChangelogFile="true"/>
+    <include file="scripts/05_add_anonymous_role.sql" relativeToChangelogFile="true"/>
+    <include file="scripts/06_refactor_users_table.sql" relativeToChangelogFile="true"/>
+    <include file="scripts/07_refactor_roles_table.sql" relativeToChangelogFile="true"/>
+    <include file="scripts/08_add_roles.sql" relativeToChangelogFile="true"/>
 
 </databaseChangeLog>

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
 );

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)
 );
 

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');

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;

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 'Имя роли';

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');