From 5a5342126bcd0070b32c7e3cf6968e63a8b82a94 Mon Sep 17 00:00:00 2001 From: Omur Sahin Date: Sat, 19 Sep 2026 11:37:34 +0300 Subject: [PATCH] source codes --- .../cs/rest/testing-system/.env.example | 7 + .../cs/rest/testing-system/.gitattributes | 2 + .../testing-system/.github/dependabot.yml | 11 + .../cs/rest/testing-system/.gitignore | 34 +++ .../.mvn/wrapper/maven-wrapper.properties | 19 ++ jdk_21_maven/cs/rest/testing-system/LICENSE | 21 ++ jdk_21_maven/cs/rest/testing-system/README.md | 117 ++++++++ .../cs/rest/testing-system/docker-compose.yml | 51 ++++ .../cs/rest/testing-system/docker/Dockerfile | 13 + .../docker/sql/01_create_tables.sql | 123 ++++++++ .../docker/sql/02_insert_data.sql | 116 ++++++++ jdk_21_maven/cs/rest/testing-system/mvnw | 259 +++++++++++++++++ jdk_21_maven/cs/rest/testing-system/mvnw.cmd | 149 ++++++++++ jdk_21_maven/cs/rest/testing-system/pom.xml | 129 +++++++++ .../src/main/frontend/.gitignore | 4 + .../TestingSystemApplication.java | 12 + .../testing_system/configs/AppConfig.java | 64 +++++ .../configs/GlobalErrorAttributes.java | 35 +++ .../configs/JwtAuthenticationFilter.java | 65 +++++ .../testing_system/configs/OpenApiConfig.java | 73 +++++ .../configs/PageableWithFilterResolver.java | 269 +++++++++++++++++ .../configs/SecurityConfig.java | 91 ++++++ .../testing_system/configs/WebMvcConfig.java | 21 ++ .../controllers/AuthController.java | 50 ++++ .../controllers/TestEventController.java | 42 +++ .../controllers/TestTakerController.java | 40 +++ .../controllers/UserManagementController.java | 64 +++++ .../testing_system/dtos/AuthResponseDTO.java | 14 + .../dtos/GenericErrorResponse.java | 65 +++++ .../testing_system/dtos/PagedResponse.java | 85 ++++++ .../testing_system/dtos/TestAttemptDTO.java | 8 + .../dtos/TestEventResponseDTO.java | 44 +++ .../testing_system/dtos/TestResponseDTO.java | 33 +++ .../dtos/TestTakerRegisterRequestDTO.java | 22 ++ .../dtos/UserCreateRequestDTO.java | 25 ++ .../dtos/UserLoginRequestDTO.java | 13 + .../testing_system/dtos/UserRequestDTO.java | 15 + .../testing_system/dtos/UserResponseDTO.java | 71 +++++ .../dtos/WrapResponseWithContentKey.java | 17 ++ .../exceptions/ExceptionHandlerFilter.java | 47 +++ .../exceptions/GenericValidationError.java | 13 + .../GlobalControllerExceptionHandler.java | 76 +++++ .../exceptions/InvalidTokenException.java | 17 ++ .../exceptions/ResourceNotFoundException.java | 17 ++ .../exceptions/ResponseStatusException.java | 20 ++ .../exceptions/UnauthorizedException.java | 17 ++ .../exceptions/UserAccountBlocked.java | 17 ++ .../testing_system/models/Permission.java | 56 ++++ .../mirodil/testing_system/models/Role.java | 71 +++++ .../mirodil/testing_system/models/Test.java | 116 ++++++++ .../testing_system/models/TestAttempt.java | 47 +++ .../testing_system/models/TestEvent.java | 170 +++++++++++ .../mirodil/testing_system/models/User.java | 208 ++++++++++++++ .../models/enums/PermissionType.java | 21 ++ .../models/enums/TestEventStatus.java | 13 + .../models/enums/UserGender.java | 32 +++ .../models/enums/UserGenderDeserializer.java | 21 ++ .../testing_system/models/enums/UserRole.java | 9 + .../models/enums/UserRoleDeserializer.java | 21 ++ .../models/enums/UserStatus.java | 7 + .../CustomTestEventRepository.java | 12 + .../repositories/CustomUserRepository.java | 12 + .../GenericRepositoryWithPagination.java | 12 + .../repositories/GenericRowMapper.java | 25 ++ .../repositories/RoleRepository.java | 23 ++ .../RoleWithPermissionResultSetExtractor.java | 38 +++ .../repositories/TestEventRepository.java | 15 + .../repositories/UserRepository.java | 28 ++ .../UserWithPermissionResultSetExtractor.java | 42 +++ .../impls/CustomTestEventRepositoryImpl.java | 43 +++ .../impls/CustomUserRepositoryImpl.java | 45 +++ .../GenericRepositoryWithPaginationImpl.java | 65 +++++ .../testing_system/services/AuthService.java | 51 ++++ .../services/TestEventService.java | 41 +++ .../testing_system/services/UserService.java | 115 ++++++++ .../mirodil/testing_system/utils/AppUtil.java | 14 + .../testing_system/utils/AuthUtil.java | 179 ++++++++++++ .../testing_system/utils/DataUtil.java | 271 ++++++++++++++++++ .../testing_system/utils/FilterCriteria.java | 11 + .../utils/PageWithFilterRequest.java | 46 +++ .../testing_system/utils/ValidationUtil.java | 112 ++++++++ .../validations/UniqueEmail.java | 18 ++ .../validations/UniqueEmailValidator.java | 29 ++ .../ValidTestEventPageRequest.java | 9 + .../validations/ValidUserPageRequest.java | 9 + .../src/main/resources/application.properties | 17 ++ .../src/main/resources/static/index.html | 10 + .../TestingSystemApplicationTests.java | 13 + .../PageableWithFilterResolverTest.java | 167 +++++++++++ 89 files changed, 4781 insertions(+) create mode 100644 jdk_21_maven/cs/rest/testing-system/.env.example create mode 100644 jdk_21_maven/cs/rest/testing-system/.gitattributes create mode 100644 jdk_21_maven/cs/rest/testing-system/.github/dependabot.yml create mode 100644 jdk_21_maven/cs/rest/testing-system/.gitignore create mode 100644 jdk_21_maven/cs/rest/testing-system/.mvn/wrapper/maven-wrapper.properties create mode 100644 jdk_21_maven/cs/rest/testing-system/LICENSE create mode 100644 jdk_21_maven/cs/rest/testing-system/README.md create mode 100644 jdk_21_maven/cs/rest/testing-system/docker-compose.yml create mode 100644 jdk_21_maven/cs/rest/testing-system/docker/Dockerfile create mode 100644 jdk_21_maven/cs/rest/testing-system/docker/sql/01_create_tables.sql create mode 100644 jdk_21_maven/cs/rest/testing-system/docker/sql/02_insert_data.sql create mode 100644 jdk_21_maven/cs/rest/testing-system/mvnw create mode 100644 jdk_21_maven/cs/rest/testing-system/mvnw.cmd create mode 100644 jdk_21_maven/cs/rest/testing-system/pom.xml create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/frontend/.gitignore create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/TestingSystemApplication.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/configs/AppConfig.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/configs/GlobalErrorAttributes.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/configs/JwtAuthenticationFilter.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/configs/OpenApiConfig.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/configs/PageableWithFilterResolver.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/configs/SecurityConfig.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/configs/WebMvcConfig.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/controllers/AuthController.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/controllers/TestEventController.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/controllers/TestTakerController.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/controllers/UserManagementController.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/AuthResponseDTO.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/GenericErrorResponse.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/PagedResponse.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/TestAttemptDTO.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/TestEventResponseDTO.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/TestResponseDTO.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/TestTakerRegisterRequestDTO.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/UserCreateRequestDTO.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/UserLoginRequestDTO.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/UserRequestDTO.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/UserResponseDTO.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/WrapResponseWithContentKey.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/ExceptionHandlerFilter.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/GenericValidationError.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/GlobalControllerExceptionHandler.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/InvalidTokenException.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/ResourceNotFoundException.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/ResponseStatusException.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/UnauthorizedException.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/UserAccountBlocked.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/Permission.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/Role.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/Test.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/TestAttempt.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/TestEvent.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/User.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/enums/PermissionType.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/enums/TestEventStatus.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/enums/UserGender.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/enums/UserGenderDeserializer.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/enums/UserRole.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/enums/UserRoleDeserializer.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/enums/UserStatus.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/CustomTestEventRepository.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/CustomUserRepository.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/GenericRepositoryWithPagination.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/GenericRowMapper.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/RoleRepository.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/RoleWithPermissionResultSetExtractor.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/TestEventRepository.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/UserRepository.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/UserWithPermissionResultSetExtractor.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/impls/CustomTestEventRepositoryImpl.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/impls/CustomUserRepositoryImpl.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/impls/GenericRepositoryWithPaginationImpl.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/services/AuthService.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/services/TestEventService.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/services/UserService.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/utils/AppUtil.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/utils/AuthUtil.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/utils/DataUtil.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/utils/FilterCriteria.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/utils/PageWithFilterRequest.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/utils/ValidationUtil.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/validations/UniqueEmail.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/validations/UniqueEmailValidator.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/validations/ValidTestEventPageRequest.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/validations/ValidUserPageRequest.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/resources/application.properties create mode 100644 jdk_21_maven/cs/rest/testing-system/src/main/resources/static/index.html create mode 100644 jdk_21_maven/cs/rest/testing-system/src/test/java/dev/mirodil/testing_system/TestingSystemApplicationTests.java create mode 100644 jdk_21_maven/cs/rest/testing-system/src/test/java/dev/mirodil/testing_system/configs/PageableWithFilterResolverTest.java diff --git a/jdk_21_maven/cs/rest/testing-system/.env.example b/jdk_21_maven/cs/rest/testing-system/.env.example new file mode 100644 index 000000000..f25d87140 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/.env.example @@ -0,0 +1,7 @@ +POSTGRES_URL=jdbc:postgresql://db:5432/testing_system +POSTGRES_DB=testing_system +POSTGRES_USER=root +POSTGRES_PASSWORD=root +SECRET_KEY= +SPRING_DATA_REDIS_HOST=redis +SPRING_DATA_REDIS_PORT=6379 \ No newline at end of file diff --git a/jdk_21_maven/cs/rest/testing-system/.gitattributes b/jdk_21_maven/cs/rest/testing-system/.gitattributes new file mode 100644 index 000000000..3b41682ac --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/jdk_21_maven/cs/rest/testing-system/.github/dependabot.yml b/jdk_21_maven/cs/rest/testing-system/.github/dependabot.yml new file mode 100644 index 000000000..9c837ba1f --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/.github/dependabot.yml @@ -0,0 +1,11 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file + +version: 2 +updates: + - package-ecosystem: "maven" + directory: "/" + schedule: + interval: "weekly" diff --git a/jdk_21_maven/cs/rest/testing-system/.gitignore b/jdk_21_maven/cs/rest/testing-system/.gitignore new file mode 100644 index 000000000..fcbeb77b7 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/.gitignore @@ -0,0 +1,34 @@ +.env +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ +docker/postgres_data/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/jdk_21_maven/cs/rest/testing-system/.mvn/wrapper/maven-wrapper.properties b/jdk_21_maven/cs/rest/testing-system/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 000000000..d58dfb70b --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip diff --git a/jdk_21_maven/cs/rest/testing-system/LICENSE b/jdk_21_maven/cs/rest/testing-system/LICENSE new file mode 100644 index 000000000..4e46ee269 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2025 Mirodil Kamilov + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/jdk_21_maven/cs/rest/testing-system/README.md b/jdk_21_maven/cs/rest/testing-system/README.md new file mode 100644 index 000000000..f03005b0e --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/README.md @@ -0,0 +1,117 @@ +# Testing System + +**_Note:_** 🚧 _This project is under development. Service interruptions may occur in the production environment._ 🚧 + +## Overview + +The Testing System REST API is a backend application that manages test creation, participation, and result evaluation. +This project showcases backend development expertise using modern technologies and the **Spring Boot framework**. + +## Key Features + +- **User Management**: Admins control accounts and test assignments while test takers participate with automatic + progress saving. +- **Test Management**: Admins create and assign tests with multiple question types (MCQ, Checkbox, True/False, Text). +- **Results Management**: Automatic evaluation with pass/fail status and summaries. +- **Secure and Scalable**: Role-based access control with little effort to scale, encrypted password storage, and + modular design. + +For a detailed breakdown of the software requirements, refer to [this document](Software%20Requirements%20Document.pdf). + +## Tech Stack + +- **Backend Framework**: Spring Boot 3 +- **Database**: PostgreSQL +- **Persistence**: Spring Data JDBC and Spring JDBC Template +- **Caching**: Redis (for token blocklisting & autosave test progress) +- **Security**: Spring Security (Authentication & Authorization) +- **Containerization**: Docker +- **Documentation**: Swagger UI (OpenAPI) +- **Testing & Debugging**: Postman +- **Cloud Deployment** + +## Diagrams + +### Entity-Relationship Diagram (ERD) + +The following ER diagram shows the core database structure of the Testing System: +![ER Diagram](ER_Diagram.jpg) + +### API Examples + +![Example responses](example_responses.png) + +For exploring and testing complete API endpoints, visit +the [Swagger UI](https://testing.mirodil.dev/api/swagger-ui.html) +or [Postman collection](https://www.postman.com/mirodil-dev/workspace/testing-system) with saved +examples. + +## Installation & Setup + +If you'd like to simply access the API, you can use the +already [deployed application](https://testing.mirodil.dev/api/swagger-ui.html). However, if you prefer to set it +up locally, follow the steps below. + +### Prerequisites + +Before starting, ensure the following tools are installed on your system: + +1. [**Docker**](https://docs.docker.com/get-started/get-docker/): Version 20.10 or higher + +2. **Docker Compose**: Version 1.29 or higher (included with Docker Desktop) + +### Steps + +Clone the Testing System project from the GitHub repository: + +```bash +git clone https://github.com/mirodilkamilov/testing-system.git +cd testing-system +``` + +Copy `.env.example` to create your `.env` file and make sure you set `SECRET_KEY` variable. It should be at least 32 +character long: + +```bash +cp .env.example .env +``` + +Use Maven to package the application as a JAR file. Skip tests during this step since containerized PostgreSQL and Redis +won't be running yet: + +```bash +./mvnw clean package -DskipTests +``` + +Build and start the Docker containers (you can add the -d option to run in detached mode): + +```docker +docker-compose up --build +``` + +Once the containers are running, the application will be available at http://localhost:8080. You can navigate +to http://localhost:8080/api/swagger-ui.html to view the API documentation. + +To stop and remove the containers, run: + +```docker +docker-compose down +``` + +### Frontend Integration + +To allow frontend developers to integrate with the backend during local development, CORS has been configured to permit +requests from the following origins: + +- http://localhost:3000 +- http://127.0.0.1:3000 + +If you're working on a frontend application, you can make API calls to the backend without encountering CORS-related +issues. Ensure your frontend is running on one of the allowed origins above. + +## Contribute + +I developed this project to showcase my Java skills and web technologies. Developers interested in building a +user-friendly interface for this application are welcome to contribute. I also invite anyone who wants to enhance and +extend the existing functionality, helping this project evolve and improve. + diff --git a/jdk_21_maven/cs/rest/testing-system/docker-compose.yml b/jdk_21_maven/cs/rest/testing-system/docker-compose.yml new file mode 100644 index 000000000..6d22e72b9 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/docker-compose.yml @@ -0,0 +1,51 @@ +version: '3.8' + +services: + app: + container_name: testing-system + build: + context: . + dockerfile: docker/Dockerfile + ports: + - "8080:8080" + env_file: + - .env + environment: + SPRING_DATASOURCE_URL: ${POSTGRES_URL} + SPRING_DATASOURCE_USERNAME: ${POSTGRES_USER} + SPRING_DATASOURCE_PASSWORD: ${POSTGRES_PASSWORD} + SECRET_KEY: ${SECRET_KEY} + SPRING_DATA_REDIS_HOST: redis + depends_on: + - db + - redis + networks: + - testing-network + + db: + image: postgres:17.2 + container_name: postgres + restart: always + environment: + POSTGRES_DB: ${POSTGRES_DB} + POSTGRES_USER: ${POSTGRES_USER} + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} + networks: + - testing-network + volumes: + - ./docker/postgres_data:/var/lib/postgresql/data + - ./docker/sql:/docker-entrypoint-initdb.d + + redis: + image: redis:7.4 + container_name: redis + restart: always + networks: + - testing-network + +networks: + testing-network: + driver: bridge + +volumes: + postgres_data: diff --git a/jdk_21_maven/cs/rest/testing-system/docker/Dockerfile b/jdk_21_maven/cs/rest/testing-system/docker/Dockerfile new file mode 100644 index 000000000..38e6b2c5f --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/docker/Dockerfile @@ -0,0 +1,13 @@ +FROM eclipse-temurin:21-jdk + +# Set working directory +WORKDIR /app + +# First run "./mvnw clean package" locally +COPY target/testing-system-0.0.1-SNAPSHOT.jar /app/target/testing-system.jar + +# Expose port +EXPOSE 8080 + +# Run the Spring Boot application +ENTRYPOINT ["java", "-jar", "/app/target/testing-system.jar"] diff --git a/jdk_21_maven/cs/rest/testing-system/docker/sql/01_create_tables.sql b/jdk_21_maven/cs/rest/testing-system/docker/sql/01_create_tables.sql new file mode 100644 index 000000000..991542e15 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/docker/sql/01_create_tables.sql @@ -0,0 +1,123 @@ +CREATE TABLE roles +( + id SERIAL PRIMARY KEY, + name VARCHAR(50) UNIQUE +); + +CREATE TABLE permissions +( + id SERIAL PRIMARY KEY, + name VARCHAR(50) UNIQUE NOT NULL, + description VARCHAR(256) NULL +); + +CREATE TABLE role_permissions +( + role_id BIGINT REFERENCES roles (id), + permission_id BIGINT REFERENCES permissions (id), + PRIMARY KEY (role_id, permission_id) +); + +CREATE TABLE users +( + id SERIAL PRIMARY KEY, + email VARCHAR(100) UNIQUE NOT NULL, + password VARCHAR(256) NOT NULL, + role_id BIGINT REFERENCES roles (id) NOT NULL, + fname VARCHAR(100) NOT NULL, + lname VARCHAR(100) NOT NULL, + gender VARCHAR(10) NOT NULL, + status VARCHAR(50) DEFAULT 'ACTIVE'::CHARACTER VARYING NOT NULL, + created_at TIMESTAMP(0) WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP +); +CREATE UNIQUE INDEX idx_users_email ON users (email); + +CREATE TABLE tests +( + id SERIAL PRIMARY KEY, + title VARCHAR(256) NOT NULL, + description TEXT NULL, + duration INTEGER NOT NULL, + no_of_questions INTEGER NOT NULL, + passing_percentage INTEGER NOT NULL, + should_shuffle BOOLEAN DEFAULT TRUE NOT NULL, + should_randomly_pick BOOLEAN DEFAULT TRUE NOT NULL, + deleted_at TIMESTAMP(0) WITH TIME ZONE NULL +); + +CREATE TABLE test_events +( + id SERIAL PRIMARY KEY, + test_taker_id BIGINT REFERENCES users (id) NOT NULL, + test_id BIGINT REFERENCES tests (id) ON DELETE SET NULL, + event_datetime TIMESTAMP(0) WITH TIME ZONE NOT NULL, + status VARCHAR(50) DEFAULT 'SCHEDULED'::CHARACTER VARYING NOT NULL, + score_points REAL NULL, + score_percentage INTEGER NULL, + is_passed BOOLEAN NULL, + started_at TIMESTAMP(0) WITH TIME ZONE NULL, + finished_at TIMESTAMP(0) WITH TIME ZONE NULL, + created_at TIMESTAMP(0) WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + test_attempt jsonb NULL +); + +CREATE TABLE question_types +( + id SERIAL PRIMARY KEY, + type VARCHAR(100) UNIQUE NOT NULL +); + +CREATE TABLE questions +( + id SERIAL PRIMARY KEY, + test_id BIGINT REFERENCES tests (id) ON DELETE CASCADE, + question_type_id BIGINT REFERENCES question_types (id), + title VARCHAR(256) NOT NULL, + description TEXT NULL, + image VARCHAR(256) NULL, + point REAL NOT NULL +); + +CREATE TABLE options +( + id SERIAL PRIMARY KEY, + question_id BIGINT REFERENCES questions (id) ON DELETE CASCADE, + option VARCHAR(256) NOT NULL, + is_answer BOOLEAN NOT NULL +); + +-- Views -- +CREATE VIEW test_events_view AS +SELECT te.id AS test_event_id, + event_datetime, + te.status AS test_event_status, + score_points, + score_percentage, + is_passed, + started_at, + finished_at, + te.created_at AS test_event_created_at, + test_attempt, + test_taker_id, + email, + password, + role_id, + roles.name AS role_name, + fname, + lname, + gender, + u.status AS user_status, + u.created_at AS user_created_at, + te.test_id AS test_id, + title, + description, + duration, + no_of_questions, + passing_percentage, + should_shuffle, + should_randomly_pick, + deleted_at +FROM test_events te + LEFT JOIN users u ON u.id = te.test_taker_id + LEFT JOIN roles ON roles.id = u.role_id + LEFT JOIN tests ON tests.id = te.test_id; diff --git a/jdk_21_maven/cs/rest/testing-system/docker/sql/02_insert_data.sql b/jdk_21_maven/cs/rest/testing-system/docker/sql/02_insert_data.sql new file mode 100644 index 000000000..f7c5e9228 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/docker/sql/02_insert_data.sql @@ -0,0 +1,116 @@ +INSERT INTO roles(name) +VALUES ('ADMIN'); +INSERT INTO roles(name) +VALUES ('TEST_TAKER'); + +INSERT INTO permissions(name, description) +VALUES ('VIEW_PROFILE', 'Ability to view own profile.'), + ('MANAGE_PROFILE', 'Ability to update own profile details.'), + ('VIEW_ASSIGNED_TEST', 'Ability to access assigned test to the user.'), + ('VIEW_ASSIGNED_TEST_RESULTS', 'Ability to view (past) assigned test results to the user.'), + + ('VIEW_ASSIGNED_TEST_TAKERS', 'Ability to view, search all assigned test takers.'), + ('VIEW_ALL_TEST_TAKERS', 'Ability to view, search all test takers.'), + ('MANAGE_TEST_TAKERS', 'Ability to add, update, and deactivate test takers.'), + ('MANAGE_ALL_USERS', 'Ability to add, update, and deactivate all users.'), -- id: 8 + + ('VIEW_ALL_TESTS', 'Ability to view all tests (inc. questions and answers).'), + ('MANAGE_OWN_TESTS', 'Ability to create, update, or delete only owned tests.'), + ('MANAGE_ALL_TESTS', 'Ability to create, update, or delete tests.'), + ('VIEW_ALL_TEST_RESULTS', 'Ability to view all (past) test results.'), -- id: 12 + + ('MANAGE_TEST_EVENTS', '(Assign and) manage test events assigned to test takers.'), + ('MONITOR_TESTS', 'Monitor test takers during tests.'); + +INSERT INTO role_permissions(role_id, permission_id) +VALUES (1, 1), + (1, 2), + (1, 5), + (1, 6), + (1, 7), + (1, 8), + (1, 9), + (1, 10), + (1, 11), + (1, 12), + (1, 13), + (1, 14), + + (2, 1), + (2, 2), + (2, 3), + (2, 4); + +INSERT INTO users (email, password, role_id, fname, lname, gender, status, created_at) +VALUES ('john.doe@gmail.com', '$2a$10$EF1x/Pd5OxIASv6Ui9aP2.fhyaMV1akRlnkfCu6om6OtMmcHo6ZNy', 2, + 'John', 'Doe', 'MALE', 'ACTIVE', '2025-01-19 12:03:50'), + ('maryam@gmail.com', '$2a$10$2cvUcn8pQ/foOboU.egQgegyt44ziaAmC4aq8KTgfcnEZ/kINRr/.', 2, + 'Maryam', 'Imran', 'FEMALE', 'ACTIVE', '2025-01-18 19:33:11'), + ('info44@mirodil.dev', '$2a$10$KiRDi5QT59fQxP7eSEsfYeY11JVl/qHwcorVKLpWrEx7o1NJYtLwC', 2, + 'Mirodil', 'Kamilov', 'MALE', 'ACTIVE', '2025-01-18 18:02:58'), + ('mirjalol@gmail.nl', '$2a$10$NTMyNaW3aWYy3AUqRs2rfuCmP1aMHJfb3c0R3MgGCdIuCj1AyWz/O', 2, + 'Mirjalol', 'Kamilov', 'MALE', 'ACTIVE', '2025-01-15 12:50:09'), + ('whatever@mirodil.dev', '$2a$10$Dvq4/DEIqsNGAS9HsWxpFuif/VHyHWWlX3je2CNRhqz.X/8iBTQrW', 2, + 'Mirodil', 'Kamilov', 'MALE', 'ACTIVE', '2025-01-14 15:52:57'), + ('info@mirodil.dev', '$2a$10$z9LZxrMJm/JgovAYdR/qvODExHSoBeH9H3yS0K5fUsb6il8s4EiRu', 1, 'Mirodil', + 'Kamilov', 'MALE', 'ACTIVE', '2025-01-14 15:12:27'), + ('mirodig@lcc.com', '$2a$10$RWz46v.NmrpmD4TZO0N0Nex8BjQB9a.clUq96rkhYjAoyt9gtoyIa', 2, 'Mirodil', + 'Kamilov', 'MALE', 'ACTIVE', '2025-01-14 14:45:00'), + ('test2@lcc.com', '$2a$10$ZEji2CcB.y7XfjSVGGzxzelkp3gyY5oK2lZZn5mHYezopWm.xS7Wq', 2, 'Mirodil', + 'Kamilov', 'MALE', 'ACTIVE', '2025-01-14 13:57:38'), + ('mirodil@cc.com', '$2a$10$9blp1VSeaH/HmHFAFLKZlOg4n5lb7FVlmIO5MA/6sJsPVKGK0HM6i', 2, 'Mirodil', + 'Kamilov', 'MALE', 'ACTIVE', '2025-01-14 12:41:03'), + ('mirodil@www.com', '$2a$10$r2VqD7QrtTzaxbDWzYSmz.Jy/xo3jCKcKbDhRs3sWdwRW/Hc.EERG', 2, 'Mirodil', + 'Kamilov', 'MALE', 'ACTIVE', '2025-01-14 12:16:31'); + +INSERT INTO tests(title, description, duration, no_of_questions, passing_percentage, should_shuffle, + should_randomly_pick, deleted_at) +VALUES ('Java Basics', 'A test covering basic Java concepts including syntax, data types, and control structures.', + 60, 20, 70, TRUE, FALSE, NULL), + ('Spring Boot Fundamentals', + 'Test on Spring Boot fundamentals, including configuration, annotations, and REST APIs.', + 90, 25, 75, TRUE, TRUE, NULL), + ('PostgreSQL Advanced', + NULL, 75, 30, 80, FALSE, TRUE, NULL), + ('Data Structures and Algorithms', + 'A test covering various data structures and algorithms like sorting, searching, and recursion.', + 120, 40, 85, TRUE, FALSE, NULL), + ('DevOps and CI/CD', 'A test covering DevOps practices, CI/CD pipelines, and infrastructure automation.', + 80, 25, 78, FALSE, TRUE, NULL), + ('Python Programming', 'A test on Python syntax, data structures, and object-oriented programming.', + 70, 20, 72, TRUE, TRUE, NULL), + ('Software Engineering Principles', + 'A test on software development methodologies, design patterns, and best practices.', + 90, 30, 80, FALSE, FALSE, NULL); + +INSERT INTO test_events (test_taker_id, test_id, event_datetime, status, score_points, score_percentage, is_passed, + started_at, finished_at, test_attempt) +VALUES (1, 1, '2025-02-06 14:00:00', 'COMPLETED', 16.5, 75, TRUE, '2025-02-06 14:02:10', '2025-02-06 15:02:00', + '[ + { + "question_id": 1001, + "selected_option_id": 5001, + "is_correct": true + }, + { + "question_id": 1002, + "selected_option_id": 5005, + "is_correct": false + }, + { + "question_id": 1003, + "selected_option_id": 5009, + "is_correct": true + }, + { + "question_id": 1004, + "selected_option_id": 5011, + "is_correct": true + } + ]'), + (2, 1, '2025-02-10 14:00:00', 'SCHEDULED', NULL, NULL, NULL, NULL, NULL, NULL), + (3, 2, '2025-02-09 14:00:00', 'SCHEDULED', NULL, NULL, NULL, NULL, NULL, NULL), + (3, 3, '2025-02-10 14:00:00', 'SCHEDULED', NULL, NULL, NULL, NULL, NULL, NULL), + (4, 3, '2025-02-15 09:00:00', 'SCHEDULED', NULL, NULL, NULL, NULL, NULL, NULL), + (5, 4, '2025-02-17 09:30:00', 'SCHEDULED', NULL, NULL, NULL, NULL, NULL, NULL); + diff --git a/jdk_21_maven/cs/rest/testing-system/mvnw b/jdk_21_maven/cs/rest/testing-system/mvnw new file mode 100644 index 000000000..19529ddf8 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/mvnw @@ -0,0 +1,259 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.2 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/jdk_21_maven/cs/rest/testing-system/mvnw.cmd b/jdk_21_maven/cs/rest/testing-system/mvnw.cmd new file mode 100644 index 000000000..249bdf382 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/mvnw.cmd @@ -0,0 +1,149 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/jdk_21_maven/cs/rest/testing-system/pom.xml b/jdk_21_maven/cs/rest/testing-system/pom.xml new file mode 100644 index 000000000..2298c1e11 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/pom.xml @@ -0,0 +1,129 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.5.14 + + + dev.mirodil + testing-system + 0.0.1-SNAPSHOT + testing-system + Testing System project with Spring Boot + + + + + + + + + + + + + + + 21 + + + + org.springframework.boot + spring-boot-starter-data-jdbc + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + org.postgresql + postgresql + runtime + + + + org.springframework.hateoas + spring-hateoas + 2.5.2 + + + + org.springframework.boot + spring-boot-starter-validation + + + + org.springframework.boot + spring-boot-starter-security + + + + io.jsonwebtoken + jjwt-api + 0.13.0 + + + + io.jsonwebtoken + jjwt-impl + 0.13.0 + runtime + + + + io.jsonwebtoken + jjwt-jackson + 0.13.0 + runtime + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-devtools + true + + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + 2.8.17 + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.apache.maven.plugins + maven-surefire-plugin + + + -javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar + -Xshare:off + + + + + + + diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/frontend/.gitignore b/jdk_21_maven/cs/rest/testing-system/src/main/frontend/.gitignore new file mode 100644 index 000000000..da4be4879 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/frontend/.gitignore @@ -0,0 +1,4 @@ +node_modules/ +dist/ +npm-debug.log +yarn-error.log \ No newline at end of file diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/TestingSystemApplication.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/TestingSystemApplication.java new file mode 100644 index 000000000..56de3109c --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/TestingSystemApplication.java @@ -0,0 +1,12 @@ +package dev.mirodil.testing_system; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class TestingSystemApplication { + + public static void main(String[] args) { + SpringApplication.run(TestingSystemApplication.class, args); + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/configs/AppConfig.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/configs/AppConfig.java new file mode 100644 index 000000000..672dc8cc9 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/configs/AppConfig.java @@ -0,0 +1,64 @@ +package dev.mirodil.testing_system.configs; + +import dev.mirodil.testing_system.models.TestEvent; +import dev.mirodil.testing_system.models.User; +import dev.mirodil.testing_system.repositories.GenericRowMapper; +import dev.mirodil.testing_system.repositories.RoleWithPermissionResultSetExtractor; +import dev.mirodil.testing_system.repositories.UserWithPermissionResultSetExtractor; +import dev.mirodil.testing_system.utils.DataUtil; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.jdbc.core.RowMapper; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.CorsConfigurationSource; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; + +import java.util.List; + +@Configuration +public class AppConfig { + @Bean + public CorsConfigurationSource corsConfigurationSource() { + CorsConfiguration configuration = new CorsConfiguration(); + configuration.setAllowedOrigins(List.of( + "http://127.0.0.1:3000", + "http://localhost:3000", + "https://testing.mirodil.dev" + )); + configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "OPTIONS")); + configuration.setAllowedHeaders(List.of("*")); + configuration.setAllowCredentials(true); + configuration.setMaxAge(3600L); + + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + source.registerCorsConfiguration("/**", configuration); + return source; + } + + @Bean + public StringRedisTemplate getStringRedisTemplate(LettuceConnectionFactory lettuceConnectionFactory) { + return new StringRedisTemplate(lettuceConnectionFactory); + } + + @Bean + public UserWithPermissionResultSetExtractor userWithPermissionResultSetExtractor() { + return new UserWithPermissionResultSetExtractor(); + } + + @Bean + public RoleWithPermissionResultSetExtractor roleWithPermissionResultSetExtractor() { + return new RoleWithPermissionResultSetExtractor(); + } + + @Bean + public RowMapper userRowMapper() { + return new GenericRowMapper<>(DataUtil::extractUserFromResultSet); + } + + @Bean + public RowMapper testEventRowMapper() { + return new GenericRowMapper<>(DataUtil::extractTestEventFromResultSet); + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/configs/GlobalErrorAttributes.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/configs/GlobalErrorAttributes.java new file mode 100644 index 000000000..7910594ec --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/configs/GlobalErrorAttributes.java @@ -0,0 +1,35 @@ +package dev.mirodil.testing_system.configs; + +import org.apache.catalina.connector.RequestFacade; +import org.springframework.boot.web.error.ErrorAttributeOptions; +import org.springframework.boot.web.servlet.error.DefaultErrorAttributes; +import org.springframework.stereotype.Component; +import org.springframework.web.context.request.ServletWebRequest; +import org.springframework.web.context.request.WebRequest; + +import java.time.Instant; +import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoUnit; +import java.util.Map; + +@Component +public class GlobalErrorAttributes extends DefaultErrorAttributes { + + @Override + public Map getErrorAttributes(WebRequest webRequest, ErrorAttributeOptions options) { + Map errorAttributes = super.getErrorAttributes(webRequest, options); + + // Convert timestamp to Instant in UTC (second precision) + String timestamp = DateTimeFormatter.ISO_INSTANT.format(Instant.now().truncatedTo(ChronoUnit.SECONDS)); + errorAttributes.put("timestamp", timestamp); + + // Convert path URI to full URL path + RequestFacade requestFacade = ((ServletWebRequest) webRequest).getNativeRequest(RequestFacade.class); + if (requestFacade != null) { + String fullUrl = requestFacade.getRequestURL().toString(); + errorAttributes.put("path", fullUrl); + } + + return errorAttributes; + } +} \ No newline at end of file diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/configs/JwtAuthenticationFilter.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/configs/JwtAuthenticationFilter.java new file mode 100644 index 000000000..b1eef106d --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/configs/JwtAuthenticationFilter.java @@ -0,0 +1,65 @@ +package dev.mirodil.testing_system.configs; + +import dev.mirodil.testing_system.exceptions.InvalidTokenException; +import dev.mirodil.testing_system.exceptions.UserAccountBlocked; +import dev.mirodil.testing_system.models.User; +import dev.mirodil.testing_system.services.UserService; +import dev.mirodil.testing_system.utils.AuthUtil; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.lang.NonNull; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; + +@Component +public class JwtAuthenticationFilter extends OncePerRequestFilter { + private final UserService userService; + + public JwtAuthenticationFilter(UserService userService) { + this.userService = userService; + } + + @Override + protected void doFilterInternal( + @NonNull HttpServletRequest request, + @NonNull HttpServletResponse response, + @NonNull FilterChain filterChain + ) throws ServletException, IOException { + final String authHeader = request.getHeader("Authorization"); + if (authHeader == null || !authHeader.startsWith("Bearer ")) { + filterChain.doFilter(request, response); + return; + } + + //=== Exceptions are handled in separate ExceptionHandlerFilter ===// + String token = authHeader.substring(7); + String username = AuthUtil.extractUsername(token); + AuthUtil.checkTokenBlacklisted(token); + + User user = userService.loadUserByUsername(username); + if (AuthUtil.isTokenExpired(token)) { + throw new InvalidTokenException("Token expired"); +// Alternative way without throwing exceptions +// response.sendError(HttpServletResponse.SC_FORBIDDEN, "Token expired"); +// return; + } + + // TODO: if SessionCreationPolicy stateful, then remove: + AuthUtil.setAuthenticationToSecurityContext(user, request); + + if (AuthUtil.isUserAuthenticated()) { + if (!user.isAccountNonLocked()) { + throw new UserAccountBlocked(); + } + filterChain.doFilter(request, response); + return; + } + + // Continue with the filter chain + filterChain.doFilter(request, response); + } +} \ No newline at end of file diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/configs/OpenApiConfig.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/configs/OpenApiConfig.java new file mode 100644 index 000000000..bcc659fb4 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/configs/OpenApiConfig.java @@ -0,0 +1,73 @@ +package dev.mirodil.testing_system.configs; + +import io.swagger.v3.oas.annotations.OpenAPIDefinition; +import io.swagger.v3.oas.annotations.enums.SecuritySchemeIn; +import io.swagger.v3.oas.annotations.enums.SecuritySchemeType; +import io.swagger.v3.oas.annotations.info.Contact; +import io.swagger.v3.oas.annotations.info.Info; +import io.swagger.v3.oas.annotations.info.License; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import io.swagger.v3.oas.annotations.security.SecurityScheme; +import io.swagger.v3.oas.annotations.servers.Server; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@OpenAPIDefinition( + info = @Info( + contact = @Contact( + name = "Mirodil Kamilov", + email = "mirodilkamilov@gmail.com", + url = "https://www.linkedin.com/in/mirodilkamilov" + ), + title = "Testing System REST API Documentation", + description = """ + Welcome to the Testing System REST API! This backend application facilitates the management of testing activities, including test creation, participation, and automatic result evaluation. Designed with scalability, security, and modularity in mind, this API empowers both administrators and test takers to efficiently handle testing processes. + + Key Features: + + - **User Management**: Admins manage accounts and assign tests, while test takers participate seamlessly with autosave functionality. + - **Test Management**: Create and manage tests with diverse question types (MCQs, checkboxes, true/false, text-based). + - **Results Management**: Automated result evaluation with detailed summaries and pass/fail statuses. + + Explore the API endpoints interactively via Swagger-UI or use the [Postman collection](https://www.postman.com/mirodil-dev/workspace/testing-system) for pre-configured examples. The source code is accessible through the [GitHub repository.](https://github.com/mirodilkamilov/testing-system) + + **_Note: \uD83D\uDEA7 This project is a work in progress. Some interruptions may occur in the production environment. \uD83D\uDEA7_**""", + version = "1.0", + license = @License( + name = "MIT licence", + url = "https://github.com/mirodilkamilov/testing-system/blob/main/LICENSE" + ) + ), + servers = { + @Server( + description = "PROD ENV", + url = "https://testing.mirodil.dev/api" + ), + @Server( + description = "Local ENV", + url = "http://localhost:8080/api" + ), + }, + security = { + @SecurityRequirement( + name = "bearerAuth" + ) + } +) +@SecurityScheme( + name = "bearerAuth", + scheme = "bearer", + type = SecuritySchemeType.HTTP, + bearerFormat = "JWT", + in = SecuritySchemeIn.HEADER +) +@Configuration +public class OpenApiConfig implements WebMvcConfigurer { + @Override + public void addViewControllers(ViewControllerRegistry registry) { + // Redirect trailing slash to the correct Swagger UI endpoint + registry.addRedirectViewController("/swagger-ui.html/", "/swagger-ui.html"); + registry.addRedirectViewController("/swagger-ui/index.html/", "/swagger-ui/index.html"); + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/configs/PageableWithFilterResolver.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/configs/PageableWithFilterResolver.java new file mode 100644 index 000000000..6dbeb6769 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/configs/PageableWithFilterResolver.java @@ -0,0 +1,269 @@ +package dev.mirodil.testing_system.configs; + +import dev.mirodil.testing_system.exceptions.GenericValidationError; +import dev.mirodil.testing_system.models.TestEvent; +import dev.mirodil.testing_system.models.User; +import dev.mirodil.testing_system.utils.FilterCriteria; +import dev.mirodil.testing_system.utils.PageWithFilterRequest; +import dev.mirodil.testing_system.utils.ValidationUtil; +import dev.mirodil.testing_system.validations.ValidTestEventPageRequest; +import dev.mirodil.testing_system.validations.ValidUserPageRequest; +import org.springframework.core.MethodParameter; +import org.springframework.data.domain.Pageable; +import org.springframework.data.web.PageableHandlerMethodArgumentResolver; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.support.WebDataBinderFactory; +import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.method.support.ModelAndViewContainer; + +import java.time.Instant; +import java.time.LocalDate; +import java.time.ZoneOffset; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeParseException; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * Custom argument resolver for {@link PageWithFilterRequest} that automatically + * extracts pagination, sorting, and filter parameters from request queries. + * The resolver is also responsible for validation of these parameters. + *

