Merge main into endpoints

.github/workflows/docker-image.yml

@@ -40,6 +40,8 @@ jobs:
       SPRING_DATASOURCE_USERNAME: ${{ secrets.SPRING_DATASOURCE_USERNAME }}
       SPRING_DATASOURCE_PASSWORD: ${{ secrets.SPRING_DATASOURCE_PASSWORD }}
       SPRING_PROFILES_ACTIVE: ${{ secrets.SPRING_PROFILES_ACTIVE }}
+      EMAIL_USERNAME: ${{ secrets.EMAIL_USERNAME }}
+      EMAIL_PASSWORD: ${{ secrets.EMAIL_PASSWORD }}
 
     steps:
       - name: Checkout code
@@ -108,3 +110,6 @@ jobs:
             ghcr.io/${{ env.IMAGE_REPO }}:${{ github.run_number }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
+          build-args: |
+            EMAIL_USERNAME=${{ secrets.EMAIL_USERNAME }}
+            EMAIL_PASSWORD=${{ secrets.EMAIL_PASSWORD }}

README.md

@@ -18,27 +18,10 @@
 ### 1. Clone the repository
 
 ```shell
-docker pull ghcr.io/pkttteam/pkwmtt-backend:[PACKAGE_NUMBER]
+docker pull ghcr.io/pkttteam/pkwmtt-backend:latest
 ```
 
-### 2. Create a `.env` file
-
-Create `.env` file in project
-
-Update values like:
-
-```dotenv
-MYSQL_ROOT_PASSWORD=example
-MYSQL_DATABASE=example_db
-MYSQL_USER=username
-MYSQL_PASSWORD=password
-
-SPRING_DATASOURCE_URL=jdbc:mysql://localhost:3306/example_db
-SPRING_DATASOURCE_USERNAME=username
-SPRING_DATASOURCE_PASSWORD=password
-```
-
-### 3. Run
+### 2. Run
 
 ```shell
 docker run -d --name [image_name] -p 8080:8080 ghcr.io/pkttteam/pkwmttt-backend:[PACKAGE_NUMBER]

init.sql

@@ -3,7 +3,7 @@
 -- https://www.phpmyadmin.net/
 --
 -- Host: db
--- Generation Time: Lip 31, 2025 at 06:56 PM
+-- Generation Time: Aug 18, 2025 at 07:00 PM
 -- Wersja serwera: 9.3.0
 -- Wersja PHP: 8.2.27
 
@@ -32,10 +32,9 @@ USE `pktt`;
 DROP TABLE IF EXISTS `exams`;
 CREATE TABLE `exams` (
   `exam_id` int NOT NULL,
-  `title` varchar(255) DEFAULT NULL,
+  `title` varchar(255) NOT NULL,
   `description` varchar(255) DEFAULT NULL,
-  `date` datetime(6) DEFAULT NULL,
-  `groups` varchar(255) DEFAULT NULL,
+  `exam_date` datetime NOT NULL,
   `exam_type_id` int NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
@@ -48,10 +47,51 @@ TRUNCATE TABLE `exams`;
 -- Zrzut danych tabeli `exams`
 --
 
-INSERT INTO `exams` (`exam_id`, `title`, `description`, `date`, `groups`, `exam_type_id`) VALUES
-(1, 'Matematyka Dyskretna', 'Egzamin końcowy z matematyki dyskretnej', '2025-07-30 00:00:00.000000', '12K3,11L1', 2),
-(2, 'Programowanie C++', 'Kolokwium z programowania w C++', '2025-08-05 00:00:00.000000', '12K2,13S3', 1),
-(3, 'Sieci Komputerowe', 'Projekt zespołowy na sieciach komputerowych', '2025-09-10 00:00:00.000000', '14S4,12K1', 3);
+INSERT INTO `exams` (`exam_id`, `title`, `description`, `exam_date`, `exam_type_id`) VALUES
+(1, 'Kolokwium z matematyki', 'Pierwsze kolokwium obejmujące rozdziały 1–3', '2025-10-01 10:00:00', 1),
+(2, 'Egzamin końcowy z programowania', 'Egzamin pisemny i praktyczny', '2025-01-20 09:00:00', 2),
+(3, 'Projekt z baz danych', 'Oddanie projektu grupowego', '2025-06-15 23:59:00', 3),
+(4, 'Kolokwium z fizyki', 'Druga część materiału: mechanika', '2025-11-05 12:00:00', 1),
+(5, 'Egzamin końcowy z ekonomii', 'Egzamin pisemny testowy', '2025-02-10 08:30:00', 2),
+(6, 'Projekt z systemów operacyjnych', 'Prezentacja projektu semestralnego', '2025-06-25 14:00:00', 3);
+
+-- --------------------------------------------------------
+
+--
+-- Struktura tabeli dla tabeli `exams_groups`
+--
+
+DROP TABLE IF EXISTS `exams_groups`;
+CREATE TABLE `exams_groups` (
+  `exam_group_id` int NOT NULL,
+  `exam_id` int NOT NULL,
+  `group_id` int NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+--
+-- Tabela Truncate przed wstawieniem `exams_groups`
+--
+
+TRUNCATE TABLE `exams_groups`;
+--
+-- Zrzut danych tabeli `exams_groups`
+--
+
+INSERT INTO `exams_groups` (`exam_group_id`, `exam_id`, `group_id`) VALUES
+(7, 1, 9),
+(8, 1, 10),
+(9, 2, 12),
+(10, 2, 13),
+(11, 2, 14),
+(12, 3, 15),
+(13, 3, 16),
+(14, 3, 17),
+(15, 4, 9),
+(16, 4, 10),
+(17, 5, 12),
+(18, 5, 13),
+(19, 6, 15),
+(20, 6, 16);
 
 -- --------------------------------------------------------
 
@@ -62,7 +102,7 @@ INSERT INTO `exams` (`exam_id`, `title`, `description`, `date`, `groups`, `exam_
 DROP TABLE IF EXISTS `exam_type`;
 CREATE TABLE `exam_type` (
   `exam_type_id` int NOT NULL,
-  `name` varchar(255) DEFAULT NULL
+  `name` varchar(255) NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 --
@@ -88,7 +128,7 @@ INSERT INTO `exam_type` (`exam_type_id`, `name`) VALUES
 DROP TABLE IF EXISTS `general_group`;
 CREATE TABLE `general_group` (
   `general_group_id` int NOT NULL,
-  `name` varchar(255) DEFAULT NULL
+  `name` varchar(255) NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 --
@@ -101,10 +141,10 @@ TRUNCATE TABLE `general_group`;
 --
 
 INSERT INTO `general_group` (`general_group_id`, `name`) VALUES
-(11, '1'),
-(12, '2'),
-(13, '3'),
-(14, '4');
+(17, '11A'),
+(18, '12E'),
+(19, '13K'),
+(20, '14M');
 
 -- --------------------------------------------------------
 
@@ -115,10 +155,7 @@ INSERT INTO `general_group` (`general_group_id`, `name`) VALUES
 DROP TABLE IF EXISTS `groups`;
 CREATE TABLE `groups` (
   `group_id` int NOT NULL,
-  `letter` char(1) NOT NULL,
-  `group_count` int NOT NULL,
-  `general_group_id` int NOT NULL,
-  `name` varchar(255) DEFAULT NULL
+  `name` varchar(255) NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 --
@@ -130,15 +167,16 @@ TRUNCATE TABLE `groups`;
 -- Zrzut danych tabeli `groups`
 --
 
-INSERT INTO `groups` (`group_id`, `letter`, `group_count`, `general_group_id`, `name`) VALUES
-(1, 'K', 1, 11, NULL),
-(2, 'K', 2, 12, NULL),
-(3, 'L', 1, 11, NULL),
-(4, 'L', 2, 12, NULL),
-(5, 'S', 3, 13, NULL),
-(6, 'S', 4, 14, NULL),
-(7, 'K', 3, 12, NULL),
-(8, 'L', 4, 14, NULL);
+INSERT INTO `groups` (`group_id`, `name`) VALUES
+(9, '11A1'),
+(10, '11A2'),
+(12, '12E1'),
+(13, '12E2'),
+(14, '12E3'),
+(15, '13K1'),
+(16, '13K2'),
+(17, '13K3'),
+(18, '14M1');
 
 -- --------------------------------------------------------
 
@@ -148,19 +186,27 @@ INSERT INTO `groups` (`group_id`, `letter`, `group_count`, `general_group_id`, `
 
 DROP TABLE IF EXISTS `otp_codes`;
 CREATE TABLE `otp_codes` (
-  `code` varchar(255) DEFAULT NULL,
-  `expire` timestamp NOT NULL,
-  `used` tinyint(1) NOT NULL,
-  `user_id` int NOT NULL,
   `otp_code_id` int NOT NULL,
-  `timestamp` datetime(6) DEFAULT NULL
+  `code` varchar(255) NOT NULL,
+  `expire` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `general_group_id` int NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 --
 -- Tabela Truncate przed wstawieniem `otp_codes`
 --
 
 TRUNCATE TABLE `otp_codes`;
+--
+-- Zrzut danych tabeli `otp_codes`
+--
+
+INSERT INTO `otp_codes` (`otp_code_id`, `code`, `expire`, `general_group_id`) VALUES
+(1, 'ABC123', '2025-08-18 19:51:40', 17),
+(2, 'XYZ789', '2025-08-18 20:51:40', 18),
+(3, 'QWE456', '2025-08-18 21:51:40', 19),
+(4, 'JKL999', '2025-08-18 22:51:40', 20);
+
 -- --------------------------------------------------------
 
 --
@@ -171,9 +217,9 @@ DROP TABLE IF EXISTS `users`;
 CREATE TABLE `users` (
   `user_id` int NOT NULL,
   `general_group_id` int NOT NULL,
-  `email` varchar(254) NOT NULL,
-  `is_active` tinyint(1) NOT NULL,
-  `role` enum('ADMIN','REPRESENTATIVE') NOT NULL
+  `email` varchar(255) NOT NULL,
+  `is_active` tinyint(1) NOT NULL DEFAULT '1',
+  `role` enum('ADMIN','REPRESENTATIVE') NOT NULL DEFAULT 'REPRESENTATIVE'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 --
@@ -186,10 +232,10 @@ TRUNCATE TABLE `users`;
 --
 
 INSERT INTO `users` (`user_id`, `general_group_id`, `email`, `is_active`, `role`) VALUES
-(1, 12, 'jan.kowalski@example.com', 1, 'ADMIN'),
-(2, 11, 'anna.nowak@example.com', 1, 'REPRESENTATIVE'),
-(3, 13, 'piotr.zielinski@example.com', 0, 'REPRESENTATIVE'),
-(4, 14, 'ewa.wisniewska@example.com', 1, 'ADMIN');
+(1, 17, 'user11a@example.com', 1, 'REPRESENTATIVE'),
+(2, 18, 'user12e@example.com', 1, 'REPRESENTATIVE'),
+(3, 19, 'user13k@example.com', 1, 'REPRESENTATIVE'),
+(4, 20, 'user14m@example.com', 1, 'ADMIN');
 
 --
 -- Indeksy dla zrzutów tabel
@@ -200,8 +246,15 @@ INSERT INTO `users` (`user_id`, `general_group_id`, `email`, `is_active`, `role`
 --
 ALTER TABLE `exams`
   ADD PRIMARY KEY (`exam_id`),
-  ADD KEY `exam_type` (`exam_type_id`),
-  ADD KEY `exam_type_id` (`exam_type_id`);
+  ADD KEY `exam_type_id_idx` (`exam_type_id`);
+
+--
+-- Indeksy dla tabeli `exams_groups`
+--
+ALTER TABLE `exams_groups`
+  ADD PRIMARY KEY (`exam_group_id`),
+  ADD KEY `exam_id_idx` (`exam_id`),
+  ADD KEY `group_id_idx` (`group_id`);
 
 --
 -- Indeksy dla tabeli `exam_type`
@@ -219,28 +272,38 @@ ALTER TABLE `general_group`
 -- Indeksy dla tabeli `groups`
 --
 ALTER TABLE `groups`
-  ADD PRIMARY KEY (`group_id`),
-  ADD KEY `general_group` (`general_group_id`),
-  ADD KEY `general_group_id` (`general_group_id`);
+  ADD PRIMARY KEY (`group_id`);
 
 --
 -- Indeksy dla tabeli `otp_codes`
 --
 ALTER TABLE `otp_codes`
   ADD PRIMARY KEY (`otp_code_id`),
-  ADD KEY `user_id` (`user_id`);
+  ADD KEY `general_group_id_idx` (`general_group_id`);
 
 --
 -- Indeksy dla tabeli `users`
 --
 ALTER TABLE `users`
   ADD PRIMARY KEY (`user_id`),
-  ADD KEY `general_group_id` (`general_group_id`);
+  ADD KEY `general_group_id_idx` (`general_group_id`);
 
 --
 -- AUTO_INCREMENT dla zrzuconych tabel
 --
 
+--
+-- AUTO_INCREMENT dla tabeli `exams`
+--
+ALTER TABLE `exams`
+  MODIFY `exam_id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=7;
+
+--
+-- AUTO_INCREMENT dla tabeli `exams_groups`
+--
+ALTER TABLE `exams_groups`
+  MODIFY `exam_group_id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=21;
+
 --
 -- AUTO_INCREMENT dla tabeli `exam_type`
 --
@@ -251,13 +314,19 @@ ALTER TABLE `exam_type`
 -- AUTO_INCREMENT dla tabeli `general_group`
 --
 ALTER TABLE `general_group`
-  MODIFY `general_group_id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=15;
+  MODIFY `general_group_id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=21;
 
 --
 -- AUTO_INCREMENT dla tabeli `groups`
 --
 ALTER TABLE `groups`
-  MODIFY `group_id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=9;
+  MODIFY `group_id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=21;
+
+--
+-- AUTO_INCREMENT dla tabeli `otp_codes`
+--
+ALTER TABLE `otp_codes`
+  MODIFY `otp_code_id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=5;
 
 --
 -- AUTO_INCREMENT dla tabeli `users`
@@ -273,25 +342,26 @@ ALTER TABLE `users`
 -- Ograniczenia dla tabeli `exams`
 --
 ALTER TABLE `exams`
-  ADD CONSTRAINT `exams_ibfk_1` FOREIGN KEY (`exam_type_id`) REFERENCES `exam_type` (`exam_type_id`);
+  ADD CONSTRAINT `exams_ibfk_1` FOREIGN KEY (`exam_type_id`) REFERENCES `exam_type` (`exam_type_id`) ON DELETE CASCADE;
 
 --
--- Ograniczenia dla tabeli `groups`
+-- Ograniczenia dla tabeli `exams_groups`
 --
-ALTER TABLE `groups`
-  ADD CONSTRAINT `groups_ibfk_1` FOREIGN KEY (`general_group_id`) REFERENCES `general_group` (`general_group_id`);
+ALTER TABLE `exams_groups`
+  ADD CONSTRAINT `exams_groups_ibfk_1` FOREIGN KEY (`exam_id`) REFERENCES `exams` (`exam_id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `exams_groups_ibfk_2` FOREIGN KEY (`group_id`) REFERENCES `groups` (`group_id`) ON DELETE CASCADE;
 
 --
 -- Ograniczenia dla tabeli `otp_codes`
 --
 ALTER TABLE `otp_codes`
-  ADD CONSTRAINT `otp_codes_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `users` (`user_id`);
+  ADD CONSTRAINT `otp_codes_ibfk_1` FOREIGN KEY (`general_group_id`) REFERENCES `general_group` (`general_group_id`) ON DELETE CASCADE;
 
 --
 -- Ograniczenia dla tabeli `users`
 --
 ALTER TABLE `users`
-  ADD CONSTRAINT `users_ibfk_1` FOREIGN KEY (`general_group_id`) REFERENCES `general_group` (`general_group_id`);
+  ADD CONSTRAINT `users_ibfk_1` FOREIGN KEY (`general_group_id`) REFERENCES `general_group` (`general_group_id`) ON DELETE CASCADE;
 COMMIT;
 
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;