Update DB scripts.

Signed-off-by: Mykhailo Marchuk <[email protected]>
FindMeTicketTeam · Jun 5, 2024 · 4f8b37e · 4f8b37e
1 parent a42615f
commit 4f8b37e
Show file tree

Hide file tree

Showing 4 changed files with 92 additions and 55 deletions.
diff --git a/src/main/resources/image/admin_avatar.png b/src/main/resources/image/admin_avatar.png
diff --git a/src/main/resources/liquibase/scripts/002-create-tables.yaml b/src/main/resources/liquibase/scripts/002-create-tables.yaml
@@ -1,6 +1,6 @@
 databaseChangeLog:
   - changeSet:
-      id: 1716983425426-1
+      id: 1717617973899-1
       author: misha (generated)
       objectQuotingStrategy: QUOTE_ONLY_RESERVED_WORDS
       changes:
@@ -27,7 +27,7 @@ databaseChangeLog:
                   type: UUID
             tableName: bus_info
   - changeSet:
-      id: 1716983425426-2
+      id: 1717617973899-2
       author: misha (generated)
       objectQuotingStrategy: QUOTE_ONLY_RESERVED_WORDS
       changes:
@@ -52,7 +52,7 @@ databaseChangeLog:
                   type: DATETIME
             tableName: confirmation_code
   - changeSet:
-      id: 1716983425426-3
+      id: 1717617973899-3
       author: misha (generated)
       objectQuotingStrategy: QUOTE_ONLY_RESERVED_WORDS
       changes:
@@ -81,7 +81,7 @@ databaseChangeLog:
                   type: UUID
             tableName: review
   - changeSet:
-      id: 1716983425426-4
+      id: 1717617973899-4
       author: misha (generated)
       objectQuotingStrategy: QUOTE_ONLY_RESERVED_WORDS
       changes:
@@ -92,15 +92,15 @@ databaseChangeLog:
                   constraints:
                     nullable: false
                     primaryKey: true
-                    primaryKeyName: pk_role
+                    primaryKeyName: pk_roles
                   name: id
-                  type: INT
+                  type: SMALLINT
               - column:
-                  name: enum_role
+                  name: type
                   type: VARCHAR(255)
-            tableName: role
+            tableName: roles
   - changeSet:
-      id: 1716983425426-5
+      id: 1717617973899-5
       author: misha (generated)
       objectQuotingStrategy: QUOTE_ONLY_RESERVED_WORDS
       changes:
@@ -127,7 +127,7 @@ databaseChangeLog:
                   type: DATETIME
             tableName: route
   - changeSet:
-      id: 1716983425426-6
+      id: 1717617973899-6
       author: misha (generated)
       objectQuotingStrategy: QUOTE_ONLY_RESERVED_WORDS
       changes:
@@ -157,7 +157,7 @@ databaseChangeLog:
                   type: UUID
             tableName: search_history
   - changeSet:
-      id: 1716983425426-7
+      id: 1717617973899-7
       author: misha (generated)
       objectQuotingStrategy: QUOTE_ONLY_RESERVED_WORDS
       changes:
@@ -199,7 +199,7 @@ databaseChangeLog:
                   type: UUID
             tableName: ticket
   - changeSet:
-      id: 1716983425426-8
+      id: 1717617973899-8
       author: misha (generated)
       objectQuotingStrategy: QUOTE_ONLY_RESERVED_WORDS
       changes:
@@ -226,7 +226,7 @@ databaseChangeLog:
                   type: UUID
             tableName: train_info
   - changeSet:
-      id: 1716983425426-9
+      id: 1717617973899-9
       author: misha (generated)
       objectQuotingStrategy: QUOTE_ONLY_RESERVED_WORDS
       changes:
@@ -242,7 +242,7 @@ databaseChangeLog:
                   type: VARCHAR(255)
             tableName: type_transport
   - changeSet:
-      id: 1716983425426-10
+      id: 1717617973899-10
       author: misha (generated)
       objectQuotingStrategy: QUOTE_ONLY_RESERVED_WORDS
       changes:
@@ -276,7 +276,7 @@ databaseChangeLog:
                   type: VARCHAR(255)
             tableName: ukrainian_cities
   - changeSet:
-      id: 1716983425426-11
+      id: 1717617973899-11
       author: misha (generated)
       objectQuotingStrategy: QUOTE_ONLY_RESERVED_WORDS
       changes:
