From ae90cb29aa5dce441ab1720313e0e2550a59f658 Mon Sep 17 00:00:00 2001
From: Velixeor <126388806+Velixeor@users.noreply.github.com>
Date: Tue, 6 Aug 2024 01:29:13 +0300
Subject: [PATCH] Add base cases and fix GenerationType.SEQUENCE

---
 server/pom.xml                                              | 6 +++++-
 .../main/java/ru/tubryansk/tdms/dto/DiplomaTopicDTO.java    | 0
 .../src}/main/java/ru/tubryansk/tdms/dto/RoleDTO.java       | 0
 .../src}/main/java/ru/tubryansk/tdms/dto/StudentDTO.java    | 0
 .../src}/main/java/ru/tubryansk/tdms/dto/UserDTO.java       | 0
 .../main/java/ru/tubryansk/tdms/entity/DiplomaTopic.java    | 0
 .../src}/main/java/ru/tubryansk/tdms/entity/Group.java      | 0
 .../src}/main/java/ru/tubryansk/tdms/entity/Role.java       | 0
 .../src}/main/java/ru/tubryansk/tdms/entity/Student.java    | 0
 .../src}/main/java/ru/tubryansk/tdms/entity/User.java       | 0
 .../resources/db.migration/V00001__Create__role_table.sql   | 0
 .../resources/db.migration/V00010__Create__user_table.sql   | 0
 .../db.migration/V00020__Create__user_role_table.sql        | 0
 .../db.migration/V00030__Create__diploma_topic_table.sql    | 0
 .../resources/db.migration/V00040__Create__group_table.sql  | 0
 .../db.migration/V00050__Create__student_table.sql          | 0
 .../V0055__Insert_base_cases_in__diploma_topic.sql          | 0
 .../db.migration/V0060__Insert_base_cases_in__user.sql      | 0
 .../db.migration/V0065__Insert_base_cases_in__group.sql     | 0
 .../db.migration/V0070__Insert_base_cases_in__role.sql      | 0
 .../db.migration/V0075__Insert_base_cases_in__student.sql   | 0
 .../db.migration/V0080__Insert_base_cases_in__user_role.sql | 0
 22 files changed, 5 insertions(+), 1 deletion(-)
 rename {src => server/src}/main/java/ru/tubryansk/tdms/dto/DiplomaTopicDTO.java (100%)
 rename {src => server/src}/main/java/ru/tubryansk/tdms/dto/RoleDTO.java (100%)
 rename {src => server/src}/main/java/ru/tubryansk/tdms/dto/StudentDTO.java (100%)
 rename {src => server/src}/main/java/ru/tubryansk/tdms/dto/UserDTO.java (100%)
 rename {src => server/src}/main/java/ru/tubryansk/tdms/entity/DiplomaTopic.java (100%)
 rename {src => server/src}/main/java/ru/tubryansk/tdms/entity/Group.java (100%)
 rename {src => server/src}/main/java/ru/tubryansk/tdms/entity/Role.java (100%)
 rename {src => server/src}/main/java/ru/tubryansk/tdms/entity/Student.java (100%)
 rename {src => server/src}/main/java/ru/tubryansk/tdms/entity/User.java (100%)
 rename {src => server/src}/main/resources/db.migration/V00001__Create__role_table.sql (100%)
 rename {src => server/src}/main/resources/db.migration/V00010__Create__user_table.sql (100%)
 rename {src => server/src}/main/resources/db.migration/V00020__Create__user_role_table.sql (100%)
 rename {src => server/src}/main/resources/db.migration/V00030__Create__diploma_topic_table.sql (100%)
 rename {src => server/src}/main/resources/db.migration/V00040__Create__group_table.sql (100%)
 rename {src => server/src}/main/resources/db.migration/V00050__Create__student_table.sql (100%)
 rename {src => server/src}/main/resources/db.migration/V0055__Insert_base_cases_in__diploma_topic.sql (100%)
 rename {src => server/src}/main/resources/db.migration/V0060__Insert_base_cases_in__user.sql (100%)
 rename {src => server/src}/main/resources/db.migration/V0065__Insert_base_cases_in__group.sql (100%)
 rename {src => server/src}/main/resources/db.migration/V0070__Insert_base_cases_in__role.sql (100%)
 rename {src => server/src}/main/resources/db.migration/V0075__Insert_base_cases_in__student.sql (100%)
 rename {src => server/src}/main/resources/db.migration/V0080__Insert_base_cases_in__user_role.sql (100%)