+ * Sorting and filtering attributes are validated based on entity-specific + * annotations ({@code @ValidTestEventPageRequest}, {@code @ValidUserPageRequest}). + *

+ * Example query: {@code ?scorePercentage>=70&scorePercentage<=90&isPassed=true,false} + *

+ * Converts to List of {@link FilterCriteria} - {@code List(key, List, List)>}: + *

+ * [
+ *   new FilterCriteria<>("scorePercentage", List.of(">=", "<="), List.of(70, 90)), // Integer values
+ *   new FilterCriteria<>("isPassed", List.of("="), List.of(true, false)) // Boolean values
+ * ]
+ * 
+ * + * @see PageWithFilterRequest + * @see PageableHandlerMethodArgumentResolver + */ +@Component +public class PageableWithFilterResolver implements HandlerMethodArgumentResolver { + private final PageableHandlerMethodArgumentResolver defaultPageableResolver; + + public PageableWithFilterResolver(PageableHandlerMethodArgumentResolver defaultPageableResolver) { + this.defaultPageableResolver = defaultPageableResolver; + } + + @Override + public boolean supportsParameter(MethodParameter parameter) { + return PageWithFilterRequest.class.equals(parameter.getParameterType()); + } + + @Override + public PageWithFilterRequest resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) { + Pageable pageable = defaultPageableResolver.resolveArgument(parameter, mavContainer, webRequest, binderFactory); + + // Extract raw filters from query parameters + Map> rawFilters = extractFilterParameters(webRequest); + + // Determine allowed filters and sorts based on entity annotation + Set allowedSorts = getEntityAllowedSorts(parameter); + ValidationUtil.forceValidPageable(pageable, allowedSorts); + Map> allowedFilters = getEntityAllowedFilters(parameter); + ValidationUtil.forceValidRawFilters(rawFilters, allowedFilters); + + List> filters = convertFiltersToTypedList(rawFilters, allowedFilters); + + return new PageWithFilterRequest( + pageable.getPageNumber(), + pageable.getPageSize(), + pageable.getSort(), + filters + ); + } + + Map> extractFilterParameters(NativeWebRequest webRequest) { + Map> rawFilters = new HashMap<>(); + Iterator iterator = webRequest.getParameterNames(); + + while (iterator.hasNext()) { + String paramName = iterator.next(); + if (paramName.equals("page") || paramName.equals("size") || paramName.equals("sort")) { + continue; + } + + String key = paramName; + String[] filterValues = webRequest.getParameterValues(key); + if (filterValues == null) { + continue; + } + + String operator = "="; + Map operatorValueMap = new HashMap<>(); + + for (String value : filterValues) { + // Matches operator and value in the key + Matcher matcher = Pattern.compile("([<>])(.*)").matcher(paramName); + if (matcher.find()) { + operator = matcher.group(1); + // If value is not on the key (in other words value is not blank), then original query param must have "=". Example case: ?score>=10 -> key: score>, value: 10 + boolean shouldContainEqualityOperator = !value.isBlank(); + value = value.isBlank() ? matcher.group(2) : value; + key = paramName.endsWith(operator) && shouldContainEqualityOperator + ? paramName.substring(0, paramName.length() - operator.length()).strip() // ?score>=10 -> key: score>, value: 10 + : paramName.substring(0, paramName.length() - operator.length() - value.length()).strip(); // ?score>10 -> key: score>10, value: "" + value = value.strip(); + if (shouldContainEqualityOperator) { + operator += "="; + } + } + + if (value.isBlank()) { + continue; + } + + // If there is duplicate operators, overwrite value (e.g. score>70&score>90 -> score>90) + operatorValueMap.put(operator, value.trim()); + } + + if (operatorValueMap.isEmpty()) { + continue; + } + + if (rawFilters.containsKey(key)) { + rawFilters.get(key).putAll(operatorValueMap); + continue; + } + rawFilters.put(key, operatorValueMap); + } + return rawFilters; + } + + /** + * Converts raw filter parameters into a list of structured filter criteria. + * Raw filter should be validated before passed for conversion. + * + * @param rawFilters The raw filter parameters from the request + * @param allowedFilters The allowed filters with their expected data types + * @return A list of {@link FilterCriteria} objects representing structured filters + * @throws RuntimeException If filter type is not defined in an entity level + */ + private List> convertFiltersToTypedList(Map> rawFilters, Map> allowedFilters) { + if (rawFilters.isEmpty()) { + return Collections.emptyList(); + } + + List> filterCriteriaList = new ArrayList<>(); + for (Map.Entry> entry : rawFilters.entrySet()) { + String key = entry.getKey(); + + Class type = allowedFilters.get(key); + if (type == null) { + throw new RuntimeException("Filter type is not defined for: " + key); + } + + List operators = new ArrayList<>(); + List convertedValues = new ArrayList<>(); + + for (Map.Entry operatorValue : entry.getValue().entrySet()) { + String operator = operatorValue.getKey(); + String value = operatorValue.getValue(); + + // Support multi-value filters (e.g., ?status=active,inactive) + if (value.contains(",") && operator.equals("=")) { + List matchedValues = Arrays.stream(value.split(",", 10)) + .filter(matchedValue -> !matchedValue.isBlank()) + .toList(); + + operators.add(operator); + convertedValues.addAll(convertListValuesToTypes(key, matchedValues, type)); + } else { + convertedValues.addAll(convertListValuesToTypes(key, List.of(value), type)); + operators.add(operator); + } + } + + if (!convertedValues.isEmpty()) { + filterCriteriaList.add(new FilterCriteria<>(key, operators, convertedValues)); + } + } + + return filterCriteriaList; + } + + /** + * Converts a list of string values to list of its expected data type. + */ + private List convertListValuesToTypes(String key, List values, Class type) { + if (values.isEmpty()) { + return Collections.emptyList(); + } + + List valuesWithType = new ArrayList<>(); + for (String value : values) { + if (value.equalsIgnoreCase("NULL")) { + valuesWithType.add(null); + continue; + } + + try { + Object valueWithType = switch (type.getSimpleName()) { + case "Integer" -> Integer.parseInt(value); + case "Long" -> Long.parseLong(value); + case "Double" -> Double.parseDouble(value); + case "Boolean" -> Boolean.parseBoolean(value); + case "Instant" -> parseInstantValue(value); + default -> value; + }; + valuesWithType.add(valueWithType); + } catch (NumberFormatException e) { + throw new GenericValidationError("Invalid value '" + value + "' for filter '" + key + "' (expected " + type.getSimpleName() + ")."); + } catch (DateTimeParseException e) { + throw new GenericValidationError("Invalid value: '" + value + "' for filter '" + key + "' (expected ISO format [yyyy-MM-ddTHH:mm:ssZ or with offset +05:00] or date [yyyy-MM-dd])."); + } + } + return valuesWithType; + } + + /** + * Determines the allowed filter attributes and their types for the given entity. + * + * @param parameter The method parameter + * @return A map of allowed filter attributes and their corresponding types + */ + private Map> getEntityAllowedFilters(MethodParameter parameter) { + if (parameter.hasParameterAnnotation(ValidTestEventPageRequest.class)) { + return TestEvent.getAllowedFilterAttributes(); + } else if (parameter.hasParameterAnnotation(ValidUserPageRequest.class)) { + return User.getAllowedFilterAttributes(); + } + throw new IllegalArgumentException("No allowed filters defined for this entity."); + } + + /** + * Determines the allowed sort attributes for the given entity. + * + * @param parameter The method parameter + * @return A set of allowed sorting attributes + */ + private Set getEntityAllowedSorts(MethodParameter parameter) { + if (parameter.hasParameterAnnotation(ValidTestEventPageRequest.class)) { + return TestEvent.getAllowedSortAttributes(); + } else if (parameter.hasParameterAnnotation(ValidUserPageRequest.class)) { + return User.getAllowedSortAttributes(); + } + throw new IllegalArgumentException("No allowed sorts defined for this entity."); + } + + private Instant parseInstantValue(String value) { + DateTimeFormatter dateOnlyFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + + try { + return Instant.parse(value); + } catch (DateTimeParseException ignored) { + LocalDate localDate = LocalDate.parse(value, dateOnlyFormatter); + return localDate.atStartOfDay(ZoneOffset.UTC).toInstant(); + } + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/configs/SecurityConfig.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/configs/SecurityConfig.java new file mode 100644 index 000000000..02a47477d --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/configs/SecurityConfig.java @@ -0,0 +1,91 @@ +package dev.mirodil.testing_system.configs; + +import dev.mirodil.testing_system.exceptions.ExceptionHandlerFilter; +import dev.mirodil.testing_system.services.UserService; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationProvider; +import org.springframework.security.authentication.dao.DaoAuthenticationProvider; +import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; +import org.springframework.web.cors.CorsConfigurationSource; + +import static dev.mirodil.testing_system.models.enums.UserRole.ADMIN; +import static dev.mirodil.testing_system.models.enums.UserRole.TEST_TAKER; + +@Configuration +@EnableWebSecurity +@EnableMethodSecurity(prePostEnabled = true) +public class SecurityConfig { + private static final String[] WHITE_LIST_URL = { + "/auth/**", + "/test-taker/register", + "/error", + "/public", + + "/v3/api-docs/**", + "/swagger-resources", + "/swagger-resources/**", + "/configuration/ui", + "/configuration/security", + "/swagger-ui/**", + "/webjars/**", + "/swagger-ui.html", + "/swagger-ui.html/"}; + private final UserService userService; + private final JwtAuthenticationFilter jwtAuthenticationFilter; + + public SecurityConfig(UserService userService, JwtAuthenticationFilter jwtAuthenticationFilter) { + this.userService = userService; + this.jwtAuthenticationFilter = jwtAuthenticationFilter; + } + + @Bean + public PasswordEncoder getPasswordEncoder() { + return new BCryptPasswordEncoder(); + } + + @Bean + public AuthenticationProvider getAuthenticationProvider(UserService userService) { + DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider(); + authProvider.setUserDetailsService(userService); + authProvider.setPasswordEncoder(getPasswordEncoder()); + return authProvider; + } + + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http, CorsConfigurationSource corsConfigurationSource) throws Exception { + http + .csrf(csrf -> csrf.disable()) + .cors(cors -> cors.configurationSource(corsConfigurationSource)) + .exceptionHandling(exceptionHandling -> + exceptionHandling + .authenticationEntryPoint((request, response, authException) -> + response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Unauthorized") + ) + .accessDeniedHandler((request, response, accessDeniedException) -> + response.sendError(HttpServletResponse.SC_FORBIDDEN, "Access Denied") + )) + .authorizeHttpRequests(authorizeHttpRequests -> + authorizeHttpRequests + .requestMatchers(WHITE_LIST_URL).permitAll() + .requestMatchers("/admin/**").hasRole(ADMIN.name()) + .requestMatchers("/test-taker/**").hasAnyRole(ADMIN.name(), TEST_TAKER.name()) + .anyRequest().authenticated() + ) + .sessionManagement(sessionManagement -> + sessionManagement.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) // TODO: later make it stateful + .authenticationProvider(getAuthenticationProvider(userService)) + .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class) + .addFilterBefore(new ExceptionHandlerFilter(), jwtAuthenticationFilter.getClass()); + + return http.build(); + } +} \ No newline at end of file diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/configs/WebMvcConfig.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/configs/WebMvcConfig.java new file mode 100644 index 000000000..aa271fea2 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/configs/WebMvcConfig.java @@ -0,0 +1,21 @@ +package dev.mirodil.testing_system.configs; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +import java.util.List; + +@Configuration +public class WebMvcConfig implements WebMvcConfigurer { + private final PageableWithFilterResolver pageableWithFilterResolver; + + public WebMvcConfig(PageableWithFilterResolver pageableWithFilterResolver) { + this.pageableWithFilterResolver = pageableWithFilterResolver; + } + + @Override + public void addArgumentResolvers(List resolvers) { + resolvers.add(pageableWithFilterResolver); + } +} \ No newline at end of file diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/controllers/AuthController.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/controllers/AuthController.java new file mode 100644 index 000000000..e0ffc1a73 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/controllers/AuthController.java @@ -0,0 +1,50 @@ +package dev.mirodil.testing_system.controllers; + +import dev.mirodil.testing_system.dtos.AuthResponseDTO; +import dev.mirodil.testing_system.dtos.UserLoginRequestDTO; +import dev.mirodil.testing_system.dtos.WrapResponseWithContentKey; +import dev.mirodil.testing_system.services.AuthService; +import io.swagger.v3.oas.annotations.Operation; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; +import org.springframework.http.ResponseEntity; +import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.security.auth.login.AccountLockedException; +import java.util.Collections; +import java.util.Map; + +@RestController +@RequestMapping("/auth") +public class AuthController { + private final AuthService authService; + + public AuthController(AuthService authService) { + this.authService = authService; + } + + @Operation( + summary = "Login (for all user roles)", + description = "Authenticate using email and password. **Default Admin Credentials: email:** info@mirodil.dev, **password:** 12345" + ) + @PostMapping("/login") + public ResponseEntity login( + @Valid @RequestBody UserLoginRequestDTO request, + HttpServletRequest servletRequest + ) throws BadCredentialsException, AccountLockedException { + AuthResponseDTO authResponseDTO = authService.authenticate(request, servletRequest); + return ResponseEntity.ok( + new WrapResponseWithContentKey<>(authResponseDTO) + ); + } + + @PostMapping("/logout") + public ResponseEntity> logout(HttpServletRequest request) { + authService.logout(request); + return ResponseEntity.ok(Collections.singletonMap("message", "Successfully logged out")); + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/controllers/TestEventController.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/controllers/TestEventController.java new file mode 100644 index 000000000..c3e217700 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/controllers/TestEventController.java @@ -0,0 +1,42 @@ +package dev.mirodil.testing_system.controllers; + +import dev.mirodil.testing_system.dtos.PagedResponse; +import dev.mirodil.testing_system.dtos.TestEventResponseDTO; +import dev.mirodil.testing_system.dtos.WrapResponseWithContentKey; +import dev.mirodil.testing_system.services.TestEventService; +import dev.mirodil.testing_system.utils.AppUtil; +import dev.mirodil.testing_system.utils.PageWithFilterRequest; +import dev.mirodil.testing_system.validations.ValidTestEventPageRequest; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/admin") +public class TestEventController { + private final TestEventService testEventService; + + public TestEventController(TestEventService testEventService) { + this.testEventService = testEventService; + } + + @GetMapping("/test-events") + public PagedResponse getAllTestEvents(@ValidTestEventPageRequest PageWithFilterRequest pageable, HttpServletRequest request) { + String fullUrl = AppUtil.getUrlWithQueryParams(request); + return testEventService.getTestEvents(pageable, fullUrl); + } + + @GetMapping("/test-events/{id}") + public WrapResponseWithContentKey getTestEventById(@PathVariable Long id) { + TestEventResponseDTO testEventDTO = testEventService.getTestEventById(id); + return new WrapResponseWithContentKey<>(testEventDTO); + } + + @GetMapping("/test-events/{id}/test-attempt") + public WrapResponseWithContentKey getTestAttempt(@PathVariable Long id) { + // TODO: implement + return new WrapResponseWithContentKey<>(null); + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/controllers/TestTakerController.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/controllers/TestTakerController.java new file mode 100644 index 000000000..681abf840 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/controllers/TestTakerController.java @@ -0,0 +1,40 @@ +package dev.mirodil.testing_system.controllers; + +import dev.mirodil.testing_system.dtos.AuthResponseDTO; +import dev.mirodil.testing_system.dtos.TestTakerRegisterRequestDTO; +import dev.mirodil.testing_system.dtos.UserResponseDTO; +import dev.mirodil.testing_system.dtos.WrapResponseWithContentKey; +import dev.mirodil.testing_system.services.UserService; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import java.net.URI; + +import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo; + +@RestController +@RequestMapping("/test-taker") +public class TestTakerController { + private final UserService userService; + + public TestTakerController(UserService userService) { + this.userService = userService; + } + + @PostMapping("/register") + public ResponseEntity register(@Valid @RequestBody TestTakerRegisterRequestDTO request, HttpServletRequest servletRequest) { + AuthResponseDTO authResponseDTO = userService.createTestTaker(request, servletRequest); + URI profilePath = linkTo(TestTakerController.class).withRel("profile").toUri(); + return ResponseEntity.created(profilePath).body(new WrapResponseWithContentKey<>(authResponseDTO)); + } + + @PreAuthorize("hasAuthority('VIEW_PROFILE')") + @GetMapping("/profile") + public WrapResponseWithContentKey getProfile() { + UserResponseDTO currentUserDTO = userService.getProfile(); + return new WrapResponseWithContentKey<>(currentUserDTO); + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/controllers/UserManagementController.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/controllers/UserManagementController.java new file mode 100644 index 000000000..e865c3be2 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/controllers/UserManagementController.java @@ -0,0 +1,64 @@ +package dev.mirodil.testing_system.controllers; + +import dev.mirodil.testing_system.dtos.PagedResponse; +import dev.mirodil.testing_system.dtos.UserCreateRequestDTO; +import dev.mirodil.testing_system.dtos.UserResponseDTO; +import dev.mirodil.testing_system.dtos.WrapResponseWithContentKey; +import dev.mirodil.testing_system.services.UserService; +import dev.mirodil.testing_system.utils.AppUtil; +import dev.mirodil.testing_system.utils.PageWithFilterRequest; +import dev.mirodil.testing_system.validations.ValidUserPageRequest; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; +import org.springdoc.core.converters.models.PageableAsQueryParam; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/admin") +public class UserManagementController { + private final UserService userService; + + public UserManagementController(UserService userService) { + this.userService = userService; + } + + @PreAuthorize("hasAuthority('VIEW_PROFILE')") + @GetMapping("/profile") + public WrapResponseWithContentKey getProfile() { + UserResponseDTO currentUserDTO = userService.getProfile(); + return new WrapResponseWithContentKey<>(currentUserDTO); + } + + @PreAuthorize("hasAuthority('MANAGE_ALL_USERS')") + @GetMapping("/users") + @PageableAsQueryParam + @Operation(summary = "Get all users", + description = "Retrieve a paginated list of users with optional sorting and filters (cannot add field in swagger-ui \uD83D\uDE05. So, recommend using my Postman collection).\n\nExample usage: users?page=0&size=7&sort=userId&email=info") + public PagedResponse getAllUsers( + @Parameter(hidden = true) @ValidUserPageRequest PageWithFilterRequest pageable, + HttpServletRequest request + ) { + String fullUrl = AppUtil.getUrlWithQueryParams(request); + return userService.getUsers(pageable, fullUrl); + } + + @PreAuthorize("hasAuthority('MANAGE_ALL_USERS')") + @GetMapping("/users/{id}") + public WrapResponseWithContentKey getUserById(@PathVariable Long id) { + UserResponseDTO userDTO = userService.getUserById(id); + return new WrapResponseWithContentKey<>(userDTO); + } + + @PreAuthorize("hasAuthority('MANAGE_ALL_USERS')") + @PostMapping("/users") + public ResponseEntity createUser(@Valid @RequestBody UserCreateRequestDTO request) { + UserResponseDTO userDTO = userService.createUser(request); + return ResponseEntity.created(userDTO.path()).body( + new WrapResponseWithContentKey<>(userDTO) + ); + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/AuthResponseDTO.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/AuthResponseDTO.java new file mode 100644 index 000000000..6f6819be9 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/AuthResponseDTO.java @@ -0,0 +1,14 @@ +package dev.mirodil.testing_system.dtos; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.Map; + + +public record AuthResponseDTO( + @JsonProperty("user") + UserResponseDTO userDTO, + @JsonProperty("token") + Map jwtTokenDetails +) { +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/GenericErrorResponse.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/GenericErrorResponse.java new file mode 100644 index 000000000..e7481e5e8 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/GenericErrorResponse.java @@ -0,0 +1,65 @@ +package dev.mirodil.testing_system.dtos; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.boot.autoconfigure.web.servlet.error.BasicErrorController; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + +import java.net.URI; +import java.time.Instant; +import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoUnit; +import java.util.HashMap; +import java.util.Map; + +public class GenericErrorResponse { + /** + * Creates and returns a {@link ResponseEntity} containing a JSON-formatted error message. + * + * @param message value for the json object + * @param statusCode http status code + * @param path request path of which error occurred + * @return ResponseEntity - same structure as default error response in {@link BasicErrorController} + */ + public static ResponseEntity> returnResponse(String message, HttpStatus statusCode, URI path) { + if (statusCode == HttpStatus.NO_CONTENT) { + return new ResponseEntity<>(statusCode); + } + + Map errorDetails = getErrorDetailsMap(message, statusCode, path); + return new ResponseEntity<>(errorDetails, statusCode); + } + + public static Map getErrorDetailsMap(String message, HttpStatus statusCode, URI path) { + Map errorDetails = new HashMap<>(); + String timestamp = DateTimeFormatter.ISO_INSTANT.format(Instant.now().truncatedTo(ChronoUnit.SECONDS)); + + errorDetails.put("timestamp", timestamp); + errorDetails.put("status", statusCode.value()); + errorDetails.put("error", statusCode.getReasonPhrase()); + errorDetails.put("message", message); + errorDetails.put("path", path); + return errorDetails; + } + + public static String getErrorDetailsJson(String message, HttpStatus statusCode, URI path) throws JsonProcessingException { + Map errorDetailsMap = getErrorDetailsMap(message, statusCode, path); + ObjectMapper objectMapper = new ObjectMapper(); + return objectMapper.writeValueAsString(errorDetailsMap); + } + + /** + * Creates and returns a {@link ResponseEntity} containing a JSON-formatted error message. + * + * @param message value for the json object + * @param statusCode http status code + * @param request HttpServletRequest to set "error" key in response + * @return ResponseEntity - same structure as default error response in {@link BasicErrorController} + */ + public static ResponseEntity> returnResponse(String message, HttpStatus statusCode, HttpServletRequest request) { + URI path = URI.create(request.getRequestURL().toString()); + return returnResponse(message, statusCode, path); + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/PagedResponse.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/PagedResponse.java new file mode 100644 index 000000000..3d0fd7ad6 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/PagedResponse.java @@ -0,0 +1,85 @@ +package dev.mirodil.testing_system.dtos; + +import org.springframework.data.domain.Page; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class PagedResponse { + private final int size; + private final int pageNumber; + private final long totalElements; + private final int totalPages; + + private final List content; + private final Map page; + private final Map links; + + public PagedResponse(Page pageData, String fullUrl) { + this.content = pageData.getContent(); + this.pageNumber = pageData.getNumber(); + this.size = pageData.getSize(); + this.totalElements = pageData.getTotalElements(); + this.totalPages = pageData.getTotalPages(); + this.links = generateLinks(fullUrl, pageData); + page = generatePage(); + } + + private Map generatePage() { + Map page = new HashMap<>(4); + page.put("size", size); + page.put("number", pageNumber); + page.put("totalElements", totalElements); + page.put("totalPages", totalPages); + + return page; + } + + private Map generateLinks(String fullUrl, Page pageData) { + Map links = new HashMap<>(); + + int currentPage = pageData.getNumber(); + int totalPages = pageData.getTotalPages(); + + // Remove the existing page parameter from the URL + String baseUrl = fullUrl.replaceAll("[&?]page=\\d+", ""); + + if (baseUrl.contains("?")) { + baseUrl = baseUrl.endsWith("?") || baseUrl.endsWith("&") ? baseUrl.substring(0, baseUrl.length() - 1) : baseUrl; + } + + // Append page parameters dynamically + String self = baseUrl + (baseUrl.contains("?") ? "&" : "?") + "page=" + currentPage; + String first = baseUrl + (baseUrl.contains("?") ? "&" : "?") + "page=0"; + String last = baseUrl + (baseUrl.contains("?") ? "&" : "?") + "page=" + (totalPages - 1); + + links.put("self", self); + links.put("first", first); + links.put("last", last); + + if (pageData.hasNext()) { + String next = baseUrl + (baseUrl.contains("?") ? "&" : "?") + "page=" + (currentPage + 1); + links.put("next", next); + } + + if (pageData.hasPrevious()) { + String previous = baseUrl + (baseUrl.contains("?") ? "&" : "?") + "page=" + (currentPage - 1); + links.put("previous", previous); + } + + return links; + } + + public List getContent() { + return content; + } + + public Map getPage() { + return page; + } + + public Map getLinks() { + return links; + } +} \ No newline at end of file diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/TestAttemptDTO.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/TestAttemptDTO.java new file mode 100644 index 000000000..5d5fef89a --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/TestAttemptDTO.java @@ -0,0 +1,8 @@ +package dev.mirodil.testing_system.dtos; + +public record TestAttemptDTO( +// QuestionResponseDTO question, + Long selectedOptionId, + boolean isCorrect +) { +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/TestEventResponseDTO.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/TestEventResponseDTO.java new file mode 100644 index 000000000..b243b89c5 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/TestEventResponseDTO.java @@ -0,0 +1,44 @@ +package dev.mirodil.testing_system.dtos; + +import dev.mirodil.testing_system.controllers.TestEventController; +import dev.mirodil.testing_system.models.TestEvent; +import dev.mirodil.testing_system.models.enums.TestEventStatus; + +import java.net.URI; +import java.time.Instant; + +import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo; +import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.methodOn; + +public record TestEventResponseDTO( + Long testEventId, + UserResponseDTO testTaker, + TestResponseDTO test, + Instant eventDatetime, + TestEventStatus status, + Float scorePoints, + Integer scorePercentage, + Boolean isPassed, + Instant startedAt, + Instant finishedAt, + Instant createdAt, + // TODO: create separate TestAttemptDTO (with detailed questions and their options) + URI path +) { + public TestEventResponseDTO(TestEvent testEvent) { + this( + testEvent.getId(), + new UserResponseDTO(testEvent.getTestTaker()), + new TestResponseDTO(testEvent.getTest()), + testEvent.getEventDateTime(), + testEvent.getStatus(), + testEvent.getScorePoints(), + testEvent.getScorePercentage(), + testEvent.getIsPassed(), + testEvent.getStartedAt(), + testEvent.getFinishedAt(), + testEvent.getCreatedAt(), + linkTo(methodOn(TestEventController.class).getTestEventById(testEvent.getId())).toUri() + ); + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/TestResponseDTO.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/TestResponseDTO.java new file mode 100644 index 000000000..7dc0090f1 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/TestResponseDTO.java @@ -0,0 +1,33 @@ +package dev.mirodil.testing_system.dtos; + +import com.fasterxml.jackson.annotation.JsonInclude; +import dev.mirodil.testing_system.models.Test; + +import java.time.Instant; + +@JsonInclude(JsonInclude.Include.NON_NULL) +public record TestResponseDTO( + Long testId, + String title, + String description, + int duration, + int noOfQuestions, + int passingPercentage, + Boolean shouldShuffle, + Boolean shouldRandomlyPick, + Instant deletedAt +) { + public TestResponseDTO(Test test) { + this( + test.getId(), + test.getTitle(), + test.getDescription(), + test.getDuration(), + test.getNoOfQuestions(), + test.getPassingPercentage(), + test.shouldShuffle(), + test.shouldRandomlyPick(), + test.getDeletedAt() + ); + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/TestTakerRegisterRequestDTO.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/TestTakerRegisterRequestDTO.java new file mode 100644 index 000000000..23f5bfdb4 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/TestTakerRegisterRequestDTO.java @@ -0,0 +1,22 @@ +package dev.mirodil.testing_system.dtos; + +import dev.mirodil.testing_system.models.enums.UserGender; +import dev.mirodil.testing_system.validations.UniqueEmail; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; + +public record TestTakerRegisterRequestDTO( + @Email @Size(min = 5, max = 50) @UniqueEmail + String email, + @NotBlank @Size(min = 5, max = 50) + String password, + @NotBlank @Size(max = 50) + String fname, + @NotBlank @Size(max = 50) + String lname, + @NotNull + UserGender gender +) implements UserRequestDTO { +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/UserCreateRequestDTO.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/UserCreateRequestDTO.java new file mode 100644 index 000000000..d6fd7666e --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/UserCreateRequestDTO.java @@ -0,0 +1,25 @@ +package dev.mirodil.testing_system.dtos; + +import dev.mirodil.testing_system.models.enums.UserGender; +import dev.mirodil.testing_system.models.enums.UserRole; +import dev.mirodil.testing_system.validations.UniqueEmail; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; + +public record UserCreateRequestDTO( + @Email @Size(min = 5, max = 50) @UniqueEmail + String email, + @NotBlank @Size(min = 5, max = 50) + String password, + @NotBlank @Size(max = 50) + String fname, + @NotBlank @Size(max = 50) + String lname, + @NotNull + UserGender gender, + @NotNull + UserRole role +) implements UserRequestDTO { +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/UserLoginRequestDTO.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/UserLoginRequestDTO.java new file mode 100644 index 000000000..df8ff5e74 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/UserLoginRequestDTO.java @@ -0,0 +1,13 @@ +package dev.mirodil.testing_system.dtos; + +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; + +public record UserLoginRequestDTO( + @Email @Size(min = 5, max = 50) + String email, + @NotBlank @Size(min = 5, max = 50) + String password +) { +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/UserRequestDTO.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/UserRequestDTO.java new file mode 100644 index 000000000..7381d0b6b --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/UserRequestDTO.java @@ -0,0 +1,15 @@ +package dev.mirodil.testing_system.dtos; + +import dev.mirodil.testing_system.models.enums.UserGender; + +public interface UserRequestDTO { + String email(); + + String password(); + + String fname(); + + String lname(); + + UserGender gender(); +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/UserResponseDTO.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/UserResponseDTO.java new file mode 100644 index 000000000..7ed932890 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/UserResponseDTO.java @@ -0,0 +1,71 @@ +package dev.mirodil.testing_system.dtos; + +import com.fasterxml.jackson.annotation.JsonInclude; +import dev.mirodil.testing_system.controllers.TestTakerController; +import dev.mirodil.testing_system.controllers.UserManagementController; +import dev.mirodil.testing_system.models.User; +import dev.mirodil.testing_system.models.enums.PermissionType; +import dev.mirodil.testing_system.models.enums.UserGender; +import dev.mirodil.testing_system.models.enums.UserRole; +import dev.mirodil.testing_system.models.enums.UserStatus; +import dev.mirodil.testing_system.utils.AuthUtil; + +import java.net.URI; +import java.time.Instant; +import java.util.Set; + +import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo; +import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.methodOn; + +@JsonInclude(JsonInclude.Include.NON_NULL) +public record UserResponseDTO( + Long userId, + UserRole userRole, + String email, + UserGender gender, + UserStatus status, + String fname, + String lname, + Boolean isAccountNonLocked, + Instant createdAt, + URI path, + Set permissions +) { + public UserResponseDTO(User user) { + this(user, resolvePath(user)); + } + + public UserResponseDTO(User user, URI fullURL) { + this( + user.getId(), + user.getUserRoleName(), + user.getEmail(), + user.getGender(), + user.getStatus(), + user.getFirstName(), + user.getLastName(), + user.isAccountNonLocked(), + user.getCreatedAt(), + fullURL, + user.getPermissionNames() + ); + } + + private static URI resolvePath(User user) throws RuntimeException { + UserRole currentRole = UserRole.TEST_TAKER; + if (AuthUtil.isUserAuthenticated()) { + currentRole = AuthUtil.getAuthenticatedUserRole(); + } + + switch (currentRole) { + case ADMIN -> { + return linkTo(methodOn(UserManagementController.class).getUserById(user.getId())).toUri(); + } + case TEST_TAKER -> { + return linkTo(methodOn(TestTakerController.class).getProfile()).toUri(); + } + default -> + throw new RuntimeException("Unexpected UserRole type: " + currentRole + ". Cannot resolve path."); + } + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/WrapResponseWithContentKey.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/WrapResponseWithContentKey.java new file mode 100644 index 000000000..39fe38349 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/dtos/WrapResponseWithContentKey.java @@ -0,0 +1,17 @@ +package dev.mirodil.testing_system.dtos; + +public class WrapResponseWithContentKey { + private T content; + + public WrapResponseWithContentKey(T content) { + this.content = content; + } + + public T getContent() { + return content; + } + + public void setContent(T content) { + this.content = content; + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/ExceptionHandlerFilter.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/ExceptionHandlerFilter.java new file mode 100644 index 000000000..4a7c015bb --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/ExceptionHandlerFilter.java @@ -0,0 +1,47 @@ +package dev.mirodil.testing_system.exceptions; + +import dev.mirodil.testing_system.dtos.GenericErrorResponse; +import io.jsonwebtoken.JwtException; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.http.HttpStatus; +import org.springframework.lang.NonNull; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; +import java.net.URI; + + +@Component +public class ExceptionHandlerFilter extends OncePerRequestFilter { + @Override + protected void doFilterInternal( + @NonNull HttpServletRequest request, + @NonNull HttpServletResponse response, + @NonNull FilterChain filterChain + ) throws ServletException, IOException { + try { + filterChain.doFilter(request, response); + } catch (JwtException e) { + handleException(request, response, HttpStatus.UNAUTHORIZED, "Invalid JWT Token"); + } catch (InvalidTokenException | UserAccountBlocked | ResourceNotFoundException e) { + handleException(request, response, e.getStatusCode(), e.getMessage()); + } + } + + private void handleException( + HttpServletRequest request, + HttpServletResponse response, + HttpStatus status, + String message + ) throws IOException { + response.setContentType("application/json"); + response.setStatus(status.value()); + URI path = URI.create(request.getRequestURL().toString()); + String jsonResponse = GenericErrorResponse.getErrorDetailsJson(message, status, path); + response.getWriter().write(jsonResponse); + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/GenericValidationError.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/GenericValidationError.java new file mode 100644 index 000000000..566dddb4b --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/GenericValidationError.java @@ -0,0 +1,13 @@ +package dev.mirodil.testing_system.exceptions; + +import org.springframework.http.HttpStatus; + +public class GenericValidationError extends ResponseStatusException { + public GenericValidationError(String message) { + this(message, HttpStatus.BAD_REQUEST); + } + + public GenericValidationError(String message, HttpStatus statusCode) { + super(message, statusCode); + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/GlobalControllerExceptionHandler.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/GlobalControllerExceptionHandler.java new file mode 100644 index 000000000..3e48c6931 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/GlobalControllerExceptionHandler.java @@ -0,0 +1,76 @@ +package dev.mirodil.testing_system.exceptions; + +import dev.mirodil.testing_system.dtos.GenericErrorResponse; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.validation.FieldError; +import org.springframework.validation.ObjectError; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; + +import javax.security.auth.login.AccountLockedException; +import java.net.URI; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@ControllerAdvice +public class GlobalControllerExceptionHandler { + private final HttpServletRequest servletRequest; + + public GlobalControllerExceptionHandler(HttpServletRequest servletRequest) { + this.servletRequest = servletRequest; + } + + private static List> getValidationErrorReasons(MethodArgumentNotValidException ex) { + List> errors = new ArrayList<>(); + for (ObjectError objectError : ex.getBindingResult().getAllErrors()) { + FieldError fieldError = (FieldError) objectError; + Map error = new HashMap<>(); + + error.put("field", fieldError.getField()); + error.put("rejectedValue", (String) fieldError.getRejectedValue()); + error.put("defaultMessage", objectError.getDefaultMessage()); + error.put("code", objectError.getCode()); + errors.add(error); + } + return errors; + } + + @ExceptionHandler(ResourceNotFoundException.class) + public ResponseEntity> handleResourceNotFound(ResponseStatusException e) { + return GenericErrorResponse.returnResponse(e.getMessage(), e.getStatusCode(), servletRequest); + } + + @ExceptionHandler({ + InvalidTokenException.class, + GenericValidationError.class, + UnauthorizedException.class + }) + public ResponseEntity> handleUserExceptions(ResponseStatusException e) { + return GenericErrorResponse.returnResponse(e.getMessage(), e.getStatusCode(), servletRequest); + } + + @ExceptionHandler({ + BadCredentialsException.class, + AccountLockedException.class + }) + public ResponseEntity> handleUserExceptionsWithDefaultStatusCode(Exception e) { + return GenericErrorResponse.returnResponse(e.getMessage(), HttpStatus.BAD_REQUEST, servletRequest); + } + + @ExceptionHandler(MethodArgumentNotValidException.class) + public ResponseEntity> handleValidationExceptions(MethodArgumentNotValidException ex) { + List> errors = getValidationErrorReasons(ex); + + URI path = URI.create(servletRequest.getRequestURL().toString()); + Map response = GenericErrorResponse.getErrorDetailsMap("Invalid request - validation error. Error count: " + errors.size(), HttpStatus.BAD_REQUEST, path); + response.put("errors", errors); + + return new ResponseEntity<>(response, HttpStatus.BAD_REQUEST); + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/InvalidTokenException.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/InvalidTokenException.java new file mode 100644 index 000000000..0a4730092 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/InvalidTokenException.java @@ -0,0 +1,17 @@ +package dev.mirodil.testing_system.exceptions; + +import org.springframework.http.HttpStatus; + +public class InvalidTokenException extends ResponseStatusException { + public InvalidTokenException() { + this("Invalid token"); + } + + public InvalidTokenException(String message) { + this(message, HttpStatus.UNAUTHORIZED); + } + + public InvalidTokenException(String message, HttpStatus statusCode) { + super(message, statusCode); + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/ResourceNotFoundException.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/ResourceNotFoundException.java new file mode 100644 index 000000000..da5d5234f --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/ResourceNotFoundException.java @@ -0,0 +1,17 @@ +package dev.mirodil.testing_system.exceptions; + +import org.springframework.http.HttpStatus; + +public class ResourceNotFoundException extends ResponseStatusException { + public ResourceNotFoundException() { + this("Resource not found"); + } + + public ResourceNotFoundException(String message) { + this(message, HttpStatus.NOT_FOUND); + } + + public ResourceNotFoundException(String message, HttpStatus statusCode) { + super(message, statusCode); + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/ResponseStatusException.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/ResponseStatusException.java new file mode 100644 index 000000000..4ef9c4dcc --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/ResponseStatusException.java @@ -0,0 +1,20 @@ +package dev.mirodil.testing_system.exceptions; + +import org.springframework.http.HttpStatus; + +public abstract class ResponseStatusException extends RuntimeException { + private final HttpStatus statusCode; + + public ResponseStatusException(String message, HttpStatus statusCode) { + super(message); + this.statusCode = statusCode; + } + + public HttpStatus getStatusCode() { + return statusCode; + } + + public int getStatusCodeValue() { + return statusCode.value(); + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/UnauthorizedException.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/UnauthorizedException.java new file mode 100644 index 000000000..7e1ecc348 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/UnauthorizedException.java @@ -0,0 +1,17 @@ +package dev.mirodil.testing_system.exceptions; + +import org.springframework.http.HttpStatus; + +public class UnauthorizedException extends ResponseStatusException { + public UnauthorizedException() { + this("Unauthorized"); + } + + public UnauthorizedException(String message) { + this(message, HttpStatus.UNAUTHORIZED); + } + + public UnauthorizedException(String message, HttpStatus statusCode) { + super(message, statusCode); + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/UserAccountBlocked.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/UserAccountBlocked.java new file mode 100644 index 000000000..4a8eef94a --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/exceptions/UserAccountBlocked.java @@ -0,0 +1,17 @@ +package dev.mirodil.testing_system.exceptions; + +import org.springframework.http.HttpStatus; + +public class UserAccountBlocked extends ResponseStatusException { + public UserAccountBlocked() { + this("System administrator has restricted your account from using the system."); + } + + public UserAccountBlocked(String message) { + this(message, HttpStatus.FORBIDDEN); + } + + public UserAccountBlocked(String message, HttpStatus statusCode) { + super(message, statusCode); + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/Permission.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/Permission.java new file mode 100644 index 000000000..59832f958 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/Permission.java @@ -0,0 +1,56 @@ +package dev.mirodil.testing_system.models; + +import dev.mirodil.testing_system.models.enums.PermissionType; +import org.springframework.data.annotation.Id; +import org.springframework.data.relational.core.mapping.Table; + +@Table("permissions") +public class Permission { + @Id + private Long id; + private PermissionType name; + private String description; + + public Permission(PermissionType name) { + this.name = name; + } + + public Permission(Long id, PermissionType name, String description) { + this.id = id; + this.name = name; + this.description = description; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public PermissionType getName() { + return name; + } + + public void setName(PermissionType name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + @Override + public String toString() { + return "Permission{" + + "id=" + id + + ", name=" + name + + ", description='" + description + '\'' + + '}'; + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/Role.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/Role.java new file mode 100644 index 000000000..f9b876a8a --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/Role.java @@ -0,0 +1,71 @@ +package dev.mirodil.testing_system.models; + +import dev.mirodil.testing_system.models.enums.PermissionType; +import dev.mirodil.testing_system.models.enums.UserRole; +import org.springframework.data.annotation.Id; +import org.springframework.data.annotation.Transient; +import org.springframework.data.relational.core.mapping.Table; + +import java.util.Set; +import java.util.stream.Collectors; + +@Table("roles") +public class Role { + @Id + private Long id; + private UserRole name; + + @Transient + private Set permissions; + + public Role() { + } + + public Role(Long id, UserRole name) { + this.id = id; + this.name = name; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public UserRole getName() { + return name; + } + + public void setName(UserRole name) { + this.name = name; + } + + public Set getPermissions() { + return permissions; + } + + public void setPermissions(Set permissions) { + this.permissions = permissions; + } + + public boolean isPermissionsSet() { + return permissions != null; + } + + public Set getPermissionNames() { + return permissions.stream() + .map(Permission::getName) + .collect(Collectors.toSet()); + } + + @Override + public String toString() { + return "Role{" + + "id=" + id + + ", name=" + name + + ", permissions=" + permissions + + '}'; + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/Test.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/Test.java new file mode 100644 index 000000000..c089a0a64 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/Test.java @@ -0,0 +1,116 @@ +package dev.mirodil.testing_system.models; + +import org.springframework.data.annotation.Id; +import org.springframework.data.relational.core.mapping.Table; + +import java.time.Instant; + +@Table("tests") +public class Test { + @Id + private Long id; + private String title; + private String description; + private int duration; + private int noOfQuestions; + private int passingPercentage; + private Boolean shouldShuffle; + private Boolean shouldRandomlyPick; + private Instant deleted_at; + + public Test() { + } + + /** + * Test Constructor for shallow reading + */ + public Test(Long id, String title, int duration, int noOfQuestions, int passingPercentage) { + this.id = id; + this.title = title; + this.duration = duration; + this.noOfQuestions = noOfQuestions; + this.passingPercentage = passingPercentage; + } + + /** + * Test Constructor for detailed reading + */ + public Test(Long id, String title, String description, int duration, int noOfQuestions, int passingPercentage, Boolean shouldShuffle, Boolean shouldRandomlyPick, Instant deleted_at) { + this( + title, + description, + duration, + noOfQuestions, + passingPercentage, + shouldShuffle, + shouldRandomlyPick + ); + this.id = id; + this.deleted_at = deleted_at; + } + + /** + * Test constructor for creating a new test + */ + public Test(String title, String description, int duration, int noOfQuestions, int passingPercentage, Boolean shouldShuffle, Boolean shouldRandomlyPick) { + this.title = title; + this.description = description; + this.duration = duration; + this.noOfQuestions = noOfQuestions; + this.passingPercentage = passingPercentage; + this.shouldShuffle = shouldShuffle; + this.shouldRandomlyPick = shouldRandomlyPick; + } + + public Long getId() { + return id; + } + + public String getTitle() { + return title; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getDuration() { + return duration; + } + + public int getNoOfQuestions() { + return noOfQuestions; + } + + public int getPassingPercentage() { + return passingPercentage; + } + + public Boolean shouldShuffle() { + return shouldShuffle; + } + + public void setShouldShuffle(Boolean shouldShuffle) { + this.shouldShuffle = shouldShuffle; + } + + public Boolean shouldRandomlyPick() { + return shouldRandomlyPick; + } + + public void setShouldRandomlyPick(Boolean shouldRandomlyPick) { + this.shouldRandomlyPick = shouldRandomlyPick; + } + + public Instant getDeletedAt() { + return deleted_at; + } + + public void setDeletedAt(Instant deleted_at) { + this.deleted_at = deleted_at; + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/TestAttempt.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/TestAttempt.java new file mode 100644 index 000000000..49596acb3 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/TestAttempt.java @@ -0,0 +1,47 @@ +package dev.mirodil.testing_system.models; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class TestAttempt { + @JsonProperty("question_id") + private Long questionId; + + @JsonProperty("selected_option_id") + private Long selectedOptionId; + + @JsonProperty("is_correct") + private boolean isCorrect; + + public TestAttempt() { + } + + public TestAttempt(Long questionId, Long selectedOptionId, boolean isCorrect) { + this.questionId = questionId; + this.selectedOptionId = selectedOptionId; + this.isCorrect = isCorrect; + } + + public Long getQuestionId() { + return questionId; + } + + public void setQuestionId(Long questionId) { + this.questionId = questionId; + } + + public Long getSelectedOptionId() { + return selectedOptionId; + } + + public void setSelectedOptionId(Long selectedOptionId) { + this.selectedOptionId = selectedOptionId; + } + + public boolean getIsCorrect() { + return isCorrect; + } + + public void setIsCorrect(boolean correct) { + isCorrect = correct; + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/TestEvent.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/TestEvent.java new file mode 100644 index 000000000..83b9a5545 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/TestEvent.java @@ -0,0 +1,170 @@ +package dev.mirodil.testing_system.models; + +import dev.mirodil.testing_system.models.enums.TestEventStatus; +import org.springframework.data.annotation.Id; +import org.springframework.data.annotation.Transient; +import org.springframework.data.relational.core.mapping.Column; +import org.springframework.data.relational.core.mapping.Table; + +import java.time.Instant; +import java.util.List; +import java.util.Map; +import java.util.Set; + +@Table("test_events") +public class TestEvent { + private static final Set ALLOWED_SORT_ATTRIBUTES = Set.of( + "testEventId", "testTakerId", "testId", "eventDatetime", "testEventStatus", "scorePercentage", "testEventCreatedAt", + "email", "fname", "lname", "title" + ); + private static final Map> ALLOWED_FILTER_ATTRIBUTES = Map.of( + "eventDatetime", Instant.class, + "testEventStatus", String.class, + "scorePercentage", Integer.class, + "isPassed", Boolean.class, + "email", String.class, + "fname", String.class, + "lname", String.class, + "title", String.class + ); + + @Id + private Long id; + private Long testTakerId; + private Long testId; + @Column("event_datetime") + private Instant eventDateTime; + private TestEventStatus status; + private Float scorePoints = null; + private Integer scorePercentage = null; + private Boolean isPassed = null; + private Instant startedAt; + private Instant finishedAt; + private Instant createdAt; + private List testAttempt; + @Transient + private User testTaker; + @Transient + private Test test; + + public TestEvent() { + } + + public TestEvent(Long testTakerId, Long testId, Instant eventDateTime, TestEventStatus status) { + this.testTakerId = testTakerId; + this.testId = testId; + this.eventDateTime = eventDateTime; + this.status = status; + } + + public TestEvent(Long id, Long testTakerId, Long testId, Instant eventDateTime, TestEventStatus status, Float scorePoints, Integer scorePercentage, Boolean isPassed, Instant startedAt, Instant finishedAt, Instant createdAt) { + this(testTakerId, testId, eventDateTime, status); + this.id = id; + this.scorePoints = scorePoints; + this.scorePercentage = scorePercentage; + this.isPassed = isPassed; + this.startedAt = startedAt; + this.finishedAt = finishedAt; + this.createdAt = createdAt; + } + + public static Set getAllowedSortAttributes() { + return ALLOWED_SORT_ATTRIBUTES; + } + + public static Map> getAllowedFilterAttributes() { + return ALLOWED_FILTER_ATTRIBUTES; + } + + public Long getId() { + return id; + } + + public Long getTestTakerId() { + return testTakerId; + } + + public Long getTestId() { + return testId; + } + + public Instant getEventDateTime() { + return eventDateTime; + } + + public TestEventStatus getStatus() { + return status; + } + + public void setStatus(TestEventStatus status) { + this.status = status; + } + + public Float getScorePoints() { + return scorePoints; + } + + public void setScorePoints(Float scorePoints) { + this.scorePoints = scorePoints; + } + + public Integer getScorePercentage() { + return scorePercentage; + } + + public void setScorePercentage(Integer scorePercentage) { + this.scorePercentage = scorePercentage; + } + + public Boolean getIsPassed() { + return isPassed; + } + + public void setIsPassed(Boolean isPassed) { + this.isPassed = isPassed; + } + + public Instant getStartedAt() { + return startedAt; + } + + public void setStartedAt(Instant startedAt) { + this.startedAt = startedAt; + } + + public Instant getFinishedAt() { + return finishedAt; + } + + public void setFinishedAt(Instant finishedAt) { + this.finishedAt = finishedAt; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public List getTestAttempt() { + return testAttempt; + } + + public void setTestAttempt(List testAttempt) { + this.testAttempt = testAttempt; + } + + public User getTestTaker() { + return testTaker; + } + + public void setTestTaker(User testTaker) { + this.testTaker = testTaker; + } + + public Test getTest() { + return test; + } + + public void setTest(Test test) { + this.test = test; + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/User.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/User.java new file mode 100644 index 000000000..d3054f741 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/User.java @@ -0,0 +1,208 @@ +package dev.mirodil.testing_system.models; + +import dev.mirodil.testing_system.models.enums.PermissionType; +import dev.mirodil.testing_system.models.enums.UserGender; +import dev.mirodil.testing_system.models.enums.UserRole; +import dev.mirodil.testing_system.models.enums.UserStatus; +import org.springframework.data.annotation.Id; +import org.springframework.data.annotation.Transient; +import org.springframework.data.relational.core.mapping.Table; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; + +import java.time.Instant; +import java.time.temporal.ChronoUnit; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Map; +import java.util.Set; + +@Table("users") +public class User implements UserDetails { + private static final Set ALLOWED_SORT_ATTRIBUTES = Set.of( + "userId", "email", "roleId", "fname", "lname", "status", "createdAt" + ); + private static final Map> ALLOWED_FILTER_ATTRIBUTES = Map.of( + "userId", String.class, + "email", String.class, + "roleId", Integer.class, + "fname", String.class, + "lname", String.class, + "status", String.class, + "createdAt", Instant.class + ); + + @Id + private Long id; + private String email; + private String password; + private Long roleId; + private String fname; + private String lname; + private UserGender gender; + private UserStatus status; + private Instant createdAt; + + @Transient + private Role role; + @Transient + private Set permissionNames; + + public User() { + } + + /** + * User Constructor for shallow reading + */ + public User(Long id, String email, String fname, String lname) { + this.id = id; + this.email = email; + this.fname = fname; + this.lname = lname; + } + + /** + * User Constructor for detailed reading + */ + public User(Long id, String email, String password, Long roleId, String fname, String lname, UserGender gender, UserStatus status, Instant createdAt) { + this(email, password, roleId, fname, lname, gender); + this.id = id; + this.status = status; + this.createdAt = createdAt; + } + + /** + * User constructor only for creating a new user (with default values to userStatus & createdAt) + */ + public User(String email, String password, Long roleId, String fname, String lname, UserGender gender) { + this.email = email; + this.password = password; + this.roleId = roleId; + this.fname = fname; + this.lname = lname; + this.gender = gender; + this.status = UserStatus.ACTIVE; + this.createdAt = Instant.now().truncatedTo(ChronoUnit.SECONDS); + } + + public static Set getAllowedSortAttributes() { + return ALLOWED_SORT_ATTRIBUTES; + } + + public static Map> getAllowedFilterAttributes() { + return ALLOWED_FILTER_ATTRIBUTES; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getEmail() { + return email; + } + + public String getUsername() { + return email; + } + + @Override + public String getPassword() { + return password; + } + + public Role getUserRole() { + return role; + } + + public void setUserRole(Role role) { + this.role = role; + } + + public UserRole getUserRoleName() { + if (role == null) { + return null; + } + + return role.getName(); + } + + public Long getRoleId() { + return roleId; + } + + public void setRoleId(long roleId) { + this.roleId = roleId; + } + + public boolean isAdmin() { + return role.getName() == UserRole.ADMIN; + } + + public Set getPermissionNames() { + return permissionNames; + } + + public void setPermissionNames(Set permissionNames) { + this.permissionNames = permissionNames; + } + + public String getFirstName() { + return fname; + } + + public String getLastName() { + return lname; + } + + public UserGender getGender() { + return gender; + } + + public void setGender(UserGender gender) { + this.gender = gender; + } + + public UserStatus getStatus() { + return status; + } + + public void setUserStatus(UserStatus status) { + this.status = status; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + @Override + public Collection getAuthorities() { + Collection grantedAuthorities = new ArrayList<>(); + // Add the user's role as a GrantedAuthority + grantedAuthorities.add(new SimpleGrantedAuthority("ROLE_" + role.getName().toString().toUpperCase())); + // Add permissions associated with the role + permissionNames.forEach(permission -> + grantedAuthorities.add(new SimpleGrantedAuthority(permission.name())) + ); + + return grantedAuthorities; + } + + @Override + public boolean isAccountNonLocked() { + return status != UserStatus.BLOCKED; + } + + @Override + public boolean isEnabled() { + return isAccountNonLocked(); + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/enums/PermissionType.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/enums/PermissionType.java new file mode 100644 index 000000000..91fb4f8dd --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/enums/PermissionType.java @@ -0,0 +1,21 @@ +package dev.mirodil.testing_system.models.enums; + +public enum PermissionType { + VIEW_PROFILE, + MANAGE_PROFILE, + VIEW_ASSIGNED_TEST, + VIEW_ASSIGNED_TEST_RESULTS, + + VIEW_ASSIGNED_TEST_TAKERS, + VIEW_ALL_TEST_TAKERS, + MANAGE_TEST_TAKERS, + + MANAGE_ALL_USERS, + VIEW_ALL_TESTS, + MANAGE_OWN_TESTS, + MANAGE_ALL_TESTS, + + VIEW_ALL_TEST_RESULTS, + MANAGE_TEST_EVENTS, + MONITOR_TESTS +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/enums/TestEventStatus.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/enums/TestEventStatus.java new file mode 100644 index 000000000..d83d5d138 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/enums/TestEventStatus.java @@ -0,0 +1,13 @@ +package dev.mirodil.testing_system.models.enums; + +public enum TestEventStatus { + PENDING_APPROVAL, + SCHEDULED, + RESCHEDULED, + CANCELLED, + COMPLETED, + IN_PROGRESS, + POSTPONED, + EXPIRED, + TECHNICAL_ERROR_OCCURRED, +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/enums/UserGender.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/enums/UserGender.java new file mode 100644 index 000000000..0d80723fc --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/enums/UserGender.java @@ -0,0 +1,32 @@ +package dev.mirodil.testing_system.models.enums; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; + +@JsonDeserialize(using = UserGenderDeserializer.class) +public enum UserGender { + MALE("male"), + FEMALE("female"); + + private final String value; + + UserGender(String value) { + this.value = value; + } + + @JsonCreator + public static UserGender fromValue(String value) { + for (UserGender gender : UserGender.values()) { + if (gender.value.equalsIgnoreCase(value)) { + return gender; + } + } + throw new IllegalArgumentException("Invalid gender value: " + value); + } + + @JsonValue + public String getValue() { + return value; + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/enums/UserGenderDeserializer.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/enums/UserGenderDeserializer.java new file mode 100644 index 000000000..faa542f2c --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/enums/UserGenderDeserializer.java @@ -0,0 +1,21 @@ +package dev.mirodil.testing_system.models.enums; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; +import dev.mirodil.testing_system.exceptions.GenericValidationError; + +import java.io.IOException; +import java.util.Arrays; + +public class UserGenderDeserializer extends JsonDeserializer { + @Override + public UserGender deserialize(JsonParser p, DeserializationContext ctxt) throws IOException { + String value = p.getText().toUpperCase(); + try { + return UserGender.valueOf(value); + } catch (IllegalArgumentException e) { + throw new GenericValidationError("Invalid gender value: " + value + ". Supported values: " + Arrays.toString(UserGender.values())); + } + } +} \ No newline at end of file diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/enums/UserRole.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/enums/UserRole.java new file mode 100644 index 000000000..af8491e4c --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/enums/UserRole.java @@ -0,0 +1,9 @@ +package dev.mirodil.testing_system.models.enums; + +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; + +@JsonDeserialize(using = UserRoleDeserializer.class) +public enum UserRole { + TEST_TAKER, + ADMIN, +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/enums/UserRoleDeserializer.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/enums/UserRoleDeserializer.java new file mode 100644 index 000000000..7ecebb267 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/enums/UserRoleDeserializer.java @@ -0,0 +1,21 @@ +package dev.mirodil.testing_system.models.enums; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; +import dev.mirodil.testing_system.exceptions.GenericValidationError; + +import java.io.IOException; +import java.util.Arrays; + +public class UserRoleDeserializer extends JsonDeserializer { + @Override + public UserRole deserialize(JsonParser p, DeserializationContext ctxt) throws IOException { + String value = p.getText().toUpperCase(); + try { + return UserRole.valueOf(value); + } catch (IllegalArgumentException e) { + throw new GenericValidationError("Invalid role value: " + value + ". Supported values: " + Arrays.toString(UserRole.values())); + } + } +} \ No newline at end of file diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/enums/UserStatus.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/enums/UserStatus.java new file mode 100644 index 000000000..a69877a2d --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/models/enums/UserStatus.java @@ -0,0 +1,7 @@ +package dev.mirodil.testing_system.models.enums; + +public enum UserStatus { + PENDING, + ACTIVE, + BLOCKED, +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/CustomTestEventRepository.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/CustomTestEventRepository.java new file mode 100644 index 000000000..55bccc940 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/CustomTestEventRepository.java @@ -0,0 +1,12 @@ +package dev.mirodil.testing_system.repositories; + +import dev.mirodil.testing_system.models.TestEvent; +import dev.mirodil.testing_system.utils.PageWithFilterRequest; + +import java.util.List; + +public interface CustomTestEventRepository { + List findAndSortTestEventsWithPagination(PageWithFilterRequest pageable); + + long countFilteredTestEvents(PageWithFilterRequest pageable); +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/CustomUserRepository.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/CustomUserRepository.java new file mode 100644 index 000000000..669cafdcc --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/CustomUserRepository.java @@ -0,0 +1,12 @@ +package dev.mirodil.testing_system.repositories; + +import dev.mirodil.testing_system.models.User; +import dev.mirodil.testing_system.utils.PageWithFilterRequest; + +import java.util.List; + +public interface CustomUserRepository { + List findAndSortUsersWithPagination(PageWithFilterRequest pageable); + + long countFilteredUsers(PageWithFilterRequest pageable); +} \ No newline at end of file diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/GenericRepositoryWithPagination.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/GenericRepositoryWithPagination.java new file mode 100644 index 000000000..d3e11f3d0 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/GenericRepositoryWithPagination.java @@ -0,0 +1,12 @@ +package dev.mirodil.testing_system.repositories; + +import dev.mirodil.testing_system.utils.PageWithFilterRequest; +import org.springframework.jdbc.core.RowMapper; + +import java.util.List; + +public interface GenericRepositoryWithPagination { + List findAndSortModelWithPagination(PageWithFilterRequest pageable, StringBuilder queryBuilder, RowMapper rowMapper); + + long countFilteredModel(PageWithFilterRequest pageable, StringBuilder queryBuilder); +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/GenericRowMapper.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/GenericRowMapper.java new file mode 100644 index 000000000..3b82ad6cf --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/GenericRowMapper.java @@ -0,0 +1,25 @@ +package dev.mirodil.testing_system.repositories; + +import org.springframework.jdbc.core.RowMapper; + +import java.sql.ResultSet; +import java.sql.SQLException; + +public class GenericRowMapper implements RowMapper { + + private final ResultSetExtractor extractor; + + public GenericRowMapper(ResultSetExtractor extractor) { + this.extractor = extractor; + } + + @Override + public T mapRow(ResultSet rs, int rowNum) throws SQLException { + return extractor.extractData(rs); + } + + @FunctionalInterface + public interface ResultSetExtractor { + T extractData(ResultSet rs) throws SQLException; + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/RoleRepository.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/RoleRepository.java new file mode 100644 index 000000000..a5ce26259 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/RoleRepository.java @@ -0,0 +1,23 @@ +package dev.mirodil.testing_system.repositories; + +import dev.mirodil.testing_system.models.Role; +import dev.mirodil.testing_system.models.enums.UserRole; +import org.springframework.data.jdbc.repository.query.Query; +import org.springframework.data.repository.CrudRepository; + +import java.util.Optional; + +public interface RoleRepository extends CrudRepository { + String BASE_QUERY = """ + SELECT r.id AS role_id, r.name AS role_name, p.id AS permission_id, p.name AS permission_name, p.description AS permission_description + FROM roles r + LEFT JOIN role_permissions rp ON r.id = rp.role_id + LEFT JOIN permissions p ON rp.permission_id = p.id + """; + + @Query( + value = BASE_QUERY + " WHERE r.name = :name", + resultSetExtractorRef = "roleWithPermissionResultSetExtractor" + ) + Optional findRoleWithPermissionsByName(UserRole name); +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/RoleWithPermissionResultSetExtractor.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/RoleWithPermissionResultSetExtractor.java new file mode 100644 index 000000000..de50c6aab --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/RoleWithPermissionResultSetExtractor.java @@ -0,0 +1,38 @@ +package dev.mirodil.testing_system.repositories; + +import dev.mirodil.testing_system.models.Permission; +import dev.mirodil.testing_system.models.Role; +import dev.mirodil.testing_system.utils.DataUtil; +import org.springframework.dao.DataAccessException; +import org.springframework.jdbc.core.ResultSetExtractor; + +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.HashSet; +import java.util.Set; + +public class RoleWithPermissionResultSetExtractor implements ResultSetExtractor { + @Override + public Role extractData(ResultSet rs) throws SQLException, DataAccessException { + Role role = null; + Set permissions = new HashSet<>(); + + while (rs.next()) { + // Same role with multiple permissions + if (role == null) { + role = DataUtil.extractRoleFromResultSet(rs); + } + + rs.getString("permission_name"); + if (!rs.wasNull()) { + permissions.add(DataUtil.extractPermissionFromResultSet(rs)); + } + } + + if (role != null) { + role.setPermissions(permissions); + } + + return role; + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/TestEventRepository.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/TestEventRepository.java new file mode 100644 index 000000000..876eb0143 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/TestEventRepository.java @@ -0,0 +1,15 @@ +package dev.mirodil.testing_system.repositories; + +import dev.mirodil.testing_system.models.TestEvent; +import org.springframework.data.jdbc.repository.query.Query; +import org.springframework.data.repository.CrudRepository; + +import java.util.Optional; + +public interface TestEventRepository extends CrudRepository, CustomTestEventRepository { + String GET_DETAILED_BASE_QUERY = "SELECT * FROM test_events_view"; + + @Query(value = GET_DETAILED_BASE_QUERY + " WHERE test_event_id = :id", + rowMapperRef = "testEventRowMapper") + Optional getTestEventsById(Long id); +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/UserRepository.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/UserRepository.java new file mode 100644 index 000000000..3e9b980bb --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/UserRepository.java @@ -0,0 +1,28 @@ +package dev.mirodil.testing_system.repositories; + +import dev.mirodil.testing_system.models.User; +import org.springframework.data.jdbc.repository.query.Query; +import org.springframework.data.repository.CrudRepository; + +import java.util.Optional; + +public interface UserRepository extends CrudRepository, CustomUserRepository { + String BASE_QUERY = """ + SELECT users.id AS user_id, email, password, fname, lname, gender, status, created_at, + roles.id AS role_id, roles.name AS role_name, + array_agg(p.name) FILTER (WHERE p.name IS NOT NULL) AS permission_names + FROM users + LEFT JOIN roles ON users.role_id = roles.id + LEFT JOIN role_permissions rp ON roles.id = rp.role_id + LEFT JOIN permissions p ON rp.permission_id = p.id + """; + String GROUP_BY_CLAUSE = " GROUP BY users.id, roles.id"; + + @Query(value = BASE_QUERY + " WHERE users.email = :email" + GROUP_BY_CLAUSE, + resultSetExtractorRef = "userWithPermissionResultSetExtractor") + Optional findUserByEmail(String email); + + @Query(value = BASE_QUERY + " WHERE users.id = :id" + GROUP_BY_CLAUSE, + resultSetExtractorRef = "userWithPermissionResultSetExtractor") + Optional findUserById(Long id); +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/UserWithPermissionResultSetExtractor.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/UserWithPermissionResultSetExtractor.java new file mode 100644 index 000000000..dbcb903ec --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/UserWithPermissionResultSetExtractor.java @@ -0,0 +1,42 @@ +package dev.mirodil.testing_system.repositories; + +import dev.mirodil.testing_system.models.User; +import dev.mirodil.testing_system.models.enums.PermissionType; +import dev.mirodil.testing_system.utils.DataUtil; +import org.springframework.dao.DataAccessException; +import org.springframework.jdbc.core.ResultSetExtractor; + +import java.sql.Array; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.HashSet; +import java.util.Set; + +public class UserWithPermissionResultSetExtractor implements ResultSetExtractor { + @Override + public User extractData(ResultSet rs) throws SQLException, DataAccessException { + User user = null; + Set permissionNames = new HashSet<>(); + + while (rs.next()) { + // Same user with multiple permissions names + if (user == null) { + user = DataUtil.extractUserFromResultSet(rs); + } + + if (DataUtil.isColumnSet(rs, "permission_names")) { + Array permissionNamesArray = rs.getArray("permission_names"); + String[] permissionNamesString = (String[]) permissionNamesArray.getArray(); + for (String permissionName : permissionNamesString) { + permissionNames.add(PermissionType.valueOf(permissionName)); + } + } + } + + if (user != null) { + user.setPermissionNames(permissionNames); + } + + return user; + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/impls/CustomTestEventRepositoryImpl.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/impls/CustomTestEventRepositoryImpl.java new file mode 100644 index 000000000..89ae7275f --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/impls/CustomTestEventRepositoryImpl.java @@ -0,0 +1,43 @@ +package dev.mirodil.testing_system.repositories.impls; + +import dev.mirodil.testing_system.models.TestEvent; +import dev.mirodil.testing_system.repositories.CustomTestEventRepository; +import dev.mirodil.testing_system.repositories.GenericRepositoryWithPagination; +import dev.mirodil.testing_system.utils.PageWithFilterRequest; +import org.springframework.jdbc.core.RowMapper; + +import java.util.List; + +public class CustomTestEventRepositoryImpl implements CustomTestEventRepository { + private final RowMapper testEventRowMapper; + private final GenericRepositoryWithPagination paginationRepository; + + public CustomTestEventRepositoryImpl(RowMapper testEventRowMapper, GenericRepositoryWithPagination paginationRepository) { + this.testEventRowMapper = testEventRowMapper; + this.paginationRepository = paginationRepository; + } + + @Override + public List findAndSortTestEventsWithPagination(PageWithFilterRequest pageable) { + return paginationRepository.findAndSortModelWithPagination(pageable, getBaseQuery(), testEventRowMapper); + } + + @Override + public long countFilteredTestEvents(PageWithFilterRequest pageable) { + return paginationRepository.countFilteredModel(pageable, getCountBaseQuery()); + } + + private StringBuilder getBaseQuery() { + return new StringBuilder(""" + SELECT test_event_id, event_datetime, test_event_status, + score_points, score_percentage, is_passed, started_at, finished_at, test_event_created_at, + test_taker_id, email, fname, lname, + test_id, title, duration, no_of_questions, passing_percentage + FROM test_events_view + """); + } + + private StringBuilder getCountBaseQuery() { + return new StringBuilder("SELECT count(*) FROM test_events_view"); + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/impls/CustomUserRepositoryImpl.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/impls/CustomUserRepositoryImpl.java new file mode 100644 index 000000000..31037a95b --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/impls/CustomUserRepositoryImpl.java @@ -0,0 +1,45 @@ +package dev.mirodil.testing_system.repositories.impls; + +import dev.mirodil.testing_system.models.User; +import dev.mirodil.testing_system.repositories.CustomUserRepository; +import dev.mirodil.testing_system.repositories.GenericRepositoryWithPagination; +import dev.mirodil.testing_system.utils.PageWithFilterRequest; +import org.springframework.jdbc.core.RowMapper; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public class CustomUserRepositoryImpl implements CustomUserRepository { + private final RowMapper userRowMapper; + private final GenericRepositoryWithPagination paginationRepository; + + public CustomUserRepositoryImpl(RowMapper userRowMapper, GenericRepositoryWithPagination paginationRepository) { + this.userRowMapper = userRowMapper; + this.paginationRepository = paginationRepository; + } + + @Override + public List findAndSortUsersWithPagination(PageWithFilterRequest pageable) { + return paginationRepository.findAndSortModelWithPagination(pageable, getBaseQuery(), userRowMapper); + } + + @Override + public long countFilteredUsers(PageWithFilterRequest pageable) { + return paginationRepository.countFilteredModel(pageable, getCountBaseQuery()); + } + + private StringBuilder getBaseQuery() { + return new StringBuilder(""" + SELECT users.id AS user_id, email, password, fname, lname, gender, status, created_at, + roles.id AS role_id, roles.name AS role_name + FROM users + LEFT JOIN roles ON users.role_id = roles.id + """ + ); + } + + private StringBuilder getCountBaseQuery() { + return new StringBuilder("SELECT count(*) FROM users"); + } +} \ No newline at end of file diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/impls/GenericRepositoryWithPaginationImpl.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/impls/GenericRepositoryWithPaginationImpl.java new file mode 100644 index 000000000..d114674c0 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/repositories/impls/GenericRepositoryWithPaginationImpl.java @@ -0,0 +1,65 @@ +package dev.mirodil.testing_system.repositories.impls; + +import dev.mirodil.testing_system.repositories.GenericRepositoryWithPagination; +import dev.mirodil.testing_system.utils.FilterCriteria; +import dev.mirodil.testing_system.utils.PageWithFilterRequest; +import org.springframework.data.domain.Sort; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.RowMapper; +import org.springframework.stereotype.Repository; + +import java.util.ArrayList; +import java.util.List; + +import static dev.mirodil.testing_system.utils.DataUtil.appendOrderByClause; +import static dev.mirodil.testing_system.utils.DataUtil.appendWhereClause; + +@Repository +public class GenericRepositoryWithPaginationImpl implements GenericRepositoryWithPagination { + private final JdbcTemplate jdbcTemplate; + + public GenericRepositoryWithPaginationImpl(JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; + } + + @Override + public List findAndSortModelWithPagination(PageWithFilterRequest pageable, StringBuilder queryBuilder, RowMapper rowMapper) { + // Add filters dynamically + List> filters = pageable.getFilters(); + List queryParams = new ArrayList<>( + appendWhereClause(queryBuilder, filters) + ); + + // Add sorting dynamically + Sort sort = pageable.getSort(); + appendOrderByClause(queryBuilder, sort); + + // Add pagination + queryBuilder.append(" LIMIT ? OFFSET ?"); + queryParams.add(pageable.getPageSize()); + queryParams.add(pageable.getOffset()); + + // Execute the query + return jdbcTemplate.query( + queryBuilder.toString(), + rowMapper, + queryParams.toArray() + ); + } + + @Override + public long countFilteredModel(PageWithFilterRequest pageable, StringBuilder queryBuilder) { + // Add filters dynamically + List> filters = pageable.getFilters(); + List queryParams = new ArrayList<>( + appendWhereClause(queryBuilder, filters) + ); + + Long count = jdbcTemplate.queryForObject( + queryBuilder.toString(), + Long.class, + queryParams.toArray() + ); + return count != null ? count : 0L; + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/services/AuthService.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/services/AuthService.java new file mode 100644 index 000000000..77596c0c6 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/services/AuthService.java @@ -0,0 +1,51 @@ +package dev.mirodil.testing_system.services; + +import dev.mirodil.testing_system.dtos.AuthResponseDTO; +import dev.mirodil.testing_system.dtos.UserLoginRequestDTO; +import dev.mirodil.testing_system.dtos.UserResponseDTO; +import dev.mirodil.testing_system.models.User; +import dev.mirodil.testing_system.utils.AuthUtil; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Service; + +import javax.security.auth.login.AccountLockedException; +import java.util.Map; + +@Service +public class AuthService { + private final UserService userService; + + public AuthService(UserService userService) { + this.userService = userService; + } + + public AuthResponseDTO authenticate(UserLoginRequestDTO request, HttpServletRequest servletRequest) throws BadCredentialsException, AccountLockedException { + User user; + try { + user = userService.loadUserByUsername(request.email()); + } catch (UsernameNotFoundException e) { + throw new BadCredentialsException("Email or password is incorrect"); + } + + if (!AuthUtil.isPasswordMatches(request.password(), user.getPassword())) { + throw new BadCredentialsException("Email or password is incorrect"); + } + + if (!user.isAccountNonLocked()) { + throw new AccountLockedException("Your account is locked. Please contact support."); + } + + AuthUtil.setAuthenticationToSecurityContext(user, servletRequest); + Map jwtTokenDetails = AuthUtil.generateTokenDetails(user.getEmail()); + + return new AuthResponseDTO(new UserResponseDTO(user), jwtTokenDetails); + } + + public void logout(HttpServletRequest request) { + SecurityContextHolder.clearContext(); + AuthUtil.blacklistToken(AuthUtil.extractTokenFromRequest(request)); + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/services/TestEventService.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/services/TestEventService.java new file mode 100644 index 000000000..fb6b81025 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/services/TestEventService.java @@ -0,0 +1,41 @@ +package dev.mirodil.testing_system.services; + +import dev.mirodil.testing_system.dtos.PagedResponse; +import dev.mirodil.testing_system.dtos.TestEventResponseDTO; +import dev.mirodil.testing_system.exceptions.ResourceNotFoundException; +import dev.mirodil.testing_system.models.TestEvent; +import dev.mirodil.testing_system.repositories.TestEventRepository; +import dev.mirodil.testing_system.utils.PageWithFilterRequest; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class TestEventService { + private final TestEventRepository testEventRepository; + + public TestEventService(TestEventRepository testEventRepository) { + this.testEventRepository = testEventRepository; + } + + public PagedResponse getTestEvents(PageWithFilterRequest pageable, String fullUrl) { + List testEvents = testEventRepository.findAndSortTestEventsWithPagination(pageable); + long totalElements = testEventRepository.countFilteredTestEvents(pageable); + + List testEventsDTO = testEvents.stream() + .map(TestEventResponseDTO::new) + .toList(); + Page page = new PageImpl<>(testEventsDTO, pageable, totalElements); + + return new PagedResponse<>(page, fullUrl); + } + + public TestEventResponseDTO getTestEventById(Long id) { + TestEvent testEvent = testEventRepository.getTestEventsById(id).orElseThrow( + () -> new ResourceNotFoundException("Test event not found with id: " + id) + ); + return new TestEventResponseDTO(testEvent); + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/services/UserService.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/services/UserService.java new file mode 100644 index 000000000..197ff8c92 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/services/UserService.java @@ -0,0 +1,115 @@ +package dev.mirodil.testing_system.services; + +import dev.mirodil.testing_system.dtos.*; +import dev.mirodil.testing_system.exceptions.GenericValidationError; +import dev.mirodil.testing_system.exceptions.ResourceNotFoundException; +import dev.mirodil.testing_system.models.Role; +import dev.mirodil.testing_system.models.User; +import dev.mirodil.testing_system.models.enums.UserRole; +import dev.mirodil.testing_system.repositories.RoleRepository; +import dev.mirodil.testing_system.repositories.UserRepository; +import dev.mirodil.testing_system.utils.AuthUtil; +import dev.mirodil.testing_system.utils.PageWithFilterRequest; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +@Service +public class UserService implements UserDetailsService { + private final UserRepository userRepository; + private final RoleRepository roleRepository; + + public UserService(UserRepository userRepository, RoleRepository roleRepository) { + this.userRepository = userRepository; + this.roleRepository = roleRepository; + } + + private static User prepareNewUser(UserRequestDTO request, Role role) { + User user = new User( + request.email(), + AuthUtil.encodePassword(request.password()), + role.getId(), + request.fname(), + request.lname(), + request.gender() + ); + user.setUserRole(role); + if (role.isPermissionsSet()) { + user.setPermissionNames(role.getPermissionNames()); + } + return user; + } + + public UserResponseDTO getProfile() { + return AuthUtil.getAuthenticatedUserDTO(); + } + + // TODO: change user profile (details, password) + + public AuthResponseDTO createTestTaker(TestTakerRegisterRequestDTO request, HttpServletRequest servletRequest) { + Role defaultRole = roleRepository.findRoleWithPermissionsByName(UserRole.TEST_TAKER) + .orElseThrow(() -> new GenericValidationError("Role not found: " + UserRole.TEST_TAKER.name())); + + User user = saveNewUser(request, defaultRole); + UserResponseDTO userDTO = new UserResponseDTO(user); + AuthUtil.setAuthenticationToSecurityContext(user, servletRequest); + + return convertToAuthResponse(userDTO); + } + + public UserResponseDTO createUser(UserCreateRequestDTO request) { + Role role = roleRepository.findRoleWithPermissionsByName(request.role()) + .orElseThrow(() -> new GenericValidationError("Role not found: " + request.role().name())); + + return new UserResponseDTO(saveNewUser(request, role)); + } + + private User saveNewUser(UserRequestDTO request, Role role) { + User user = prepareNewUser(request, role); + return userRepository.save(user); + } + + private AuthResponseDTO convertToAuthResponse(UserResponseDTO userDTO) { + Map jwtTokenDetails = AuthUtil.generateTokenDetails(userDTO.email()); + return new AuthResponseDTO(userDTO, jwtTokenDetails); + } + + public UserResponseDTO getUserById(Long id) { + User user = userRepository.findUserById(id).orElseThrow( + () -> new ResourceNotFoundException("User not found with id: " + id) + ); + return new UserResponseDTO(user); + } + + public PagedResponse getUsers(PageWithFilterRequest pageable, String fullUrl) { + List users = userRepository.findAndSortUsersWithPagination(pageable); + long totalElements = userRepository.countFilteredUsers(pageable); + + List usersDTO = users.stream() + .map(UserResponseDTO::new) + .toList(); + Page page = new PageImpl<>(usersDTO, pageable, totalElements); + + return new PagedResponse<>(page, fullUrl); + } + + @Override + public User loadUserByUsername(String username) throws UsernameNotFoundException { + return userRepository.findUserByEmail(username).orElseThrow( + () -> new UsernameNotFoundException("User with " + username + " username doesn't exist") + ); + } + + public UserResponseDTO getUserByEmail(String email) { + User user = userRepository.findUserByEmail(email).orElseThrow( + () -> new ResourceNotFoundException("User not found with email: " + email) + ); + return new UserResponseDTO(user); + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/utils/AppUtil.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/utils/AppUtil.java new file mode 100644 index 000000000..7bd5067d1 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/utils/AppUtil.java @@ -0,0 +1,14 @@ +package dev.mirodil.testing_system.utils; + +import jakarta.servlet.http.HttpServletRequest; + +public class AppUtil { + public static String getUrlWithQueryParams(HttpServletRequest request) { + String fullUrl = request.getRequestURL().toString(); + String queryParams = request.getQueryString(); + if (queryParams != null) { + fullUrl += "?" + queryParams; + } + return fullUrl; + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/utils/AuthUtil.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/utils/AuthUtil.java new file mode 100644 index 000000000..91cedb621 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/utils/AuthUtil.java @@ -0,0 +1,179 @@ +package dev.mirodil.testing_system.utils; + +import dev.mirodil.testing_system.controllers.UserManagementController; +import dev.mirodil.testing_system.dtos.UserResponseDTO; +import dev.mirodil.testing_system.exceptions.InvalidTokenException; +import dev.mirodil.testing_system.exceptions.UnauthorizedException; +import dev.mirodil.testing_system.models.User; +import dev.mirodil.testing_system.models.enums.UserRole; +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.security.Keys; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.http.HttpStatus; +import org.springframework.security.authentication.AnonymousAuthenticationToken; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; +import org.springframework.stereotype.Component; + +import javax.crypto.SecretKey; +import java.net.URI; +import java.time.Instant; +import java.util.Date; +import java.util.Map; +import java.util.concurrent.TimeUnit; + +import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo; +import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.methodOn; + +@Component +public class AuthUtil { + private static final long ONE_DAY_IN_SECONDS = 24 * 60 * 60; + private static final String secretKeyPlain = System.getenv("SECRET_KEY"); + private static final SecretKey key = Keys.hmacShaKeyFor(secretKeyPlain.getBytes()); + private static PasswordEncoder passwordEncoder; + private static StringRedisTemplate redisTemplate; + + public AuthUtil(StringRedisTemplate redisTemplate, PasswordEncoder passwordEncoder) { + AuthUtil.redisTemplate = redisTemplate; + AuthUtil.passwordEncoder = passwordEncoder; + } + + public static void blacklistToken(String token) { + redisTemplate.opsForValue().set( + token, + "blackListed", + ONE_DAY_IN_SECONDS, + TimeUnit.SECONDS + ); + } + + public static boolean isTokenBlacklisted(String token) { + return redisTemplate.hasKey(token); + } + + public static void checkTokenBlacklisted(String token) throws InvalidTokenException { + if (isTokenBlacklisted(token)) { + throw new InvalidTokenException(); + } + } + + public static boolean isUserAuthenticated() { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + return isUserAuthenticated(authentication); + } + + public static boolean isUserAuthenticated(Authentication authentication) { + return authentication != null && + authentication.isAuthenticated() && + !(authentication instanceof AnonymousAuthenticationToken); + } + + public static UserResponseDTO getAuthenticatedUserDTO() throws UnauthorizedException { + User user = getAuthenticatedUser(); + if (user.isAdmin()) { + URI customPath = linkTo(methodOn(UserManagementController.class).getProfile()).toUri(); + return new UserResponseDTO(user, customPath); + } + return new UserResponseDTO(user); + } + + public static User getAuthenticatedUser() throws UnauthorizedException { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + if (!isUserAuthenticated(authentication)) { + throw new UnauthorizedException(); + } + return (User) authentication.getPrincipal(); + } + + public static UserRole getAuthenticatedUserRole() throws UnauthorizedException { + User user = getAuthenticatedUser(); + return user.getUserRoleName(); + } + + private static Claims getClaims(String token) { + return Jwts.parser() + .verifyWith(key) + .build() + .parseSignedClaims(token) + .getPayload(); + } + + public static String extractUsername(String token) { + return getClaims(token).getSubject(); + } + + public static String extractTokenFromRequest(HttpServletRequest request) throws InvalidTokenException { + final String authHeader = request.getHeader("Authorization"); + if (authHeader == null || !authHeader.startsWith("Bearer ")) { + throw new InvalidTokenException("Authorization header is missing or invalid", HttpStatus.BAD_REQUEST); + } + + return authHeader.substring(7); + } + + public static boolean isTokenExpired(String token) { + Claims claims = getClaims(token); + return claims.getExpiration().toInstant().isBefore(Instant.now()); + } + + public static Map generateTokenDetails(String subject) { + String jwtToken = generateToken(subject); + Instant expiresAt = getTokenExpiresAt(jwtToken); + + return Map.of( + "access", jwtToken, + "issuedAt", Instant.now(), + "expiresAt", expiresAt, + "type", "Bearer" + ); + } + + public static Instant getTokenExpiresAt(String token) { + Claims claims = getClaims(token); + return claims.getExpiration().toInstant(); + } + + public static String generateToken(String subject) { + Instant iat = Instant.now(); + Instant exp = iat.plusSeconds(ONE_DAY_IN_SECONDS); + return generateToken(subject, exp); + } + + public static String generateToken(String subject, Instant exp) { + Instant iat = Instant.now(); + if (exp.isBefore(iat)) { + throw new IllegalArgumentException("JWT token's expiration date cannot be before it's issued date"); + } + return Jwts + .builder() + .subject(subject) + .issuedAt(Date.from(iat)) + .expiration(Date.from(exp)) + .signWith(key, Jwts.SIG.HS256) + .compact(); + } + + public static String encodePassword(String rawPassword) { + return passwordEncoder.encode(rawPassword); + } + + public static boolean isPasswordMatches(String rawPassword, String encodedPassword) { + return passwordEncoder.matches(rawPassword, encodedPassword); + } + + public static void setAuthenticationToSecurityContext(User user, HttpServletRequest request) { + UsernamePasswordAuthenticationToken authenticationToken = + UsernamePasswordAuthenticationToken.authenticated( + user, + null, + user.getAuthorities() + ); + authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request)); + SecurityContextHolder.getContext().setAuthentication(authenticationToken); + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/utils/DataUtil.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/utils/DataUtil.java new file mode 100644 index 000000000..5617b2b9e --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/utils/DataUtil.java @@ -0,0 +1,271 @@ +package dev.mirodil.testing_system.utils; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import dev.mirodil.testing_system.models.*; +import dev.mirodil.testing_system.models.enums.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.data.domain.Sort; + +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Timestamp; +import java.time.Instant; +import java.time.ZoneOffset; +import java.time.temporal.ChronoUnit; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +public class DataUtil { + private static final Logger logger = LoggerFactory.getLogger(DataUtil.class); + private static final ObjectMapper objectMapper = new ObjectMapper(); + + + public static void appendOrderByClause(StringBuilder queryBuilder, Sort sort) { + if (sort.isEmpty()) { + return; + } + + queryBuilder.append(" ORDER BY "); + queryBuilder.append(sort.stream() + .map(order -> convertToSnakeCase(order.getProperty()) + " " + order.getDirection().name()) + .collect(Collectors.joining(", "))); + } + + public static List appendWhereClause(StringBuilder queryBuilder, List> filters) { + List queryParams = new ArrayList<>(); + if (filters.isEmpty()) { + return queryParams; + } + + boolean hasWhereClause = queryBuilder.toString().toUpperCase().contains(" WHERE "); + queryBuilder.append(hasWhereClause ? " AND " : " WHERE "); + + List conditions = new ArrayList<>(); + for (FilterCriteria filterCriteria : filters) { + List operators = filterCriteria.operators(); + List values = filterCriteria.values(); + + // Ensure operators and values are aligned correctly + boolean isOperatorOnlyEquality = operators.size() == 1 && operators.getFirst().equals("="); + if (operators.size() != values.size() && !isOperatorOnlyEquality) { // except if operators list is List.of("=") - ?status=active,inactive + throw new IllegalArgumentException("Invalid FilterCriteria: Operators and values must match in size. Received: " + filterCriteria); + } + + String attribute = convertToSnakeCase(filterCriteria.attribute()); + for (int i = 0; i < values.size(); i++) { + Object value = values.get(i); + String operator = operators.get(i); + + if (isOperatorOnlyEquality && values.size() > 1) { + // Handle multi-value IN clause (e.g., status=active,inactive) + String placeholders = String.join(",", Collections.nCopies(values.size(), "?")); + conditions.add(attribute + " IN (" + placeholders + ")"); + queryParams.addAll(values); + break; + } else if (value == null) { + conditions.add(attribute + " IS NULL"); + } else if (value instanceof String) { + queryParams.add("%" + value + "%"); + conditions.add(attribute + " LIKE ?"); + } else if (value instanceof Boolean || value instanceof Number) { + queryParams.add(value); + conditions.add(attribute + " " + operator + " ?"); + } else if (value instanceof Instant instantValue) { + boolean isDateOnly = instantValue.toString().endsWith("T00:00:00Z"); + if (isDateOnly && operator.equals("=")) { + Instant endOfDay = instantValue.plus(1, ChronoUnit.DAYS).minusMillis(1); + + queryParams.add(Timestamp.valueOf(instantValue.atZone(ZoneOffset.UTC).toLocalDateTime())); + queryParams.add(Timestamp.valueOf(endOfDay.atZone(ZoneOffset.UTC).toLocalDateTime())); + conditions.add(attribute + " BETWEEN ? AND ?"); + } else { + // Normal timestamp comparison + queryParams.add(Timestamp.valueOf(instantValue.atZone(ZoneOffset.UTC).toLocalDateTime())); + conditions.add(attribute + " " + operator + " ?"); + } + } else { + throw new IllegalArgumentException("Unsupported filter type for attribute '" + attribute + "': " + value.getClass().getSimpleName()); + } + } + } + queryBuilder.append(String.join(" AND ", conditions)); + + return queryParams; + } + + public static String convertToSnakeCase(String camelCase) { + if (camelCase == null || camelCase.isEmpty()) { + return camelCase; + } + return camelCase.replaceAll("([a-z])([A-Z])", "$1_$2").toLowerCase(); + } + + public static User extractUserFromResultSet(ResultSet rs) throws SQLException { + User user = new User( + rs.getLong("user_id"), + rs.getString("email"), + rs.getString("password"), + rs.getLong("role_id"), + rs.getString("fname"), + rs.getString("lname"), + UserGender.valueOf(rs.getString("gender")), + UserStatus.valueOf(rs.getString("status")), + Optional.ofNullable(rs.getTimestamp("created_at")) + .map(Timestamp::toInstant) + .orElse(null) + ); + Role role = extractRoleFromResultSet(rs); + user.setUserRole(role); + + return user; + } + + public static Role extractRoleFromResultSet(ResultSet rs) throws SQLException { + return new Role( + rs.getLong("role_id"), + UserRole.valueOf(rs.getString("role_name")) + ); + } + + public static Permission extractPermissionFromResultSet(ResultSet rs) throws SQLException { + return new Permission( + rs.getLong("permission_id"), + PermissionType.valueOf(rs.getString("permission_name")), + rs.getString("permission_description") + ); + } + + public static TestEvent extractTestEventFromResultSet(ResultSet rs) throws SQLException { + TestEvent testEvent = new TestEvent( + rs.getLong("test_event_id"), + rs.getLong("test_taker_id"), + rs.getLong("test_id"), + Optional.ofNullable(rs.getTimestamp("event_datetime")) + .map(Timestamp::toInstant) + .orElse(null), + TestEventStatus.valueOf(rs.getString("test_event_status")), + (Float) rs.getObject("score_points"), + (Integer) rs.getObject("score_percentage"), + (Boolean) rs.getObject("is_passed"), + Optional.ofNullable(rs.getTimestamp("started_at")) + .map(Timestamp::toInstant) + .orElse(null), + Optional.ofNullable(rs.getTimestamp("finished_at")) + .map(Timestamp::toInstant) + .orElse(null), + Optional.ofNullable(rs.getTimestamp("test_event_created_at")) + .map(Timestamp::toInstant) + .orElse(null) + ); + if (hasColumn(rs, "test_attempt")) { + List testAttempt = extractTestAttemptFromResultSet(rs); + testEvent.setTestAttempt(testAttempt); + } + + testEvent.setTestTaker(extractTestTakerFromResultSet(rs)); + + testEvent.setTest(extractTestFromResultSet(rs)); + + return testEvent; + } + + private static List extractTestAttemptFromResultSet(ResultSet rs) throws SQLException { + String testAttemptJson = rs.getString("test_attempt"); + if (testAttemptJson != null && !testAttemptJson.isEmpty()) { + try { + return objectMapper.readValue(testAttemptJson, new TypeReference<>() { + }); + } catch (Exception e) { + throw new SQLException("Failed to deserialize test_attempt JSON", e); + } + } + + return List.of(); + } + + private static User extractTestTakerFromResultSet(ResultSet rs) throws SQLException { + User testTaker = new User( + rs.getLong("test_taker_id"), + rs.getString("email"), + rs.getString("fname"), + rs.getString("lname") + ); + String[] otherUserColumns = {"gender", "user_status", "user_created_at"}; + if (hasColumns(rs, otherUserColumns)) { + testTaker.setGender(UserGender.valueOf(rs.getString("gender"))); + testTaker.setUserStatus(UserStatus.valueOf(rs.getString("user_status"))); + testTaker.setCreatedAt(Optional.ofNullable(rs.getTimestamp("user_created_at")) + .map(Timestamp::toInstant) + .orElse(null)); + } + if (isColumnSet(rs, "role_name")) { + testTaker.setUserRole(extractRoleFromResultSet(rs)); + } + + return testTaker; + } + + public static Test extractTestFromResultSet(ResultSet rs) throws SQLException { + return new Test( + rs.getLong("test_id"), + rs.getString("title"), + hasColumn(rs, "description") ? rs.getString("description") : null, + rs.getInt("duration"), + rs.getInt("no_of_questions"), + rs.getInt("passing_percentage"), + hasColumn(rs, "should_shuffle") ? rs.getBoolean("should_shuffle") : null, + hasColumn(rs, "should_randomly_pick") ? rs.getBoolean("should_randomly_pick") : null, + hasColumn(rs, "deleted_at") ? + Optional.ofNullable(rs.getTimestamp("deleted_at")) + .map(Timestamp::toInstant) + .orElse(null) + : null + ); + } + + /// Note: Int, Double, Boolean is assumed set even if it's null + public static boolean isColumnSet(ResultSet rs, String column) throws SQLException { + if (rs == null || column == null || column.trim().isEmpty()) { + return false; + } + + if (!hasColumn(rs, column)) { + return false; + } + + Object value = rs.getObject(column); + if (value == null) { + return false; + } + + if (value instanceof String) { + return !((String) value).trim().isEmpty(); + } + + return true; + } + + public static boolean hasColumn(ResultSet rs, String column) { + try { + rs.findColumn(column); + return true; + } catch (SQLException e) { + logger.debug("column doesn't exist {}", column); + } + return false; + } + + public static boolean hasColumns(ResultSet rs, String[] columns) { + for (String column : columns) { + if (!hasColumn(rs, column)) { + return false; + } + } + return true; + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/utils/FilterCriteria.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/utils/FilterCriteria.java new file mode 100644 index 000000000..b4a7a9e28 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/utils/FilterCriteria.java @@ -0,0 +1,11 @@ +package dev.mirodil.testing_system.utils; + +import java.util.List; + +public record FilterCriteria(String attribute, List operators, List values) { + + @Override + public String toString() { + return attribute + " " + operators + " " + values; + } +} \ No newline at end of file diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/utils/PageWithFilterRequest.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/utils/PageWithFilterRequest.java new file mode 100644 index 000000000..b218178af --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/utils/PageWithFilterRequest.java @@ -0,0 +1,46 @@ +package dev.mirodil.testing_system.utils; + +import dev.mirodil.testing_system.configs.PageableWithFilterResolver; +import io.swagger.v3.oas.annotations.media.Schema; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; + +import java.util.ArrayList; +import java.util.List; + +/** + * Extends {@link PageRequest} to support dynamic filtering. + *

+ * Filters are stored as a List of {@link FilterCriteria} + *

+ * {@code List(key, List, List)>} + *

+ * Example query: {@code ?scorePercentage>=70&scorePercentage<=90&isPassed=true,false} + *

+ * [
+ *   new FilterCriteria<>("scorePercentage", List.of(">=", "<="), List.of(70, 90)), // Integer values
+ *   new FilterCriteria<>("isPassed", List.of("="), List.of(true, false)) // Boolean values
+ * ]
+ * 
+ * Internally, {@link PageableWithFilterResolver} converts them to the correct types. + * + * @see PageableWithFilterResolver + * @see PageRequest + */ +@Schema(description = "Custom pageable request with filters") +public class PageWithFilterRequest extends PageRequest { + /** + * Filter criteria in the form of {@code List(key, List, List)>}. + */ + @Schema(description = "Map of filter criteria. Add as query parameters (e.g., ?scorePercentage>=70&scorePercentage<=90&isPassed=true,false).") + private final List> filters; + + public PageWithFilterRequest(int pageNumber, int pageSize, Sort sort, List> filters) { + super(pageNumber, pageSize, sort); + this.filters = filters != null ? filters : new ArrayList<>(); + } + + public List> getFilters() { + return filters; + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/utils/ValidationUtil.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/utils/ValidationUtil.java new file mode 100644 index 000000000..0fa806168 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/utils/ValidationUtil.java @@ -0,0 +1,112 @@ +package dev.mirodil.testing_system.utils; + +import dev.mirodil.testing_system.exceptions.GenericValidationError; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; + +import java.time.Instant; +import java.util.Map; +import java.util.Set; + +public class ValidationUtil { + public static final int MAX_PAGE_SIZE = 100; + + /** + * Validates the sorting parameters of a {@link Pageable} object to ensure that only allowed attributes + * and valid sort directions (ascending or descending) are used. This method helps prevent SQL injection + * attacks by restricting sorting attributes to a predefined set of allowed values. + *

+ * Malicious input example: + * {@code ?size=7&sort=id,desc&sort=fname;DROP TABLE users; --} + * + * @param pageable the {@link Pageable} object to validate. + * @param allowedSortAttributes a {@link Set} of attribute names that are permitted for sorting. + * @throws GenericValidationError if an invalid sort attribute or direction is detected. + */ + public static void forceValidPageable(Pageable pageable, Set allowedSortAttributes) throws GenericValidationError { + forceValidPage(pageable.getPageNumber(), pageable.getPageSize()); + forceValidSort(pageable.getSort(), allowedSortAttributes); + } + + public static void forceValidPage(int pageNumber, int pageSize) { + if (pageNumber < 0 || pageSize < 0) { + throw new GenericValidationError("Page number or page size cannot be negative"); + } + + if (pageSize > MAX_PAGE_SIZE) { + throw new GenericValidationError("Page size cannot be more than " + MAX_PAGE_SIZE); + } + } + + public static void forceValidSort(Sort sort, Set allowedSortAttributes) { + if (sort.isEmpty()) { + return; + } + + for (Sort.Order order : sort.stream().toList()) { + if (!allowedSortAttributes.contains(order.getProperty())) { + throw new GenericValidationError("Not allowed sort attribute: '" + order.getProperty() + "'. Allowed attributes: " + allowedSortAttributes); + } + + if (!order.isAscending() && !order.isDescending()) { + throw new GenericValidationError("Sort direction must be either ASC or DESC"); + } + } + } + + /** + * Validates raw filter parameters with {@code Map>} representation to ensure + * that only allowed filter attributes are used. + * + * @param rawFilters the {@code Map>} object to validate. Example object:

+ * {@code Map.of("score", Map.of(">=", "70")) // ?score>=70} + * @param allowedFilterAttributes a {@link Map} of permitted attributes and their value types for filtering. {@code Map.of("isPassed", Boolean.class)}. + * @throws GenericValidationError if an invalid filter attribute, operator, or value is detected. + */ + public static void forceValidRawFilters(Map> rawFilters, Map> allowedFilterAttributes) { + if (rawFilters.isEmpty()) { + return; + } + + for (Map.Entry> filter : rawFilters.entrySet()) { + String attribute = filter.getKey(); + Map.Entry operatorValueEntry = filter.getValue().entrySet().iterator().next(); + String operator = operatorValueEntry.getKey(); + String value = operatorValueEntry.getValue(); + + if (!allowedFilterAttributes.containsKey(attribute)) { + throw new GenericValidationError("Not allowed filter attribute: '" + attribute + "'. Allowed attributes: " + allowedFilterAttributes.keySet()); + } + + Class type = allowedFilterAttributes.get(attribute); + Set validOperators = getAllowedOperatorsForType(type); + if (!validOperators.contains(operator)) { + throw new GenericValidationError("Invalid operator '" + operator + "' for filter '" + attribute + "'. " + + "Allowed operators: " + validOperators); + } + + if (value.isBlank()) { + throw new GenericValidationError("Value for '" + attribute + "' cannot be empty."); + } + + if (value.contains(",") && !operator.equals("=")) { + throw new GenericValidationError("Multivalued filter with the same attribute is only supported with equality operator (=). You should declare " + attribute + " separately (e.g. scorePercentage>=70&scorePercentage<90)."); + } + } + } + + /** + * Determines the allowed operators for a given data type. + */ + private static Set getAllowedOperatorsForType(Class type) { + final Set ALL_OPERATORS = Set.of("=", "<", ">", "<=", ">="); + + if (Number.class.isAssignableFrom(type) || type.equals(Instant.class)) { + return ALL_OPERATORS; + } else if (type.equals(String.class) || type.equals(Boolean.class)) { + return Set.of("="); + } else { + throw new RuntimeException("Unsupported filter type: " + type.getSimpleName()); + } + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/validations/UniqueEmail.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/validations/UniqueEmail.java new file mode 100644 index 000000000..0275b4f30 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/validations/UniqueEmail.java @@ -0,0 +1,18 @@ +package dev.mirodil.testing_system.validations; + +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + +import java.lang.annotation.*; + +@Documented +@Constraint(validatedBy = UniqueEmailValidator.class) +@Target({ElementType.FIELD, ElementType.PARAMETER}) +@Retention(RetentionPolicy.RUNTIME) +public @interface UniqueEmail { + String message() default "Email is already in use."; + + Class[] groups() default {}; + + Class[] payload() default {}; +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/validations/UniqueEmailValidator.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/validations/UniqueEmailValidator.java new file mode 100644 index 000000000..285d3e3f1 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/validations/UniqueEmailValidator.java @@ -0,0 +1,29 @@ +package dev.mirodil.testing_system.validations; + +import dev.mirodil.testing_system.services.UserService; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import org.springframework.security.core.userdetails.UsernameNotFoundException; + +public class UniqueEmailValidator implements ConstraintValidator { + + private final UserService userService; + + public UniqueEmailValidator(UserService userService) { + this.userService = userService; + } + + @Override + public boolean isValid(String email, ConstraintValidatorContext context) { + if (email == null || email.isBlank()) { + return false; + } + try { + userService.loadUserByUsername(email); + } catch (UsernameNotFoundException e) { + return true; + } + + return false; + } +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/validations/ValidTestEventPageRequest.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/validations/ValidTestEventPageRequest.java new file mode 100644 index 000000000..67b50d555 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/validations/ValidTestEventPageRequest.java @@ -0,0 +1,9 @@ +package dev.mirodil.testing_system.validations; + +import java.lang.annotation.*; + +@Target(ElementType.PARAMETER) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface ValidTestEventPageRequest { +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/validations/ValidUserPageRequest.java b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/validations/ValidUserPageRequest.java new file mode 100644 index 000000000..43d19c515 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/java/dev/mirodil/testing_system/validations/ValidUserPageRequest.java @@ -0,0 +1,9 @@ +package dev.mirodil.testing_system.validations; + +import java.lang.annotation.*; + +@Target(ElementType.PARAMETER) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface ValidUserPageRequest { +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/resources/application.properties b/jdk_21_maven/cs/rest/testing-system/src/main/resources/application.properties new file mode 100644 index 000000000..1693e855a --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/resources/application.properties @@ -0,0 +1,17 @@ +spring.application.name=testing-system +server.servlet.context-path=/api +server.error.include-stacktrace=never +# behind a reverse proxy using HTTPS [in production] +server.forward-headers-strategy=native +# Data +spring.datasource.url=${POSTGRES_URL} +spring.datasource.username=${POSTGRES_USER} +spring.datasource.password=${POSTGRES_PASSWORD} +spring.data.redis.host=${SPRING_DATA_REDIS_HOST} +spring.data.redis.port=${SPRING_DATA_REDIS_PORT} +# Spring Doc +springdoc.default-produces-media-type=application/json +# Development settings +spring.devtools.restart.enabled=true +logging.level.org.springframework.jdbc.core.JdbcTemplate=DEBUG +logging.level.org.springframework.web=debug diff --git a/jdk_21_maven/cs/rest/testing-system/src/main/resources/static/index.html b/jdk_21_maven/cs/rest/testing-system/src/main/resources/static/index.html new file mode 100644 index 000000000..4daec54c4 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/main/resources/static/index.html @@ -0,0 +1,10 @@ + + + + + Title + + +

Hello World!

+ + \ No newline at end of file diff --git a/jdk_21_maven/cs/rest/testing-system/src/test/java/dev/mirodil/testing_system/TestingSystemApplicationTests.java b/jdk_21_maven/cs/rest/testing-system/src/test/java/dev/mirodil/testing_system/TestingSystemApplicationTests.java new file mode 100644 index 000000000..5f0028fb4 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/test/java/dev/mirodil/testing_system/TestingSystemApplicationTests.java @@ -0,0 +1,13 @@ +package dev.mirodil.testing_system; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class TestingSystemApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/jdk_21_maven/cs/rest/testing-system/src/test/java/dev/mirodil/testing_system/configs/PageableWithFilterResolverTest.java b/jdk_21_maven/cs/rest/testing-system/src/test/java/dev/mirodil/testing_system/configs/PageableWithFilterResolverTest.java new file mode 100644 index 000000000..05756d456 --- /dev/null +++ b/jdk_21_maven/cs/rest/testing-system/src/test/java/dev/mirodil/testing_system/configs/PageableWithFilterResolverTest.java @@ -0,0 +1,167 @@ +package dev.mirodil.testing_system.configs; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.web.context.request.NativeWebRequest; + +import java.util.List; +import java.util.Map; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.when; + +@ExtendWith(MockitoExtension.class) +class PageableWithFilterResolverTest { + @InjectMocks + private PageableWithFilterResolver resolver; + @Mock + private NativeWebRequest webRequest; + + @Test + void testExtractFilterParameters_singleFilter() { + when(webRequest.getParameterNames()).thenReturn(List.of("scorePercentage>70").iterator()); + when(webRequest.getParameterValues("scorePercentage>70")).thenReturn(new String[]{""}); + + Map> result = resolver.extractFilterParameters(webRequest); + + assertEquals(1, result.size()); + assertEquals(Map.of(">", "70"), result.get("scorePercentage")); + } + + @Test + void testExtractFilterParameters_multipleFilters() { + when(webRequest.getParameterNames()).thenReturn(List.of("scorePercentage>70", "isPassed").iterator()); + when(webRequest.getParameterValues("scorePercentage>70")).thenReturn(new String[]{""}); + when(webRequest.getParameterValues("isPassed")).thenReturn(new String[]{"true"}); + + Map> result = resolver.extractFilterParameters(webRequest); + + assertEquals(2, result.size()); + assertEquals(Map.of(">", "70"), result.get("scorePercentage")); + assertEquals(Map.of("=", "true"), result.get("isPassed")); + } + + @Test + void testExtractFilterParameters_singleFilterWithGreaterOrEqualTo() { + when(webRequest.getParameterNames()).thenReturn(List.of("scorePercentage>").iterator()); + when(webRequest.getParameterValues("scorePercentage>")).thenReturn(new String[]{"70"}); + + Map> result = resolver.extractFilterParameters(webRequest); + + assertEquals(1, result.size()); + assertEquals(Map.of(">=", "70"), result.get("scorePercentage")); + } + + @Test + void testExtractFilterParameters_multipleFiltersWithMixOperators() { + when(webRequest.getParameterNames()).thenReturn(List.of("scorePercentage>", "eventDatetime<", "isPassed", "whatever<30").iterator()); + when(webRequest.getParameterValues("scorePercentage>")).thenReturn(new String[]{"70"}); + when(webRequest.getParameterValues("eventDatetime<")).thenReturn(new String[]{"2025-03-06"}); + when(webRequest.getParameterValues("isPassed")).thenReturn(new String[]{"true"}); + when(webRequest.getParameterValues("whatever<30")).thenReturn(new String[]{""}); + + Map> result = resolver.extractFilterParameters(webRequest); + + assertEquals(4, result.size()); + assertEquals(Map.of(">=", "70"), result.get("scorePercentage")); + assertEquals(Map.of("<=", "2025-03-06"), result.get("eventDatetime")); + assertEquals(Map.of("=", "true"), result.get("isPassed")); + assertEquals(Map.of("<", "30"), result.get("whatever")); + } + + @Test + void testExtractFilterParameters_multiValueFilterWithEquality() { + when(webRequest.getParameterNames()).thenReturn(List.of("testEventStatus").iterator()); + when(webRequest.getParameterValues("testEventStatus")).thenReturn(new String[]{"SCHEDULED,RESCHEDULED"}); + + Map> result = resolver.extractFilterParameters(webRequest); + + assertEquals(1, result.size()); + assertEquals(Map.of("=", "SCHEDULED,RESCHEDULED"), result.get("testEventStatus")); + } + + @Test + void testExtractFilterParameters_multiValueFilterWithDifferentOperators() { + when(webRequest.getParameterNames()).thenReturn(List.of("scorePercentage>", "scorePercentage<90").iterator()); + when(webRequest.getParameterValues("scorePercentage>")).thenReturn(new String[]{"70"}); + when(webRequest.getParameterValues("scorePercentage<90")).thenReturn(new String[]{""}); + + Map> result = resolver.extractFilterParameters(webRequest); + + assertEquals(1, result.size()); + assertEquals(2, result.get("scorePercentage").size()); + assertEquals(Map.of(">=", "70", "<", "90"), result.get("scorePercentage")); + } + + @Test + void testExtractFilterParameters_multiValueFilterWithSameOperator_shouldOverwrite() { + when(webRequest.getParameterNames()).thenReturn(List.of("scorePercentage>70", "scorePercentage>90").iterator()); + when(webRequest.getParameterValues("scorePercentage>70")).thenReturn(new String[]{""}); + when(webRequest.getParameterValues("scorePercentage>90")).thenReturn(new String[]{""}); + + Map> result = resolver.extractFilterParameters(webRequest); + + assertEquals(1, result.size()); + assertEquals(1, result.get("scorePercentage").size()); + assertEquals(Map.of(">", "90"), result.get("scorePercentage")); + } + + @Test + void testExtractFilterParameters_paginationAndSortParams_shouldIgnore() { + when(webRequest.getParameterNames()).thenReturn(List.of("page", "size", "isPassed", "sort").iterator()); + when(webRequest.getParameterValues("isPassed")).thenReturn(new String[]{"null"}); + + Map> result = resolver.extractFilterParameters(webRequest); + + assertEquals(1, result.size()); + assertEquals(Map.of("=", "null"), result.get("isPassed")); + } + + @Test + void testExtractFilterParameters_spaces() { + when(webRequest.getParameterNames()).thenReturn(List.of("title", "isPassed> true ", " whatever <").iterator()); + when(webRequest.getParameterValues("title")).thenReturn(new String[]{" New test "}); + when(webRequest.getParameterValues("isPassed> true ")).thenReturn(new String[]{""}); + when(webRequest.getParameterValues(" whatever <")).thenReturn(new String[]{" 50 "}); + + Map> result = resolver.extractFilterParameters(webRequest); + + assertEquals(3, result.size()); + assertEquals(Map.of("=", "New test"), result.get("title")); + assertEquals(Map.of(">", "true"), result.get("isPassed")); + assertEquals(Map.of("<=", "50"), result.get("whatever")); + } + + @Test + void testExtractFilterParameters_missingValue_shouldIgnore() { + when(webRequest.getParameterNames()).thenReturn(List.of("title").iterator()); + when(webRequest.getParameterValues("title")).thenReturn(new String[]{""}); + + Map> result = resolver.extractFilterParameters(webRequest); + + assertEquals(0, result.size()); + } + + @Test + void testExtractFilterParameters_malformedOperators() { + when(webRequest.getParameterNames()).thenReturn(List.of("score>>50", "isPassed", "scorePercentage>", "whatever>", "whatever!").iterator()); + when(webRequest.getParameterValues("score>>50")).thenReturn(new String[]{""}); + when(webRequest.getParameterValues("isPassed")).thenReturn(new String[]{">true"}); + when(webRequest.getParameterValues("scorePercentage>")).thenReturn(new String[]{"70,90"}); + when(webRequest.getParameterValues("whatever>")).thenReturn(new String[]{">50"}); + when(webRequest.getParameterValues("whatever!")).thenReturn(new String[]{"50"}); + + Map> result = resolver.extractFilterParameters(webRequest); + + assertEquals(5, result.size()); + assertEquals(Map.of(">", ">50"), result.get("score")); // ?score>>50 + assertEquals(Map.of("=", ">true"), result.get("isPassed")); // ?isPassed=>true + assertEquals(Map.of(">=", "70,90"), result.get("scorePercentage")); // ?scorePercentage>=70,90 + assertEquals(Map.of(">=", ">50"), result.get("whatever")); // ?whatever>=>50 + assertEquals(Map.of("=", "50"), result.get("whatever!")); // ?whatever!=50 + } +} +