@@ -338,15 +338,34 @@ databaseChangeLog:
                     nullable: false
                   name: enabled
                   type: BOOLEAN
-              - column:
-                  name: role_id
-                  type: INT
               - column:
                   name: token_id
                   type: UUID
             tableName: users
   - changeSet:
-      id: 1716983425426-12
+      id: 1717617973899-12
+      author: misha (generated)
+      objectQuotingStrategy: QUOTE_ONLY_RESERVED_WORDS
+      changes:
+        - createTable:
+            columns:
+              - column:
+                  constraints:
+                    nullable: false
+                    primaryKey: true
+                    primaryKeyName: pk_users_roles
+                  name: roles_id
+                  type: SMALLINT
+              - column:
+                  constraints:
+                    nullable: false
+                    primaryKey: true
+                    primaryKeyName: pk_users_roles
+                  name: users_id
+                  type: UUID
+            tableName: users_roles
+  - changeSet:
+      id: 1717617973899-13
       author: misha (generated)
       objectQuotingStrategy: QUOTE_ONLY_RESERVED_WORDS
       changes:
@@ -355,7 +374,7 @@ databaseChangeLog:
             constraintName: uc_review_user
             tableName: review
   - changeSet:
-      id: 1716983425426-13
+      id: 1717617973899-14
       author: misha (generated)
       objectQuotingStrategy: QUOTE_ONLY_RESERVED_WORDS
       changes:
@@ -364,7 +383,7 @@ databaseChangeLog:
             constraintName: uc_users_email
             tableName: users
   - changeSet:
-      id: 1716983425426-14
+      id: 1717617973899-15
       author: misha (generated)
       objectQuotingStrategy: QUOTE_ONLY_RESERVED_WORDS
       changes:
@@ -373,7 +392,7 @@ databaseChangeLog:
             constraintName: uc_users_phone_number
             tableName: users
   - changeSet:
-      id: 1716983425426-15
+      id: 1717617973899-16
       author: misha (generated)
       objectQuotingStrategy: QUOTE_ONLY_RESERVED_WORDS
       changes:
@@ -382,7 +401,7 @@ databaseChangeLog:
             constraintName: uc_users_token
             tableName: users
   - changeSet:
-      id: 1716983425426-16
+      id: 1717617973899-17
       author: misha (generated)
       objectQuotingStrategy: QUOTE_ONLY_RESERVED_WORDS
       changes:
@@ -394,7 +413,7 @@ databaseChangeLog:
             tableName: users
             unique: true
   - changeSet:
-      id: 1716983425426-17
+      id: 1717617973899-18
       author: misha (generated)
       objectQuotingStrategy: QUOTE_ONLY_RESERVED_WORDS
       changes:
@@ -405,7 +424,7 @@ databaseChangeLog:
             referencedColumnNames: id
             referencedTableName: ticket
   - changeSet:
-      id: 1716983425426-18
+      id: 1717617973899-19
       author: misha (generated)
       objectQuotingStrategy: QUOTE_ONLY_RESERVED_WORDS
       changes:
@@ -416,7 +435,7 @@ databaseChangeLog:
             referencedColumnNames: id
             referencedTableName: users
   - changeSet:
-      id: 1716983425426-19
+      id: 1717617973899-20
       author: misha (generated)
       objectQuotingStrategy: QUOTE_ONLY_RESERVED_WORDS
       changes:
@@ -427,7 +446,7 @@ databaseChangeLog:
             referencedColumnNames: id
             referencedTableName: users
   - changeSet:
-      id: 1716983425426-20
+      id: 1717617973899-21
       author: misha (generated)
       objectQuotingStrategy: QUOTE_ONLY_RESERVED_WORDS
       changes:
@@ -438,7 +457,7 @@ databaseChangeLog:
             referencedColumnNames: id
             referencedTableName: route
   - changeSet:
-      id: 1716983425426-21
+      id: 1717617973899-22
       author: misha (generated)
       objectQuotingStrategy: QUOTE_ONLY_RESERVED_WORDS
       changes:
@@ -449,18 +468,7 @@ databaseChangeLog:
             referencedColumnNames: id
             referencedTableName: ticket
   - changeSet:
-      id: 1716983425426-22
-      author: misha (generated)
-      objectQuotingStrategy: QUOTE_ONLY_RESERVED_WORDS
-      changes:
-        - addForeignKeyConstraint:
-            baseColumnNames: role_id
-            baseTableName: users
-            constraintName: FK_USERS_ON_ROLE
-            referencedColumnNames: id
-            referencedTableName: role
-  - changeSet:
-      id: 1716983425426-23
+      id: 1717617973899-23
       author: misha (generated)
       objectQuotingStrategy: QUOTE_ONLY_RESERVED_WORDS
       changes:
@@ -471,7 +479,7 @@ databaseChangeLog:
             referencedColumnNames: id
             referencedTableName: confirmation_code
   - changeSet:
-      id: 1716983425426-24
+      id: 1717617973899-24
       author: misha (generated)
       objectQuotingStrategy: QUOTE_ONLY_RESERVED_WORDS
       changes:
@@ -481,4 +489,26 @@ databaseChangeLog:
             constraintName: fk_type_transport_on_search_history
             referencedColumnNames: id
             referencedTableName: search_history
+  - changeSet:
+      id: 1717617973899-25
+      author: misha (generated)
+      objectQuotingStrategy: QUOTE_ONLY_RESERVED_WORDS
+      changes:
+        - addForeignKeyConstraint:
+            baseColumnNames: roles_id
+            baseTableName: users_roles
+            constraintName: fk_userol_on_role
+            referencedColumnNames: id
+            referencedTableName: roles
+  - changeSet:
+      id: 1717617973899-26
+      author: misha (generated)
+      objectQuotingStrategy: QUOTE_ONLY_RESERVED_WORDS
+      changes:
+        - addForeignKeyConstraint:
+            baseColumnNames: users_id
+            baseTableName: users_roles
+            constraintName: fk_userol_on_user
+            referencedColumnNames: id
+            referencedTableName: users
 
diff --git a/...rces/liquibase/scripts/003-init-role.yaml → ...ces/liquibase/scripts/003-init-roles.yaml b/...rces/liquibase/scripts/003-init-role.yaml → ...ces/liquibase/scripts/003-init-roles.yaml
@@ -6,6 +6,7 @@ databaseChangeLog:
       changes:
         - sql:
             sql: |
-              INSERT INTO role (enum_role) VALUES
+              INSERT INTO roles (type) VALUES
                  ('USER'),