diff --git a/server/pom.xml b/server/pom.xml
index efc723b..8b19cbc 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -76,6 +76,10 @@
             <artifactId>postgresql</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-core</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -132,4 +136,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/main/java/ru/tubryansk/tdms/dto/DiplomaTopicDTO.java b/server/src/main/java/ru/tubryansk/tdms/dto/DiplomaTopicDTO.java
similarity index 100%
rename from src/main/java/ru/tubryansk/tdms/dto/DiplomaTopicDTO.java
rename to server/src/main/java/ru/tubryansk/tdms/dto/DiplomaTopicDTO.java
diff --git a/src/main/java/ru/tubryansk/tdms/dto/RoleDTO.java b/server/src/main/java/ru/tubryansk/tdms/dto/RoleDTO.java
similarity index 100%
rename from src/main/java/ru/tubryansk/tdms/dto/RoleDTO.java
rename to server/src/main/java/ru/tubryansk/tdms/dto/RoleDTO.java
diff --git a/src/main/java/ru/tubryansk/tdms/dto/StudentDTO.java b/server/src/main/java/ru/tubryansk/tdms/dto/StudentDTO.java
similarity index 100%
rename from src/main/java/ru/tubryansk/tdms/dto/StudentDTO.java
rename to server/src/main/java/ru/tubryansk/tdms/dto/StudentDTO.java
diff --git a/src/main/java/ru/tubryansk/tdms/dto/UserDTO.java b/server/src/main/java/ru/tubryansk/tdms/dto/UserDTO.java
similarity index 100%
rename from src/main/java/ru/tubryansk/tdms/dto/UserDTO.java
rename to server/src/main/java/ru/tubryansk/tdms/dto/UserDTO.java
diff --git a/src/main/java/ru/tubryansk/tdms/entity/DiplomaTopic.java b/server/src/main/java/ru/tubryansk/tdms/entity/DiplomaTopic.java
similarity index 100%
rename from src/main/java/ru/tubryansk/tdms/entity/DiplomaTopic.java
rename to server/src/main/java/ru/tubryansk/tdms/entity/DiplomaTopic.java
diff --git a/src/main/java/ru/tubryansk/tdms/entity/Group.java b/server/src/main/java/ru/tubryansk/tdms/entity/Group.java
similarity index 100%
rename from src/main/java/ru/tubryansk/tdms/entity/Group.java
rename to server/src/main/java/ru/tubryansk/tdms/entity/Group.java
diff --git a/src/main/java/ru/tubryansk/tdms/entity/Role.java b/server/src/main/java/ru/tubryansk/tdms/entity/Role.java
similarity index 100%
rename from src/main/java/ru/tubryansk/tdms/entity/Role.java
rename to server/src/main/java/ru/tubryansk/tdms/entity/Role.java
diff --git a/src/main/java/ru/tubryansk/tdms/entity/Student.java b/server/src/main/java/ru/tubryansk/tdms/entity/Student.java
similarity index 100%
rename from src/main/java/ru/tubryansk/tdms/entity/Student.java
rename to server/src/main/java/ru/tubryansk/tdms/entity/Student.java
diff --git a/src/main/java/ru/tubryansk/tdms/entity/User.java b/server/src/main/java/ru/tubryansk/tdms/entity/User.java
similarity index 100%
rename from src/main/java/ru/tubryansk/tdms/entity/User.java
rename to server/src/main/java/ru/tubryansk/tdms/entity/User.java
diff --git a/src/main/resources/db.migration/V00001__Create__role_table.sql b/server/src/main/resources/db.migration/V00001__Create__role_table.sql
similarity index 100%
rename from src/main/resources/db.migration/V00001__Create__role_table.sql
rename to server/src/main/resources/db.migration/V00001__Create__role_table.sql
diff --git a/src/main/resources/db.migration/V00010__Create__user_table.sql b/server/src/main/resources/db.migration/V00010__Create__user_table.sql
similarity index 100%
rename from src/main/resources/db.migration/V00010__Create__user_table.sql
rename to server/src/main/resources/db.migration/V00010__Create__user_table.sql
diff --git a/src/main/resources/db.migration/V00020__Create__user_role_table.sql b/server/src/main/resources/db.migration/V00020__Create__user_role_table.sql
similarity index 100%
rename from src/main/resources/db.migration/V00020__Create__user_role_table.sql
rename to server/src/main/resources/db.migration/V00020__Create__user_role_table.sql
diff --git a/src/main/resources/db.migration/V00030__Create__diploma_topic_table.sql b/server/src/main/resources/db.migration/V00030__Create__diploma_topic_table.sql
similarity index 100%
rename from src/main/resources/db.migration/V00030__Create__diploma_topic_table.sql
rename to server/src/main/resources/db.migration/V00030__Create__diploma_topic_table.sql
diff --git a/src/main/resources/db.migration/V00040__Create__group_table.sql b/server/src/main/resources/db.migration/V00040__Create__group_table.sql
similarity index 100%
rename from src/main/resources/db.migration/V00040__Create__group_table.sql
rename to server/src/main/resources/db.migration/V00040__Create__group_table.sql
diff --git a/src/main/resources/db.migration/V00050__Create__student_table.sql b/server/src/main/resources/db.migration/V00050__Create__student_table.sql
similarity index 100%
rename from src/main/resources/db.migration/V00050__Create__student_table.sql
rename to server/src/main/resources/db.migration/V00050__Create__student_table.sql
diff --git a/src/main/resources/db.migration/V0055__Insert_base_cases_in__diploma_topic.sql b/server/src/main/resources/db.migration/V0055__Insert_base_cases_in__diploma_topic.sql
similarity index 100%
rename from src/main/resources/db.migration/V0055__Insert_base_cases_in__diploma_topic.sql
rename to server/src/main/resources/db.migration/V0055__Insert_base_cases_in__diploma_topic.sql
diff --git a/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
similarity index 100%
rename from src/main/resources/db.migration/V0060__Insert_base_cases_in__user.sql
rename to server/src/main/resources/db.migration/V0060__Insert_base_cases_in__user.sql
diff --git a/src/main/resources/db.migration/V0065__Insert_base_cases_in__group.sql b/server/src/main/resources/db.migration/V0065__Insert_base_cases_in__group.sql
similarity index 100%
rename from src/main/resources/db.migration/V0065__Insert_base_cases_in__group.sql
rename to server/src/main/resources/db.migration/V0065__Insert_base_cases_in__group.sql
diff --git a/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
similarity index 100%
rename from src/main/resources/db.migration/V0070__Insert_base_cases_in__role.sql
rename to server/src/main/resources/db.migration/V0070__Insert_base_cases_in__role.sql
diff --git a/src/main/resources/db.migration/V0075__Insert_base_cases_in__student.sql b/server/src/main/resources/db.migration/V0075__Insert_base_cases_in__student.sql
similarity index 100%
rename from src/main/resources/db.migration/V0075__Insert_base_cases_in__student.sql
rename to server/src/main/resources/db.migration/V0075__Insert_base_cases_in__student.sql
diff --git a/src/main/resources/db.migration/V0080__Insert_base_cases_in__user_role.sql b/server/src/main/resources/db.migration/V0080__Insert_base_cases_in__user_role.sql
similarity index 100%
rename from src/main/resources/db.migration/V0080__Insert_base_cases_in__user_role.sql
rename to server/src/main/resources/db.migration/V0080__Insert_base_cases_in__user_role.sql