-                 ('ADMIN');
+                 ('ADMIN'),
+                 ('MANAGER');
diff --git a/...urces/liquibase/scripts/005-init-user.sql → ...rces/liquibase/scripts/005-init-users.sql b/...urces/liquibase/scripts/005-init-user.sql → ...rces/liquibase/scripts/005-init-users.sql
@@ -1,6 +1,6 @@
 INSERT INTO find_me_ticket_schema.users (id, email, password, username, provider,
                                          account_non_expired, account_non_locked, credentials_non_expired,
-                                         enabled, registration_date, social_media_avatar, notification, role_id)
+                                         enabled, registration_date, social_media_avatar, notification)
 VALUES ('282cd4b3-240c-4483-811c-3625e1795626',
         '[email protected]',
         '$2a$10$ceOGO7v/5HC0833TT1YKKe38nlrqIuBv5V8axGIWyjepqQFq1W3K2',
@@ -9,8 +9,8 @@ VALUES ('282cd4b3-240c-4483-811c-3625e1795626',
         TRUE, TRUE, TRUE, TRUE,
         NOW(),
         'https://lh3.googleusercontent.com/pw/AP1GczOhz7hHCCfGHp3j3TL6hi6dAanTbwim6_4GcPLxhB7Db7Ezz67kagJUasJYSsgYd7yEcRIIT5BWWu1U0QYWhHqsT5WgwIleBhQ6DOoJD-v5OcvnhpKxZ0t-V1K-LsEbuFY_xbLpJEdRlQ-760_uZAc=w398-h398-s-no-gm?authuser=0',
-        TRUE, 2),
-----
+        TRUE),
+---------------
        ('6bdafe1f-fb85-4d04-b95a-532570a2d8fb',
         '[email protected]',
         '$2a$10$ceOGO7v/5HC0833TT1YKKe38nlrqIuBv5V8axGIWyjepqQFq1W3K2',
@@ -19,17 +19,17 @@ VALUES ('282cd4b3-240c-4483-811c-3625e1795626',
         TRUE, TRUE, TRUE, TRUE,
         NOW(),
         'https://lh3.googleusercontent.com/pw/AP1GczPbvb64vYc46m-u09vkphIVtW7M2bHx5Q_YlqdV4q9OMg1QsayQJucMShM91pB0oQ9sIqTk9OxAaMZqEgDEWfum8N5C-si1LYztJFhE78aYZlznl5S5O1OdK6D3DNL2FjKbbJ-1cApMoxg21VmPDHM=w945-h945-s-no-gm?authuser=0',
-        TRUE, 2),
-----
+        TRUE),
+---------------
        ('c7a4efb5-1525-4f6a-9672-2b865f414de3',
         '[email protected]',
         '$2a$10$ceOGO7v/5HC0833TT1YKKe38nlrqIuBv5V8axGIWyjepqQFq1W3K2',
         'Mykhailo Marchuk',
         'GOOGLE', TRUE, TRUE, TRUE, TRUE,
         NOW(),
         'https://lh3.googleusercontent.com/pw/AP1GczN1kT8-ubvv3taOi2bnDP2cBvQ2Ai1IWxbulSqPa-P39hJhWQ7OeRDwm2iUVItk6UKsrlTt3wWt4Yta8signLfUPb6zt8JbjuouAVeeJ-WkP99Z2zbC5DiXklze5wShuwKEzEnTYYgPkBbNUnONKRA=w945-h945-s-no-gm?authuser=0',
-        TRUE, 2),
-----
+        TRUE),
+---------------
        ('1523babf-4ede-4a3f-9920-9795c228091b',
         '[email protected]',
         '$2a$10$ceOGO7v/5HC0833TT1YKKe38nlrqIuBv5V8axGIWyjepqQFq1W3K2',
@@ -38,25 +38,31 @@ VALUES ('282cd4b3-240c-4483-811c-3625e1795626',
         TRUE, TRUE, TRUE, TRUE,
         NOW(),
         'https://lh3.googleusercontent.com/pw/AP1GczMG03AiH9CHR4fkgAMOWLO8rj4xVN9kn0mN07LJ9oFQqeUd61LavwCeyUrJSk_gXmYkB0-6IHpnNZVhXAtxKsWNmoRRFhCQnq8BtcmfBG4IkYRhpfSOTDhJxBxiVTJX-6zHcDvGm_-wjZre8CNJmlM=w643-h643-s-no-gm?authuser=0',
-        TRUE, 2);
+        TRUE);
+
+INSERT INTO find_me_ticket_schema.users_roles (users_id, roles_id)
+VALUES ('282cd4b3-240c-4483-811c-3625e1795626', 2),
+       ('6bdafe1f-fb85-4d04-b95a-532570a2d8fb', 2),
+       ('c7a4efb5-1525-4f6a-9672-2b865f414de3', 2),
+       ('1523babf-4ede-4a3f-9920-9795c228091b', 2);
 
 INSERT INTO find_me_ticket_schema.review (id, review_text, adding_date, grade, user_id)
 VALUES ('efe7ad40-edc9-4a4d-9c3d-74bbab8e9aa0',
         'Ефективний і зручний агрегатор квитків. Заощаджує час і гроші. Ідеальний для планування подорожей. Відтепер - мій основний інструмент для планування подорожей!',
         NOW(), 5,
         '282cd4b3-240c-4483-811c-3625e1795626'),
-----
+       ---------------
        ('890b2c2c-2147-4b85-bfa1-d8a609f428e4',
         'Цей агрегатор - справжнє відкриття! Швидкий пошук, зручний інтерфейс, широкий вибір квитків. Рекомендую усім шукачам найзручніших способів подорожувати!',
         NOW(), 5,
         '6bdafe1f-fb85-4d04-b95a-532570a2d8fb'),
-----
+       ---------------
        ('de78962b-8d20-4827-819f-6e3dd6d9a68c',
         'I recently had the opportunity to use FindMeTicket to look for tickets, and I must say, it exceeded my expectations in several ways. As a frequent traveler, I''m always on the lookout for convenient search propositions and efficient ways to plan my journeys, and FindMeTicket certainly delivered on both fronts.',
         NOW(), 5,
         'c7a4efb5-1525-4f6a-9672-2b865f414de3'),
-----
-       ('70239c68-4fc1-42c2-8848-ecd4e3f9a770',
+       ---------------
+       ('52bd4867-b9ad-428c-a2f8-0a65e50d00bc',
         'Нещодавно я використав застосунок FindMeTicket, і можу сказати, що це дійсно зручний і корисний інструмент для тих, хто подорожує. Сайт пропонує широкий вибір квитків на автобуси та потяги, що дозволяє легко порівнювати ціни та вибирати найбільш вигідні пропозиції',
         NOW(), 5,
         '1523babf-4ede-4a3f-9920-9795c228091b');