diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3c7d8d3f6c75be1f1da28005091d353c6bb7e9c7..61fa3fa64086dbfa04f8e0bb9a0df5bf462461cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ image: gradle:jdk17
# Include templates for security scans and code quality reports
include:
- - template: Dependency-Scanning.gitlab-ci.yml
+ - template: Jobs/Dependency-Scanning.gitlab-ci.yml
- template: Jobs/Code-Quality.gitlab-ci.yml
- template: Security/DAST.gitlab-ci.yml
- template: Security/SAST.gitlab-ci.yml
@@ -28,6 +28,9 @@ include:
- template: Security/Secret-Detection.gitlab-ci.yml
variables:
+ #TEMP
+ SECURE_LOG_LEVEL: "debug"
+ #Docker
DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: "/certs"
@@ -113,8 +116,8 @@ gradle_test:
reports:
junit: build/test-results/test/TEST-*.xml
coverage_report:
- coverage_format: cobertura
- path: build/reports/jacoco/test/jacocoTestReport.xml
+ coverage_format: cobertura
+ path: build/reports/jacoco/test/jacocoTestReport.xml
before_script:
- 'mv src/test/resources/application-h2.properties src/test/resources/application-test.properties'
script:
diff --git a/build.gradle.kts b/build.gradle.kts
index 323e8ec5f7fcf75e2ba77589f9b557c9802af2cb..d997b8b31ef50eec08c96d8abb84cc8784c65bac 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,18 +8,20 @@ version = "1.1.0"
val javaVersion = JavaVersion.VERSION_17
// version numbers for versions not maintained by Spring Boot
-val libradorVersion = "1.2.0"
-val springDocVersion = "1.2.33"
-val guavaVersion = "30.1.1-jre"
-val queryDslVersion = "4.4.0"
+val libradorVersion = "1.2.1"
+val springDocVersion = "1.7.0"
+val guavaVersion = "32.1.1-jre"
+val queryDslVersion = "5.0.0"
val lombokVersion = "1.18.18"
val jaegerVersion = "3.3.1"
val modelMapperVersion = "2.4.4"
val sentryVersion = "5.0.1"
-val java_otpVersion = "0.2.0"
+val java_otpVersion = "0.4.0"
val qrgenVersion = "2.6.0"
val hibernateJpaVersion = "1.0.2.Final"
+ext["spring-security.version"]="5.8.4"
+
// The repositories used to lookup dependencies.
repositories {
mavenLocal()
@@ -53,15 +55,15 @@ plugins {
// Spring plugins for managing dependencies and creating
// a nice Spring Boot application.
- id("org.springframework.boot").version("2.5.14")
+ id("org.springframework.boot").version("2.7.13")
id("io.spring.dependency-management").version("1.1.0")
// Spotless plugin for checking style of Java code.
- id("com.diffplug.spotless").version("6.0.1")
+ id("com.diffplug.spotless").version("6.19.0")
// Plugin to provide task to check the current versions of
// dependencies and of Gradle to see if updates are available.
- id("com.github.ben-manes.versions").version("0.46.0")
+ id("com.github.ben-manes.versions").version("0.47.0")
// Plugin for checking license headers within our code and files.
id("com.github.hierynomus.license").version("0.16.1")
@@ -138,7 +140,7 @@ tasks.jacocoTestReport {
xml.required.set(true)
csv.required.set(true)
- html.destination = file("$buildDir/reports/coverage")
+ html.outputLocation.set(file("$buildDir/reports/coverage"))
}
}
@@ -229,7 +231,7 @@ dependencies {
// Database migration + database driver dependencies
implementation("org.liquibase:liquibase-core")
implementation("com.h2database:h2")
- implementation("mysql:mysql-connector-java")
+ implementation("com.mysql:mysql-connector-j")
implementation("org.mariadb.jdbc:mariadb-java-client")
implementation("org.postgresql:postgresql")
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..ccebba7710deaf9f98673a68957ea02138b60d0a 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ffed3a254e91df704a9acc0f2745c0e340d9b582..a36387743928b6e9332527ee3f97fc4d2c5cb7ee 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1b6c787337ffb79f0e3cf8b1e9f00f680a959de1..79a61d421cc4e272926b1d590728d0bbfc224b0d 100755
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
esac
done
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
+ # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
+ # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
@@ -205,6 +209,12 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \
"$@"
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+ die "xargs is not available"
+fi
+
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index 107acd32c4e687021ef32db511e8a206129b88ec..93e3f59f135dd2dd498de4beb5c64338cc33beeb 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
@rem limitations under the License.
@rem
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@@ -25,7 +25,8 @@
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
:end
@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal
diff --git a/src/main/java/nl/tudelft/labracore/DevDatabaseLoader.java b/src/main/java/nl/tudelft/labracore/DevDatabaseLoader.java
index da8d44b6d6eae687ca7afd81ad5b3945336d0098..1cfbfff04213b94c7d92d143bede8a84e1936d94 100644
--- a/src/main/java/nl/tudelft/labracore/DevDatabaseLoader.java
+++ b/src/main/java/nl/tudelft/labracore/DevDatabaseLoader.java
@@ -27,6 +27,10 @@ import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
import javax.transaction.Transactional;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Service;
+
import lombok.Getter;
import nl.tudelft.labracore.enums.RoleType;
import nl.tudelft.labracore.model.*;
@@ -39,10 +43,6 @@ import nl.tudelft.labracore.model.security.TOTPKey;
import nl.tudelft.labracore.repository.*;
import nl.tudelft.labracore.service.PermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Profile;
-import org.springframework.stereotype.Service;
-
/**
* Class to be used to load the database of Labracore with pre-determined data before running the rest of the
* Labracore application.
diff --git a/src/main/java/nl/tudelft/labracore/ProdDatabaseLoader.java b/src/main/java/nl/tudelft/labracore/ProdDatabaseLoader.java
index 6959dd8d10f53ee0c3a4da02ad047ab726ef1bfd..7a2b431018b83986726dec76d0e69140a6ccb69b 100644
--- a/src/main/java/nl/tudelft/labracore/ProdDatabaseLoader.java
+++ b/src/main/java/nl/tudelft/labracore/ProdDatabaseLoader.java
@@ -24,6 +24,13 @@ import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Service;
+
import nl.tudelft.labracore.enums.RoleType;
import nl.tudelft.labracore.model.Permission;
import nl.tudelft.labracore.model.Person;
@@ -34,13 +41,6 @@ import nl.tudelft.labracore.repository.PermissionRepository;
import nl.tudelft.labracore.repository.PersonRepository;
import nl.tudelft.labracore.service.PermissionService;
-import org.apache.commons.lang3.RandomStringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Profile;
-import org.springframework.stereotype.Service;
-
@Service
@Profile("production")
public class ProdDatabaseLoader {
diff --git a/src/main/java/nl/tudelft/labracore/config/LibradorConfiguration.java b/src/main/java/nl/tudelft/labracore/config/LibradorConfiguration.java
index e672af05bc7d9f20f0eb2e075ee0c6c05a4b637c..395105b2452f9dcbf40482010ac0d5b19238cd71 100644
--- a/src/main/java/nl/tudelft/labracore/config/LibradorConfiguration.java
+++ b/src/main/java/nl/tudelft/labracore/config/LibradorConfiguration.java
@@ -19,6 +19,10 @@ package nl.tudelft.labracore.config;
import static org.modelmapper.convention.MatchingStrategies.STRICT;
+import org.modelmapper.ModelMapper;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
import nl.tudelft.labracore.dto.id.*;
import nl.tudelft.labracore.model.*;
import nl.tudelft.labracore.model.Module;
@@ -27,10 +31,6 @@ import nl.tudelft.librador.EnableLibrador;
import nl.tudelft.librador.LibradorConfigAdapter;
import nl.tudelft.librador.dto.id.IdMapperBuilder;
-import org.modelmapper.ModelMapper;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
@Configuration
@EnableLibrador
public class LibradorConfiguration extends LibradorConfigAdapter {
diff --git a/src/main/java/nl/tudelft/labracore/config/WebMvcConfiguration.java b/src/main/java/nl/tudelft/labracore/config/WebMvcConfiguration.java
index fd9db44dc2287c24292654f279d1f22238f092d5..e402f393298b97e1fb5145111229881b916f8ce7 100644
--- a/src/main/java/nl/tudelft/labracore/config/WebMvcConfiguration.java
+++ b/src/main/java/nl/tudelft/labracore/config/WebMvcConfiguration.java
@@ -19,17 +19,17 @@ package nl.tudelft.labracore.config;
import java.util.List;
-import nl.tudelft.labracore.interceptor.AppInterceptor;
-import nl.tudelft.labracore.repository.APIKeyRepository;
-import nl.tudelft.labracore.repository.AppRepository;
-import nl.tudelft.labracore.security.user.AuthenticatedPersonParameterResolver;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import nl.tudelft.labracore.interceptor.AppInterceptor;
+import nl.tudelft.labracore.repository.APIKeyRepository;
+import nl.tudelft.labracore.repository.AppRepository;
+import nl.tudelft.labracore.security.user.AuthenticatedPersonParameterResolver;
+
@Configuration
public class WebMvcConfiguration implements WebMvcConfigurer {
@Autowired
diff --git a/src/main/java/nl/tudelft/labracore/controller/APIKeyController.java b/src/main/java/nl/tudelft/labracore/controller/APIKeyController.java
index 7dbbf3acace35f01781f56a1d91084ec592400bb..33acf289a94fe90593dcd23d982880fe4c22a634 100644
--- a/src/main/java/nl/tudelft/labracore/controller/APIKeyController.java
+++ b/src/main/java/nl/tudelft/labracore/controller/APIKeyController.java
@@ -21,6 +21,10 @@ import java.util.List;
import javax.transaction.Transactional;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
import nl.tudelft.labracore.dto.create.APIKeyCreateDTO;
import nl.tudelft.labracore.dto.patch.APIKeyPatchDTO;
import nl.tudelft.labracore.dto.view.structured.details.APIKeyDetailsDTO;
@@ -34,10 +38,6 @@ import nl.tudelft.labracore.service.APIKeyService;
import nl.tudelft.librador.dto.view.View;
import nl.tudelft.librador.resolver.annotations.PathEntity;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
@Transactional(Transactional.TxType.REQUIRED)
@RequestMapping("/api/api-key")
@RestController
diff --git a/src/main/java/nl/tudelft/labracore/controller/AppController.java b/src/main/java/nl/tudelft/labracore/controller/AppController.java
index 8f6e4c74cf3d3fb81d57f93cc1dbcaa7ab3e1338..a79222cce8c7b21d0e96ba9b6f0faf5e99ca8e0c 100644
--- a/src/main/java/nl/tudelft/labracore/controller/AppController.java
+++ b/src/main/java/nl/tudelft/labracore/controller/AppController.java
@@ -21,17 +21,17 @@ import java.util.List;
import javax.transaction.Transactional;
-import nl.tudelft.labracore.dto.view.structured.summary.AppSummaryDTO;
-import nl.tudelft.labracore.model.App;
-import nl.tudelft.labracore.repository.AppRepository;
-import nl.tudelft.librador.dto.view.View;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.server.ResponseStatusException;
+import nl.tudelft.labracore.dto.view.structured.summary.AppSummaryDTO;
+import nl.tudelft.labracore.model.App;
+import nl.tudelft.labracore.repository.AppRepository;
+import nl.tudelft.librador.dto.view.View;
+
@Transactional
@RestController
@RequestMapping("/api/app")
diff --git a/src/main/java/nl/tudelft/labracore/controller/AssignmentController.java b/src/main/java/nl/tudelft/labracore/controller/AssignmentController.java
index 272da41d5c1f282b5f23296b2eaf536b4dd9f417..d0217e72408bd6ef5907b85406978ff30576ee5a 100644
--- a/src/main/java/nl/tudelft/labracore/controller/AssignmentController.java
+++ b/src/main/java/nl/tudelft/labracore/controller/AssignmentController.java
@@ -18,10 +18,15 @@
package nl.tudelft.labracore.controller;
import java.util.List;
-import java.util.Set;
import javax.transaction.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
import nl.tudelft.labracore.dto.create.AssignmentCreateDTO;
import nl.tudelft.labracore.dto.patch.AssignmentPatchDTO;
import nl.tudelft.labracore.dto.view.structured.details.AssignmentDetailsDTO;
@@ -31,12 +36,6 @@ import nl.tudelft.labracore.repository.AssignmentRepository;
import nl.tudelft.labracore.service.AssignmentService;
import nl.tudelft.librador.dto.view.View;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
@Transactional
@RestController
@RequestMapping("/api/assignment")
@@ -118,7 +117,7 @@ public class AssignmentController {
*/
@GetMapping("by-ids")
@PreAuthorize("hasAuthority('ASSIGNMENT_READ')")
- public List<AssignmentDetailsDTO> getAllAssignmentsById(@RequestParam Set<Long> ids) {
+ public List<AssignmentDetailsDTO> getAllAssignmentsById(@RequestParam List<Long> ids) {
return View.convert(ar.findAllById(ids), AssignmentDetailsDTO.class);
}
@@ -130,7 +129,7 @@ public class AssignmentController {
*/
@GetMapping("with-modules")
@PreAuthorize("hasAuthority('ASSIGNMENT_READ')")
- public List<AssignmentModuleDetailsDTO> getAssignmentsWithModules(@RequestParam Set<Long> ids) {
+ public List<AssignmentModuleDetailsDTO> getAssignmentsWithModules(@RequestParam List<Long> ids) {
return View.convert(ar.findAllById(ids), AssignmentModuleDetailsDTO.class);
}
diff --git a/src/main/java/nl/tudelft/labracore/controller/AuthorizationController.java b/src/main/java/nl/tudelft/labracore/controller/AuthorizationController.java
index c08603e42637b7a217d029925841036ebeb5c877..04f19adaa48ffd148c1f292326020492e131f1e1 100644
--- a/src/main/java/nl/tudelft/labracore/controller/AuthorizationController.java
+++ b/src/main/java/nl/tudelft/labracore/controller/AuthorizationController.java
@@ -23,6 +23,9 @@ import java.util.Set;
import javax.transaction.Transactional;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
import nl.tudelft.labracore.enums.RoleType;
import nl.tudelft.labracore.model.Assignment;
import nl.tudelft.labracore.model.Module;
@@ -34,9 +37,6 @@ import nl.tudelft.labracore.repository.RoleRepository;
import nl.tudelft.labracore.security.AuthorizationService;
import nl.tudelft.librador.resolver.annotations.PathEntity;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
@Transactional
@RestController
@RequestMapping("/api/auth")
diff --git a/src/main/java/nl/tudelft/labracore/controller/BuildingController.java b/src/main/java/nl/tudelft/labracore/controller/BuildingController.java
index 2eaa40bd040f6d30b41edfc979ca43751622920b..f5c125f5d92ce324f4c6bad028645ee707fa6ec9 100644
--- a/src/main/java/nl/tudelft/labracore/controller/BuildingController.java
+++ b/src/main/java/nl/tudelft/labracore/controller/BuildingController.java
@@ -18,10 +18,15 @@
package nl.tudelft.labracore.controller;
import java.util.List;
-import java.util.Set;
import javax.transaction.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
import nl.tudelft.labracore.dto.create.BuildingCreateDTO;
import nl.tudelft.labracore.dto.patch.BuildingPatchDTO;
import nl.tudelft.labracore.dto.view.structured.details.BuildingDetailsDTO;
@@ -29,12 +34,6 @@ import nl.tudelft.labracore.dto.view.structured.summary.BuildingSummaryDTO;
import nl.tudelft.labracore.repository.BuildingRepository;
import nl.tudelft.librador.dto.view.View;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
@Transactional
@RequestMapping("/api/building")
@RestController
@@ -90,7 +89,7 @@ public class BuildingController {
*/
@GetMapping("by-ids")
@PreAuthorize("hasAuthority('BUILDING_READ')")
- public List<BuildingDetailsDTO> getAllBuildingsById(@RequestParam Set<Long> ids) {
+ public List<BuildingDetailsDTO> getAllBuildingsById(@RequestParam List<Long> ids) {
return View.convert(br.findAllById(ids), BuildingDetailsDTO.class);
}
diff --git a/src/main/java/nl/tudelft/labracore/controller/ClusterController.java b/src/main/java/nl/tudelft/labracore/controller/ClusterController.java
index e65e68250ce11fc166e20cf5ac5f2eeb57b8bc70..b9afdb2d1905078aa83c3fcf3988e08950023e19 100644
--- a/src/main/java/nl/tudelft/labracore/controller/ClusterController.java
+++ b/src/main/java/nl/tudelft/labracore/controller/ClusterController.java
@@ -23,6 +23,13 @@ import java.util.Set;
import javax.transaction.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
import nl.tudelft.labracore.dto.create.ClusterCreateDTO;
import nl.tudelft.labracore.dto.patch.ClusterPatchDTO;
import nl.tudelft.labracore.dto.view.structured.details.ClusterDetailsDTO;
@@ -31,13 +38,6 @@ import nl.tudelft.labracore.repository.PersonRepository;
import nl.tudelft.labracore.service.ClusterService;
import nl.tudelft.librador.dto.view.View;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
@Transactional
@RequestMapping("/api/cluster")
@RestController
@@ -73,7 +73,7 @@ public class ClusterController {
*/
@GetMapping("by-ids")
@PreAuthorize("hasAuthority('CLUSTER_READ')")
- public List<ClusterDetailsDTO> getAllClustersById(@RequestParam Set<Long> ids) {
+ public List<ClusterDetailsDTO> getAllClustersById(@RequestParam List<Long> ids) {
return View.convert(cr.findAllById(ids), ClusterDetailsDTO.class);
}
diff --git a/src/main/java/nl/tudelft/labracore/controller/CohortController.java b/src/main/java/nl/tudelft/labracore/controller/CohortController.java
index c13e418cdc31744e25853a964b4abb1cbf977de6..da651cf79282270a5f69691de4bc87d3386be144 100644
--- a/src/main/java/nl/tudelft/labracore/controller/CohortController.java
+++ b/src/main/java/nl/tudelft/labracore/controller/CohortController.java
@@ -18,11 +18,15 @@
package nl.tudelft.labracore.controller;
import java.util.List;
-import java.util.Set;
import javax.transaction.Transactional;
import javax.validation.Valid;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
import nl.tudelft.labracore.dto.create.CohortCreateDTO;
import nl.tudelft.labracore.dto.helper.ClusterImportDTO;
import nl.tudelft.labracore.dto.patch.CohortPatchDTO;
@@ -32,11 +36,6 @@ import nl.tudelft.labracore.repository.CohortRepository;
import nl.tudelft.labracore.service.CohortService;
import nl.tudelft.librador.dto.view.View;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
@Transactional
@RequestMapping("/api/cohort")
@RestController
@@ -71,7 +70,7 @@ public class CohortController {
@Validated
@PatchMapping("{id}")
@PreAuthorize("hasAuthority('COHORT_UPDATE')")
- public Long patchCohort(@PathVariable long id, @Valid @RequestBody CohortPatchDTO patch) {
+ public Long patchCohort(@PathVariable Long id, @Valid @RequestBody CohortPatchDTO patch) {
return patch.apply(cohortRepository.findByIdOrThrow(id)).getId();
}
@@ -95,7 +94,7 @@ public class CohortController {
*/
@GetMapping("by-ids")
@PreAuthorize("hasAuthority('COHORT_READ')")
- public List<CohortDetailsDTO> getAllCohortsById(@RequestParam Set<Long> ids) {
+ public List<CohortDetailsDTO> getAllCohortsById(@RequestParam List<Long> ids) {
return View.convert(cohortRepository.findAllById(ids), CohortDetailsDTO.class);
}
diff --git a/src/main/java/nl/tudelft/labracore/controller/CourseController.java b/src/main/java/nl/tudelft/labracore/controller/CourseController.java
index 8153b16a36e4efd680b8f55e41e289c9be047db9..ab420cdaa42b1cc2d67f9dd9570175cbe063fc08 100644
--- a/src/main/java/nl/tudelft/labracore/controller/CourseController.java
+++ b/src/main/java/nl/tudelft/labracore/controller/CourseController.java
@@ -18,10 +18,15 @@
package nl.tudelft.labracore.controller;
import java.util.List;
-import java.util.Set;
import javax.transaction.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
import nl.tudelft.labracore.dto.create.CourseCreateDTO;
import nl.tudelft.labracore.dto.patch.CoursePatchDTO;
import nl.tudelft.labracore.dto.view.structured.details.CourseDetailsDTO;
@@ -30,12 +35,6 @@ import nl.tudelft.labracore.repository.CourseRepository;
import nl.tudelft.labracore.service.CourseService;
import nl.tudelft.librador.dto.view.View;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
@Transactional
@RequestMapping("/api/course")
@RestController
@@ -93,7 +92,7 @@ public class CourseController {
*/
@GetMapping("by-ids")
@PreAuthorize("hasAuthority('COURSE_READ')")
- public List<CourseDetailsDTO> getAllCoursesById(@RequestParam Set<Long> ids) {
+ public List<CourseDetailsDTO> getAllCoursesById(@RequestParam List<Long> ids) {
return View.convert(cr.findAllById(ids), CourseDetailsDTO.class);
}
diff --git a/src/main/java/nl/tudelft/labracore/controller/DBLoaderController.java b/src/main/java/nl/tudelft/labracore/controller/DBLoaderController.java
index 67050590b4e21167b9b05a2bd0bc199efe528e0a..49b0ca8c43b4a4710421a08d58c270e6d3b9692c 100644
--- a/src/main/java/nl/tudelft/labracore/controller/DBLoaderController.java
+++ b/src/main/java/nl/tudelft/labracore/controller/DBLoaderController.java
@@ -21,6 +21,14 @@ import java.util.List;
import javax.transaction.Transactional;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
import nl.tudelft.labracore.dto.view.structured.details.ModuleAssignmentsGroupsDetailsDTO;
import nl.tudelft.labracore.dto.view.structured.summary.PersonSummaryDTO;
import nl.tudelft.labracore.dto.view.structured.summary.RoleSummaryDTO;
@@ -31,14 +39,6 @@ import nl.tudelft.labracore.repository.SubmissionRepository;
import nl.tudelft.labracore.service.DBLoaderService;
import nl.tudelft.librador.dto.view.View;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Profile;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
@Transactional
@RestController
@Profile("!production")
diff --git a/src/main/java/nl/tudelft/labracore/controller/EditionCollectionController.java b/src/main/java/nl/tudelft/labracore/controller/EditionCollectionController.java
index e00eb74d665cdc0ef46d0f486b860c4d286abc46..02bea09a957ffd0ecd20552bf0a99ac7cb3c7ff3 100644
--- a/src/main/java/nl/tudelft/labracore/controller/EditionCollectionController.java
+++ b/src/main/java/nl/tudelft/labracore/controller/EditionCollectionController.java
@@ -21,6 +21,12 @@ import java.util.List;
import javax.transaction.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
import nl.tudelft.labracore.dto.create.EditionCollectionCreateDTO;
import nl.tudelft.labracore.dto.patch.EditionCollectionPatchDTO;
import nl.tudelft.labracore.dto.view.structured.details.EditionCollectionDetailsDTO;
@@ -30,12 +36,6 @@ import nl.tudelft.labracore.repository.EditionCollectionRepository;
import nl.tudelft.librador.dto.view.View;
import nl.tudelft.librador.resolver.annotations.PathEntity;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
@Transactional
@RestController
@RequestMapping("/api/edition-collection")
diff --git a/src/main/java/nl/tudelft/labracore/controller/EditionController.java b/src/main/java/nl/tudelft/labracore/controller/EditionController.java
index 0c2aabee09cae3b4bd0c1a5a26adc8d31c6e96fd..bf7148fa1c8155ea9737ba2bc4074c11c0674533 100644
--- a/src/main/java/nl/tudelft/labracore/controller/EditionController.java
+++ b/src/main/java/nl/tudelft/labracore/controller/EditionController.java
@@ -27,6 +27,15 @@ import java.util.Map;
import javax.transaction.Transactional;
import javax.validation.Valid;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.server.ResponseStatusException;
+
+import io.swagger.v3.oas.annotations.Operation;
import nl.tudelft.labracore.dto.create.EditionCreateDTO;
import nl.tudelft.labracore.dto.helper.LCPageable;
import nl.tudelft.labracore.dto.helper.ParticipantsImportDTO;
@@ -49,15 +58,6 @@ import nl.tudelft.labracore.service.DBApiService;
import nl.tudelft.labracore.service.EditionService;
import nl.tudelft.librador.dto.view.View;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.http.HttpStatus;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.server.ResponseStatusException;
-
-import io.swagger.v3.oas.annotations.Operation;
-
@Transactional
@RestController
@RequestMapping("/api/edition")
@@ -216,9 +216,10 @@ public class EditionController {
* @param at The time the Editions should be active at.
* @return The list of Editions active at the given time.
*/
- @PutMapping("/active-at")
+ @GetMapping("/active-at")
@PreAuthorize("hasAuthority('EDITION_READ')")
- public List<EditionSummaryDTO> getAllEditionsActiveAtDate(@RequestBody LocalDateTime at) {
+ public List<EditionSummaryDTO> getAllEditionsActiveAtDate(
+ @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime at) {
return View.convert(er.findAllActiveAt(at), EditionSummaryDTO.class);
}
@@ -228,9 +229,12 @@ public class EditionController {
* @param period The time during which Editions should be found.
* @return The list of Editions active at the given time.
*/
- @PutMapping("/active-during")
+ @GetMapping("/active-during")
@PreAuthorize("hasAuthority('EDITION_READ')")
- public List<EditionSummaryDTO> getAllEditionsActiveDuringPeriod(@RequestBody Period period) {
+ public List<EditionSummaryDTO> getAllEditionsActiveDuringPeriod(
+ @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime start,
+ @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime end) {
+ Period period = new Period(start, end);
return View.convert(er.findAllActiveDuring(period), EditionSummaryDTO.class);
}
diff --git a/src/main/java/nl/tudelft/labracore/controller/EventController.java b/src/main/java/nl/tudelft/labracore/controller/EventController.java
index 1004efed99e2006c8ea040f57eb60a759cd92974..e25980ac48a3d097e902687a0d8c9fe8b72880d3 100644
--- a/src/main/java/nl/tudelft/labracore/controller/EventController.java
+++ b/src/main/java/nl/tudelft/labracore/controller/EventController.java
@@ -20,6 +20,12 @@ package nl.tudelft.labracore.controller;
import javax.servlet.http.HttpServletRequest;
import javax.transaction.Transactional;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.server.ResponseStatusException;
+
import nl.tudelft.labracore.dto.create.EventSubscriptionCreateDTO;
import nl.tudelft.labracore.event.CoreEvent;
import nl.tudelft.labracore.model.App;
@@ -28,12 +34,6 @@ import nl.tudelft.labracore.repository.AppRepository;
import nl.tudelft.labracore.repository.EventSubscriptionRepository;
import nl.tudelft.labracore.service.EventService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.server.ResponseStatusException;
-
@Transactional
@RestController
@RequestMapping("/api/event")
diff --git a/src/main/java/nl/tudelft/labracore/controller/GradeController.java b/src/main/java/nl/tudelft/labracore/controller/GradeController.java
index 4e5d3dff4cca90f6793577082903352d3762ca13..c28ea8e41225c29a00ea2107201c7b6d713e367d 100644
--- a/src/main/java/nl/tudelft/labracore/controller/GradeController.java
+++ b/src/main/java/nl/tudelft/labracore/controller/GradeController.java
@@ -19,6 +19,10 @@ package nl.tudelft.labracore.controller;
import javax.transaction.Transactional;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
import nl.tudelft.labracore.dto.create.GradeBatchImportDTO;
import nl.tudelft.labracore.dto.create.GradeCreateDTO;
import nl.tudelft.labracore.dto.id.PersonIdDTO;
@@ -30,10 +34,6 @@ import nl.tudelft.labracore.repository.SubmissionRepository;
import nl.tudelft.labracore.security.user.AuthenticatedPerson;
import nl.tudelft.labracore.service.GradeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
@Transactional
@RequestMapping("/api/grade")
@RestController
diff --git a/src/main/java/nl/tudelft/labracore/controller/ModuleController.java b/src/main/java/nl/tudelft/labracore/controller/ModuleController.java
index cc6c2efc83640ab047d15a850b5e44d53713cbc3..bd9ae4c109c6fedd561c199b9a2063376b900506 100644
--- a/src/main/java/nl/tudelft/labracore/controller/ModuleController.java
+++ b/src/main/java/nl/tudelft/labracore/controller/ModuleController.java
@@ -21,6 +21,10 @@ import java.util.List;
import javax.transaction.Transactional;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
import nl.tudelft.labracore.dto.create.ModuleCreateDTO;
import nl.tudelft.labracore.dto.patch.ModulePatchDTO;
import nl.tudelft.labracore.dto.view.structured.details.ModuleDetailsDTO;
@@ -28,10 +32,6 @@ import nl.tudelft.labracore.repository.EditionRepository;
import nl.tudelft.labracore.repository.ModuleRepository;
import nl.tudelft.librador.dto.view.View;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
@Transactional
@RequestMapping("/api/module")
@RestController
diff --git a/src/main/java/nl/tudelft/labracore/controller/ModuleDivisionController.java b/src/main/java/nl/tudelft/labracore/controller/ModuleDivisionController.java
index e4e1cf8d1f5be2c4eda158d79581753355a1312c..bb1de09daef38130c70b9f7208d7f2e1f8b0e28f 100644
--- a/src/main/java/nl/tudelft/labracore/controller/ModuleDivisionController.java
+++ b/src/main/java/nl/tudelft/labracore/controller/ModuleDivisionController.java
@@ -21,16 +21,16 @@ import java.util.List;
import javax.transaction.Transactional;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
import nl.tudelft.labracore.dto.create.ModuleDivisionCreateDTO;
import nl.tudelft.labracore.dto.view.structured.details.ModuleDivisionDetailsDTO;
import nl.tudelft.labracore.repository.ModuleDivisionRepository;
import nl.tudelft.labracore.service.ModuleDivisionService;
import nl.tudelft.librador.dto.view.View;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
@Transactional
@RequestMapping("/api/division")
@RestController
diff --git a/src/main/java/nl/tudelft/labracore/controller/PermissionController.java b/src/main/java/nl/tudelft/labracore/controller/PermissionController.java
index 677c5f18a420e639413f3123e253ed42476d86a7..9959497fed6eb00f5701bacea2c80230bb50c454 100644
--- a/src/main/java/nl/tudelft/labracore/controller/PermissionController.java
+++ b/src/main/java/nl/tudelft/labracore/controller/PermissionController.java
@@ -21,14 +21,14 @@ import java.util.List;
import javax.transaction.Transactional;
-import nl.tudelft.labracore.dto.view.structured.summary.PermissionSummaryDTO;
-import nl.tudelft.labracore.repository.PermissionRepository;
-import nl.tudelft.librador.dto.view.View;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
+import nl.tudelft.labracore.dto.view.structured.summary.PermissionSummaryDTO;
+import nl.tudelft.labracore.repository.PermissionRepository;
+import nl.tudelft.librador.dto.view.View;
+
@Transactional
@RestController
@RequestMapping("/api/permission")
diff --git a/src/main/java/nl/tudelft/labracore/controller/PersonController.java b/src/main/java/nl/tudelft/labracore/controller/PersonController.java
index f3e1d46aa1c8ac2bbc3dd294ef22754d0aaeb843..f694ef04679d2334d87a92a8c20fada700afe500 100644
--- a/src/main/java/nl/tudelft/labracore/controller/PersonController.java
+++ b/src/main/java/nl/tudelft/labracore/controller/PersonController.java
@@ -25,6 +25,10 @@ import java.util.regex.Pattern;
import javax.transaction.Transactional;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
import nl.tudelft.labracore.dto.create.PersonCreateDTO;
import nl.tudelft.labracore.dto.helper.PersonSearchDTO;
import nl.tudelft.labracore.dto.patch.PersonPatchDTO;
@@ -41,10 +45,6 @@ import nl.tudelft.labracore.service.CohortService;
import nl.tudelft.labracore.service.PersonService;
import nl.tudelft.librador.dto.view.View;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
@Transactional
@RequestMapping("/api/person")
@RestController
diff --git a/src/main/java/nl/tudelft/labracore/controller/ProgramController.java b/src/main/java/nl/tudelft/labracore/controller/ProgramController.java
index 0642be7259121506ab75e7b8abb204bd7cbe6e2e..fe91dad6e4025b7dc68b0a70fad2a3883e73ae67 100644
--- a/src/main/java/nl/tudelft/labracore/controller/ProgramController.java
+++ b/src/main/java/nl/tudelft/labracore/controller/ProgramController.java
@@ -18,11 +18,14 @@
package nl.tudelft.labracore.controller;
import java.util.List;
-import java.util.Set;
import javax.transaction.Transactional;
import javax.validation.Valid;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
import nl.tudelft.labracore.dto.create.ProgramCreateDTO;
import nl.tudelft.labracore.dto.patch.ProgramPatchDTO;
import nl.tudelft.labracore.dto.view.structured.details.ProgramDetailsDTO;
@@ -33,10 +36,6 @@ import nl.tudelft.labracore.service.ProgramService;
import nl.tudelft.librador.dto.view.View;
import nl.tudelft.librador.resolver.annotations.PathEntity;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
@Transactional
@RestController
@RequestMapping("/api/program")
@@ -67,7 +66,7 @@ public class ProgramController {
*/
@GetMapping("by-ids")
@PreAuthorize("hasAuthority('PROGRAM_READ')")
- public List<ProgramDetailsDTO> getAllProgramsById(@RequestParam Set<Long> ids) {
+ public List<ProgramDetailsDTO> getAllProgramsById(@RequestParam List<Long> ids) {
return View.convert(pr.findAllById(ids), ProgramDetailsDTO.class);
}
diff --git a/src/main/java/nl/tudelft/labracore/controller/QuestionController.java b/src/main/java/nl/tudelft/labracore/controller/QuestionController.java
index d1989cbe9cbb29904dda19cfd60d9c77149d537d..3af7a83deedd221daff2fadafaa9a151dd5bc8bd 100644
--- a/src/main/java/nl/tudelft/labracore/controller/QuestionController.java
+++ b/src/main/java/nl/tudelft/labracore/controller/QuestionController.java
@@ -19,6 +19,10 @@ package nl.tudelft.labracore.controller;
import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
import nl.tudelft.labracore.dto.create.QuestionCreateDTO;
import nl.tudelft.labracore.dto.patch.QuestionPatchDTO;
import nl.tudelft.labracore.dto.view.structured.details.QuestionDetailsDTO;
@@ -26,10 +30,6 @@ import nl.tudelft.labracore.repository.QuestionRepository;
import nl.tudelft.labracore.service.QuestionService;
import nl.tudelft.librador.dto.view.View;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
@RequestMapping("/api/question")
@RestController
public class QuestionController {
diff --git a/src/main/java/nl/tudelft/labracore/controller/RoleController.java b/src/main/java/nl/tudelft/labracore/controller/RoleController.java
index d82d2f1188c4eee94264a12a5595c9216b1ab09d..254a2cbf78f47ea1a773dbafb391696fc1bcc34c 100644
--- a/src/main/java/nl/tudelft/labracore/controller/RoleController.java
+++ b/src/main/java/nl/tudelft/labracore/controller/RoleController.java
@@ -23,6 +23,13 @@ import java.util.stream.Collectors;
import javax.transaction.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
import nl.tudelft.labracore.dto.create.RoleCreateDTO;
import nl.tudelft.labracore.dto.patch.RolePatchDTO;
import nl.tudelft.labracore.dto.view.structured.details.RoleDetailsDTO;
@@ -33,13 +40,6 @@ import nl.tudelft.labracore.repository.RoleRepository;
import nl.tudelft.librador.dto.view.View;
import nl.tudelft.librador.resolver.annotations.PathEntity;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
@Transactional
@RequestMapping("/api/role")
@RestController
diff --git a/src/main/java/nl/tudelft/labracore/controller/RoomController.java b/src/main/java/nl/tudelft/labracore/controller/RoomController.java
index 55f17a77d6c38936847149abd6a9ad9ac66b6add..824f567d2940d27c43f8c9850619bffd7893acc9 100644
--- a/src/main/java/nl/tudelft/labracore/controller/RoomController.java
+++ b/src/main/java/nl/tudelft/labracore/controller/RoomController.java
@@ -22,6 +22,12 @@ import java.util.List;
import javax.transaction.Transactional;
import javax.validation.Valid;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
import nl.tudelft.labracore.dto.create.RoomCreateDTO;
import nl.tudelft.labracore.dto.patch.RoomPatchDTO;
import nl.tudelft.labracore.dto.view.structured.details.RoomDetailsDTO;
@@ -29,12 +35,6 @@ import nl.tudelft.labracore.dto.view.structured.summary.RoomSummaryDTO;
import nl.tudelft.labracore.repository.RoomRepository;
import nl.tudelft.librador.dto.view.View;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
@Transactional
@RequestMapping("/api/room")
@RestController
diff --git a/src/main/java/nl/tudelft/labracore/controller/SessionController.java b/src/main/java/nl/tudelft/labracore/controller/SessionController.java
index 3003c72c5ab3797fa392eae4d007072d2478f0d7..9bfc79d8e3acba6b064beeabafbc4ed841b81ac9 100644
--- a/src/main/java/nl/tudelft/labracore/controller/SessionController.java
+++ b/src/main/java/nl/tudelft/labracore/controller/SessionController.java
@@ -21,6 +21,12 @@ import java.util.List;
import javax.transaction.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
import nl.tudelft.labracore.dto.create.SharedSessionCreateDTO;
import nl.tudelft.labracore.dto.create.SingleSessionCreateDTO;
import nl.tudelft.labracore.dto.patch.SessionPatchDTO;
@@ -28,12 +34,6 @@ import nl.tudelft.labracore.dto.view.structured.details.SessionDetailsDTO;
import nl.tudelft.labracore.repository.SessionRepository;
import nl.tudelft.librador.dto.view.View;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
@Transactional
@RequestMapping("/api/session")
@RestController
diff --git a/src/main/java/nl/tudelft/labracore/controller/StudentGroupController.java b/src/main/java/nl/tudelft/labracore/controller/StudentGroupController.java
index 32f6dbaf21fccbb696871033b37b0771cfe52354..6895cab1331c524db7d5bafa32f5d966915aeaad 100644
--- a/src/main/java/nl/tudelft/labracore/controller/StudentGroupController.java
+++ b/src/main/java/nl/tudelft/labracore/controller/StudentGroupController.java
@@ -21,6 +21,13 @@ import java.util.List;
import javax.transaction.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
import nl.tudelft.labracore.dto.create.StudentGroupCreateDTO;
import nl.tudelft.labracore.dto.helper.GroupGenerateDTO;
import nl.tudelft.labracore.dto.helper.GroupImportDTO;
@@ -33,13 +40,6 @@ import nl.tudelft.labracore.service.RoleService;
import nl.tudelft.labracore.service.StudentGroupService;
import nl.tudelft.librador.dto.view.View;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
@Transactional
@RequestMapping("/api/student-group")
@RestController
diff --git a/src/main/java/nl/tudelft/labracore/controller/SubmissionController.java b/src/main/java/nl/tudelft/labracore/controller/SubmissionController.java
index 3c87bfc054864e3af097628daf6cf670e68b213b..2e95e0627fb01a8907a8a7e962b27fc09a30da83 100644
--- a/src/main/java/nl/tudelft/labracore/controller/SubmissionController.java
+++ b/src/main/java/nl/tudelft/labracore/controller/SubmissionController.java
@@ -22,6 +22,12 @@ import java.util.Set;
import javax.transaction.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
import nl.tudelft.labracore.dto.create.SubmissionCreateDTO;
import nl.tudelft.labracore.dto.view.structured.details.SubmissionDetailsDTO;
import nl.tudelft.labracore.dto.view.structured.details.SubmissionMemberDetailsDTO;
@@ -29,12 +35,6 @@ import nl.tudelft.labracore.repository.SubmissionRepository;
import nl.tudelft.labracore.service.SubmissionService;
import nl.tudelft.librador.dto.view.View;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
@Transactional
@RequestMapping("/api/submission")
@RestController
diff --git a/src/main/java/nl/tudelft/labracore/controller/TOTPController.java b/src/main/java/nl/tudelft/labracore/controller/TOTPController.java
index e5b3c65b3bcd7edbb017a4f4769c295a397963d9..31eb27e880bcca6be304ece7625c361d80a249a9 100644
--- a/src/main/java/nl/tudelft/labracore/controller/TOTPController.java
+++ b/src/main/java/nl/tudelft/labracore/controller/TOTPController.java
@@ -17,16 +17,16 @@
*/
package nl.tudelft.labracore.controller;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
import nl.tudelft.labracore.dto.view.structured.details.TOTPKeyInfoDetailsDTO;
import nl.tudelft.labracore.model.person.ConcretePerson;
import nl.tudelft.labracore.security.user.AuthenticatedPerson;
import nl.tudelft.labracore.service.TOTPService;
import nl.tudelft.librador.dto.view.View;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
@RestController
@RequestMapping("/api/2fa/totp")
public class TOTPController {
diff --git a/src/main/java/nl/tudelft/labracore/dto/create/SessionCreateDTO.java b/src/main/java/nl/tudelft/labracore/dto/create/SessionCreateDTO.java
index 5b7ca8b20a88aa2ed478f8ea2c3c63963a91a057..9f05e4a12fb451b295a20deec660eb2c6726c7f8 100644
--- a/src/main/java/nl/tudelft/labracore/dto/create/SessionCreateDTO.java
+++ b/src/main/java/nl/tudelft/labracore/dto/create/SessionCreateDTO.java
@@ -42,7 +42,7 @@ public abstract class SessionCreateDTO<T extends Session> extends Create<T> {
@NotNull
private LocalDateTime start;
@NotNull
- private LocalDateTime end;
+ private LocalDateTime endTime;
private String description;
diff --git a/src/main/java/nl/tudelft/labracore/dto/helper/LCPageable.java b/src/main/java/nl/tudelft/labracore/dto/helper/LCPageable.java
index 9909ca2c2e5fbcd0f96c674c544d2e1f67cc8770..0e6e0666dce206d19370b6600c67908a36a17b4b 100644
--- a/src/main/java/nl/tudelft/labracore/dto/helper/LCPageable.java
+++ b/src/main/java/nl/tudelft/labracore/dto/helper/LCPageable.java
@@ -23,15 +23,15 @@ import java.util.stream.Collectors;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-
@Data
@Builder
@NoArgsConstructor
diff --git a/src/main/java/nl/tudelft/labracore/dto/helper/Period.java b/src/main/java/nl/tudelft/labracore/dto/helper/Period.java
index 48308ed19905c0a645c0793954a1a8448077a9df..46a76c96e1b31d81604989fef62d84c1d8279197 100644
--- a/src/main/java/nl/tudelft/labracore/dto/helper/Period.java
+++ b/src/main/java/nl/tudelft/labracore/dto/helper/Period.java
@@ -17,8 +17,13 @@
*/
package nl.tudelft.labracore.dto.helper;
+import java.io.Serializable;
import java.time.LocalDateTime;
+import javax.validation.constraints.NotNull;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -26,7 +31,12 @@ import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
-public class Period {
+public class Period implements Serializable {
+ @NotNull
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
private LocalDateTime start;
+
+ @NotNull
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
private LocalDateTime end;
}
diff --git a/src/main/java/nl/tudelft/labracore/dto/id/APIKeyIdDTO.java b/src/main/java/nl/tudelft/labracore/dto/id/APIKeyIdDTO.java
index 65ede06be8d023a6af5629597ee429e840d3c7f4..62f9c315c1c01b6b42a7c562c566fdff26b4b866 100644
--- a/src/main/java/nl/tudelft/labracore/dto/id/APIKeyIdDTO.java
+++ b/src/main/java/nl/tudelft/labracore/dto/id/APIKeyIdDTO.java
@@ -17,12 +17,12 @@
*/
package nl.tudelft.labracore.dto.id;
+import org.springframework.data.repository.CrudRepository;
+
import nl.tudelft.labracore.model.security.APIKey;
import nl.tudelft.labracore.repository.APIKeyRepository;
import nl.tudelft.librador.dto.id.IdDTO;
-import org.springframework.data.repository.CrudRepository;
-
/**
* DTO representing an APIKey passed by its ID.
*/
diff --git a/src/main/java/nl/tudelft/labracore/dto/id/AssignmentIdDTO.java b/src/main/java/nl/tudelft/labracore/dto/id/AssignmentIdDTO.java
index fcfe90d8efa778739a7eefb678c11ffb673d5477..4e1ab4420c3e35d1ae2a965723d7f9885e998d6a 100644
--- a/src/main/java/nl/tudelft/labracore/dto/id/AssignmentIdDTO.java
+++ b/src/main/java/nl/tudelft/labracore/dto/id/AssignmentIdDTO.java
@@ -17,12 +17,12 @@
*/
package nl.tudelft.labracore.dto.id;
+import org.springframework.data.repository.CrudRepository;
+
import nl.tudelft.labracore.model.Assignment;
import nl.tudelft.labracore.repository.AssignmentRepository;
import nl.tudelft.librador.dto.id.IdDTO;
-import org.springframework.data.repository.CrudRepository;
-
/**
* DTO representing an Assignment passed by its ID.
*/
diff --git a/src/main/java/nl/tudelft/labracore/dto/id/BuildingIdDTO.java b/src/main/java/nl/tudelft/labracore/dto/id/BuildingIdDTO.java
index fe889b85c90af51cc547235e622a60c068f8a6df..a34bb832615cede2cee8a55379474e40c4d3a991 100644
--- a/src/main/java/nl/tudelft/labracore/dto/id/BuildingIdDTO.java
+++ b/src/main/java/nl/tudelft/labracore/dto/id/BuildingIdDTO.java
@@ -17,12 +17,12 @@
*/
package nl.tudelft.labracore.dto.id;
+import org.springframework.data.repository.CrudRepository;
+
import nl.tudelft.labracore.model.Building;
import nl.tudelft.labracore.repository.BuildingRepository;
import nl.tudelft.librador.dto.id.IdDTO;
-import org.springframework.data.repository.CrudRepository;
-
/**
* DTO representing a Building passed by its ID.
*/
diff --git a/src/main/java/nl/tudelft/labracore/dto/id/ClusterIdDTO.java b/src/main/java/nl/tudelft/labracore/dto/id/ClusterIdDTO.java
index 0e8d1201653c319bc0349788836a70b6c5054515..ddf355de8268882c7dca3f8676202661ab74055f 100644
--- a/src/main/java/nl/tudelft/labracore/dto/id/ClusterIdDTO.java
+++ b/src/main/java/nl/tudelft/labracore/dto/id/ClusterIdDTO.java
@@ -17,12 +17,12 @@
*/
package nl.tudelft.labracore.dto.id;
+import org.springframework.data.repository.CrudRepository;
+
import nl.tudelft.labracore.model.Cluster;
import nl.tudelft.labracore.repository.ClusterRepository;
import nl.tudelft.librador.dto.id.IdDTO;
-import org.springframework.data.repository.CrudRepository;
-
/**
* DTO representing a Cluster passed by its ID.
*/
diff --git a/src/main/java/nl/tudelft/labracore/dto/id/CohortIdDTO.java b/src/main/java/nl/tudelft/labracore/dto/id/CohortIdDTO.java
index d3fdfd6910d519212975e6c655d9031b0bc3282c..4e42f062d0404c0aca2437eb414f4f2bdd080e3f 100644
--- a/src/main/java/nl/tudelft/labracore/dto/id/CohortIdDTO.java
+++ b/src/main/java/nl/tudelft/labracore/dto/id/CohortIdDTO.java
@@ -17,12 +17,12 @@
*/
package nl.tudelft.labracore.dto.id;
+import org.springframework.data.repository.CrudRepository;
+
import nl.tudelft.labracore.model.Cohort;
import nl.tudelft.labracore.repository.CohortRepository;
import nl.tudelft.librador.dto.id.IdDTO;
-import org.springframework.data.repository.CrudRepository;
-
/**
* DTO representing a Cohort passed by its ID.
*/
diff --git a/src/main/java/nl/tudelft/labracore/dto/id/CourseIdDTO.java b/src/main/java/nl/tudelft/labracore/dto/id/CourseIdDTO.java
index 83f01878632f00c74c5882889235b7697e167017..62905130d49cfa9c8a38a8ab28d1afe5daf80fc5 100644
--- a/src/main/java/nl/tudelft/labracore/dto/id/CourseIdDTO.java
+++ b/src/main/java/nl/tudelft/labracore/dto/id/CourseIdDTO.java
@@ -17,12 +17,12 @@
*/
package nl.tudelft.labracore.dto.id;
+import org.springframework.data.repository.CrudRepository;
+
import nl.tudelft.labracore.model.Course;
import nl.tudelft.labracore.repository.CourseRepository;
import nl.tudelft.librador.dto.id.IdDTO;
-import org.springframework.data.repository.CrudRepository;
-
/**
* DTO representing a Course passed by its ID.
*/
diff --git a/src/main/java/nl/tudelft/labracore/dto/id/EditionCollectionIdDTO.java b/src/main/java/nl/tudelft/labracore/dto/id/EditionCollectionIdDTO.java
index a0966e9f487c26e88a5917b34e5e59052c46254b..bd3b10bd292af1c37848426e2ef4da16bf10b379 100644
--- a/src/main/java/nl/tudelft/labracore/dto/id/EditionCollectionIdDTO.java
+++ b/src/main/java/nl/tudelft/labracore/dto/id/EditionCollectionIdDTO.java
@@ -17,13 +17,13 @@
*/
package nl.tudelft.labracore.dto.id;
+import org.springframework.data.repository.CrudRepository;
+
import lombok.NoArgsConstructor;
import nl.tudelft.labracore.model.EditionCollection;
import nl.tudelft.labracore.repository.EditionCollectionRepository;
import nl.tudelft.librador.dto.id.IdDTO;
-import org.springframework.data.repository.CrudRepository;
-
/**
* DTO representing a {@link nl.tudelft.labracore.model.EditionCollection} passed by its ID.
*/
diff --git a/src/main/java/nl/tudelft/labracore/dto/id/EditionIdDTO.java b/src/main/java/nl/tudelft/labracore/dto/id/EditionIdDTO.java
index 8cc378316aaa691b3f3ba85182470b3a0b9e8e41..8848df2801ec3e29bdc9004c9be1959169a01584 100644
--- a/src/main/java/nl/tudelft/labracore/dto/id/EditionIdDTO.java
+++ b/src/main/java/nl/tudelft/labracore/dto/id/EditionIdDTO.java
@@ -17,12 +17,12 @@
*/
package nl.tudelft.labracore.dto.id;
+import org.springframework.data.repository.CrudRepository;
+
import nl.tudelft.labracore.model.Edition;
import nl.tudelft.labracore.repository.EditionRepository;
import nl.tudelft.librador.dto.id.IdDTO;
-import org.springframework.data.repository.CrudRepository;
-
/**
* DTO representing an Edition passed by its ID.
*/
diff --git a/src/main/java/nl/tudelft/labracore/dto/id/GradeIdDTO.java b/src/main/java/nl/tudelft/labracore/dto/id/GradeIdDTO.java
index 219ea12d9f0fddb12e71095ca951fce41f6ce8b8..33e554fb17ee17e2818268276ae1b13452e35e41 100644
--- a/src/main/java/nl/tudelft/labracore/dto/id/GradeIdDTO.java
+++ b/src/main/java/nl/tudelft/labracore/dto/id/GradeIdDTO.java
@@ -17,12 +17,12 @@
*/
package nl.tudelft.labracore.dto.id;
+import org.springframework.data.repository.CrudRepository;
+
import nl.tudelft.labracore.model.Grade;
import nl.tudelft.labracore.repository.GradeRepository;
import nl.tudelft.librador.dto.id.IdDTO;
-import org.springframework.data.repository.CrudRepository;
-
/**
* DTO representing an Grade passed by its ID.
*/
diff --git a/src/main/java/nl/tudelft/labracore/dto/id/ModuleDivisionIdDTO.java b/src/main/java/nl/tudelft/labracore/dto/id/ModuleDivisionIdDTO.java
index 33db4fd7d1fe75b69257cf386f724c09cc248ec9..6f7ad0db4a86bd2371734111257cec26083e07c0 100644
--- a/src/main/java/nl/tudelft/labracore/dto/id/ModuleDivisionIdDTO.java
+++ b/src/main/java/nl/tudelft/labracore/dto/id/ModuleDivisionIdDTO.java
@@ -17,12 +17,12 @@
*/
package nl.tudelft.labracore.dto.id;
+import org.springframework.data.repository.CrudRepository;
+
import nl.tudelft.labracore.model.ModuleDivision;
import nl.tudelft.labracore.repository.ModuleDivisionRepository;
import nl.tudelft.librador.dto.id.IdDTO;
-import org.springframework.data.repository.CrudRepository;
-
/**
* DTO representing a ModuleDivision passed by its ID.
*/
diff --git a/src/main/java/nl/tudelft/labracore/dto/id/ModuleIdDTO.java b/src/main/java/nl/tudelft/labracore/dto/id/ModuleIdDTO.java
index b4f9e6ccf35b4f0d9c37e95c36f0170cfdbb07cc..a5efa2e0d83c320bac33872ceb5a8459845c70d0 100644
--- a/src/main/java/nl/tudelft/labracore/dto/id/ModuleIdDTO.java
+++ b/src/main/java/nl/tudelft/labracore/dto/id/ModuleIdDTO.java
@@ -17,12 +17,12 @@
*/
package nl.tudelft.labracore.dto.id;
+import org.springframework.data.repository.CrudRepository;
+
import nl.tudelft.labracore.model.Module;
import nl.tudelft.labracore.repository.ModuleRepository;
import nl.tudelft.librador.dto.id.IdDTO;
-import org.springframework.data.repository.CrudRepository;
-
/**
* DTO representing a Module passed by its ID.
*/
diff --git a/src/main/java/nl/tudelft/labracore/dto/id/PermissionIdDTO.java b/src/main/java/nl/tudelft/labracore/dto/id/PermissionIdDTO.java
index d91082d95b732241731cbbcb7daa6bca38fab8b5..7611d1f5ebbd99bb6b27f8f66a99b91cf1c5d9d3 100644
--- a/src/main/java/nl/tudelft/labracore/dto/id/PermissionIdDTO.java
+++ b/src/main/java/nl/tudelft/labracore/dto/id/PermissionIdDTO.java
@@ -17,12 +17,12 @@
*/
package nl.tudelft.labracore.dto.id;
+import org.springframework.data.repository.CrudRepository;
+
import nl.tudelft.labracore.model.Permission;
import nl.tudelft.labracore.repository.PermissionRepository;
import nl.tudelft.librador.dto.id.IdDTO;
-import org.springframework.data.repository.CrudRepository;
-
/**
* DTO representing a Permission passed by its ID.
*/
diff --git a/src/main/java/nl/tudelft/labracore/dto/id/PersonIdDTO.java b/src/main/java/nl/tudelft/labracore/dto/id/PersonIdDTO.java
index caebce021b73b08a99df24a05718064e50509baf..8f96b079d596e20f0c9c72210bfd161012c8be2c 100644
--- a/src/main/java/nl/tudelft/labracore/dto/id/PersonIdDTO.java
+++ b/src/main/java/nl/tudelft/labracore/dto/id/PersonIdDTO.java
@@ -17,12 +17,12 @@
*/
package nl.tudelft.labracore.dto.id;
+import org.springframework.data.repository.CrudRepository;
+
import nl.tudelft.labracore.model.Person;
import nl.tudelft.labracore.repository.PersonRepository;
import nl.tudelft.librador.dto.id.IdDTO;
-import org.springframework.data.repository.CrudRepository;
-
/**
* DTO representing a Person passed by its ID.
*/
diff --git a/src/main/java/nl/tudelft/labracore/dto/id/ProgramIdDTO.java b/src/main/java/nl/tudelft/labracore/dto/id/ProgramIdDTO.java
index d619136482ca93ac1887fa7169f7b5e7bd865a75..6a674b8d8d0878b5f0d1427f5ced5a6c5c4858fd 100644
--- a/src/main/java/nl/tudelft/labracore/dto/id/ProgramIdDTO.java
+++ b/src/main/java/nl/tudelft/labracore/dto/id/ProgramIdDTO.java
@@ -17,12 +17,12 @@
*/
package nl.tudelft.labracore.dto.id;
+import org.springframework.data.repository.CrudRepository;
+
import nl.tudelft.labracore.model.Program;
import nl.tudelft.labracore.repository.ProgramRepository;
import nl.tudelft.librador.dto.id.IdDTO;
-import org.springframework.data.repository.CrudRepository;
-
/**
* DTO representing a Program passed by its ID.
*/
diff --git a/src/main/java/nl/tudelft/labracore/dto/id/RoleIdDTO.java b/src/main/java/nl/tudelft/labracore/dto/id/RoleIdDTO.java
index 61e6100ed0128a322a4edc46d35bc65915d24c55..11b6bee7493b64ae25e4652edccdfcae2e60464b 100644
--- a/src/main/java/nl/tudelft/labracore/dto/id/RoleIdDTO.java
+++ b/src/main/java/nl/tudelft/labracore/dto/id/RoleIdDTO.java
@@ -17,12 +17,12 @@
*/
package nl.tudelft.labracore.dto.id;
+import org.springframework.data.repository.CrudRepository;
+
import nl.tudelft.labracore.model.Role;
import nl.tudelft.labracore.repository.RoleRepository;
import nl.tudelft.librador.dto.id.IdDTO;
-import org.springframework.data.repository.CrudRepository;
-
/**
* DTO representing a Role passed by its ID.
*/
diff --git a/src/main/java/nl/tudelft/labracore/dto/id/RoomIdDTO.java b/src/main/java/nl/tudelft/labracore/dto/id/RoomIdDTO.java
index e527a48a9d9a030a1c8522a24e9f6af0f4611edf..b850e70205e514dd47e05c1ba1d1a50ae9efb7a0 100644
--- a/src/main/java/nl/tudelft/labracore/dto/id/RoomIdDTO.java
+++ b/src/main/java/nl/tudelft/labracore/dto/id/RoomIdDTO.java
@@ -17,12 +17,12 @@
*/
package nl.tudelft.labracore.dto.id;
+import org.springframework.data.repository.CrudRepository;
+
import nl.tudelft.labracore.model.Room;
import nl.tudelft.labracore.repository.RoomRepository;
import nl.tudelft.librador.dto.id.IdDTO;
-import org.springframework.data.repository.CrudRepository;
-
/**
* DTO representing a Room passed by its ID.
*/
diff --git a/src/main/java/nl/tudelft/labracore/dto/id/SessionIdDTO.java b/src/main/java/nl/tudelft/labracore/dto/id/SessionIdDTO.java
index fccc638f892b121efca40e7116a4756ef88c7a6a..70461467aed923b0d336d9d84bb441f4a1d2c190 100644
--- a/src/main/java/nl/tudelft/labracore/dto/id/SessionIdDTO.java
+++ b/src/main/java/nl/tudelft/labracore/dto/id/SessionIdDTO.java
@@ -17,12 +17,12 @@
*/
package nl.tudelft.labracore.dto.id;
+import org.springframework.data.repository.CrudRepository;
+
import nl.tudelft.labracore.model.Session;
import nl.tudelft.labracore.repository.SessionRepository;
import nl.tudelft.librador.dto.id.IdDTO;
-import org.springframework.data.repository.CrudRepository;
-
/**
* DTO representing a Session passed by its ID.
*/
diff --git a/src/main/java/nl/tudelft/labracore/dto/id/StudentGroupIdDTO.java b/src/main/java/nl/tudelft/labracore/dto/id/StudentGroupIdDTO.java
index a4e64162bf05be396ad80ea56b5e4d9cd4eacb0c..4b5cebbf0e66227fa66ac5939dc54574313db993 100644
--- a/src/main/java/nl/tudelft/labracore/dto/id/StudentGroupIdDTO.java
+++ b/src/main/java/nl/tudelft/labracore/dto/id/StudentGroupIdDTO.java
@@ -17,12 +17,12 @@
*/
package nl.tudelft.labracore.dto.id;
+import org.springframework.data.repository.CrudRepository;
+
import nl.tudelft.labracore.model.StudentGroup;
import nl.tudelft.labracore.repository.StudentGroupRepository;
import nl.tudelft.librador.dto.id.IdDTO;
-import org.springframework.data.repository.CrudRepository;
-
/**
* DTO representing a StudentGroup passed by its ID.
*/
diff --git a/src/main/java/nl/tudelft/labracore/dto/id/SubmissionIdDTO.java b/src/main/java/nl/tudelft/labracore/dto/id/SubmissionIdDTO.java
index 3436ca7dd171ae9fa4170037cd61edefedc96c10..8c3d43242fd474b5a45b052af05ad2964c3630bf 100644
--- a/src/main/java/nl/tudelft/labracore/dto/id/SubmissionIdDTO.java
+++ b/src/main/java/nl/tudelft/labracore/dto/id/SubmissionIdDTO.java
@@ -17,12 +17,12 @@
*/
package nl.tudelft.labracore.dto.id;
+import org.springframework.data.repository.CrudRepository;
+
import nl.tudelft.labracore.model.Submission;
import nl.tudelft.labracore.repository.SubmissionRepository;
import nl.tudelft.librador.dto.id.IdDTO;
-import org.springframework.data.repository.CrudRepository;
-
/**
* DTO representing a Submission passed by its ID.
*/
diff --git a/src/main/java/nl/tudelft/labracore/dto/patch/SessionPatchDTO.java b/src/main/java/nl/tudelft/labracore/dto/patch/SessionPatchDTO.java
index 5b50b8d8b47d11670bdfb3958e20947ff432fff4..de8f1626358cf8665ac2a344d6609ad3bca39d52 100644
--- a/src/main/java/nl/tudelft/labracore/dto/patch/SessionPatchDTO.java
+++ b/src/main/java/nl/tudelft/labracore/dto/patch/SessionPatchDTO.java
@@ -48,7 +48,7 @@ public class SessionPatchDTO extends Patch<Session> {
public void applyOneToOne() {
updateNonNull(name, data::setName);
updateNonNull(start, data::setStart);
- updateNonNull(end, data::setEnd);
+ updateNonNull(end, data::setEndTime);
updateNonNull(description, data::setDescription);
}
diff --git a/src/main/java/nl/tudelft/labracore/dto/view/structured/summary/SessionSummaryDTO.java b/src/main/java/nl/tudelft/labracore/dto/view/structured/summary/SessionSummaryDTO.java
index c123b935c3628a27a91fe150e3ec4d784ee966e5..f876aef6b313ff538a6476279edb812581a5a1e0 100644
--- a/src/main/java/nl/tudelft/labracore/dto/view/structured/summary/SessionSummaryDTO.java
+++ b/src/main/java/nl/tudelft/labracore/dto/view/structured/summary/SessionSummaryDTO.java
@@ -41,6 +41,6 @@ public class SessionSummaryDTO extends View<Session> {
@NotNull
private LocalDateTime start;
@NotNull
- private LocalDateTime end;
+ private LocalDateTime endTime;
private String description;
}
diff --git a/src/main/java/nl/tudelft/labracore/interceptor/AppInterceptor.java b/src/main/java/nl/tudelft/labracore/interceptor/AppInterceptor.java
index 4e67d23c3f6574f3c9b5fab4988f56182b634795..d62a331cf5b0a4197b1834fe36b72ba9f153463f 100644
--- a/src/main/java/nl/tudelft/labracore/interceptor/AppInterceptor.java
+++ b/src/main/java/nl/tudelft/labracore/interceptor/AppInterceptor.java
@@ -22,14 +22,14 @@ import java.time.LocalDateTime;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+
import nl.tudelft.labracore.model.App;
import nl.tudelft.labracore.model.security.APIKey;
import nl.tudelft.labracore.repository.APIKeyRepository;
import nl.tudelft.labracore.repository.AppRepository;
-import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.ModelAndView;
-
public class AppInterceptor implements HandlerInterceptor {
private final AppRepository appRepository;
diff --git a/src/main/java/nl/tudelft/labracore/model/Assignment.java b/src/main/java/nl/tudelft/labracore/model/Assignment.java
index 4b12c71df2b92d4473c1a8ab710843193d05f394..9f51e014293bee1417cc4cde92333bd8dfd826f9 100644
--- a/src/main/java/nl/tudelft/labracore/model/Assignment.java
+++ b/src/main/java/nl/tudelft/labracore/model/Assignment.java
@@ -25,12 +25,12 @@ import javax.persistence.*;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
-import lombok.*;
-import nl.tudelft.labracore.model.embeddable.Description;
-
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
+import lombok.*;
+import nl.tudelft.labracore.model.embeddable.Description;
+
@Data
@Builder
@NoArgsConstructor
diff --git a/src/main/java/nl/tudelft/labracore/model/Building.java b/src/main/java/nl/tudelft/labracore/model/Building.java
index 6e6a7108260d2256fa493d1c2a73be918ec49623..853042e24ec5bfde3cd0a50e80cd96de0af69159 100644
--- a/src/main/java/nl/tudelft/labracore/model/Building.java
+++ b/src/main/java/nl/tudelft/labracore/model/Building.java
@@ -24,12 +24,12 @@ import java.util.Set;
import javax.persistence.*;
import javax.validation.constraints.NotBlank;
-import lombok.*;
-import nl.tudelft.labracore.model.embeddable.Address;
-
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
+import lombok.*;
+import nl.tudelft.labracore.model.embeddable.Address;
+
/**
* Entity class representing a building in a university.
* <p>
diff --git a/src/main/java/nl/tudelft/labracore/model/Cluster.java b/src/main/java/nl/tudelft/labracore/model/Cluster.java
index f8dd384a6187be3c77166bcc746621ff718a71b3..886ee81e2c277baffadf67707a5c24256057534f 100644
--- a/src/main/java/nl/tudelft/labracore/model/Cluster.java
+++ b/src/main/java/nl/tudelft/labracore/model/Cluster.java
@@ -24,11 +24,11 @@ import java.util.Set;
import javax.persistence.*;
import javax.validation.constraints.NotNull;
-import lombok.*;
-
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
+import lombok.*;
+
/**
* This entity represents a cluster of students. These clusters are provided by the university. A person can
* only belong to 1 cluster per study program (this is not enforced by the DB schema).
diff --git a/src/main/java/nl/tudelft/labracore/model/Cohort.java b/src/main/java/nl/tudelft/labracore/model/Cohort.java
index e1cc0c8e0453165c1435b18eda161e8d0a725540..1defd95bbb7711651f0f6bcb25726a2ea5cd3a65 100644
--- a/src/main/java/nl/tudelft/labracore/model/Cohort.java
+++ b/src/main/java/nl/tudelft/labracore/model/Cohort.java
@@ -27,11 +27,11 @@ import javax.persistence.*;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
-import lombok.*;
-
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
+import lombok.*;
+
/**
* A cohort is the set of students that entered the university at the same year. An edition of the course is
* then tied to the cohort which it is being held for.
diff --git a/src/main/java/nl/tudelft/labracore/model/Course.java b/src/main/java/nl/tudelft/labracore/model/Course.java
index 14e366b9b7afbbd5143861288859d9c8ae469c4d..4bae4d6f9e4ed60cc5d9bef3ee606f5887bf320c 100644
--- a/src/main/java/nl/tudelft/labracore/model/Course.java
+++ b/src/main/java/nl/tudelft/labracore/model/Course.java
@@ -25,11 +25,11 @@ import javax.persistence.*;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
-import lombok.*;
-
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
+import lombok.*;
+
@Data
@Builder
@NoArgsConstructor
diff --git a/src/main/java/nl/tudelft/labracore/model/Edition.java b/src/main/java/nl/tudelft/labracore/model/Edition.java
index db0b4748c5e6b93ae9f6600d890b37aa4b7b1db4..b034b05771325c5c986d341ac1abcb5bc28cadbd 100644
--- a/src/main/java/nl/tudelft/labracore/model/Edition.java
+++ b/src/main/java/nl/tudelft/labracore/model/Edition.java
@@ -30,13 +30,13 @@ import javax.persistence.*;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
+
import lombok.*;
import nl.tudelft.labracore.enums.EnrollabilityStatus;
import nl.tudelft.labracore.enums.RoleType;
-import org.hibernate.annotations.SQLDelete;
-import org.hibernate.annotations.Where;
-
/**
* This is an edition of a specific course (i.e., "Calculus" would be a Course while "Calculus 2020" would be
* an edition of that course).
diff --git a/src/main/java/nl/tudelft/labracore/model/EditionCollection.java b/src/main/java/nl/tudelft/labracore/model/EditionCollection.java
index b50e00055278c482062638e22be3babaca427d60..cc29745d5933159ac2f76a1d90022af0a9a8d520 100644
--- a/src/main/java/nl/tudelft/labracore/model/EditionCollection.java
+++ b/src/main/java/nl/tudelft/labracore/model/EditionCollection.java
@@ -25,11 +25,11 @@ import javax.persistence.*;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
-import lombok.*;
-
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
+import lombok.*;
+
/**
* This is a collection of editions. This entity is used for determining permissions over shared labs.
* Sessions can be linked to this {@link EditionCollection} instead of just a single
diff --git a/src/main/java/nl/tudelft/labracore/model/Grade.java b/src/main/java/nl/tudelft/labracore/model/Grade.java
index a4825e1a3257977d5eac079db2ba5a62fe608475..62d550c50c5a9e5cf96993f20ab245994b81ec4f 100644
--- a/src/main/java/nl/tudelft/labracore/model/Grade.java
+++ b/src/main/java/nl/tudelft/labracore/model/Grade.java
@@ -22,15 +22,15 @@ import java.time.LocalDateTime;
import javax.persistence.*;
import javax.validation.constraints.NotNull;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
+
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import nl.tudelft.labracore.enums.GradeScheme;
-import org.hibernate.annotations.SQLDelete;
-import org.hibernate.annotations.Where;
-
/**
* The grade given to an Assignment submission. Grades can be defined in many different ways. We support all
* the grade types in {@link GradeScheme}.
diff --git a/src/main/java/nl/tudelft/labracore/model/Module.java b/src/main/java/nl/tudelft/labracore/model/Module.java
index b3a419d7f4973fa19c67023b912aa9d759318229..559d60d7478de3b5faf19449ba545e599be1c925 100644
--- a/src/main/java/nl/tudelft/labracore/model/Module.java
+++ b/src/main/java/nl/tudelft/labracore/model/Module.java
@@ -25,11 +25,11 @@ import javax.persistence.*;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
-import lombok.*;
-
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
+import lombok.*;
+
/**
* A module represents a series of assignments in a course edition. A student can only be in one group per
* module. The course edition "Mathematics 2020" could have two modules: "Calculus" and "Linear Algebra". Both
diff --git a/src/main/java/nl/tudelft/labracore/model/ModuleDivision.java b/src/main/java/nl/tudelft/labracore/model/ModuleDivision.java
index 9dc8c54e11cd9ee14f76ab878a0250189ec313c2..95080e2e2829934c340e439936b5a79aed3ae4b7 100644
--- a/src/main/java/nl/tudelft/labracore/model/ModuleDivision.java
+++ b/src/main/java/nl/tudelft/labracore/model/ModuleDivision.java
@@ -24,11 +24,11 @@ import java.util.Set;
import javax.persistence.*;
import javax.validation.constraints.NotNull;
-import lombok.*;
-
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
+import lombok.*;
+
/**
* This is a division of the students for a specific module. Students can only form groups for this module
* with people who are in the same division as them. These divisions can be copied over from the global
diff --git a/src/main/java/nl/tudelft/labracore/model/Program.java b/src/main/java/nl/tudelft/labracore/model/Program.java
index a66b8957153d57d109f01d00bd103b9d304b6677..935c03e8fe0b3dd50870fba7c240fb6ed6f8c8a2 100644
--- a/src/main/java/nl/tudelft/labracore/model/Program.java
+++ b/src/main/java/nl/tudelft/labracore/model/Program.java
@@ -25,12 +25,12 @@ import javax.persistence.*;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
-import lombok.*;
-import nl.tudelft.labracore.model.person.FunctionalMailbox;
-
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
+import lombok.*;
+import nl.tudelft.labracore.model.person.FunctionalMailbox;
+
@Data
@Builder
@NoArgsConstructor
diff --git a/src/main/java/nl/tudelft/labracore/model/Question.java b/src/main/java/nl/tudelft/labracore/model/Question.java
index f62a2e6cf89a322dc4e909a316685b0cf193a12d..811cfed8d275ee499fa2783bdb61451c6b259aed 100644
--- a/src/main/java/nl/tudelft/labracore/model/Question.java
+++ b/src/main/java/nl/tudelft/labracore/model/Question.java
@@ -25,14 +25,14 @@ import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
+
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
-import org.hibernate.annotations.SQLDelete;
-import org.hibernate.annotations.Where;
-
@Data
@Builder
@NoArgsConstructor
diff --git a/src/main/java/nl/tudelft/labracore/model/Room.java b/src/main/java/nl/tudelft/labracore/model/Room.java
index 1cbfea12485e3e4bd5d312b0a8e59b2cc4c9871d..ee7790ede18883489cd6b77920b122504a48667c 100644
--- a/src/main/java/nl/tudelft/labracore/model/Room.java
+++ b/src/main/java/nl/tudelft/labracore/model/Room.java
@@ -25,11 +25,11 @@ import javax.persistence.*;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
-import lombok.*;
-
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
+import lombok.*;
+
/**
* Entity class representing a Room within a Building.
*
diff --git a/src/main/java/nl/tudelft/labracore/model/Session.java b/src/main/java/nl/tudelft/labracore/model/Session.java
index 207b84caa086e3c6db7a71306335b951f74f3370..584768cc76a7b1926ff77a854d588f15ad4ed1c5 100644
--- a/src/main/java/nl/tudelft/labracore/model/Session.java
+++ b/src/main/java/nl/tudelft/labracore/model/Session.java
@@ -25,12 +25,12 @@ import javax.persistence.*;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
-import lombok.*;
-import lombok.experimental.SuperBuilder;
-
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
/**
* Superclass for Session entities. This class defines the common fields between different types of sessions.
* This class also defines methods for extracting commonalities between implementations that are abstracted
@@ -68,7 +68,7 @@ public abstract class Session {
* The time the session ends.
*/
@NotNull
- private LocalDateTime end;
+ private LocalDateTime endTime;
/**
* A short text describing the intentions and goals of the session.
diff --git a/src/main/java/nl/tudelft/labracore/model/SharedSession.java b/src/main/java/nl/tudelft/labracore/model/SharedSession.java
index 9a89656af7900088fb4730d88eaf322542cf6ff6..baf91caf8365d2c7b506436a5968c3f7bce9f0f3 100644
--- a/src/main/java/nl/tudelft/labracore/model/SharedSession.java
+++ b/src/main/java/nl/tudelft/labracore/model/SharedSession.java
@@ -24,12 +24,12 @@ import javax.persistence.Entity;
import javax.persistence.ManyToOne;
import javax.validation.constraints.NotNull;
-import lombok.*;
-import lombok.experimental.SuperBuilder;
-
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
/**
* A {@link Session} implementation representing a shared lab situation. In such a situation, the session is
* hosted by multiple course editions and is related to all of those editions. Assignments that are covered
diff --git a/src/main/java/nl/tudelft/labracore/model/SingleSession.java b/src/main/java/nl/tudelft/labracore/model/SingleSession.java
index 4be79cc649ed7f3ea0f70593e9e8b411e038bc4c..4cab803e15f910411a35f1455da3b204462e4dbe 100644
--- a/src/main/java/nl/tudelft/labracore/model/SingleSession.java
+++ b/src/main/java/nl/tudelft/labracore/model/SingleSession.java
@@ -24,12 +24,12 @@ import javax.persistence.Entity;
import javax.persistence.ManyToOne;
import javax.validation.constraints.NotNull;
-import lombok.*;
-import lombok.experimental.SuperBuilder;
-
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.WhereJoinTable;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
/**
* A {@link Session} implementation representing a regular situation with only one edition hosting it.
* Assignments that are covered could then only come from that single edition.
diff --git a/src/main/java/nl/tudelft/labracore/model/StudentGroup.java b/src/main/java/nl/tudelft/labracore/model/StudentGroup.java
index e349bac19d383ef51e1b82915e4380deb3ae8709..62cabc8beedb72e78dc454b4b88382de8e467c18 100644
--- a/src/main/java/nl/tudelft/labracore/model/StudentGroup.java
+++ b/src/main/java/nl/tudelft/labracore/model/StudentGroup.java
@@ -25,12 +25,12 @@ import javax.persistence.*;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
-import lombok.*;
-import nl.tudelft.labracore.enums.RoleType;
-
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
+import lombok.*;
+import nl.tudelft.labracore.enums.RoleType;
+
/**
* This entity represents the groups that student form for a course module.
*/
diff --git a/src/main/java/nl/tudelft/labracore/model/Submission.java b/src/main/java/nl/tudelft/labracore/model/Submission.java
index a8edfaa1d3e622cddbc2ee9e373097c4e5f6ca88..53de2db388bc8eb944b7473f0f30b0be59034e8a 100644
--- a/src/main/java/nl/tudelft/labracore/model/Submission.java
+++ b/src/main/java/nl/tudelft/labracore/model/Submission.java
@@ -26,11 +26,11 @@ import java.util.Set;
import javax.persistence.*;
import javax.validation.constraints.NotNull;
-import lombok.*;
-
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
+import lombok.*;
+
/**
* The entity class for representing a Submission. A Submission represents the event of a student submitting
* their solution to an {@link Assignment}. This Submission may be graded by a TA or by automated software.
diff --git a/src/main/java/nl/tudelft/labracore/model/security/TOTPKey.java b/src/main/java/nl/tudelft/labracore/model/security/TOTPKey.java
index 76a65a095d2556e940d05c66e67a524d7442033e..4fd494a4447a4744cf48fc43e44c9ac484215987 100644
--- a/src/main/java/nl/tudelft/labracore/model/security/TOTPKey.java
+++ b/src/main/java/nl/tudelft/labracore/model/security/TOTPKey.java
@@ -23,12 +23,12 @@ import javax.persistence.*;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
+import org.apache.commons.codec.binary.Base32;
+
import lombok.Data;
import lombok.NoArgsConstructor;
import nl.tudelft.labracore.model.Person;
-import org.apache.commons.codec.binary.Base32;
-
/**
* The entity object representing a time-based one-time password key.
*
diff --git a/src/main/java/nl/tudelft/labracore/properties/DBApiProperties.java b/src/main/java/nl/tudelft/labracore/properties/DBApiProperties.java
index 41c18c1c3f3cb10286be11717795addcfcd71f4e..258daa1d614a7214d81f4c42e10d185c170f352a 100644
--- a/src/main/java/nl/tudelft/labracore/properties/DBApiProperties.java
+++ b/src/main/java/nl/tudelft/labracore/properties/DBApiProperties.java
@@ -17,11 +17,11 @@
*/
package nl.tudelft.labracore.properties;
-import lombok.Data;
-
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
+import lombok.Data;
+
@Data
@Component
@ConfigurationProperties(prefix = "labracore.db-api")
diff --git a/src/main/java/nl/tudelft/labracore/properties/ElasticProperties.java b/src/main/java/nl/tudelft/labracore/properties/ElasticProperties.java
index c48b88fb4949a97f94eff2f35c8bfd423b3f1bf8..acbe76dfaf407af8f0ee3a3c43fa4758c1139421 100644
--- a/src/main/java/nl/tudelft/labracore/properties/ElasticProperties.java
+++ b/src/main/java/nl/tudelft/labracore/properties/ElasticProperties.java
@@ -17,11 +17,11 @@
*/
package nl.tudelft.labracore.properties;
-import lombok.Data;
-
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
+import lombok.Data;
+
@Data
@Component
@ConfigurationProperties(prefix = "labracore.elastic")
diff --git a/src/main/java/nl/tudelft/labracore/repository/APIKeyRepository.java b/src/main/java/nl/tudelft/labracore/repository/APIKeyRepository.java
index a7831e4a223b9446a4cc2d0a1afd855e6a3d9462..ac5aefc49fecb85dad26aa8e3a58d69e181a7dbc 100644
--- a/src/main/java/nl/tudelft/labracore/repository/APIKeyRepository.java
+++ b/src/main/java/nl/tudelft/labracore/repository/APIKeyRepository.java
@@ -17,11 +17,11 @@
*/
package nl.tudelft.labracore.repository;
-import nl.tudelft.labracore.model.security.APIKey;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import nl.tudelft.labracore.model.security.APIKey;
+
public interface APIKeyRepository extends JpaRepository<APIKey, Long> {
/**
* Finds the API Key by id or throws a {@link ResourceNotFoundException}.
diff --git a/src/main/java/nl/tudelft/labracore/repository/AppRepository.java b/src/main/java/nl/tudelft/labracore/repository/AppRepository.java
index 5f0024a7c5d5aba864cf93a2460e788af60c1443..9fbf6f2d202292a9aaf20b74621fef4eb932a2b2 100644
--- a/src/main/java/nl/tudelft/labracore/repository/AppRepository.java
+++ b/src/main/java/nl/tudelft/labracore/repository/AppRepository.java
@@ -20,11 +20,11 @@ package nl.tudelft.labracore.repository;
import java.util.List;
import java.util.Optional;
-import nl.tudelft.labracore.model.App;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import nl.tudelft.labracore.model.App;
+
/**
* Repository for CRUD operations on Applications within the database.
*/
diff --git a/src/main/java/nl/tudelft/labracore/repository/AssignmentRepository.java b/src/main/java/nl/tudelft/labracore/repository/AssignmentRepository.java
index ae688ce9e1cbaf4a1b015b10d4d46f6b0a93dc9f..bb03c184e5677ae06fb01b6b2aa782c67c593620 100644
--- a/src/main/java/nl/tudelft/labracore/repository/AssignmentRepository.java
+++ b/src/main/java/nl/tudelft/labracore/repository/AssignmentRepository.java
@@ -19,12 +19,12 @@ package nl.tudelft.labracore.repository;
import java.util.List;
-import nl.tudelft.labracore.model.Assignment;
-import nl.tudelft.labracore.model.Module;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import nl.tudelft.labracore.model.Assignment;
+import nl.tudelft.labracore.model.Module;
+
public interface AssignmentRepository extends JpaRepository<Assignment, Long> {
/**
diff --git a/src/main/java/nl/tudelft/labracore/repository/BuildingRepository.java b/src/main/java/nl/tudelft/labracore/repository/BuildingRepository.java
index 1e29493d8b50c3b2dd2005033b025603c9a3192d..ca4d9d02caa69d235997d28e665ad315fc423339 100644
--- a/src/main/java/nl/tudelft/labracore/repository/BuildingRepository.java
+++ b/src/main/java/nl/tudelft/labracore/repository/BuildingRepository.java
@@ -17,11 +17,11 @@
*/
package nl.tudelft.labracore.repository;
-import nl.tudelft.labracore.model.Building;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import nl.tudelft.labracore.model.Building;
+
/**
* Repository for CRUD operations on Buildings within the database.
*/
diff --git a/src/main/java/nl/tudelft/labracore/repository/ClusterRepository.java b/src/main/java/nl/tudelft/labracore/repository/ClusterRepository.java
index dd896cc263e6780b16c9346bd2aaa034d55088ac..953c540193862a300a2853963cb6517dd0ec1341 100644
--- a/src/main/java/nl/tudelft/labracore/repository/ClusterRepository.java
+++ b/src/main/java/nl/tudelft/labracore/repository/ClusterRepository.java
@@ -19,12 +19,12 @@ package nl.tudelft.labracore.repository;
import java.util.List;
-import nl.tudelft.labracore.model.Cluster;
-import nl.tudelft.labracore.model.Cohort;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import nl.tudelft.labracore.model.Cluster;
+import nl.tudelft.labracore.model.Cohort;
+
public interface ClusterRepository extends JpaRepository<Cluster, Long> {
/**
diff --git a/src/main/java/nl/tudelft/labracore/repository/CohortRepository.java b/src/main/java/nl/tudelft/labracore/repository/CohortRepository.java
index de4282a4bc63ee6e8d5d95f7051cf00ba0741a92..d61f958e295c8e10fb7d257c5b5ad2d73a6b748e 100644
--- a/src/main/java/nl/tudelft/labracore/repository/CohortRepository.java
+++ b/src/main/java/nl/tudelft/labracore/repository/CohortRepository.java
@@ -19,11 +19,11 @@ package nl.tudelft.labracore.repository;
import java.util.List;
-import nl.tudelft.labracore.model.Cohort;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import nl.tudelft.labracore.model.Cohort;
+
public interface CohortRepository extends JpaRepository<Cohort, Long> {
/**
diff --git a/src/main/java/nl/tudelft/labracore/repository/ConcretePersonRepository.java b/src/main/java/nl/tudelft/labracore/repository/ConcretePersonRepository.java
index 94a1a8b22c45a7d5ef2934f23b69ad96fe87cc96..ea84747c4671f81f184dc238acc3f37217763722 100644
--- a/src/main/java/nl/tudelft/labracore/repository/ConcretePersonRepository.java
+++ b/src/main/java/nl/tudelft/labracore/repository/ConcretePersonRepository.java
@@ -20,10 +20,6 @@ package nl.tudelft.labracore.repository;
import java.util.List;
import java.util.Optional;
-import nl.tudelft.labracore.model.Program;
-import nl.tudelft.labracore.model.person.ConcretePerson;
-import nl.tudelft.labracore.model.person.QConcretePerson;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QuerydslPredicateExecutor;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;
@@ -32,6 +28,10 @@ import org.springframework.lang.NonNull;
import com.querydsl.core.types.Predicate;
import com.querydsl.core.types.dsl.BooleanExpression;
+import nl.tudelft.labracore.model.Program;
+import nl.tudelft.labracore.model.person.ConcretePerson;
+import nl.tudelft.labracore.model.person.QConcretePerson;
+
public interface ConcretePersonRepository
extends JpaRepository<ConcretePerson, Long>, QuerydslPredicateExecutor<ConcretePerson> {
QConcretePerson qp = QConcretePerson.concretePerson;
diff --git a/src/main/java/nl/tudelft/labracore/repository/CourseRepository.java b/src/main/java/nl/tudelft/labracore/repository/CourseRepository.java
index ca10758903a107eddc9f11fa07fa2ba0343085a5..5f90a2c4157762d4b4fb8516d03c88c38fe0be9b 100644
--- a/src/main/java/nl/tudelft/labracore/repository/CourseRepository.java
+++ b/src/main/java/nl/tudelft/labracore/repository/CourseRepository.java
@@ -17,11 +17,11 @@
*/
package nl.tudelft.labracore.repository;
-import nl.tudelft.labracore.model.Course;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import nl.tudelft.labracore.model.Course;
+
public interface CourseRepository extends JpaRepository<Course, Long> {
/**
diff --git a/src/main/java/nl/tudelft/labracore/repository/EditionCollectionRepository.java b/src/main/java/nl/tudelft/labracore/repository/EditionCollectionRepository.java
index c70e817557ded6d3ca0aaf4ed097142f41b5c93c..6e3b3515f17bfb12e5416e1f14fd73a2b7709bd8 100644
--- a/src/main/java/nl/tudelft/labracore/repository/EditionCollectionRepository.java
+++ b/src/main/java/nl/tudelft/labracore/repository/EditionCollectionRepository.java
@@ -19,10 +19,6 @@ package nl.tudelft.labracore.repository;
import java.util.List;
-import nl.tudelft.labracore.model.Edition;
-import nl.tudelft.labracore.model.EditionCollection;
-import nl.tudelft.labracore.model.QEditionCollection;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QuerydslPredicateExecutor;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;
@@ -30,6 +26,10 @@ import org.springframework.lang.NonNull;
import com.querydsl.core.types.Predicate;
+import nl.tudelft.labracore.model.Edition;
+import nl.tudelft.labracore.model.EditionCollection;
+import nl.tudelft.labracore.model.QEditionCollection;
+
public interface EditionCollectionRepository extends JpaRepository<EditionCollection, Long>,
QuerydslPredicateExecutor<EditionCollection> {
QEditionCollection editionCollection = QEditionCollection.editionCollection;
diff --git a/src/main/java/nl/tudelft/labracore/repository/EditionRepository.java b/src/main/java/nl/tudelft/labracore/repository/EditionRepository.java
index c5c6d2bcb4277367c436f56bebe8da6cd56ea3b0..74dd59979450ef3dcd314b155a5c1373f1444631 100644
--- a/src/main/java/nl/tudelft/labracore/repository/EditionRepository.java
+++ b/src/main/java/nl/tudelft/labracore/repository/EditionRepository.java
@@ -26,11 +26,7 @@ import java.util.Collection;
import java.util.List;
import java.util.Set;
-import nl.tudelft.labracore.dto.helper.Period;
-import nl.tudelft.labracore.enums.EnrollabilityStatus;
-import nl.tudelft.labracore.model.Edition;
-import nl.tudelft.labracore.model.QEdition;
-import nl.tudelft.labracore.model.QRole;
+import javax.validation.constraints.NotNull;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
@@ -42,6 +38,12 @@ import com.querydsl.core.types.Predicate;
import com.querydsl.core.types.dsl.BooleanExpression;
import com.querydsl.jpa.JPAExpressions;
+import nl.tudelft.labracore.dto.helper.Period;
+import nl.tudelft.labracore.enums.EnrollabilityStatus;
+import nl.tudelft.labracore.model.Edition;
+import nl.tudelft.labracore.model.QEdition;
+import nl.tudelft.labracore.model.QRole;
+
public interface EditionRepository extends JpaRepository<Edition, Long>, QuerydslPredicateExecutor<Edition> {
QRole qr = QRole.role;
QEdition q = QEdition.edition;
@@ -166,7 +168,7 @@ public interface EditionRepository extends JpaRepository<Edition, Long>, Queryds
* @param period The time during which Editions should be found.
* @return The list of Editions active at the given time.
*/
- default List<Edition> findAllActiveDuring(Period period) {
+ default List<Edition> findAllActiveDuring(@NotNull Period period) {
return findAll(q.isArchived.isFalse()
.and(q.endDate.after(period.getStart()).and(q.startDate.before(period.getEnd()))));
}
diff --git a/src/main/java/nl/tudelft/labracore/repository/EmailOnlyPersonRepository.java b/src/main/java/nl/tudelft/labracore/repository/EmailOnlyPersonRepository.java
index 43863e41d852e0788c7f9baadc27e18b8695728b..c43427b5df5562ba0e2482257b339aecbb987977 100644
--- a/src/main/java/nl/tudelft/labracore/repository/EmailOnlyPersonRepository.java
+++ b/src/main/java/nl/tudelft/labracore/repository/EmailOnlyPersonRepository.java
@@ -19,10 +19,10 @@ package nl.tudelft.labracore.repository;
import java.util.Optional;
-import nl.tudelft.labracore.model.person.EmailOnlyPerson;
-
import org.springframework.data.jpa.repository.JpaRepository;
+import nl.tudelft.labracore.model.person.EmailOnlyPerson;
+
public interface EmailOnlyPersonRepository extends JpaRepository<EmailOnlyPerson, Long> {
/**
* @param email The e-mail to lookup.
diff --git a/src/main/java/nl/tudelft/labracore/repository/EventSubscriptionRepository.java b/src/main/java/nl/tudelft/labracore/repository/EventSubscriptionRepository.java
index d2af9462b1c9f6c3c3c395493bb078581733d286..5aaedd88a30ba26cd66a0b029cc6b88a69e47512 100644
--- a/src/main/java/nl/tudelft/labracore/repository/EventSubscriptionRepository.java
+++ b/src/main/java/nl/tudelft/labracore/repository/EventSubscriptionRepository.java
@@ -19,11 +19,11 @@ package nl.tudelft.labracore.repository;
import java.util.List;
-import nl.tudelft.labracore.model.EventSubscription;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import nl.tudelft.labracore.model.EventSubscription;
+
/**
* Repository for CRUD operations on EventSubscriptions within the database.
*/
diff --git a/src/main/java/nl/tudelft/labracore/repository/FunctionalMailboxRepository.java b/src/main/java/nl/tudelft/labracore/repository/FunctionalMailboxRepository.java
index 663d27ce84db9118357d1a6c50257642a3af8a5c..fa3775e1c636eae864b93e589584aac578e4d5cb 100644
--- a/src/main/java/nl/tudelft/labracore/repository/FunctionalMailboxRepository.java
+++ b/src/main/java/nl/tudelft/labracore/repository/FunctionalMailboxRepository.java
@@ -17,11 +17,11 @@
*/
package nl.tudelft.labracore.repository;
-import nl.tudelft.labracore.model.person.FunctionalMailbox;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import nl.tudelft.labracore.model.person.FunctionalMailbox;
+
public interface FunctionalMailboxRepository extends JpaRepository<FunctionalMailbox, Long> {
/**
* Finds the mailbox by id or throws a ResourceNotFoundException.
diff --git a/src/main/java/nl/tudelft/labracore/repository/GradeRepository.java b/src/main/java/nl/tudelft/labracore/repository/GradeRepository.java
index 97f1aea683ca5290704114c006b7190493464c8d..3f8a26ba4283b1b340bf79e5113d250f5eb6691c 100644
--- a/src/main/java/nl/tudelft/labracore/repository/GradeRepository.java
+++ b/src/main/java/nl/tudelft/labracore/repository/GradeRepository.java
@@ -19,12 +19,12 @@ package nl.tudelft.labracore.repository;
import java.util.Optional;
-import nl.tudelft.labracore.model.Grade;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QuerydslPredicateExecutor;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import nl.tudelft.labracore.model.Grade;
+
public interface GradeRepository extends JpaRepository<Grade, Long>, QuerydslPredicateExecutor<Grade> {
/**
* Finds the grade by id or throws a ResourceNotFoundException.
diff --git a/src/main/java/nl/tudelft/labracore/repository/ModuleDivisionRepository.java b/src/main/java/nl/tudelft/labracore/repository/ModuleDivisionRepository.java
index 668c770efeaff744fc9d08505d7283b8a572aa0c..38bcd1651cd0c459b63377798a9a274cbe11b7f5 100644
--- a/src/main/java/nl/tudelft/labracore/repository/ModuleDivisionRepository.java
+++ b/src/main/java/nl/tudelft/labracore/repository/ModuleDivisionRepository.java
@@ -19,13 +19,13 @@ package nl.tudelft.labracore.repository;
import java.util.List;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+
import nl.tudelft.labracore.model.Module;
import nl.tudelft.labracore.model.ModuleDivision;
import nl.tudelft.labracore.model.Person;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.rest.webmvc.ResourceNotFoundException;
-
public interface ModuleDivisionRepository extends JpaRepository<ModuleDivision, Long> {
/**
diff --git a/src/main/java/nl/tudelft/labracore/repository/ModuleRepository.java b/src/main/java/nl/tudelft/labracore/repository/ModuleRepository.java
index fa718ff142fc801c60aa30759273509446aa478a..55c029e1763e6a32c6f6b345fba1fbd7d5b0b5e1 100644
--- a/src/main/java/nl/tudelft/labracore/repository/ModuleRepository.java
+++ b/src/main/java/nl/tudelft/labracore/repository/ModuleRepository.java
@@ -19,12 +19,12 @@ package nl.tudelft.labracore.repository;
import java.util.List;
-import nl.tudelft.labracore.model.Edition;
-import nl.tudelft.labracore.model.Module;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import nl.tudelft.labracore.model.Edition;
+import nl.tudelft.labracore.model.Module;
+
public interface ModuleRepository extends JpaRepository<Module, Long> {
/**
diff --git a/src/main/java/nl/tudelft/labracore/repository/NumberOnlyPersonRepository.java b/src/main/java/nl/tudelft/labracore/repository/NumberOnlyPersonRepository.java
index e000798a4b9716249a97c0edcbb1b5cfa4109567..1848dbbeef81cf586ff191e71624bfb2f5524cb5 100644
--- a/src/main/java/nl/tudelft/labracore/repository/NumberOnlyPersonRepository.java
+++ b/src/main/java/nl/tudelft/labracore/repository/NumberOnlyPersonRepository.java
@@ -20,14 +20,14 @@ package nl.tudelft.labracore.repository;
import java.util.List;
import java.util.Optional;
-import nl.tudelft.labracore.model.person.NumberOnlyPerson;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QuerydslPredicateExecutor;
import org.springframework.lang.NonNull;
import com.querydsl.core.types.Predicate;
+import nl.tudelft.labracore.model.person.NumberOnlyPerson;
+
public interface NumberOnlyPersonRepository
extends JpaRepository<NumberOnlyPerson, Long>, QuerydslPredicateExecutor<NumberOnlyPerson> {
/**
diff --git a/src/main/java/nl/tudelft/labracore/repository/PermissionRepository.java b/src/main/java/nl/tudelft/labracore/repository/PermissionRepository.java
index 83a9ed94d9e383fa2a52be892335d42d826ee98f..2eb24e960f853d885f15eb31d78441f8163d93e8 100644
--- a/src/main/java/nl/tudelft/labracore/repository/PermissionRepository.java
+++ b/src/main/java/nl/tudelft/labracore/repository/PermissionRepository.java
@@ -17,10 +17,10 @@
*/
package nl.tudelft.labracore.repository;
-import nl.tudelft.labracore.model.Permission;
-
import org.springframework.data.jpa.repository.JpaRepository;
+import nl.tudelft.labracore.model.Permission;
+
public interface PermissionRepository extends JpaRepository<Permission, Long> {
Permission findByName(String name);
}
diff --git a/src/main/java/nl/tudelft/labracore/repository/PersonRepository.java b/src/main/java/nl/tudelft/labracore/repository/PersonRepository.java
index b15bf8d52de588b86bf8b02798ba0431fb7d5160..502d0f8d45413b3664b298f95e65d0db65f4b7f3 100644
--- a/src/main/java/nl/tudelft/labracore/repository/PersonRepository.java
+++ b/src/main/java/nl/tudelft/labracore/repository/PersonRepository.java
@@ -24,12 +24,6 @@ import java.util.List;
import java.util.Optional;
import java.util.Set;
-import nl.tudelft.labracore.enums.RoleType;
-import nl.tudelft.labracore.model.*;
-import nl.tudelft.labracore.model.person.QConcretePerson;
-import nl.tudelft.labracore.model.person.QNumberOnlyPerson;
-import nl.tudelft.labracore.model.person.QUsernameOnlyPerson;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QuerydslPredicateExecutor;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;
@@ -38,6 +32,12 @@ import org.springframework.lang.NonNull;
import com.querydsl.core.types.Predicate;
import com.querydsl.core.types.dsl.BooleanExpression;
+import nl.tudelft.labracore.enums.RoleType;
+import nl.tudelft.labracore.model.*;
+import nl.tudelft.labracore.model.person.QConcretePerson;
+import nl.tudelft.labracore.model.person.QNumberOnlyPerson;
+import nl.tudelft.labracore.model.person.QUsernameOnlyPerson;
+
public interface PersonRepository extends JpaRepository<Person, Long>, QuerydslPredicateExecutor<Person> {
QPerson qp = QPerson.person;
QConcretePerson qcp = QConcretePerson.concretePerson;
diff --git a/src/main/java/nl/tudelft/labracore/repository/ProgramRepository.java b/src/main/java/nl/tudelft/labracore/repository/ProgramRepository.java
index 7d6faf2e64dcf6ae766721519d0bea6679318154..bfc45f589aadfbcf4b2eeb8a36f99fb4433aeb92 100644
--- a/src/main/java/nl/tudelft/labracore/repository/ProgramRepository.java
+++ b/src/main/java/nl/tudelft/labracore/repository/ProgramRepository.java
@@ -19,11 +19,11 @@ package nl.tudelft.labracore.repository;
import java.util.Optional;
-import nl.tudelft.labracore.model.Program;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import nl.tudelft.labracore.model.Program;
+
public interface ProgramRepository extends JpaRepository<Program, Long> {
/**
diff --git a/src/main/java/nl/tudelft/labracore/repository/QuestionRepository.java b/src/main/java/nl/tudelft/labracore/repository/QuestionRepository.java
index 3ec08863dcb8c15a7917dac976ace18bc8c4fd2b..c34f06c141b52bb5ca414d4d0f183ae239f7125f 100644
--- a/src/main/java/nl/tudelft/labracore/repository/QuestionRepository.java
+++ b/src/main/java/nl/tudelft/labracore/repository/QuestionRepository.java
@@ -19,12 +19,12 @@ package nl.tudelft.labracore.repository;
import java.util.List;
-import nl.tudelft.labracore.model.*;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QuerydslPredicateExecutor;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import nl.tudelft.labracore.model.*;
+
public interface QuestionRepository
extends JpaRepository<Question, Long>, QuerydslPredicateExecutor<Question> {
diff --git a/src/main/java/nl/tudelft/labracore/repository/RoleRepository.java b/src/main/java/nl/tudelft/labracore/repository/RoleRepository.java
index 76e6ad95e3460625206542e60aa9371afb66f6a3..e0f0fa5b2d6dc6a0efbf65377b6fe7257311a1cb 100644
--- a/src/main/java/nl/tudelft/labracore/repository/RoleRepository.java
+++ b/src/main/java/nl/tudelft/labracore/repository/RoleRepository.java
@@ -24,11 +24,6 @@ import java.util.List;
import java.util.Optional;
import java.util.Set;
-import nl.tudelft.labracore.enums.RoleType;
-import nl.tudelft.labracore.model.*;
-import nl.tudelft.labracore.model.person.QConcretePerson;
-import nl.tudelft.labracore.model.person.QUsernameOnlyPerson;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QuerydslPredicateExecutor;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;
@@ -37,6 +32,11 @@ import org.springframework.lang.NonNull;
import com.querydsl.core.types.Predicate;
import com.querydsl.core.types.dsl.BooleanExpression;
+import nl.tudelft.labracore.enums.RoleType;
+import nl.tudelft.labracore.model.*;
+import nl.tudelft.labracore.model.person.QConcretePerson;
+import nl.tudelft.labracore.model.person.QUsernameOnlyPerson;
+
public interface RoleRepository extends JpaRepository<Role, Role.Id>, QuerydslPredicateExecutor<Role> {
QRole qr = QRole.role;
diff --git a/src/main/java/nl/tudelft/labracore/repository/RoomRepository.java b/src/main/java/nl/tudelft/labracore/repository/RoomRepository.java
index 97528fd4e54c75e12d54583b5ab5337a25a8f324..94e3ed547bc7ac535afe569c4c267d59246aa5d7 100644
--- a/src/main/java/nl/tudelft/labracore/repository/RoomRepository.java
+++ b/src/main/java/nl/tudelft/labracore/repository/RoomRepository.java
@@ -17,11 +17,11 @@
*/
package nl.tudelft.labracore.repository;
-import nl.tudelft.labracore.model.Room;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import nl.tudelft.labracore.model.Room;
+
/**
* Repository for CRUD operations on Rooms within the database.
*/
diff --git a/src/main/java/nl/tudelft/labracore/repository/SessionRepository.java b/src/main/java/nl/tudelft/labracore/repository/SessionRepository.java
index 08607a4a690253c65571b0982d5ad0810755aca2..a990efdf131c89ff18691fd54ce2936408a4595f 100644
--- a/src/main/java/nl/tudelft/labracore/repository/SessionRepository.java
+++ b/src/main/java/nl/tudelft/labracore/repository/SessionRepository.java
@@ -20,11 +20,6 @@ package nl.tudelft.labracore.repository;
import java.time.LocalDateTime;
import java.util.List;
-import nl.tudelft.labracore.model.QSession;
-import nl.tudelft.labracore.model.QSharedSession;
-import nl.tudelft.labracore.model.QSingleSession;
-import nl.tudelft.labracore.model.Session;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QuerydslPredicateExecutor;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;
@@ -32,6 +27,11 @@ import org.springframework.lang.NonNull;
import com.querydsl.core.types.Predicate;
+import nl.tudelft.labracore.model.QSession;
+import nl.tudelft.labracore.model.QSharedSession;
+import nl.tudelft.labracore.model.QSingleSession;
+import nl.tudelft.labracore.model.Session;
+
public interface SessionRepository extends JpaRepository<Session, Long>, QuerydslPredicateExecutor<Session> {
QSession qs = QSession.session;
@@ -69,7 +69,7 @@ public interface SessionRepository extends JpaRepository<Session, Long>, Queryds
return findAll((qs.as(QSingleSession.class).edition.id.in(editionIds)
.or(qs.as(QSharedSession.class).editionCollection.editions.any().id.in(editionIds)))
- .and(qs.start.before(now)).and(qs.end.after(now.minusMinutes(gracePeriod))));
+ .and(qs.start.before(now)).and(qs.endTime.after(now.minusMinutes(gracePeriod))));
}
}
diff --git a/src/main/java/nl/tudelft/labracore/repository/StudentGroupRepository.java b/src/main/java/nl/tudelft/labracore/repository/StudentGroupRepository.java
index 7abef143393f71c3072c41be56be96209df27f8a..9a4e9daa3e4c07e8020e5229cde7e4689c6fb21c 100644
--- a/src/main/java/nl/tudelft/labracore/repository/StudentGroupRepository.java
+++ b/src/main/java/nl/tudelft/labracore/repository/StudentGroupRepository.java
@@ -24,11 +24,6 @@ import static nl.tudelft.labracore.model.QStudentGroup.studentGroup;
import java.util.Collection;
import java.util.List;
-import nl.tudelft.labracore.model.Module;
-import nl.tudelft.labracore.model.ModuleDivision;
-import nl.tudelft.labracore.model.Person;
-import nl.tudelft.labracore.model.StudentGroup;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QuerydslPredicateExecutor;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;
@@ -36,6 +31,11 @@ import org.springframework.data.rest.webmvc.ResourceNotFoundException;
import com.querydsl.core.types.Predicate;
import com.querydsl.core.types.dsl.BooleanExpression;
+import nl.tudelft.labracore.model.Module;
+import nl.tudelft.labracore.model.ModuleDivision;
+import nl.tudelft.labracore.model.Person;
+import nl.tudelft.labracore.model.StudentGroup;
+
public interface StudentGroupRepository
extends JpaRepository<StudentGroup, Long>, QuerydslPredicateExecutor<StudentGroup> {
diff --git a/src/main/java/nl/tudelft/labracore/repository/SubmissionRepository.java b/src/main/java/nl/tudelft/labracore/repository/SubmissionRepository.java
index 268a86de8a2eaa549439a4a33c63142873a64188..3aec293c5a96c3624b3385233faa3b1fae8a3db1 100644
--- a/src/main/java/nl/tudelft/labracore/repository/SubmissionRepository.java
+++ b/src/main/java/nl/tudelft/labracore/repository/SubmissionRepository.java
@@ -22,11 +22,6 @@ import static com.querydsl.jpa.JPAExpressions.select;
import java.util.List;
import java.util.Optional;
-import nl.tudelft.labracore.model.*;
-import nl.tudelft.labracore.model.person.QConcretePerson;
-import nl.tudelft.labracore.model.person.QNumberOnlyPerson;
-import nl.tudelft.labracore.model.person.QUsernameOnlyPerson;
-
import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QuerydslPredicateExecutor;
@@ -36,6 +31,11 @@ import org.springframework.lang.NonNull;
import com.querydsl.core.types.Predicate;
import com.querydsl.core.types.dsl.BooleanExpression;
+import nl.tudelft.labracore.model.*;
+import nl.tudelft.labracore.model.person.QConcretePerson;
+import nl.tudelft.labracore.model.person.QNumberOnlyPerson;
+import nl.tudelft.labracore.model.person.QUsernameOnlyPerson;
+
public interface SubmissionRepository
extends JpaRepository<Submission, Long>, QuerydslPredicateExecutor<Submission> {
QSubmission qs = QSubmission.submission;
@@ -119,7 +119,7 @@ public interface SubmissionRepository
return findAll(predicate,
Sort.sort(Submission.class).by(Submission::getSubmissionTime).descending()
.and(Sort.sort(Submission.class).by(Submission::getId).descending()))
- .stream().findFirst();
+ .stream().findFirst();
}
/**
diff --git a/src/main/java/nl/tudelft/labracore/repository/TOTPKeyRepository.java b/src/main/java/nl/tudelft/labracore/repository/TOTPKeyRepository.java
index 7d5765f35723a669465be935f047b1f31e5c17d0..39674c62c5abe502b7542b8f9fa2590a892dc786 100644
--- a/src/main/java/nl/tudelft/labracore/repository/TOTPKeyRepository.java
+++ b/src/main/java/nl/tudelft/labracore/repository/TOTPKeyRepository.java
@@ -17,9 +17,9 @@
*/
package nl.tudelft.labracore.repository;
-import nl.tudelft.labracore.model.security.TOTPKey;
-
import org.springframework.data.jpa.repository.JpaRepository;
+import nl.tudelft.labracore.model.security.TOTPKey;
+
public interface TOTPKeyRepository extends JpaRepository<TOTPKey, Long> {
}
diff --git a/src/main/java/nl/tudelft/labracore/repository/UsernameOnlyPersonRepository.java b/src/main/java/nl/tudelft/labracore/repository/UsernameOnlyPersonRepository.java
index 883ed6605970f539cd19193787a80cafb0085e0b..c88e6d4fd40f9ca9fbf0ee3fdc5df2213cf1f8b0 100644
--- a/src/main/java/nl/tudelft/labracore/repository/UsernameOnlyPersonRepository.java
+++ b/src/main/java/nl/tudelft/labracore/repository/UsernameOnlyPersonRepository.java
@@ -20,15 +20,15 @@ package nl.tudelft.labracore.repository;
import java.util.List;
import java.util.Optional;
-import nl.tudelft.labracore.model.person.QUsernameOnlyPerson;
-import nl.tudelft.labracore.model.person.UsernameOnlyPerson;
-
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QuerydslPredicateExecutor;
import org.springframework.lang.NonNull;
import com.querydsl.core.types.Predicate;
+import nl.tudelft.labracore.model.person.QUsernameOnlyPerson;
+import nl.tudelft.labracore.model.person.UsernameOnlyPerson;
+
public interface UsernameOnlyPersonRepository extends JpaRepository<UsernameOnlyPerson, Long>,
QuerydslPredicateExecutor<UsernameOnlyPerson> {
QUsernameOnlyPerson qp = QUsernameOnlyPerson.usernameOnlyPerson;
diff --git a/src/main/java/nl/tudelft/labracore/security/AuthorizationService.java b/src/main/java/nl/tudelft/labracore/security/AuthorizationService.java
index c7c9e2235bf435e03b56c3e35ac2a4c27b4d2c92..1f7fd9ec91ad00b0a3ed2a86fee2a6197c92db52 100644
--- a/src/main/java/nl/tudelft/labracore/security/AuthorizationService.java
+++ b/src/main/java/nl/tudelft/labracore/security/AuthorizationService.java
@@ -25,6 +25,13 @@ import java.util.List;
import java.util.Objects;
import java.util.function.Function;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Service;
+
import nl.tudelft.labracore.enums.RoleType;
import nl.tudelft.labracore.model.Person;
import nl.tudelft.labracore.model.Role;
@@ -34,13 +41,6 @@ import nl.tudelft.labracore.repository.*;
import nl.tudelft.labracore.security.api.APIUserDetails;
import nl.tudelft.labracore.security.api.APIUserDetailsWithPerson;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Service;
-
@Service
public class AuthorizationService {
private static final Logger logger = LoggerFactory.getLogger(AuthorizationService.class);
diff --git a/src/main/java/nl/tudelft/labracore/security/DevelopmentSecurityConfig.java b/src/main/java/nl/tudelft/labracore/security/DevelopmentSecurityConfig.java
index 231d04e9a950356f77a15b93484262536dd815cf..ecadb3daa99b6834c3803115c6e448105885c6c4 100644
--- a/src/main/java/nl/tudelft/labracore/security/DevelopmentSecurityConfig.java
+++ b/src/main/java/nl/tudelft/labracore/security/DevelopmentSecurityConfig.java
@@ -22,12 +22,6 @@ import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
-import nl.tudelft.labracore.DevDatabaseLoader;
-import nl.tudelft.labracore.repository.ConcretePersonRepository;
-import nl.tudelft.labracore.security.api.APIAuthenticationEntryPoint;
-import nl.tudelft.labracore.security.api.APIUserDetails;
-import nl.tudelft.labracore.security.api.APIUserDetailsWithPerson;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -50,6 +44,12 @@ import org.springframework.security.web.authentication.www.BasicAuthenticationFi
import org.springframework.security.web.savedrequest.NullRequestCache;
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
+import nl.tudelft.labracore.DevDatabaseLoader;
+import nl.tudelft.labracore.repository.ConcretePersonRepository;
+import nl.tudelft.labracore.security.api.APIAuthenticationEntryPoint;
+import nl.tudelft.labracore.security.api.APIUserDetails;
+import nl.tudelft.labracore.security.api.APIUserDetailsWithPerson;
+
@Configuration
@EnableWebSecurity
@Profile("development")
diff --git a/src/main/java/nl/tudelft/labracore/security/ProductionSecurityConfig.java b/src/main/java/nl/tudelft/labracore/security/ProductionSecurityConfig.java
index c75d85b25e91a3febe6e2290f23cead01da54b6a..31261412a32300601e07851ead7e1cf9ade36a92 100644
--- a/src/main/java/nl/tudelft/labracore/security/ProductionSecurityConfig.java
+++ b/src/main/java/nl/tudelft/labracore/security/ProductionSecurityConfig.java
@@ -19,10 +19,6 @@ package nl.tudelft.labracore.security;
import java.util.List;
-import nl.tudelft.labracore.security.api.APIAuthenticationDetails;
-import nl.tudelft.labracore.security.api.APIAuthenticationEntryPoint;
-import nl.tudelft.labracore.security.api.APIUserDetailsService;
-
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
@@ -41,6 +37,10 @@ import org.springframework.security.web.authentication.www.BasicAuthenticationFi
import org.springframework.security.web.savedrequest.NullRequestCache;
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
+import nl.tudelft.labracore.security.api.APIAuthenticationDetails;
+import nl.tudelft.labracore.security.api.APIAuthenticationEntryPoint;
+import nl.tudelft.labracore.security.api.APIUserDetailsService;
+
@Configuration
@EnableWebSecurity
@Profile("!development")
diff --git a/src/main/java/nl/tudelft/labracore/security/api/APIAuthenticationDetails.java b/src/main/java/nl/tudelft/labracore/security/api/APIAuthenticationDetails.java
index d8fab28a4653d592c92071bf7ae32be3f20582f8..a84c99a0d2505517de1565f6ffd50d9a1de048c8 100644
--- a/src/main/java/nl/tudelft/labracore/security/api/APIAuthenticationDetails.java
+++ b/src/main/java/nl/tudelft/labracore/security/api/APIAuthenticationDetails.java
@@ -19,11 +19,11 @@ package nl.tudelft.labracore.security.api;
import javax.servlet.http.HttpServletRequest;
-import lombok.Getter;
-
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.web.authentication.WebAuthenticationDetails;
+import lombok.Getter;
+
/**
* Data class holding the authentication details information based on the current {@link HttpServletRequest}.
*
diff --git a/src/main/java/nl/tudelft/labracore/security/api/APIUserDetails.java b/src/main/java/nl/tudelft/labracore/security/api/APIUserDetails.java
index 892938c69c4f19f35556c25bf030c960db6c97d4..06aa0a7ff7a0222559a65835b76eac6eaa6034ef 100644
--- a/src/main/java/nl/tudelft/labracore/security/api/APIUserDetails.java
+++ b/src/main/java/nl/tudelft/labracore/security/api/APIUserDetails.java
@@ -20,14 +20,14 @@ package nl.tudelft.labracore.security.api;
import java.time.LocalDateTime;
import java.util.Collection;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NonNull;
import nl.tudelft.labracore.model.security.APIKey;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
/**
* UserDetails for an API key user.
*
diff --git a/src/main/java/nl/tudelft/labracore/security/api/APIUserDetailsService.java b/src/main/java/nl/tudelft/labracore/security/api/APIUserDetailsService.java
index 818a2eee5a0912f546a7c13b43c5be2cc37b66c0..86ce47697c87a205f0a6f6ec05df60b3f3f5d800 100644
--- a/src/main/java/nl/tudelft/labracore/security/api/APIUserDetailsService.java
+++ b/src/main/java/nl/tudelft/labracore/security/api/APIUserDetailsService.java
@@ -28,11 +28,6 @@ import java.util.stream.Collectors;
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
-import nl.tudelft.labracore.model.person.ConcretePerson;
-import nl.tudelft.labracore.model.security.APIKey;
-import nl.tudelft.labracore.repository.APIKeyRepository;
-import nl.tudelft.labracore.repository.ConcretePersonRepository;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -46,6 +41,11 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken;
import org.springframework.security.web.authentication.preauth.PreAuthenticatedCredentialsNotFoundException;
+import nl.tudelft.labracore.model.person.ConcretePerson;
+import nl.tudelft.labracore.model.security.APIKey;
+import nl.tudelft.labracore.repository.APIKeyRepository;
+import nl.tudelft.labracore.repository.ConcretePersonRepository;
+
public class APIUserDetailsService implements
AuthenticationUserDetailsService<PreAuthenticatedAuthenticationToken> {
private static final Logger logger = LoggerFactory.getLogger(APIUserDetailsService.class);
diff --git a/src/main/java/nl/tudelft/labracore/security/api/APIUserDetailsWithPerson.java b/src/main/java/nl/tudelft/labracore/security/api/APIUserDetailsWithPerson.java
index 95be42df0cd154f908075f55a1ba055b6af2a728..1981892c0bfa6b01af16b165b79f0287646e1998 100644
--- a/src/main/java/nl/tudelft/labracore/security/api/APIUserDetailsWithPerson.java
+++ b/src/main/java/nl/tudelft/labracore/security/api/APIUserDetailsWithPerson.java
@@ -19,12 +19,12 @@ package nl.tudelft.labracore.security.api;
import java.util.Collection;
+import org.springframework.security.core.GrantedAuthority;
+
import lombok.NonNull;
import nl.tudelft.labracore.model.person.ConcretePerson;
import nl.tudelft.labracore.model.security.APIKey;
-import org.springframework.security.core.GrantedAuthority;
-
public class APIUserDetailsWithPerson extends APIUserDetails {
@NonNull
private final ConcretePerson person;
diff --git a/src/main/java/nl/tudelft/labracore/security/api/AuthTokenExtractor.java b/src/main/java/nl/tudelft/labracore/security/api/AuthTokenExtractor.java
index dcf37cc3b6c334b8a82e3a618d0bb10167b221b8..9a2b2fa21ee48ac54b192a94eb992c60ae4e74ae 100644
--- a/src/main/java/nl/tudelft/labracore/security/api/AuthTokenExtractor.java
+++ b/src/main/java/nl/tudelft/labracore/security/api/AuthTokenExtractor.java
@@ -20,10 +20,10 @@ package nl.tudelft.labracore.security.api;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import lombok.*;
-
import org.springframework.security.web.authentication.preauth.PreAuthenticatedCredentialsNotFoundException;
+import lombok.*;
+
/**
* A helper class used for extracting Authorization token information.<br>
* <br>
diff --git a/src/main/java/nl/tudelft/labracore/security/user/AuthenticatedPersonParameterResolver.java b/src/main/java/nl/tudelft/labracore/security/user/AuthenticatedPersonParameterResolver.java
index a22f351a52fcb2c05b72e2a6485a7b35074105cc..23a01faf858aaa15fc4d2a8841120703882da6ef 100644
--- a/src/main/java/nl/tudelft/labracore/security/user/AuthenticatedPersonParameterResolver.java
+++ b/src/main/java/nl/tudelft/labracore/security/user/AuthenticatedPersonParameterResolver.java
@@ -17,10 +17,6 @@
*/
package nl.tudelft.labracore.security.user;
-import nl.tudelft.labracore.model.person.ConcretePerson;
-import nl.tudelft.labracore.repository.ConcretePersonRepository;
-import nl.tudelft.labracore.security.api.APIUserDetailsWithPerson;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.MethodParameter;
import org.springframework.security.core.context.SecurityContextHolder;
@@ -30,6 +26,10 @@ import org.springframework.web.context.request.NativeWebRequest;
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.method.support.ModelAndViewContainer;
+import nl.tudelft.labracore.model.person.ConcretePerson;
+import nl.tudelft.labracore.repository.ConcretePersonRepository;
+import nl.tudelft.labracore.security.api.APIUserDetailsWithPerson;
+
@Component
public class AuthenticatedPersonParameterResolver implements HandlerMethodArgumentResolver {
@Autowired
diff --git a/src/main/java/nl/tudelft/labracore/service/APIKeyService.java b/src/main/java/nl/tudelft/labracore/service/APIKeyService.java
index 6978881e52359409c59336f150a10122e06f9345..b64c10f895218dd43c538be04c4cc8af334804ca 100644
--- a/src/main/java/nl/tudelft/labracore/service/APIKeyService.java
+++ b/src/main/java/nl/tudelft/labracore/service/APIKeyService.java
@@ -21,14 +21,14 @@ import java.security.SecureRandom;
import java.time.LocalDateTime;
import java.util.UUID;
-import nl.tudelft.labracore.model.Person;
-import nl.tudelft.labracore.model.security.APIKey;
-import nl.tudelft.labracore.repository.APIKeyRepository;
-
import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import nl.tudelft.labracore.model.Person;
+import nl.tudelft.labracore.model.security.APIKey;
+import nl.tudelft.labracore.repository.APIKeyRepository;
+
@Service
public class APIKeyService {
diff --git a/src/main/java/nl/tudelft/labracore/service/AppService.java b/src/main/java/nl/tudelft/labracore/service/AppService.java
index 7ebc1e292e7889d4d38904bed0e492652b1af618..2dfaaafc711e7b7f4b4459ed498e6e6fd6ccbf30 100644
--- a/src/main/java/nl/tudelft/labracore/service/AppService.java
+++ b/src/main/java/nl/tudelft/labracore/service/AppService.java
@@ -24,11 +24,6 @@ import java.util.UUID;
import javax.transaction.Transactional;
-import nl.tudelft.labracore.model.App;
-import nl.tudelft.labracore.model.security.APIKey;
-import nl.tudelft.labracore.repository.AppRepository;
-import nl.tudelft.labracore.security.api.APIUserDetailsService;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
@@ -38,6 +33,11 @@ import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestTemplate;
+import nl.tudelft.labracore.model.App;
+import nl.tudelft.labracore.model.security.APIKey;
+import nl.tudelft.labracore.repository.AppRepository;
+import nl.tudelft.labracore.security.api.APIUserDetailsService;
+
@Service
@Transactional
public class AppService {
diff --git a/src/main/java/nl/tudelft/labracore/service/AssignmentService.java b/src/main/java/nl/tudelft/labracore/service/AssignmentService.java
index ddb47202f7bff7db3f82629693426356e60cb9e2..41cf95a2606667a702d13f5ab737ccd7385e32e8 100644
--- a/src/main/java/nl/tudelft/labracore/service/AssignmentService.java
+++ b/src/main/java/nl/tudelft/labracore/service/AssignmentService.java
@@ -19,14 +19,14 @@ package nl.tudelft.labracore.service;
import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
import nl.tudelft.labracore.dto.view.structured.summary.AssignmentSummaryDTO;
import nl.tudelft.labracore.repository.AssignmentRepository;
import nl.tudelft.labracore.repository.ModuleRepository;
import nl.tudelft.librador.dto.view.View;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
@Service
public class AssignmentService {
diff --git a/src/main/java/nl/tudelft/labracore/service/ClusterService.java b/src/main/java/nl/tudelft/labracore/service/ClusterService.java
index cd1ff1598066d5709f4a640a1e6050be170c7c46..623d564869fe58e9cff22c62011dc2e31e2d4918 100644
--- a/src/main/java/nl/tudelft/labracore/service/ClusterService.java
+++ b/src/main/java/nl/tudelft/labracore/service/ClusterService.java
@@ -25,16 +25,16 @@ import java.util.stream.Collectors;
import javax.transaction.Transactional;
-import nl.tudelft.labracore.model.Cluster;
-import nl.tudelft.labracore.model.Person;
-import nl.tudelft.labracore.repository.ClusterRepository;
-import nl.tudelft.labracore.repository.PersonRepository;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.google.common.collect.Sets;
+import nl.tudelft.labracore.model.Cluster;
+import nl.tudelft.labracore.model.Person;
+import nl.tudelft.labracore.repository.ClusterRepository;
+import nl.tudelft.labracore.repository.PersonRepository;
+
@Service
public class ClusterService {
diff --git a/src/main/java/nl/tudelft/labracore/service/CohortService.java b/src/main/java/nl/tudelft/labracore/service/CohortService.java
index a09ed65968014cd298a497d555dbdae15e707b3b..df9d7f3b826b6327af3a512feb4c5779a1b387ce 100644
--- a/src/main/java/nl/tudelft/labracore/service/CohortService.java
+++ b/src/main/java/nl/tudelft/labracore/service/CohortService.java
@@ -24,6 +24,11 @@ import java.util.stream.Collectors;
import javax.transaction.Transactional;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.google.common.collect.Sets;
+
import nl.tudelft.labracore.dto.helper.ClusterImportDTO;
import nl.tudelft.labracore.model.Cluster;
import nl.tudelft.labracore.model.Cohort;
@@ -31,11 +36,6 @@ import nl.tudelft.labracore.model.Person;
import nl.tudelft.labracore.repository.ClusterRepository;
import nl.tudelft.labracore.repository.CohortRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.google.common.collect.Sets;
-
/**
* Service class for all operations on Cohort information.
*/
diff --git a/src/main/java/nl/tudelft/labracore/service/CourseService.java b/src/main/java/nl/tudelft/labracore/service/CourseService.java
index e220554e609efef387a0e099239b9c23014776a7..ff557c1e5c4e3de87cbedbf3e6bb42cd2ea01d99 100644
--- a/src/main/java/nl/tudelft/labracore/service/CourseService.java
+++ b/src/main/java/nl/tudelft/labracore/service/CourseService.java
@@ -20,6 +20,9 @@ package nl.tudelft.labracore.service;
import java.util.ArrayList;
import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
import nl.tudelft.labracore.dto.view.structured.details.CourseDetailsDTO;
import nl.tudelft.labracore.dto.view.structured.summary.CourseSummaryDTO;
import nl.tudelft.labracore.model.Person;
@@ -29,9 +32,6 @@ import nl.tudelft.labracore.repository.PersonRepository;
import nl.tudelft.labracore.repository.ProgramRepository;
import nl.tudelft.librador.dto.view.View;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
@Service
public class CourseService {
diff --git a/src/main/java/nl/tudelft/labracore/service/DBApiService.java b/src/main/java/nl/tudelft/labracore/service/DBApiService.java
index ecede19d57e55a174571a2bc4cf74a74b10d67bc..73511f5a26b397838d560c700d7aff86de0521f1 100644
--- a/src/main/java/nl/tudelft/labracore/service/DBApiService.java
+++ b/src/main/java/nl/tudelft/labracore/service/DBApiService.java
@@ -22,13 +22,13 @@ import java.util.List;
import javax.annotation.Nullable;
-import nl.tudelft.labracore.dto.helper.db.*;
-import nl.tudelft.labracore.properties.DBApiProperties;
-
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
+import nl.tudelft.labracore.dto.helper.db.*;
+import nl.tudelft.labracore.properties.DBApiProperties;
+
@Service
@ConditionalOnProperty(prefix = "labracore.db-api", name = "enabled", havingValue = "true")
public class DBApiService {
diff --git a/src/main/java/nl/tudelft/labracore/service/DBLoaderService.java b/src/main/java/nl/tudelft/labracore/service/DBLoaderService.java
index 39968c2ff8b73a8bad8025b97142156040054803..d39e6c5e12f55fd4897cb7281626e2ffbc28f223 100644
--- a/src/main/java/nl/tudelft/labracore/service/DBLoaderService.java
+++ b/src/main/java/nl/tudelft/labracore/service/DBLoaderService.java
@@ -20,15 +20,15 @@ package nl.tudelft.labracore.service;
import java.util.List;
import java.util.stream.Collectors;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
import nl.tudelft.labracore.dto.view.structured.summary.RoleSummaryDTO;
import nl.tudelft.labracore.enums.RoleType;
import nl.tudelft.labracore.repository.RoleRepository;
import nl.tudelft.labracore.repository.SubmissionRepository;
import nl.tudelft.librador.dto.view.View;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
@Service
public class DBLoaderService {
diff --git a/src/main/java/nl/tudelft/labracore/service/EditionService.java b/src/main/java/nl/tudelft/labracore/service/EditionService.java
index 984d4e006d3379f6dec12296e883145db21630e7..3ef81cc4f2d28401792b578f7fc7364785916aab 100644
--- a/src/main/java/nl/tudelft/labracore/service/EditionService.java
+++ b/src/main/java/nl/tudelft/labracore/service/EditionService.java
@@ -25,6 +25,11 @@ import java.util.stream.Collectors;
import javax.transaction.Transactional;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.google.common.collect.Sets;
+
import nl.tudelft.labracore.dto.view.structured.details.EditionDetailsDTO;
import nl.tudelft.labracore.enums.ParticipantsImportError;
import nl.tudelft.labracore.enums.RoleType;
@@ -35,11 +40,6 @@ import nl.tudelft.labracore.model.Role;
import nl.tudelft.labracore.repository.*;
import nl.tudelft.librador.dto.view.View;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.google.common.collect.Sets;
-
@Service
public class EditionService {
diff --git a/src/main/java/nl/tudelft/labracore/service/EventService.java b/src/main/java/nl/tudelft/labracore/service/EventService.java
index 19661d91ec2095b0195b5dc42b44f5aba4ee42cf..7b78ff49b7e6695886f539d444a397ac54670a9a 100644
--- a/src/main/java/nl/tudelft/labracore/service/EventService.java
+++ b/src/main/java/nl/tudelft/labracore/service/EventService.java
@@ -21,16 +21,16 @@ import java.util.List;
import javax.transaction.Transactional;
-import nl.tudelft.labracore.event.CoreEvent;
-import nl.tudelft.labracore.model.EventSubscription;
-import nl.tudelft.labracore.repository.EventSubscriptionRepository;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpMethod;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
+import nl.tudelft.labracore.event.CoreEvent;
+import nl.tudelft.labracore.model.EventSubscription;
+import nl.tudelft.labracore.repository.EventSubscriptionRepository;
+
@Service
@Transactional
public class EventService {
diff --git a/src/main/java/nl/tudelft/labracore/service/GradeService.java b/src/main/java/nl/tudelft/labracore/service/GradeService.java
index 14dbfe11287e840ad562d6a4275216ca74dcb66a..160c0173ff1201281f381e344dad8a911e41fce3 100644
--- a/src/main/java/nl/tudelft/labracore/service/GradeService.java
+++ b/src/main/java/nl/tudelft/labracore/service/GradeService.java
@@ -21,6 +21,9 @@ import java.util.Optional;
import javax.transaction.Transactional;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
import nl.tudelft.labracore.dto.create.GradeBatchImportDTO;
import nl.tudelft.labracore.dto.create.GradeImportDTO;
import nl.tudelft.labracore.dto.helper.GradeImportIdType;
@@ -30,9 +33,6 @@ import nl.tudelft.labracore.model.Submission;
import nl.tudelft.labracore.repository.GradeRepository;
import nl.tudelft.labracore.repository.SubmissionRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
@Service
public class GradeService {
diff --git a/src/main/java/nl/tudelft/labracore/service/ModuleDivisionService.java b/src/main/java/nl/tudelft/labracore/service/ModuleDivisionService.java
index 0a2436d8df2ff1a03d129162271b4b5e5f4321eb..d55d9d542cde8bc68e75c2a64b3141b3d1c730b5 100644
--- a/src/main/java/nl/tudelft/labracore/service/ModuleDivisionService.java
+++ b/src/main/java/nl/tudelft/labracore/service/ModuleDivisionService.java
@@ -24,6 +24,13 @@ import java.util.stream.Collectors;
import javax.transaction.Transactional;
+import org.apache.commons.lang3.RandomUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.stereotype.Service;
+
+import com.google.common.collect.Lists;
+
import nl.tudelft.labracore.dto.create.ModuleDivisionCreateDTO;
import nl.tudelft.labracore.dto.view.structured.details.ModuleDivisionDetailsDTO;
import nl.tudelft.labracore.enums.RoleType;
@@ -32,13 +39,6 @@ import nl.tudelft.labracore.model.Module;
import nl.tudelft.labracore.repository.*;
import nl.tudelft.librador.dto.view.View;
-import org.apache.commons.lang3.RandomUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.rest.webmvc.ResourceNotFoundException;
-import org.springframework.stereotype.Service;
-
-import com.google.common.collect.Lists;
-
@Service
@Transactional
public class ModuleDivisionService {
diff --git a/src/main/java/nl/tudelft/labracore/service/PersonService.java b/src/main/java/nl/tudelft/labracore/service/PersonService.java
index 28353d6c647fdadfe901b20c727e8b7a282ab0ca..f9294484f290ef68c745baa22269bd8479e1ba53 100644
--- a/src/main/java/nl/tudelft/labracore/service/PersonService.java
+++ b/src/main/java/nl/tudelft/labracore/service/PersonService.java
@@ -22,17 +22,17 @@ import java.util.stream.Collectors;
import javax.transaction.Transactional;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.google.common.collect.Sets;
+
import nl.tudelft.labracore.model.Person;
import nl.tudelft.labracore.model.Role;
import nl.tudelft.labracore.model.person.ConcretePerson;
import nl.tudelft.labracore.model.person.UsernameOnlyPerson;
import nl.tudelft.labracore.repository.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.google.common.collect.Sets;
-
@Service
@Transactional
public class PersonService {
diff --git a/src/main/java/nl/tudelft/labracore/service/ProgramService.java b/src/main/java/nl/tudelft/labracore/service/ProgramService.java
index 2eb951bf35ee2c74ce545c5c1903d1a0856d04b6..1a22a4812c32cae31cd428bb1c0c94f91a50e6d9 100644
--- a/src/main/java/nl/tudelft/labracore/service/ProgramService.java
+++ b/src/main/java/nl/tudelft/labracore/service/ProgramService.java
@@ -20,14 +20,14 @@ package nl.tudelft.labracore.service;
import java.util.List;
import java.util.stream.Collectors;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
import nl.tudelft.labracore.model.Person;
import nl.tudelft.labracore.model.Program;
import nl.tudelft.labracore.repository.PersonRepository;
import nl.tudelft.labracore.repository.ProgramRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
@Service
public class ProgramService {
diff --git a/src/main/java/nl/tudelft/labracore/service/QuestionService.java b/src/main/java/nl/tudelft/labracore/service/QuestionService.java
index cf1b811aba711a8230e15a7cc69f14ff67b7ecb6..fdc23aa97851873b7c46e5a50ae4b079ba50d0a1 100644
--- a/src/main/java/nl/tudelft/labracore/service/QuestionService.java
+++ b/src/main/java/nl/tudelft/labracore/service/QuestionService.java
@@ -21,6 +21,12 @@ import java.time.LocalDateTime;
import javax.persistence.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.client.support.BasicAuthenticationInterceptor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.client.RestTemplate;
+
import lombok.*;
import nl.tudelft.labracore.dto.create.QuestionCreateDTO;
import nl.tudelft.labracore.dto.patch.QuestionPatchDTO;
@@ -31,12 +37,6 @@ import nl.tudelft.labracore.properties.ElasticProperties;
import nl.tudelft.labracore.repository.QuestionRepository;
import nl.tudelft.librador.dto.view.View;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.client.support.BasicAuthenticationInterceptor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.client.RestTemplate;
-
@Service
@Transactional
public class QuestionService {
diff --git a/src/main/java/nl/tudelft/labracore/service/RoleService.java b/src/main/java/nl/tudelft/labracore/service/RoleService.java
index 70197d3b90193be33be5331f45e385f8afff2726..7159a0fdc607caa6195367dc25460c1e00a4e0b9 100644
--- a/src/main/java/nl/tudelft/labracore/service/RoleService.java
+++ b/src/main/java/nl/tudelft/labracore/service/RoleService.java
@@ -17,13 +17,13 @@
*/
package nl.tudelft.labracore.service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
import nl.tudelft.labracore.enums.RoleType;
import nl.tudelft.labracore.repository.RoleRepository;
import nl.tudelft.labracore.repository.StudentGroupRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
@Service
public class RoleService {
diff --git a/src/main/java/nl/tudelft/labracore/service/StudentGroupService.java b/src/main/java/nl/tudelft/labracore/service/StudentGroupService.java
index 2285d9169314aa4d99d5cfbb3ff5047db8c058b3..eb0c402ca71c88d4522b8b54ccd61817dc8d0ec8 100644
--- a/src/main/java/nl/tudelft/labracore/service/StudentGroupService.java
+++ b/src/main/java/nl/tudelft/labracore/service/StudentGroupService.java
@@ -22,6 +22,12 @@ import java.util.stream.Collectors;
import javax.transaction.Transactional;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.stereotype.Service;
+
+import com.google.common.collect.Sets;
+
import nl.tudelft.labracore.dto.helper.GroupGenerateDTO;
import nl.tudelft.labracore.dto.view.structured.summary.RoleSummaryDTO;
import nl.tudelft.labracore.enums.RoleType;
@@ -34,12 +40,6 @@ import nl.tudelft.labracore.repository.RoleRepository;
import nl.tudelft.labracore.repository.StudentGroupRepository;
import nl.tudelft.librador.dto.view.View;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.rest.webmvc.ResourceNotFoundException;
-import org.springframework.stereotype.Service;
-
-import com.google.common.collect.Sets;
-
@Service
public class StudentGroupService {
diff --git a/src/main/java/nl/tudelft/labracore/service/SubmissionService.java b/src/main/java/nl/tudelft/labracore/service/SubmissionService.java
index a382d46ca5847db0dcb389bf0a6ff392d8780656..faff80ff8e335d7a5a1c146b02888a37cec2adbc 100644
--- a/src/main/java/nl/tudelft/labracore/service/SubmissionService.java
+++ b/src/main/java/nl/tudelft/labracore/service/SubmissionService.java
@@ -17,13 +17,13 @@
*/
package nl.tudelft.labracore.service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
import nl.tudelft.labracore.model.Assignment;
import nl.tudelft.labracore.repository.AssignmentRepository;
import nl.tudelft.labracore.repository.SubmissionRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
@Service
public class SubmissionService {
diff --git a/src/main/java/nl/tudelft/labracore/service/TOTPService.java b/src/main/java/nl/tudelft/labracore/service/TOTPService.java
index 8a107cca6f3b7c942e7b32b83e0300008ef21224..b35347a26f859f6f9e0fd57baf949e7da75962b6 100644
--- a/src/main/java/nl/tudelft/labracore/service/TOTPService.java
+++ b/src/main/java/nl/tudelft/labracore/service/TOTPService.java
@@ -26,11 +26,6 @@ import javax.crypto.KeyGenerator;
import javax.crypto.spec.SecretKeySpec;
import javax.transaction.Transactional;
-import nl.tudelft.labracore.model.Person;
-import nl.tudelft.labracore.model.person.ConcretePerson;
-import nl.tudelft.labracore.model.security.TOTPKey;
-import nl.tudelft.labracore.repository.TOTPKeyRepository;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +34,11 @@ import org.springframework.stereotype.Service;
import com.eatthepath.otp.TimeBasedOneTimePasswordGenerator;
+import nl.tudelft.labracore.model.Person;
+import nl.tudelft.labracore.model.person.ConcretePerson;
+import nl.tudelft.labracore.model.security.TOTPKey;
+import nl.tudelft.labracore.repository.TOTPKeyRepository;
+
@Service
public class TOTPService {
diff --git a/src/main/resources/migrations.yaml b/src/main/resources/migrations.yaml
index 4c9a5e95e2197b237a748e3ae1a08ce6249cee33..2bf657a918e9313b2401fa9c730264267f11cb4d 100644
--- a/src/main/resources/migrations.yaml
+++ b/src/main/resources/migrations.yaml
@@ -1364,3 +1364,12 @@ databaseChangeLog:
referencedColumnNames: id
referencedTableName: apikey
validate: true
+ - changeSet:
+ id: 1660056031-1
+ author: otto (generated)
+ changes:
+ - renameColumn:
+ columnDataType: TIMESTAMP
+ tableName: session
+ oldColumnName: end
+ newColumnName: end_time
diff --git a/src/test/java/dummy/DummyIdDTO.java b/src/test/java/dummy/DummyIdDTO.java
index 8a20f2ce7a7794d787812a76fe07d67e7842aae7..363c26aac61a0ad72dbde014a98bfe1bb9d56fdb 100644
--- a/src/test/java/dummy/DummyIdDTO.java
+++ b/src/test/java/dummy/DummyIdDTO.java
@@ -17,10 +17,10 @@
*/
package dummy;
-import nl.tudelft.librador.dto.id.IdDTO;
-
import org.springframework.data.repository.CrudRepository;
+import nl.tudelft.librador.dto.id.IdDTO;
+
public class DummyIdDTO extends IdDTO<DummyEntity, Long> {
public DummyIdDTO() {
super(-1L);
diff --git a/src/test/java/nl/tudelft/labracore/application/JacksonTest.java b/src/test/java/nl/tudelft/labracore/application/JacksonTest.java
index 50e95b65aac332fa88313e99953367082f79d31f..43e29a5f209f3471aa863c4765ed75b2c4888b87 100644
--- a/src/test/java/nl/tudelft/labracore/application/JacksonTest.java
+++ b/src/test/java/nl/tudelft/labracore/application/JacksonTest.java
@@ -22,11 +22,6 @@ import static org.assertj.core.api.Assertions.assertThatCode;
import java.time.LocalDateTime;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import nl.tudelft.labracore.TestLabracoreApplication;
-
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
@@ -35,6 +30,11 @@ import org.springframework.test.annotation.DirtiesContext;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import nl.tudelft.labracore.TestLabracoreApplication;
+
@SpringBootTest(classes = TestLabracoreApplication.class)
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
public class JacksonTest {
diff --git a/src/test/java/nl/tudelft/labracore/application/SmokeTest.java b/src/test/java/nl/tudelft/labracore/application/SmokeTest.java
index 29f216b4184c5da4c7deb7f17d5ffe76ed095d6a..3c3d1d565b17962b3b6036c0adaeccd3282b124b 100644
--- a/src/test/java/nl/tudelft/labracore/application/SmokeTest.java
+++ b/src/test/java/nl/tudelft/labracore/application/SmokeTest.java
@@ -17,14 +17,14 @@
*/
package nl.tudelft.labracore.application;
-import nl.tudelft.labracore.DevLabracoreApplication;
-import nl.tudelft.labracore.TestLabracoreApplication;
-
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
+import nl.tudelft.labracore.DevLabracoreApplication;
+import nl.tudelft.labracore.TestLabracoreApplication;
+
public class SmokeTest {
static abstract class TestClass {
@Test
diff --git a/src/test/java/nl/tudelft/labracore/controller/APIKeyControllerTest.java b/src/test/java/nl/tudelft/labracore/controller/APIKeyControllerTest.java
index b3b80bee2038d833ae68d80ec6fbe112818a2e90..5bdcc9c6bbb2996dc497b75ebf9bf4259f88ac50 100644
--- a/src/test/java/nl/tudelft/labracore/controller/APIKeyControllerTest.java
+++ b/src/test/java/nl/tudelft/labracore/controller/APIKeyControllerTest.java
@@ -34,18 +34,6 @@ import java.util.function.Function;
import javax.transaction.Transactional;
-import nl.tudelft.labracore.TestLabracoreApplication;
-import nl.tudelft.labracore.dto.create.APIKeyCreateDTO;
-import nl.tudelft.labracore.dto.patch.APIKeyPatchDTO;
-import nl.tudelft.labracore.dto.view.structured.details.APIKeyDetailsDTO;
-import nl.tudelft.labracore.dto.view.structured.details.APIKeySecretDetailsDTO;
-import nl.tudelft.labracore.dto.view.structured.summary.APIKeySummaryDTO;
-import nl.tudelft.labracore.model.security.APIKey;
-import nl.tudelft.labracore.repository.APIKeyRepository;
-import nl.tudelft.labracore.test.TestDatabaseLoader;
-import nl.tudelft.librador.SpringContext;
-import nl.tudelft.librador.dto.view.View;
-
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
@@ -58,6 +46,18 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+import nl.tudelft.labracore.TestLabracoreApplication;
+import nl.tudelft.labracore.dto.create.APIKeyCreateDTO;
+import nl.tudelft.labracore.dto.patch.APIKeyPatchDTO;
+import nl.tudelft.labracore.dto.view.structured.details.APIKeyDetailsDTO;
+import nl.tudelft.labracore.dto.view.structured.details.APIKeySecretDetailsDTO;
+import nl.tudelft.labracore.dto.view.structured.summary.APIKeySummaryDTO;
+import nl.tudelft.labracore.model.security.APIKey;
+import nl.tudelft.labracore.repository.APIKeyRepository;
+import nl.tudelft.labracore.test.TestDatabaseLoader;
+import nl.tudelft.librador.SpringContext;
+import nl.tudelft.librador.dto.view.View;
+
@Transactional
@AutoConfigureMockMvc
@SpringBootTest(classes = TestLabracoreApplication.class)
diff --git a/src/test/java/nl/tudelft/labracore/controller/AppControllerTest.java b/src/test/java/nl/tudelft/labracore/controller/AppControllerTest.java
index e7a07f12b94aec57543f8578a3e782873c716bae..8ee43a8433fd9f3899e558c9a73b93be3662a660 100644
--- a/src/test/java/nl/tudelft/labracore/controller/AppControllerTest.java
+++ b/src/test/java/nl/tudelft/labracore/controller/AppControllerTest.java
@@ -22,13 +22,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-import nl.tudelft.labracore.TestLabracoreApplication;
-import nl.tudelft.labracore.dto.view.structured.summary.AppSummaryDTO;
-import nl.tudelft.labracore.model.App;
-import nl.tudelft.labracore.repository.AppRepository;
-import nl.tudelft.labracore.test.TestDatabaseLoader;
-import nl.tudelft.librador.dto.view.View;
-
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
@@ -39,6 +32,13 @@ import org.springframework.test.web.servlet.MockMvc;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.server.ResponseStatusException;
+import nl.tudelft.labracore.TestLabracoreApplication;
+import nl.tudelft.labracore.dto.view.structured.summary.AppSummaryDTO;
+import nl.tudelft.labracore.model.App;
+import nl.tudelft.labracore.repository.AppRepository;
+import nl.tudelft.labracore.test.TestDatabaseLoader;
+import nl.tudelft.librador.dto.view.View;
+
@Transactional
@AutoConfigureMockMvc
@SpringBootTest(classes = TestLabracoreApplication.class)
diff --git a/src/test/java/nl/tudelft/labracore/controller/AssignmentControllerTest.java b/src/test/java/nl/tudelft/labracore/controller/AssignmentControllerTest.java
index 3455726b1c8608ade731b0db212180c5fe8ef3a5..2fb6129d5d9d2bf13c3cf3584732bdb2d6ce2622 100644
--- a/src/test/java/nl/tudelft/labracore/controller/AssignmentControllerTest.java
+++ b/src/test/java/nl/tudelft/labracore/controller/AssignmentControllerTest.java
@@ -33,6 +33,20 @@ import java.util.List;
import javax.transaction.Transactional;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.security.test.context.support.WithUserDetails;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+
import nl.tudelft.labracore.TestLabracoreApplication;
import nl.tudelft.labracore.dto.create.AssignmentCreateDTO;
import nl.tudelft.labracore.dto.id.ModuleIdDTO;
@@ -50,20 +64,6 @@ import nl.tudelft.labracore.test.RestControllerTest;
import nl.tudelft.labracore.test.TestDatabaseLoader;
import nl.tudelft.librador.dto.view.View;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.SpyBean;
-import org.springframework.security.test.context.support.WithUserDetails;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-
@Transactional
@AutoConfigureMockMvc
@SpringBootTest(classes = TestLabracoreApplication.class)
diff --git a/src/test/java/nl/tudelft/labracore/controller/AuthorizationControllerTest.java b/src/test/java/nl/tudelft/labracore/controller/AuthorizationControllerTest.java
index 31c19bab6e2ba2d8c9e1a1e6bb6e82772ae50ac4..26d9349bc6d828c86674f03c80147bc54f880a7a 100644
--- a/src/test/java/nl/tudelft/labracore/controller/AuthorizationControllerTest.java
+++ b/src/test/java/nl/tudelft/labracore/controller/AuthorizationControllerTest.java
@@ -28,12 +28,6 @@ import java.util.ArrayList;
import javax.transaction.Transactional;
-import nl.tudelft.labracore.TestLabracoreApplication;
-import nl.tudelft.labracore.model.*;
-import nl.tudelft.labracore.model.Module;
-import nl.tudelft.labracore.security.AuthorizationService;
-import nl.tudelft.labracore.test.TestDatabaseLoader;
-
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +37,12 @@ import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.security.test.context.support.WithUserDetails;
import org.springframework.test.web.servlet.MockMvc;
+import nl.tudelft.labracore.TestLabracoreApplication;
+import nl.tudelft.labracore.model.*;
+import nl.tudelft.labracore.model.Module;
+import nl.tudelft.labracore.security.AuthorizationService;
+import nl.tudelft.labracore.test.TestDatabaseLoader;
+
@Transactional
@SpringBootTest(classes = TestLabracoreApplication.class)
@AutoConfigureMockMvc
diff --git a/src/test/java/nl/tudelft/labracore/controller/BuildingControllerTest.java b/src/test/java/nl/tudelft/labracore/controller/BuildingControllerTest.java
index 440e45fb0d907f8c2f82cdaf3e96099fd8d3bb48..8ed99952b2c7065232cfd9d7b7d1a1f56b929c3c 100644
--- a/src/test/java/nl/tudelft/labracore/controller/BuildingControllerTest.java
+++ b/src/test/java/nl/tudelft/labracore/controller/BuildingControllerTest.java
@@ -30,16 +30,6 @@ import java.util.List;
import javax.transaction.Transactional;
-import nl.tudelft.labracore.TestLabracoreApplication;
-import nl.tudelft.labracore.dto.create.BuildingCreateDTO;
-import nl.tudelft.labracore.dto.patch.BuildingPatchDTO;
-import nl.tudelft.labracore.dto.view.structured.details.BuildingDetailsDTO;
-import nl.tudelft.labracore.dto.view.structured.summary.BuildingSummaryDTO;
-import nl.tudelft.labracore.model.Building;
-import nl.tudelft.labracore.repository.BuildingRepository;
-import nl.tudelft.labracore.test.RestControllerTest;
-import nl.tudelft.librador.dto.view.View;
-
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
@@ -53,6 +43,16 @@ import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilde
import com.fasterxml.jackson.core.JsonProcessingException;
+import nl.tudelft.labracore.TestLabracoreApplication;
+import nl.tudelft.labracore.dto.create.BuildingCreateDTO;
+import nl.tudelft.labracore.dto.patch.BuildingPatchDTO;
+import nl.tudelft.labracore.dto.view.structured.details.BuildingDetailsDTO;
+import nl.tudelft.labracore.dto.view.structured.summary.BuildingSummaryDTO;
+import nl.tudelft.labracore.model.Building;
+import nl.tudelft.labracore.repository.BuildingRepository;
+import nl.tudelft.labracore.test.RestControllerTest;
+import nl.tudelft.librador.dto.view.View;
+
@Transactional
@SpringBootTest(classes = TestLabracoreApplication.class)
@AutoConfigureMockMvc
diff --git a/src/test/java/nl/tudelft/labracore/controller/ClusterControllerTest.java b/src/test/java/nl/tudelft/labracore/controller/ClusterControllerTest.java
index 4991e546e98d8346a0abfcef8297cb64ad4b9ede..895b0573a639a62a2f2bbb278d6f23e5a772af0f 100644
--- a/src/test/java/nl/tudelft/labracore/controller/ClusterControllerTest.java
+++ b/src/test/java/nl/tudelft/labracore/controller/ClusterControllerTest.java
@@ -32,6 +32,19 @@ import java.util.stream.Collectors;
import javax.transaction.Transactional;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.security.test.context.support.WithUserDetails;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+
import nl.tudelft.labracore.TestLabracoreApplication;
import nl.tudelft.labracore.dto.create.ClusterCreateDTO;
import nl.tudelft.labracore.dto.id.CohortIdDTO;
@@ -48,19 +61,6 @@ import nl.tudelft.labracore.test.RestControllerTest;
import nl.tudelft.labracore.test.TestDatabaseLoader;
import nl.tudelft.librador.dto.view.View;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.security.test.context.support.WithUserDetails;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-
@Transactional
@SpringBootTest(classes = TestLabracoreApplication.class)
@AutoConfigureMockMvc
diff --git a/src/test/java/nl/tudelft/labracore/controller/CohortControllerTest.java b/src/test/java/nl/tudelft/labracore/controller/CohortControllerTest.java
index 8a6036757484f00c341fd0cc04f67a5c076f0009..09651b45859f42925254f3f04f463f3fba49f011 100644
--- a/src/test/java/nl/tudelft/labracore/controller/CohortControllerTest.java
+++ b/src/test/java/nl/tudelft/labracore/controller/CohortControllerTest.java
@@ -33,6 +33,19 @@ import java.util.Set;
import javax.transaction.Transactional;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.security.test.context.support.WithUserDetails;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+
import nl.tudelft.labracore.TestLabracoreApplication;
import nl.tudelft.labracore.dto.create.CohortCreateDTO;
import nl.tudelft.labracore.dto.create.CourseCreateDTO;
@@ -47,19 +60,6 @@ import nl.tudelft.labracore.repository.CohortRepository;
import nl.tudelft.labracore.test.TestDatabaseLoader;
import nl.tudelft.librador.dto.view.View;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.security.test.context.support.WithUserDetails;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-
@Transactional
@SpringBootTest(classes = TestLabracoreApplication.class)
@AutoConfigureMockMvc
diff --git a/src/test/java/nl/tudelft/labracore/controller/CourseControllerTest.java b/src/test/java/nl/tudelft/labracore/controller/CourseControllerTest.java
index 75e4aa333d3447f0619d97849b6eeaaa1e8d8635..1b3ba8072a4e5ae9d0c87559123c99ba5db715c7 100644
--- a/src/test/java/nl/tudelft/labracore/controller/CourseControllerTest.java
+++ b/src/test/java/nl/tudelft/labracore/controller/CourseControllerTest.java
@@ -29,6 +29,16 @@ import java.util.List;
import javax.transaction.Transactional;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.security.test.context.support.WithUserDetails;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+
import nl.tudelft.labracore.TestLabracoreApplication;
import nl.tudelft.labracore.dto.create.CourseCreateDTO;
import nl.tudelft.labracore.dto.id.PersonIdDTO;
@@ -44,16 +54,6 @@ import nl.tudelft.labracore.test.RestControllerTest;
import nl.tudelft.labracore.test.TestDatabaseLoader;
import nl.tudelft.librador.dto.view.View;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.security.test.context.support.WithUserDetails;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
-
@Transactional
@SpringBootTest(classes = TestLabracoreApplication.class)
@AutoConfigureMockMvc
diff --git a/src/test/java/nl/tudelft/labracore/controller/DBLoaderControllerTest.java b/src/test/java/nl/tudelft/labracore/controller/DBLoaderControllerTest.java
index 0d3dfdcd5015944a885a87c263fe8c6730d381f1..adf9a18430e64a524a986beea2acabd5b3a9e408 100644
--- a/src/test/java/nl/tudelft/labracore/controller/DBLoaderControllerTest.java
+++ b/src/test/java/nl/tudelft/labracore/controller/DBLoaderControllerTest.java
@@ -29,6 +29,19 @@ import java.util.stream.Collectors;
import javax.transaction.Transactional;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.security.test.context.support.WithUserDetails;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
import nl.tudelft.labracore.TestLabracoreApplication;
import nl.tudelft.labracore.dto.view.structured.details.ModuleAssignmentsGroupsDetailsDTO;
import nl.tudelft.labracore.dto.view.structured.summary.PersonSummaryDTO;
@@ -44,19 +57,6 @@ import nl.tudelft.labracore.repository.SubmissionRepository;
import nl.tudelft.labracore.test.TestDatabaseLoader;
import nl.tudelft.librador.dto.view.View;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.security.test.context.support.WithUserDetails;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
@Transactional
@AutoConfigureMockMvc
@SpringBootTest(classes = TestLabracoreApplication.class)
diff --git a/src/test/java/nl/tudelft/labracore/controller/EditionCollectionControllerTest.java b/src/test/java/nl/tudelft/labracore/controller/EditionCollectionControllerTest.java
index 260a3c8c914b362fd267e8f6e650f7b41a4b825d..99ed1b30cff4594c56adb1b9ee991949405a77cb 100644
--- a/src/test/java/nl/tudelft/labracore/controller/EditionCollectionControllerTest.java
+++ b/src/test/java/nl/tudelft/labracore/controller/EditionCollectionControllerTest.java
@@ -30,6 +30,18 @@ import java.util.List;
import javax.transaction.Transactional;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.security.test.context.support.WithUserDetails;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+
import nl.tudelft.labracore.TestLabracoreApplication;
import nl.tudelft.labracore.dto.create.EditionCollectionCreateDTO;
import nl.tudelft.labracore.dto.id.EditionIdDTO;
@@ -44,18 +56,6 @@ import nl.tudelft.labracore.test.RestControllerTest;
import nl.tudelft.labracore.test.TestDatabaseLoader;
import nl.tudelft.librador.dto.view.View;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.security.test.context.support.WithUserDetails;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
-
@Transactional
@AutoConfigureMockMvc
@SpringBootTest(classes = TestLabracoreApplication.class)
diff --git a/src/test/java/nl/tudelft/labracore/controller/EditionControllerTest.java b/src/test/java/nl/tudelft/labracore/controller/EditionControllerTest.java
index 329f2ac10ff92c260d86997e9521e077e8aff6a2..a699976f949cc1cecc92ebd9f37f2f9bee925022 100644
--- a/src/test/java/nl/tudelft/labracore/controller/EditionControllerTest.java
+++ b/src/test/java/nl/tudelft/labracore/controller/EditionControllerTest.java
@@ -32,6 +32,22 @@ import java.util.*;
import javax.transaction.Transactional;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.security.test.context.support.WithUserDetails;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+
import nl.tudelft.labracore.TestLabracoreApplication;
import nl.tudelft.labracore.dto.create.EditionCreateDTO;
import nl.tudelft.labracore.dto.helper.ParticipantsImportDTO;
@@ -56,22 +72,6 @@ import nl.tudelft.labracore.test.RestControllerTest;
import nl.tudelft.labracore.test.TestDatabaseLoader;
import nl.tudelft.librador.dto.view.View;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
-import org.springframework.security.test.context.support.WithUserDetails;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-
@Transactional
@AutoConfigureMockMvc
@SpringBootTest(classes = TestLabracoreApplication.class)
@@ -221,7 +221,7 @@ public class EditionControllerTest extends RestControllerTest {
@WithUserDetails("All-access Key")
void getAllEditionsByActiveAtCallsRepositoryMethod() throws Exception {
LocalDateTime now = LocalDateTime.now().plusDays(5L);
- mvc.perform(putJson("/api/edition/active-at", now))
+ mvc.perform(get("/api/edition/active-at").param("at", now.toString()))
.andExpect(status().isOk())
.andExpect(jsonContent(EditionSummaryDTOList.class)
.test(l -> assertThat(l)
@@ -235,7 +235,8 @@ public class EditionControllerTest extends RestControllerTest {
LocalDateTime now = LocalDateTime.now().plusDays(5L);
LocalDateTime then = now.plusDays(1L);
Period during = new Period(now, then);
- mvc.perform(putJson("/api/edition/active-during", during))
+ mvc.perform(get("/api/edition/active-during").param("start", now.toString()).param("end",
+ then.toString()))
.andExpect(status().isOk())
.andExpect(jsonContent(EditionSummaryDTOList.class)
.test(l -> assertThat(l)
@@ -437,8 +438,9 @@ public class EditionControllerTest extends RestControllerTest {
postJson("/api/edition/1/add/tas", List.of()),
get("/api/edition/1/modules"),
get("/api/edition/1/roles"),
- putJson("/api/edition/active-at", LocalDateTime.now()),
- putJson("/api/edition/active-during", new Period()),
+ get("/api/edition/active-at").param("at", LocalDateTime.now().toString()),
+ get("/api/edition/active-during").param("start", LocalDateTime.now().toString()).param("end",
+ LocalDateTime.now().toString()),
get("/api/edition/open-for-enrolment"),
delete("/api/edition/1/remove/person/1"),
delete("/api/edition/1/block/person/1"),
diff --git a/src/test/java/nl/tudelft/labracore/controller/EventControllerTest.java b/src/test/java/nl/tudelft/labracore/controller/EventControllerTest.java
index a511ac93f846df0b5223d169885832fbea304844..d35b5d95ed1ad67db54d625201d58fb2c4d1c3d6 100644
--- a/src/test/java/nl/tudelft/labracore/controller/EventControllerTest.java
+++ b/src/test/java/nl/tudelft/labracore/controller/EventControllerTest.java
@@ -21,14 +21,6 @@ import static nl.tudelft.labracore.test.RestControllerTest.postJson;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-import nl.tudelft.labracore.TestLabracoreApplication;
-import nl.tudelft.labracore.dto.create.EventSubscriptionCreateDTO;
-import nl.tudelft.labracore.model.App;
-import nl.tudelft.labracore.repository.AppRepository;
-import nl.tudelft.labracore.repository.EventSubscriptionRepository;
-import nl.tudelft.labracore.service.EventService;
-import nl.tudelft.labracore.test.TestDatabaseLoader;
-
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
@@ -38,6 +30,14 @@ import org.springframework.security.test.context.support.WithUserDetails;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.transaction.annotation.Transactional;
+import nl.tudelft.labracore.TestLabracoreApplication;
+import nl.tudelft.labracore.dto.create.EventSubscriptionCreateDTO;
+import nl.tudelft.labracore.model.App;
+import nl.tudelft.labracore.repository.AppRepository;
+import nl.tudelft.labracore.repository.EventSubscriptionRepository;
+import nl.tudelft.labracore.service.EventService;
+import nl.tudelft.labracore.test.TestDatabaseLoader;
+
@Transactional
@AutoConfigureMockMvc
@SpringBootTest(classes = TestLabracoreApplication.class)
diff --git a/src/test/java/nl/tudelft/labracore/controller/GradeControllerTest.java b/src/test/java/nl/tudelft/labracore/controller/GradeControllerTest.java
index 90d72df222e9c24209aa88b602d6e14a8ddb77e7..064a38479864f3d577cc439c9af99561f67debb3 100644
--- a/src/test/java/nl/tudelft/labracore/controller/GradeControllerTest.java
+++ b/src/test/java/nl/tudelft/labracore/controller/GradeControllerTest.java
@@ -35,6 +35,21 @@ import java.util.List;
import javax.transaction.Transactional;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.security.test.context.support.WithUserDetails;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+
import nl.tudelft.labracore.TestLabracoreApplication;
import nl.tudelft.labracore.dto.create.GradeBatchImportDTO;
import nl.tudelft.labracore.dto.create.GradeCreateDTO;
@@ -51,21 +66,6 @@ import nl.tudelft.labracore.service.GradeService;
import nl.tudelft.labracore.test.RestControllerTest;
import nl.tudelft.labracore.test.TestDatabaseLoader;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.data.rest.webmvc.ResourceNotFoundException;
-import org.springframework.security.test.context.support.WithUserDetails;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-
@SpringBootTest(classes = TestLabracoreApplication.class)
@AutoConfigureMockMvc
@Transactional
diff --git a/src/test/java/nl/tudelft/labracore/controller/ModuleControllerTest.java b/src/test/java/nl/tudelft/labracore/controller/ModuleControllerTest.java
index 922969b36b30949fcb545bf0ddceb67cc12fa534..814e9bfc50a1090c5891ba7d27a83519d86458e7 100644
--- a/src/test/java/nl/tudelft/labracore/controller/ModuleControllerTest.java
+++ b/src/test/java/nl/tudelft/labracore/controller/ModuleControllerTest.java
@@ -30,19 +30,6 @@ import java.util.List;
import javax.transaction.Transactional;
-import nl.tudelft.labracore.TestLabracoreApplication;
-import nl.tudelft.labracore.dto.create.ModuleCreateDTO;
-import nl.tudelft.labracore.dto.id.EditionIdDTO;
-import nl.tudelft.labracore.dto.patch.ModulePatchDTO;
-import nl.tudelft.labracore.dto.view.structured.details.ModuleDetailsDTO;
-import nl.tudelft.labracore.model.Edition;
-import nl.tudelft.labracore.model.Module;
-import nl.tudelft.labracore.repository.EditionRepository;
-import nl.tudelft.labracore.repository.ModuleRepository;
-import nl.tudelft.labracore.test.RestControllerTest;
-import nl.tudelft.labracore.test.TestDatabaseLoader;
-import nl.tudelft.librador.dto.view.View;
-
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
@@ -57,6 +44,19 @@ import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilde
import com.fasterxml.jackson.core.JsonProcessingException;
+import nl.tudelft.labracore.TestLabracoreApplication;
+import nl.tudelft.labracore.dto.create.ModuleCreateDTO;
+import nl.tudelft.labracore.dto.id.EditionIdDTO;
+import nl.tudelft.labracore.dto.patch.ModulePatchDTO;
+import nl.tudelft.labracore.dto.view.structured.details.ModuleDetailsDTO;
+import nl.tudelft.labracore.model.Edition;
+import nl.tudelft.labracore.model.Module;
+import nl.tudelft.labracore.repository.EditionRepository;
+import nl.tudelft.labracore.repository.ModuleRepository;
+import nl.tudelft.labracore.test.RestControllerTest;
+import nl.tudelft.labracore.test.TestDatabaseLoader;
+import nl.tudelft.librador.dto.view.View;
+
@Transactional
@AutoConfigureMockMvc
@SpringBootTest(classes = TestLabracoreApplication.class)
diff --git a/src/test/java/nl/tudelft/labracore/controller/PermissionControllerTest.java b/src/test/java/nl/tudelft/labracore/controller/PermissionControllerTest.java
index 019b721de3279f9b3b752cfe26a55fcb7a29bddd..a067dcdc69b9938f76d5215ed9fec8f458b0adae 100644
--- a/src/test/java/nl/tudelft/labracore/controller/PermissionControllerTest.java
+++ b/src/test/java/nl/tudelft/labracore/controller/PermissionControllerTest.java
@@ -27,13 +27,6 @@ import java.util.List;
import javax.transaction.Transactional;
-import nl.tudelft.labracore.TestLabracoreApplication;
-import nl.tudelft.labracore.dto.view.structured.summary.PermissionSummaryDTO;
-import nl.tudelft.labracore.repository.PermissionRepository;
-import nl.tudelft.labracore.test.RestControllerTest;
-import nl.tudelft.labracore.test.TestDatabaseLoader;
-import nl.tudelft.librador.dto.view.View;
-
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
@@ -46,6 +39,13 @@ import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilde
import com.fasterxml.jackson.core.JsonProcessingException;
+import nl.tudelft.labracore.TestLabracoreApplication;
+import nl.tudelft.labracore.dto.view.structured.summary.PermissionSummaryDTO;
+import nl.tudelft.labracore.repository.PermissionRepository;
+import nl.tudelft.labracore.test.RestControllerTest;
+import nl.tudelft.labracore.test.TestDatabaseLoader;
+import nl.tudelft.librador.dto.view.View;
+
@Transactional
@SpringBootTest(classes = TestLabracoreApplication.class)
@AutoConfigureMockMvc
diff --git a/src/test/java/nl/tudelft/labracore/controller/PersonControllerTest.java b/src/test/java/nl/tudelft/labracore/controller/PersonControllerTest.java
index 6a4999033a5d11e357d10d0b583711fb72974f85..19f6ed3311a46dcd0502189f8fc6bb091c7060ba 100644
--- a/src/test/java/nl/tudelft/labracore/controller/PersonControllerTest.java
+++ b/src/test/java/nl/tudelft/labracore/controller/PersonControllerTest.java
@@ -33,6 +33,21 @@ import java.util.List;
import javax.transaction.Transactional;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.http.MediaType;
+import org.springframework.security.test.context.support.WithUserDetails;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+
import nl.tudelft.labracore.TestLabracoreApplication;
import nl.tudelft.labracore.dto.create.PersonCreateDTO;
import nl.tudelft.labracore.dto.helper.PersonSearchDTO;
@@ -51,21 +66,6 @@ import nl.tudelft.labracore.test.RestControllerTest;
import nl.tudelft.labracore.test.TestDatabaseLoader;
import nl.tudelft.librador.dto.view.View;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.http.MediaType;
-import org.springframework.security.test.context.support.WithUserDetails;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-
@Transactional
@SpringBootTest(classes = TestLabracoreApplication.class)
@AutoConfigureMockMvc
diff --git a/src/test/java/nl/tudelft/labracore/controller/ProgramControllerTest.java b/src/test/java/nl/tudelft/labracore/controller/ProgramControllerTest.java
index 8226366cd211c868a4586fa48597871c9756e43c..7bbcc35e9c98148682d8fa9fc962b0aedb14cdb8 100644
--- a/src/test/java/nl/tudelft/labracore/controller/ProgramControllerTest.java
+++ b/src/test/java/nl/tudelft/labracore/controller/ProgramControllerTest.java
@@ -35,6 +35,17 @@ import java.util.List;
import javax.transaction.Transactional;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.security.test.context.support.WithUserDetails;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+
import nl.tudelft.labracore.TestLabracoreApplication;
import nl.tudelft.labracore.dto.create.ProgramCreateDTO;
import nl.tudelft.labracore.dto.id.PersonIdDTO;
@@ -48,17 +59,6 @@ import nl.tudelft.labracore.service.ProgramService;
import nl.tudelft.labracore.test.TestDatabaseLoader;
import nl.tudelft.librador.dto.view.View;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.security.test.context.support.WithUserDetails;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
-
@Transactional
@AutoConfigureMockMvc
@SpringBootTest(classes = TestLabracoreApplication.class)
diff --git a/src/test/java/nl/tudelft/labracore/controller/QuestionControllerTest.java b/src/test/java/nl/tudelft/labracore/controller/QuestionControllerTest.java
index f7dbabf035cd9477f68f671053b1544dd32ab520..751bcc2a6fd8bbf491b932638a4eeb24de970af1 100644
--- a/src/test/java/nl/tudelft/labracore/controller/QuestionControllerTest.java
+++ b/src/test/java/nl/tudelft/labracore/controller/QuestionControllerTest.java
@@ -27,18 +27,6 @@ import java.util.List;
import javax.transaction.Transactional;
-import nl.tudelft.labracore.TestLabracoreApplication;
-import nl.tudelft.labracore.dto.create.QuestionCreateDTO;
-import nl.tudelft.labracore.dto.id.EditionIdDTO;
-import nl.tudelft.labracore.dto.patch.QuestionPatchDTO;
-import nl.tudelft.labracore.dto.view.structured.details.QuestionDetailsDTO;
-import nl.tudelft.labracore.model.Question;
-import nl.tudelft.labracore.repository.QuestionRepository;
-import nl.tudelft.labracore.service.QuestionService;
-import nl.tudelft.labracore.test.RestControllerTest;
-import nl.tudelft.labracore.test.TestDatabaseLoader;
-import nl.tudelft.librador.dto.view.View;
-
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -51,6 +39,18 @@ import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilde
import com.fasterxml.jackson.core.JsonProcessingException;
+import nl.tudelft.labracore.TestLabracoreApplication;
+import nl.tudelft.labracore.dto.create.QuestionCreateDTO;
+import nl.tudelft.labracore.dto.id.EditionIdDTO;
+import nl.tudelft.labracore.dto.patch.QuestionPatchDTO;
+import nl.tudelft.labracore.dto.view.structured.details.QuestionDetailsDTO;
+import nl.tudelft.labracore.model.Question;
+import nl.tudelft.labracore.repository.QuestionRepository;
+import nl.tudelft.labracore.service.QuestionService;
+import nl.tudelft.labracore.test.RestControllerTest;
+import nl.tudelft.labracore.test.TestDatabaseLoader;
+import nl.tudelft.librador.dto.view.View;
+
@Transactional
@SpringBootTest(classes = TestLabracoreApplication.class)
@AutoConfigureMockMvc
diff --git a/src/test/java/nl/tudelft/labracore/controller/RoleControllerTest.java b/src/test/java/nl/tudelft/labracore/controller/RoleControllerTest.java
index 01077d4f48d1671c1c508ffffc229c7639192923..44bfb2ca8c964ef8dd7c363d6e450c775afff81f 100644
--- a/src/test/java/nl/tudelft/labracore/controller/RoleControllerTest.java
+++ b/src/test/java/nl/tudelft/labracore/controller/RoleControllerTest.java
@@ -30,6 +30,18 @@ import java.util.List;
import javax.transaction.Transactional;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.security.test.context.support.WithUserDetails;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+
import nl.tudelft.labracore.TestLabracoreApplication;
import nl.tudelft.labracore.dto.create.RoleCreateDTO;
import nl.tudelft.labracore.dto.id.EditionIdDTO;
@@ -45,18 +57,6 @@ import nl.tudelft.labracore.test.RestControllerTest;
import nl.tudelft.labracore.test.TestDatabaseLoader;
import nl.tudelft.librador.dto.view.View;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.security.test.context.support.WithUserDetails;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
-
@Transactional
@AutoConfigureMockMvc
@SpringBootTest(classes = TestLabracoreApplication.class)
diff --git a/src/test/java/nl/tudelft/labracore/controller/RoomControllerTest.java b/src/test/java/nl/tudelft/labracore/controller/RoomControllerTest.java
index d6126fdd9195c5cafe6db0192cbc36eb9c72b071..cff577a00decdd11b56a8bcdd48dfa01a0be01cd 100644
--- a/src/test/java/nl/tudelft/labracore/controller/RoomControllerTest.java
+++ b/src/test/java/nl/tudelft/labracore/controller/RoomControllerTest.java
@@ -30,6 +30,19 @@ import java.util.List;
import javax.transaction.Transactional;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.security.test.context.support.WithUserDetails;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+
import nl.tudelft.labracore.TestLabracoreApplication;
import nl.tudelft.labracore.dto.create.RoomCreateDTO;
import nl.tudelft.labracore.dto.id.BuildingIdDTO;
@@ -44,19 +57,6 @@ import nl.tudelft.labracore.test.RestControllerTest;
import nl.tudelft.labracore.test.TestDatabaseLoader;
import nl.tudelft.librador.dto.view.View;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.security.test.context.support.WithUserDetails;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-
@Transactional
@AutoConfigureMockMvc
@SpringBootTest(classes = TestLabracoreApplication.class)
diff --git a/src/test/java/nl/tudelft/labracore/controller/SessionControllerTest.java b/src/test/java/nl/tudelft/labracore/controller/SessionControllerTest.java
index 7b9d89c64e6b91f0d65a8fdf322ae8f899e6d227..2267ab7147fc4d6222c5cdcff0ee8966819d65cb 100644
--- a/src/test/java/nl/tudelft/labracore/controller/SessionControllerTest.java
+++ b/src/test/java/nl/tudelft/labracore/controller/SessionControllerTest.java
@@ -31,18 +31,6 @@ import java.util.List;
import javax.transaction.Transactional;
-import nl.tudelft.labracore.TestLabracoreApplication;
-import nl.tudelft.labracore.dto.create.SharedSessionCreateDTO;
-import nl.tudelft.labracore.dto.create.SingleSessionCreateDTO;
-import nl.tudelft.labracore.dto.id.EditionCollectionIdDTO;
-import nl.tudelft.labracore.dto.id.EditionIdDTO;
-import nl.tudelft.labracore.dto.id.RoomIdDTO;
-import nl.tudelft.labracore.dto.patch.SessionPatchDTO;
-import nl.tudelft.labracore.model.Session;
-import nl.tudelft.labracore.repository.SessionRepository;
-import nl.tudelft.labracore.test.RestControllerTest;
-import nl.tudelft.labracore.test.TestDatabaseLoader;
-
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
@@ -56,6 +44,18 @@ import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilde
import com.fasterxml.jackson.core.JsonProcessingException;
+import nl.tudelft.labracore.TestLabracoreApplication;
+import nl.tudelft.labracore.dto.create.SharedSessionCreateDTO;
+import nl.tudelft.labracore.dto.create.SingleSessionCreateDTO;
+import nl.tudelft.labracore.dto.id.EditionCollectionIdDTO;
+import nl.tudelft.labracore.dto.id.EditionIdDTO;
+import nl.tudelft.labracore.dto.id.RoomIdDTO;
+import nl.tudelft.labracore.dto.patch.SessionPatchDTO;
+import nl.tudelft.labracore.model.Session;
+import nl.tudelft.labracore.repository.SessionRepository;
+import nl.tudelft.labracore.test.RestControllerTest;
+import nl.tudelft.labracore.test.TestDatabaseLoader;
+
@Transactional
@AutoConfigureMockMvc
@SpringBootTest(classes = TestLabracoreApplication.class)
@@ -90,7 +90,7 @@ public class SessionControllerTest extends RestControllerTest {
mvc.perform(postJson("/api/session/single", SingleSessionCreateDTO.builder()
.name("EWI")
.start(now())
- .end(now().plusHours(4))
+ .endTime(now().plusHours(4))
.edition(new EditionIdDTO(db.getSokovia().getId()))
.rooms(List.of(new RoomIdDTO(db.getBalcony().getId()))).build()))
.andExpect(status().isOk())
@@ -111,7 +111,7 @@ public class SessionControllerTest extends RestControllerTest {
mvc.perform(postJson("/api/session/shared", SharedSessionCreateDTO.builder()
.name("NDKASND")
.start(now())
- .end(now().plusHours(4))
+ .endTime(now().plusHours(4))
.editionCollection(new EditionCollectionIdDTO(db.getAvengersMovies().getId()))
.rooms(List.of(new RoomIdDTO(db.getBalcony().getId()))).build()))
.andExpect(status().isOk())
@@ -183,7 +183,7 @@ public class SessionControllerTest extends RestControllerTest {
@WithUserDetails("All-access Key")
void addSessionWithNoRooms() throws Exception {
mvc.perform(postJson("/api/session/single", SingleSessionCreateDTO.builder()
- .name("sdafsa").start(now()).end(now().plusHours(4))
+ .name("sdafsa").start(now()).endTime(now().plusHours(4))
.edition(new EditionIdDTO(db.getNewYork().getId()))
.rooms(new ArrayList<>()).build()))
.andExpect(status().isOk())
diff --git a/src/test/java/nl/tudelft/labracore/controller/StudentGroupControllerIntegrationTest.java b/src/test/java/nl/tudelft/labracore/controller/StudentGroupControllerIntegrationTest.java
index df6cc7a1c9ad5c226a5f221ac24606b88b29f159..c9103f03c2af872d10c658681b0d135b1e056080 100644
--- a/src/test/java/nl/tudelft/labracore/controller/StudentGroupControllerIntegrationTest.java
+++ b/src/test/java/nl/tudelft/labracore/controller/StudentGroupControllerIntegrationTest.java
@@ -29,6 +29,17 @@ import java.util.stream.Stream;
import javax.transaction.Transactional;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.security.test.context.support.WithUserDetails;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+
import nl.tudelft.labracore.TestLabracoreApplication;
import nl.tudelft.labracore.dto.create.StudentGroupCreateDTO;
import nl.tudelft.labracore.dto.helper.GroupGenerateDTO;
@@ -47,17 +58,6 @@ import nl.tudelft.labracore.test.RestControllerTest;
import nl.tudelft.labracore.test.TestDatabaseLoader;
import nl.tudelft.librador.dto.view.View;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.security.test.context.support.WithUserDetails;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
-
@Transactional
@AutoConfigureMockMvc
@SpringBootTest(classes = TestLabracoreApplication.class)
diff --git a/src/test/java/nl/tudelft/labracore/controller/StudentGroupControllerTest.java b/src/test/java/nl/tudelft/labracore/controller/StudentGroupControllerTest.java
index 7458c8684077e31ac36224664e705d5db0bcbc06..29a1b6b3399341c24a7564423823b12a405e7f7a 100644
--- a/src/test/java/nl/tudelft/labracore/controller/StudentGroupControllerTest.java
+++ b/src/test/java/nl/tudelft/labracore/controller/StudentGroupControllerTest.java
@@ -25,14 +25,6 @@ import java.util.*;
import javax.transaction.Transactional;
-import nl.tudelft.labracore.TestLabracoreApplication;
-import nl.tudelft.labracore.dto.helper.GroupGenerateDTO;
-import nl.tudelft.labracore.dto.helper.GroupImportDTO;
-import nl.tudelft.labracore.dto.view.structured.summary.RoleSummaryDTO;
-import nl.tudelft.labracore.service.RoleService;
-import nl.tudelft.labracore.service.StudentGroupService;
-import nl.tudelft.labracore.test.RestControllerTest;
-
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
@@ -44,6 +36,14 @@ import org.springframework.test.context.web.WebAppConfiguration;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import nl.tudelft.labracore.TestLabracoreApplication;
+import nl.tudelft.labracore.dto.helper.GroupGenerateDTO;
+import nl.tudelft.labracore.dto.helper.GroupImportDTO;
+import nl.tudelft.labracore.dto.view.structured.summary.RoleSummaryDTO;
+import nl.tudelft.labracore.service.RoleService;
+import nl.tudelft.labracore.service.StudentGroupService;
+import nl.tudelft.labracore.test.RestControllerTest;
+
@Transactional
@WebAppConfiguration
@SpringBootTest(classes = TestLabracoreApplication.class)
diff --git a/src/test/java/nl/tudelft/labracore/controller/SubmissionControllerTest.java b/src/test/java/nl/tudelft/labracore/controller/SubmissionControllerTest.java
index 4c0c22caa940128338c247457fff266efce3adb3..0b564d6ed4f2538954faf800f2fedb52a4db9f28 100644
--- a/src/test/java/nl/tudelft/labracore/controller/SubmissionControllerTest.java
+++ b/src/test/java/nl/tudelft/labracore/controller/SubmissionControllerTest.java
@@ -30,19 +30,6 @@ import java.util.List;
import javax.transaction.Transactional;
-import nl.tudelft.labracore.TestLabracoreApplication;
-import nl.tudelft.labracore.dto.create.SubmissionCreateDTO;
-import nl.tudelft.labracore.dto.id.AssignmentIdDTO;
-import nl.tudelft.labracore.dto.id.PersonIdDTO;
-import nl.tudelft.labracore.dto.id.StudentGroupIdDTO;
-import nl.tudelft.labracore.dto.view.structured.details.SubmissionDetailsDTO;
-import nl.tudelft.labracore.dto.view.structured.details.SubmissionMemberDetailsDTO;
-import nl.tudelft.labracore.model.*;
-import nl.tudelft.labracore.repository.SubmissionRepository;
-import nl.tudelft.labracore.test.RestControllerTest;
-import nl.tudelft.labracore.test.TestDatabaseLoader;
-import nl.tudelft.librador.dto.view.View;
-
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
@@ -56,6 +43,19 @@ import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilde
import com.fasterxml.jackson.core.JsonProcessingException;
+import nl.tudelft.labracore.TestLabracoreApplication;
+import nl.tudelft.labracore.dto.create.SubmissionCreateDTO;
+import nl.tudelft.labracore.dto.id.AssignmentIdDTO;
+import nl.tudelft.labracore.dto.id.PersonIdDTO;
+import nl.tudelft.labracore.dto.id.StudentGroupIdDTO;
+import nl.tudelft.labracore.dto.view.structured.details.SubmissionDetailsDTO;
+import nl.tudelft.labracore.dto.view.structured.details.SubmissionMemberDetailsDTO;
+import nl.tudelft.labracore.model.*;
+import nl.tudelft.labracore.repository.SubmissionRepository;
+import nl.tudelft.labracore.test.RestControllerTest;
+import nl.tudelft.labracore.test.TestDatabaseLoader;
+import nl.tudelft.librador.dto.view.View;
+
@Transactional
@AutoConfigureMockMvc
@SpringBootTest(classes = TestLabracoreApplication.class)
diff --git a/src/test/java/nl/tudelft/labracore/controller/TOTPControllerTest.java b/src/test/java/nl/tudelft/labracore/controller/TOTPControllerTest.java
index 722d9b56dff09d8be177007a539a39c4aad24818..96283c28436e3094743bf690f0eb5a963a1c626e 100644
--- a/src/test/java/nl/tudelft/labracore/controller/TOTPControllerTest.java
+++ b/src/test/java/nl/tudelft/labracore/controller/TOTPControllerTest.java
@@ -33,17 +33,6 @@ import java.util.List;
import javax.transaction.Transactional;
-import nl.tudelft.labracore.TestLabracoreApplication;
-import nl.tudelft.labracore.dto.view.structured.details.TOTPKeyInfoDetailsDTO;
-import nl.tudelft.labracore.dto.view.structured.summary.PersonSummaryDTO;
-import nl.tudelft.labracore.model.person.ConcretePerson;
-import nl.tudelft.labracore.model.security.TOTPKey;
-import nl.tudelft.labracore.repository.ConcretePersonRepository;
-import nl.tudelft.labracore.service.TOTPService;
-import nl.tudelft.labracore.test.RestControllerTest;
-import nl.tudelft.labracore.test.TestDatabaseLoader;
-import nl.tudelft.librador.dto.view.View;
-
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
@@ -58,6 +47,17 @@ import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilde
import com.fasterxml.jackson.core.JsonProcessingException;
+import nl.tudelft.labracore.TestLabracoreApplication;
+import nl.tudelft.labracore.dto.view.structured.details.TOTPKeyInfoDetailsDTO;
+import nl.tudelft.labracore.dto.view.structured.summary.PersonSummaryDTO;
+import nl.tudelft.labracore.model.person.ConcretePerson;
+import nl.tudelft.labracore.model.security.TOTPKey;
+import nl.tudelft.labracore.repository.ConcretePersonRepository;
+import nl.tudelft.labracore.service.TOTPService;
+import nl.tudelft.labracore.test.RestControllerTest;
+import nl.tudelft.labracore.test.TestDatabaseLoader;
+import nl.tudelft.librador.dto.view.View;
+
@Transactional
@SpringBootTest(classes = TestLabracoreApplication.class)
@AutoConfigureMockMvc
diff --git a/src/test/java/nl/tudelft/labracore/dto/create/AssignmentCreateDTOTest.java b/src/test/java/nl/tudelft/labracore/dto/create/AssignmentCreateDTOTest.java
index e656e7eb916293f7ff6da0496c01847cbef5584d..1ba39506ea82a68f55e05157e890d82f5aa54821 100644
--- a/src/test/java/nl/tudelft/labracore/dto/create/AssignmentCreateDTOTest.java
+++ b/src/test/java/nl/tudelft/labracore/dto/create/AssignmentCreateDTOTest.java
@@ -21,16 +21,16 @@ import java.time.LocalDateTime;
import java.util.List;
import java.util.Set;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.provider.Arguments;
+import org.springframework.beans.factory.annotation.Autowired;
+
import nl.tudelft.labracore.dto.id.ModuleIdDTO;
import nl.tudelft.labracore.model.Assignment;
import nl.tudelft.labracore.model.Module;
import nl.tudelft.labracore.model.embeddable.Description;
import nl.tudelft.labracore.test.TestDatabaseLoader;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.params.provider.Arguments;
-import org.springframework.beans.factory.annotation.Autowired;
-
public class AssignmentCreateDTOTest extends CreateTest<Assignment, AssignmentCreateDTO> {
@Autowired
private TestDatabaseLoader db;
diff --git a/src/test/java/nl/tudelft/labracore/dto/create/ClusterCreateDTOTest.java b/src/test/java/nl/tudelft/labracore/dto/create/ClusterCreateDTOTest.java
index 35a819e51adb834c3d7fa11d891c2300c1a2220b..562e6c8894c8b565be32d75c2199a3dc7e9cba07 100644
--- a/src/test/java/nl/tudelft/labracore/dto/create/ClusterCreateDTOTest.java
+++ b/src/test/java/nl/tudelft/labracore/dto/create/ClusterCreateDTOTest.java
@@ -19,6 +19,10 @@ package nl.tudelft.labracore.dto.create;
import java.util.List;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.provider.Arguments;
+import org.springframework.beans.factory.annotation.Autowired;
+
import nl.tudelft.labracore.dto.id.CohortIdDTO;
import nl.tudelft.labracore.dto.id.PersonIdDTO;
import nl.tudelft.labracore.model.Cluster;
@@ -27,10 +31,6 @@ import nl.tudelft.labracore.model.Person;
import nl.tudelft.labracore.model.Program;
import nl.tudelft.labracore.test.TestDatabaseLoader;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.params.provider.Arguments;
-import org.springframework.beans.factory.annotation.Autowired;
-
public class ClusterCreateDTOTest extends CreateTest<Cluster, ClusterCreateDTO> {
@Autowired
private TestDatabaseLoader db;
diff --git a/src/test/java/nl/tudelft/labracore/dto/create/CreateTest.java b/src/test/java/nl/tudelft/labracore/dto/create/CreateTest.java
index 07e8be7f0120a0f836acb6028e374f4b874d5a46..f649421d4a662b2c44610d04d9a3a1d1a71fae1f 100644
--- a/src/test/java/nl/tudelft/labracore/dto/create/CreateTest.java
+++ b/src/test/java/nl/tudelft/labracore/dto/create/CreateTest.java
@@ -27,10 +27,6 @@ import java.util.stream.Collectors;
import javax.transaction.Transactional;
-import nl.tudelft.labracore.TestLabracoreApplication;
-import nl.tudelft.librador.dto.create.Create;
-import nl.tudelft.librador.dto.id.IdDTO;
-
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.params.ParameterizedTest;
@@ -40,6 +36,9 @@ import org.springframework.boot.test.context.SpringBootTest;
import dummy.DummyEntity;
import dummy.DummyIdDTO;
+import nl.tudelft.labracore.TestLabracoreApplication;
+import nl.tudelft.librador.dto.create.Create;
+import nl.tudelft.librador.dto.id.IdDTO;
@Transactional
@SpringBootTest(classes = TestLabracoreApplication.class)
diff --git a/src/test/java/nl/tudelft/labracore/dto/patch/AssignmentPatchDTOTest.java b/src/test/java/nl/tudelft/labracore/dto/patch/AssignmentPatchDTOTest.java
index 906df613156fb70823c8522d0b5be31ea46b1d67..2a9ae063bf0d8eda368c300ee662c4dfa364a025 100644
--- a/src/test/java/nl/tudelft/labracore/dto/patch/AssignmentPatchDTOTest.java
+++ b/src/test/java/nl/tudelft/labracore/dto/patch/AssignmentPatchDTOTest.java
@@ -21,6 +21,10 @@ import java.time.LocalDateTime;
import java.util.List;
import java.util.Set;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.provider.Arguments;
+import org.springframework.beans.factory.annotation.Autowired;
+
import nl.tudelft.labracore.dto.id.ModuleIdDTO;
import nl.tudelft.labracore.dto.id.SessionIdDTO;
import nl.tudelft.labracore.model.*;
@@ -31,10 +35,6 @@ import nl.tudelft.labracore.repository.ModuleRepository;
import nl.tudelft.labracore.repository.SessionRepository;
import nl.tudelft.labracore.test.TestDatabaseLoader;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.params.provider.Arguments;
-import org.springframework.beans.factory.annotation.Autowired;
-
public class AssignmentPatchDTOTest extends PatchTest<Assignment, AssignmentPatchDTO> {
@Autowired
diff --git a/src/test/java/nl/tudelft/labracore/dto/patch/EditionCollectionPatchDTOTest.java b/src/test/java/nl/tudelft/labracore/dto/patch/EditionCollectionPatchDTOTest.java
index 5a2fd8e3811480950bc5e162ff3f3bd5d82838c9..8403dced1d06ce79f3a9cb8734df6c1f2f310cba 100644
--- a/src/test/java/nl/tudelft/labracore/dto/patch/EditionCollectionPatchDTOTest.java
+++ b/src/test/java/nl/tudelft/labracore/dto/patch/EditionCollectionPatchDTOTest.java
@@ -19,10 +19,10 @@ package nl.tudelft.labracore.dto.patch;
import java.util.List;
-import nl.tudelft.labracore.model.EditionCollection;
-
import org.junit.jupiter.params.provider.Arguments;
+import nl.tudelft.labracore.model.EditionCollection;
+
public class EditionCollectionPatchDTOTest extends PatchTest<EditionCollection, EditionCollectionPatchDTO> {
@Override
protected EditionCollectionPatchDTO filledDTO() {
diff --git a/src/test/java/nl/tudelft/labracore/dto/patch/EditionPatchDTOTest.java b/src/test/java/nl/tudelft/labracore/dto/patch/EditionPatchDTOTest.java
index bee71b62fa8bd66411cc783eda68724730857189..3b3a51091d9b054627bbfecb0c1e9b75169c156f 100644
--- a/src/test/java/nl/tudelft/labracore/dto/patch/EditionPatchDTOTest.java
+++ b/src/test/java/nl/tudelft/labracore/dto/patch/EditionPatchDTOTest.java
@@ -20,6 +20,9 @@ package nl.tudelft.labracore.dto.patch;
import java.time.LocalDateTime;
import java.util.List;
+import org.junit.jupiter.params.provider.Arguments;
+import org.springframework.beans.factory.annotation.Autowired;
+
import nl.tudelft.labracore.dto.id.CohortIdDTO;
import nl.tudelft.labracore.dto.id.CourseIdDTO;
import nl.tudelft.labracore.dto.id.ModuleIdDTO;
@@ -30,9 +33,6 @@ import nl.tudelft.labracore.model.Module;
import nl.tudelft.labracore.model.Role;
import nl.tudelft.labracore.test.TestDatabaseLoader;
-import org.junit.jupiter.params.provider.Arguments;
-import org.springframework.beans.factory.annotation.Autowired;
-
public class EditionPatchDTOTest extends PatchTest<Edition, EditionPatchDTO> {
@Autowired
private TestDatabaseLoader db;
diff --git a/src/test/java/nl/tudelft/labracore/dto/patch/PatchTest.java b/src/test/java/nl/tudelft/labracore/dto/patch/PatchTest.java
index e1756b9a6455f4a7394b7084811d5b3897d5a252..8aaeeeea94ab4a9fb9c514af6162bcf9f975a139 100644
--- a/src/test/java/nl/tudelft/labracore/dto/patch/PatchTest.java
+++ b/src/test/java/nl/tudelft/labracore/dto/patch/PatchTest.java
@@ -27,10 +27,6 @@ import java.util.stream.Collectors;
import javax.transaction.Transactional;
-import nl.tudelft.labracore.TestLabracoreApplication;
-import nl.tudelft.librador.dto.id.IdDTO;
-import nl.tudelft.librador.dto.patch.Patch;
-
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.params.ParameterizedTest;
@@ -41,6 +37,9 @@ import org.springframework.test.annotation.DirtiesContext;
import dummy.DummyEntity;
import dummy.DummyIdDTO;
+import nl.tudelft.labracore.TestLabracoreApplication;
+import nl.tudelft.librador.dto.id.IdDTO;
+import nl.tudelft.librador.dto.patch.Patch;
@Transactional
@SpringBootTest(classes = TestLabracoreApplication.class)
diff --git a/src/test/java/nl/tudelft/labracore/dto/patch/SessionPatchDTOTest.java b/src/test/java/nl/tudelft/labracore/dto/patch/SessionPatchDTOTest.java
index 811554cc1761aece57fba36a253d4b3d6a4e9742..a8b87fe50761d5786c20f02235aa5edf46e7070d 100644
--- a/src/test/java/nl/tudelft/labracore/dto/patch/SessionPatchDTOTest.java
+++ b/src/test/java/nl/tudelft/labracore/dto/patch/SessionPatchDTOTest.java
@@ -21,6 +21,9 @@ import java.time.LocalDateTime;
import java.util.List;
import java.util.Set;
+import org.junit.jupiter.params.provider.Arguments;
+import org.springframework.beans.factory.annotation.Autowired;
+
import nl.tudelft.labracore.dto.id.AssignmentIdDTO;
import nl.tudelft.labracore.dto.id.RoomIdDTO;
import nl.tudelft.labracore.model.Assignment;
@@ -29,9 +32,6 @@ import nl.tudelft.labracore.model.Session;
import nl.tudelft.labracore.model.SingleSession;
import nl.tudelft.labracore.test.TestDatabaseLoader;
-import org.junit.jupiter.params.provider.Arguments;
-import org.springframework.beans.factory.annotation.Autowired;
-
public class SessionPatchDTOTest extends PatchTest<Session, SessionPatchDTO> {
@Autowired
private TestDatabaseLoader db;
@@ -63,7 +63,7 @@ public class SessionPatchDTOTest extends PatchTest<Session, SessionPatchDTO> {
of(SessionPatchDTO::getName, Session::getName),
of(SessionPatchDTO::getDescription, Session::getDescription),
of(SessionPatchDTO::getStart, Session::getStart),
- of(SessionPatchDTO::getEnd, Session::getEnd));
+ of(SessionPatchDTO::getEnd, Session::getEndTime));
}
@Override
diff --git a/src/test/java/nl/tudelft/labracore/dto/view/DetailsTest.java b/src/test/java/nl/tudelft/labracore/dto/view/DetailsTest.java
index d8d8b9fae30cfca4f389f806c584a9d96027beb7..85fd0f15ef72f9e897804e0fb316ebaf5cdeaed3 100644
--- a/src/test/java/nl/tudelft/labracore/dto/view/DetailsTest.java
+++ b/src/test/java/nl/tudelft/labracore/dto/view/DetailsTest.java
@@ -24,14 +24,14 @@ import java.util.Collection;
import java.util.List;
import java.util.function.Function;
-import nl.tudelft.labracore.dto.view.structured.summary.AssignmentSummaryDTO;
-import nl.tudelft.labracore.model.Assignment;
-import nl.tudelft.librador.dto.view.View;
-
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
+import nl.tudelft.labracore.dto.view.structured.summary.AssignmentSummaryDTO;
+import nl.tudelft.labracore.model.Assignment;
+import nl.tudelft.librador.dto.view.View;
+
public abstract class DetailsTest<D, DTO extends View<D>> extends ViewTest<D, DTO> {
@Override
diff --git a/src/test/java/nl/tudelft/labracore/dto/view/SummaryTest.java b/src/test/java/nl/tudelft/labracore/dto/view/SummaryTest.java
index 6a0fe293c73d1b0b018bfe545237a0ea2ba5b48e..a81b94201e84883985df8f50370c4f36d60e399c 100644
--- a/src/test/java/nl/tudelft/labracore/dto/view/SummaryTest.java
+++ b/src/test/java/nl/tudelft/labracore/dto/view/SummaryTest.java
@@ -22,12 +22,12 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.List;
import java.util.function.Function;
-import nl.tudelft.librador.dto.view.View;
-
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
+import nl.tudelft.librador.dto.view.View;
+
public abstract class SummaryTest<D, DTO extends View<D>> extends ViewTest<D, DTO> {
@Override
diff --git a/src/test/java/nl/tudelft/labracore/dto/view/ViewTest.java b/src/test/java/nl/tudelft/labracore/dto/view/ViewTest.java
index b8a8908e31bfbfb4114168ed1829623715813400..6da7506e3d4fa3a301ed7688759222b265f53cd0 100644
--- a/src/test/java/nl/tudelft/labracore/dto/view/ViewTest.java
+++ b/src/test/java/nl/tudelft/labracore/dto/view/ViewTest.java
@@ -25,9 +25,6 @@ import java.util.function.Function;
import javax.transaction.Transactional;
-import nl.tudelft.labracore.TestLabracoreApplication;
-import nl.tudelft.librador.dto.view.View;
-
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.params.ParameterizedTest;
@@ -35,6 +32,9 @@ import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.springframework.boot.test.context.SpringBootTest;
+import nl.tudelft.labracore.TestLabracoreApplication;
+import nl.tudelft.librador.dto.view.View;
+
@Transactional
@SpringBootTest(classes = TestLabracoreApplication.class)
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
diff --git a/src/test/java/nl/tudelft/labracore/dto/view/details/AssignmentDetailsDTOTest.java b/src/test/java/nl/tudelft/labracore/dto/view/details/AssignmentDetailsDTOTest.java
index b876942e0f10fb9c781fbc2d2c6d7f5a8da63fee..1e973819c511c8d95311121aa7b74093a6bbd440 100644
--- a/src/test/java/nl/tudelft/labracore/dto/view/details/AssignmentDetailsDTOTest.java
+++ b/src/test/java/nl/tudelft/labracore/dto/view/details/AssignmentDetailsDTOTest.java
@@ -21,6 +21,8 @@ import java.time.LocalDateTime;
import java.util.List;
import java.util.Set;
+import org.junit.jupiter.params.provider.Arguments;
+
import nl.tudelft.labracore.dto.view.DetailsTest;
import nl.tudelft.labracore.dto.view.structured.details.AssignmentDetailsDTO;
import nl.tudelft.labracore.dto.view.structured.summary.ModuleSummaryDTO;
@@ -30,8 +32,6 @@ import nl.tudelft.labracore.model.*;
import nl.tudelft.labracore.model.Module;
import nl.tudelft.labracore.model.embeddable.Description;
-import org.junit.jupiter.params.provider.Arguments;
-
public class AssignmentDetailsDTOTest extends DetailsTest<Assignment, AssignmentDetailsDTO> {
@Override
protected Assignment filledData() {
diff --git a/src/test/java/nl/tudelft/labracore/dto/view/details/AssignmentModuleDetailsDTOTest.java b/src/test/java/nl/tudelft/labracore/dto/view/details/AssignmentModuleDetailsDTOTest.java
index 1e8390edb13bac1f8866c3bbcde1e23108725400..0e214440b669dd7109aa2531475721b4d1ac2245 100644
--- a/src/test/java/nl/tudelft/labracore/dto/view/details/AssignmentModuleDetailsDTOTest.java
+++ b/src/test/java/nl/tudelft/labracore/dto/view/details/AssignmentModuleDetailsDTOTest.java
@@ -20,6 +20,9 @@ package nl.tudelft.labracore.dto.view.details;
import java.util.List;
import java.util.Set;
+import org.junit.jupiter.params.provider.Arguments;
+import org.springframework.beans.factory.annotation.Autowired;
+
import nl.tudelft.labracore.dto.view.DetailsTest;
import nl.tudelft.labracore.dto.view.structured.details.AssignmentModuleDetailsDTO;
import nl.tudelft.labracore.dto.view.structured.layer1.ModuleLayer1DTO;
@@ -28,9 +31,6 @@ import nl.tudelft.labracore.model.Assignment;
import nl.tudelft.labracore.model.embeddable.Description;
import nl.tudelft.labracore.repository.AssignmentRepository;
-import org.junit.jupiter.params.provider.Arguments;
-import org.springframework.beans.factory.annotation.Autowired;
-
public class AssignmentModuleDetailsDTOTest extends DetailsTest<Assignment, AssignmentModuleDetailsDTO> {
@Autowired
private AssignmentRepository ar;
diff --git a/src/test/java/nl/tudelft/labracore/dto/view/details/EditionCollectionDetailsDTOTest.java b/src/test/java/nl/tudelft/labracore/dto/view/details/EditionCollectionDetailsDTOTest.java
index dd6159cf8b97be50fa627f5a126c0477872be675..3d46f679d42fad01a396faefd1e877574c93aea4 100644
--- a/src/test/java/nl/tudelft/labracore/dto/view/details/EditionCollectionDetailsDTOTest.java
+++ b/src/test/java/nl/tudelft/labracore/dto/view/details/EditionCollectionDetailsDTOTest.java
@@ -20,14 +20,14 @@ package nl.tudelft.labracore.dto.view.details;
import java.util.List;
import java.util.Set;
+import org.junit.jupiter.params.provider.Arguments;
+
import nl.tudelft.labracore.dto.view.DetailsTest;
import nl.tudelft.labracore.dto.view.structured.details.EditionCollectionDetailsDTO;
import nl.tudelft.labracore.dto.view.structured.summary.EditionSummaryDTO;
import nl.tudelft.labracore.model.Edition;
import nl.tudelft.labracore.model.EditionCollection;
-import org.junit.jupiter.params.provider.Arguments;
-
public class EditionCollectionDetailsDTOTest
extends DetailsTest<EditionCollection, EditionCollectionDetailsDTO> {
@Override
diff --git a/src/test/java/nl/tudelft/labracore/dto/view/details/EditionDetailsDTOTest.java b/src/test/java/nl/tudelft/labracore/dto/view/details/EditionDetailsDTOTest.java
index fa4c0ce862a84c7a1afb44ff8d8f8da311089603..029f45eb99a67eca98915ef3932019d9865c9332 100644
--- a/src/test/java/nl/tudelft/labracore/dto/view/details/EditionDetailsDTOTest.java
+++ b/src/test/java/nl/tudelft/labracore/dto/view/details/EditionDetailsDTOTest.java
@@ -20,6 +20,8 @@ package nl.tudelft.labracore.dto.view.details;
import java.util.List;
import java.util.Set;
+import org.junit.jupiter.params.provider.Arguments;
+
import nl.tudelft.labracore.dto.view.DetailsTest;
import nl.tudelft.labracore.dto.view.structured.details.EditionDetailsDTO;
import nl.tudelft.labracore.dto.view.structured.summary.*;
@@ -27,8 +29,6 @@ import nl.tudelft.labracore.enums.RoleType;
import nl.tudelft.labracore.model.*;
import nl.tudelft.labracore.model.Module;
-import org.junit.jupiter.params.provider.Arguments;
-
public class EditionDetailsDTOTest extends DetailsTest<Edition, EditionDetailsDTO> {
@Override
protected Edition filledData() {
diff --git a/src/test/java/nl/tudelft/labracore/dto/view/details/ModuleDetailsDTOTest.java b/src/test/java/nl/tudelft/labracore/dto/view/details/ModuleDetailsDTOTest.java
index a4a00cef74592b1f50ef66048412f6d715b71112..d3bcc46e57e4d006fc662b032dc938afd362dda8 100644
--- a/src/test/java/nl/tudelft/labracore/dto/view/details/ModuleDetailsDTOTest.java
+++ b/src/test/java/nl/tudelft/labracore/dto/view/details/ModuleDetailsDTOTest.java
@@ -20,14 +20,14 @@ package nl.tudelft.labracore.dto.view.details;
import java.util.List;
import java.util.Set;
+import org.junit.jupiter.params.provider.Arguments;
+
import nl.tudelft.labracore.dto.view.DetailsTest;
import nl.tudelft.labracore.dto.view.structured.details.ModuleDetailsDTO;
import nl.tudelft.labracore.dto.view.structured.summary.*;
import nl.tudelft.labracore.model.*;
import nl.tudelft.labracore.model.Module;
-import org.junit.jupiter.params.provider.Arguments;
-
public class ModuleDetailsDTOTest extends DetailsTest<Module, ModuleDetailsDTO> {
@Override
protected Module filledData() {
diff --git a/src/test/java/nl/tudelft/labracore/dto/view/details/RoleDetailsDTOTest.java b/src/test/java/nl/tudelft/labracore/dto/view/details/RoleDetailsDTOTest.java
index 9968988c576a693cbe4a2fd905fc558f607b4074..3acf066673b0d6cf197591b5fb2e62ae10e42712 100644
--- a/src/test/java/nl/tudelft/labracore/dto/view/details/RoleDetailsDTOTest.java
+++ b/src/test/java/nl/tudelft/labracore/dto/view/details/RoleDetailsDTOTest.java
@@ -19,6 +19,8 @@ package nl.tudelft.labracore.dto.view.details;
import java.util.List;
+import org.junit.jupiter.params.provider.Arguments;
+
import nl.tudelft.labracore.dto.view.DetailsTest;
import nl.tudelft.labracore.dto.view.structured.details.RoleDetailsDTO;
import nl.tudelft.labracore.dto.view.structured.summary.EditionSummaryDTO;
@@ -28,8 +30,6 @@ import nl.tudelft.labracore.model.Edition;
import nl.tudelft.labracore.model.Role;
import nl.tudelft.labracore.model.person.ConcretePerson;
-import org.junit.jupiter.params.provider.Arguments;
-
public class RoleDetailsDTOTest extends DetailsTest<Role, RoleDetailsDTO> {
@Override
protected Role filledData() {
diff --git a/src/test/java/nl/tudelft/labracore/dto/view/details/SessionDetailsDTOTest.java b/src/test/java/nl/tudelft/labracore/dto/view/details/SessionDetailsDTOTest.java
index 1f938e0ea3a53512c35933471dbb90394212b268..cf269e26a321525c1d852fa3592beab8575b2790 100644
--- a/src/test/java/nl/tudelft/labracore/dto/view/details/SessionDetailsDTOTest.java
+++ b/src/test/java/nl/tudelft/labracore/dto/view/details/SessionDetailsDTOTest.java
@@ -21,6 +21,8 @@ import java.time.LocalDateTime;
import java.util.List;
import java.util.Set;
+import org.junit.jupiter.params.provider.Arguments;
+
import nl.tudelft.labracore.dto.view.DetailsTest;
import nl.tudelft.labracore.dto.view.structured.details.RoomDetailsDTO;
import nl.tudelft.labracore.dto.view.structured.details.SessionDetailsDTO;
@@ -29,8 +31,6 @@ import nl.tudelft.labracore.dto.view.structured.summary.EditionCollectionSummary
import nl.tudelft.labracore.dto.view.structured.summary.EditionSummaryDTO;
import nl.tudelft.labracore.model.*;
-import org.junit.jupiter.params.provider.Arguments;
-
public abstract class SessionDetailsDTOTest extends DetailsTest<Session, SessionDetailsDTO> {
@Override
protected Class<? extends SessionDetailsDTO> targetClass() {
@@ -54,7 +54,7 @@ public abstract class SessionDetailsDTOTest extends DetailsTest<Session, Session
.description("djbasdjsa")
.name("jbdasjbdsa")
.start(LocalDateTime.now())
- .end(LocalDateTime.now().plusHours(3))
+ .endTime(LocalDateTime.now().plusHours(3))
.rooms(Set.of(
Room.builder().id(89231L).build(),
Room.builder().id(89232L).build()))
@@ -80,7 +80,7 @@ public abstract class SessionDetailsDTOTest extends DetailsTest<Session, Session
.description("djbasdjsa")
.name("jbdasjbdsa")
.start(LocalDateTime.now())
- .end(LocalDateTime.now().plusHours(3))
+ .endTime(LocalDateTime.now().plusHours(3))
.rooms(Set.of(
Room.builder().id(89231L).build(),
Room.builder().id(89232L).build()))
diff --git a/src/test/java/nl/tudelft/labracore/dto/view/layer1/RolePersonLayer1DTOTest.java b/src/test/java/nl/tudelft/labracore/dto/view/layer1/RolePersonLayer1DTOTest.java
index 685420209bb57dbd310e5fda5c0060fca2d6c5b5..ad375f47f93516f1a2fe129ea9aca6587f5d4066 100644
--- a/src/test/java/nl/tudelft/labracore/dto/view/layer1/RolePersonLayer1DTOTest.java
+++ b/src/test/java/nl/tudelft/labracore/dto/view/layer1/RolePersonLayer1DTOTest.java
@@ -19,6 +19,8 @@ package nl.tudelft.labracore.dto.view.layer1;
import java.util.List;
+import org.junit.jupiter.params.provider.Arguments;
+
import nl.tudelft.labracore.dto.view.DetailsTest;
import nl.tudelft.labracore.dto.view.structured.layer1.RolePersonLayer1DTO;
import nl.tudelft.labracore.dto.view.structured.summary.PersonSummaryDTO;
@@ -27,8 +29,6 @@ import nl.tudelft.labracore.model.Edition;
import nl.tudelft.labracore.model.Role;
import nl.tudelft.labracore.model.person.ConcretePerson;
-import org.junit.jupiter.params.provider.Arguments;
-
public class RolePersonLayer1DTOTest extends DetailsTest<Role, RolePersonLayer1DTO> {
@Override
protected Role filledData() {
diff --git a/src/test/java/nl/tudelft/labracore/dto/view/summary/AssignmentSummaryDTOTest.java b/src/test/java/nl/tudelft/labracore/dto/view/summary/AssignmentSummaryDTOTest.java
index 4bd7368ee392801a503041ecde113e66be1441b9..742fbfb07c2cb82a66397b1da1545e9d74d796c7 100644
--- a/src/test/java/nl/tudelft/labracore/dto/view/summary/AssignmentSummaryDTOTest.java
+++ b/src/test/java/nl/tudelft/labracore/dto/view/summary/AssignmentSummaryDTOTest.java
@@ -20,15 +20,15 @@ package nl.tudelft.labracore.dto.view.summary;
import java.util.List;
import java.util.Set;
+import org.junit.jupiter.params.provider.Arguments;
+import org.springframework.beans.factory.annotation.Autowired;
+
import nl.tudelft.labracore.dto.view.SummaryTest;
import nl.tudelft.labracore.dto.view.structured.summary.AssignmentSummaryDTO;
import nl.tudelft.labracore.model.Assignment;
import nl.tudelft.labracore.model.embeddable.Description;
import nl.tudelft.labracore.repository.AssignmentRepository;
-import org.junit.jupiter.params.provider.Arguments;
-import org.springframework.beans.factory.annotation.Autowired;
-
public class AssignmentSummaryDTOTest extends SummaryTest<Assignment, AssignmentSummaryDTO> {
@Autowired
private AssignmentRepository ar;
diff --git a/src/test/java/nl/tudelft/labracore/dto/view/summary/EditionCollectionSummaryDTOTest.java b/src/test/java/nl/tudelft/labracore/dto/view/summary/EditionCollectionSummaryDTOTest.java
index f2baf2a83210fec7442f027aa4581379f3e2ac79..d51e55939e870a5bc24451112e0911178793de08 100644
--- a/src/test/java/nl/tudelft/labracore/dto/view/summary/EditionCollectionSummaryDTOTest.java
+++ b/src/test/java/nl/tudelft/labracore/dto/view/summary/EditionCollectionSummaryDTOTest.java
@@ -22,14 +22,14 @@ import static java.time.LocalDateTime.now;
import java.util.List;
import java.util.Set;
+import org.junit.jupiter.params.provider.Arguments;
+
import nl.tudelft.labracore.dto.view.SummaryTest;
import nl.tudelft.labracore.dto.view.structured.summary.EditionCollectionSummaryDTO;
import nl.tudelft.labracore.model.Edition;
import nl.tudelft.labracore.model.EditionCollection;
import nl.tudelft.labracore.model.SharedSession;
-import org.junit.jupiter.params.provider.Arguments;
-
public class EditionCollectionSummaryDTOTest
extends SummaryTest<EditionCollection, EditionCollectionSummaryDTO> {
@Override
diff --git a/src/test/java/nl/tudelft/labracore/dto/view/summary/EditionSummaryDTOTest.java b/src/test/java/nl/tudelft/labracore/dto/view/summary/EditionSummaryDTOTest.java
index f97f12cb424cb7172d141e0807d915b8ca54518d..4372c59597b051c4517873f8f173ce6bca8b8088 100644
--- a/src/test/java/nl/tudelft/labracore/dto/view/summary/EditionSummaryDTOTest.java
+++ b/src/test/java/nl/tudelft/labracore/dto/view/summary/EditionSummaryDTOTest.java
@@ -20,13 +20,13 @@ package nl.tudelft.labracore.dto.view.summary;
import java.time.LocalDateTime;
import java.util.List;
+import org.junit.jupiter.params.provider.Arguments;
+
import nl.tudelft.labracore.dto.view.SummaryTest;
import nl.tudelft.labracore.dto.view.structured.summary.EditionSummaryDTO;
import nl.tudelft.labracore.enums.EnrollabilityStatus;
import nl.tudelft.labracore.model.Edition;
-import org.junit.jupiter.params.provider.Arguments;
-
public class EditionSummaryDTOTest extends SummaryTest<Edition, EditionSummaryDTO> {
@Override
diff --git a/src/test/java/nl/tudelft/labracore/dto/view/summary/PersonSummaryDTOTest.java b/src/test/java/nl/tudelft/labracore/dto/view/summary/PersonSummaryDTOTest.java
index 54a20ea2c4e8ce39ce97111c4191fce5b2e02ddc..5b06ba8de344db1cc8a27d1679d59d01ecdc5f58 100644
--- a/src/test/java/nl/tudelft/labracore/dto/view/summary/PersonSummaryDTOTest.java
+++ b/src/test/java/nl/tudelft/labracore/dto/view/summary/PersonSummaryDTOTest.java
@@ -19,14 +19,14 @@ package nl.tudelft.labracore.dto.view.summary;
import java.util.List;
+import org.junit.jupiter.params.provider.Arguments;
+
import nl.tudelft.labracore.dto.view.SummaryTest;
import nl.tudelft.labracore.dto.view.structured.summary.PersonSummaryDTO;
import nl.tudelft.labracore.enums.RoleType;
import nl.tudelft.labracore.model.Person;
import nl.tudelft.labracore.model.person.ConcretePerson;
-import org.junit.jupiter.params.provider.Arguments;
-
public class PersonSummaryDTOTest extends SummaryTest<Person, PersonSummaryDTO> {
@Override
protected Person filledData() {
diff --git a/src/test/java/nl/tudelft/labracore/dto/view/summary/RoleSummaryDTOTest.java b/src/test/java/nl/tudelft/labracore/dto/view/summary/RoleSummaryDTOTest.java
index 7c7ce98a418ab0b60e58740d6f7c21c3a74fe669..640b19c0c8cb82008fb75db30f67f85460d60a9b 100644
--- a/src/test/java/nl/tudelft/labracore/dto/view/summary/RoleSummaryDTOTest.java
+++ b/src/test/java/nl/tudelft/labracore/dto/view/summary/RoleSummaryDTOTest.java
@@ -19,6 +19,8 @@ package nl.tudelft.labracore.dto.view.summary;
import java.util.List;
+import org.junit.jupiter.params.provider.Arguments;
+
import nl.tudelft.labracore.dto.view.SummaryTest;
import nl.tudelft.labracore.dto.view.structured.summary.RoleSummaryDTO;
import nl.tudelft.labracore.enums.RoleType;
@@ -26,8 +28,6 @@ import nl.tudelft.labracore.model.Edition;
import nl.tudelft.labracore.model.Role;
import nl.tudelft.labracore.model.person.ConcretePerson;
-import org.junit.jupiter.params.provider.Arguments;
-
public class RoleSummaryDTOTest extends SummaryTest<Role, RoleSummaryDTO> {
@Override
protected Role filledData() {
diff --git a/src/test/java/nl/tudelft/labracore/dto/view/summary/SessionSummaryDTOTest.java b/src/test/java/nl/tudelft/labracore/dto/view/summary/SessionSummaryDTOTest.java
index ca40e58ca8ee0cc5509d02ebeab0321cf20142d8..279998823e40507fe227ccb69a8b6b44e2dc1816 100644
--- a/src/test/java/nl/tudelft/labracore/dto/view/summary/SessionSummaryDTOTest.java
+++ b/src/test/java/nl/tudelft/labracore/dto/view/summary/SessionSummaryDTOTest.java
@@ -20,19 +20,19 @@ package nl.tudelft.labracore.dto.view.summary;
import java.time.LocalDateTime;
import java.util.List;
+import org.junit.jupiter.params.provider.Arguments;
+
import nl.tudelft.labracore.dto.view.SummaryTest;
import nl.tudelft.labracore.dto.view.structured.summary.SessionSummaryDTO;
import nl.tudelft.labracore.model.Session;
import nl.tudelft.labracore.model.SingleSession;
-import org.junit.jupiter.params.provider.Arguments;
-
public class SessionSummaryDTOTest extends SummaryTest<Session, SessionSummaryDTO> {
@Override
protected Session filledData() {
return SingleSession.builder()
.start(LocalDateTime.now())
- .end(LocalDateTime.now().plusHours(4))
+ .endTime(LocalDateTime.now().plusHours(4))
.id(78323L)
.name("djsabdjbas")
.description("jkbdasjkhbdjbsa")
@@ -48,7 +48,7 @@ public class SessionSummaryDTOTest extends SummaryTest<Session, SessionSummaryDT
protected List<Arguments> getters() {
return List.of(
of(SessionSummaryDTO::getDescription, Session::getDescription),
- of(SessionSummaryDTO::getEnd, Session::getEnd),
+ of(SessionSummaryDTO::getEndTime, Session::getEndTime),
of(SessionSummaryDTO::getId, Session::getId),
of(SessionSummaryDTO::getName, Session::getName),
of(SessionSummaryDTO::getStart, Session::getStart));
diff --git a/src/test/java/nl/tudelft/labracore/dto/view/summary/StudentGroupSmallSummaryDTOTest.java b/src/test/java/nl/tudelft/labracore/dto/view/summary/StudentGroupSmallSummaryDTOTest.java
index 415101466eab8167b563425e6ff9cd4c7333a635..aa3acba4dad65d92bb89b496b893c4d5918d8f4a 100644
--- a/src/test/java/nl/tudelft/labracore/dto/view/summary/StudentGroupSmallSummaryDTOTest.java
+++ b/src/test/java/nl/tudelft/labracore/dto/view/summary/StudentGroupSmallSummaryDTOTest.java
@@ -19,14 +19,14 @@ package nl.tudelft.labracore.dto.view.summary;
import java.util.List;
+import org.junit.jupiter.params.provider.Arguments;
+import org.springframework.beans.factory.annotation.Autowired;
+
import nl.tudelft.labracore.dto.view.SummaryTest;
import nl.tudelft.labracore.dto.view.structured.summary.StudentGroupSmallSummaryDTO;
import nl.tudelft.labracore.model.StudentGroup;
import nl.tudelft.labracore.repository.AssignmentRepository;
-import org.junit.jupiter.params.provider.Arguments;
-import org.springframework.beans.factory.annotation.Autowired;
-
public class StudentGroupSmallSummaryDTOTest extends SummaryTest<StudentGroup, StudentGroupSmallSummaryDTO> {
@Autowired
private AssignmentRepository ar;
diff --git a/src/test/java/nl/tudelft/labracore/model/RoleTest.java b/src/test/java/nl/tudelft/labracore/model/RoleTest.java
index 2854872d53989e25a147c98b0fa0c607f570c1da..1b935482eaa63dba53141affe82240b6b494ee31 100644
--- a/src/test/java/nl/tudelft/labracore/model/RoleTest.java
+++ b/src/test/java/nl/tudelft/labracore/model/RoleTest.java
@@ -20,15 +20,15 @@ package nl.tudelft.labracore.model;
import static nl.tudelft.labracore.enums.RoleType.STUDENT;
import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.Test;
+import org.modelmapper.ModelMapper;
+import org.springframework.boot.test.context.SpringBootTest;
+
import nl.tudelft.labracore.TestLabracoreApplication;
import nl.tudelft.labracore.dto.view.structured.summary.RoleSummaryDTO;
import nl.tudelft.labracore.model.person.ConcretePerson;
import nl.tudelft.librador.dto.view.View;
-import org.junit.jupiter.api.Test;
-import org.modelmapper.ModelMapper;
-import org.springframework.boot.test.context.SpringBootTest;
-
@SpringBootTest(classes = TestLabracoreApplication.class)
public class RoleTest {
diff --git a/src/test/java/nl/tudelft/labracore/model/TwoFATest.java b/src/test/java/nl/tudelft/labracore/model/TwoFATest.java
index 5037b9dce2f2c0b23af985b736d99ea21e3c20e4..3823e98f8f05a2fb7174096018a05bdb9ffc97a5 100644
--- a/src/test/java/nl/tudelft/labracore/model/TwoFATest.java
+++ b/src/test/java/nl/tudelft/labracore/model/TwoFATest.java
@@ -21,6 +21,10 @@ import static org.assertj.core.api.Assertions.assertThat;
import javax.transaction.Transactional;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
import nl.tudelft.labracore.TestLabracoreApplication;
import nl.tudelft.labracore.enums.RoleType;
import nl.tudelft.labracore.model.person.ConcretePerson;
@@ -29,10 +33,6 @@ import nl.tudelft.labracore.repository.PersonRepository;
import nl.tudelft.labracore.repository.TOTPKeyRepository;
import nl.tudelft.labracore.test.TestDatabaseLoader;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
@SpringBootTest(classes = TestLabracoreApplication.class)
@Transactional
public class TwoFATest {
diff --git a/src/test/java/nl/tudelft/labracore/security/AuthorizationServiceTest.java b/src/test/java/nl/tudelft/labracore/security/AuthorizationServiceTest.java
index b942703a2faf254afa73ec641aef7808166ef0a3..f7ff301be57eda33b09c3445e23cd139ec016c8b 100644
--- a/src/test/java/nl/tudelft/labracore/security/AuthorizationServiceTest.java
+++ b/src/test/java/nl/tudelft/labracore/security/AuthorizationServiceTest.java
@@ -27,16 +27,16 @@ import java.util.stream.Collectors;
import javax.transaction.Transactional;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
import nl.tudelft.labracore.TestLabracoreApplication;
import nl.tudelft.labracore.model.Course;
import nl.tudelft.labracore.model.Person;
import nl.tudelft.labracore.repository.PersonRepository;
import nl.tudelft.labracore.test.TestDatabaseLoader;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
@Transactional
@SpringBootTest(classes = TestLabracoreApplication.class)
class AuthorizationServiceTest {
diff --git a/src/test/java/nl/tudelft/labracore/security/api/APIUserDetailsServiceTest.java b/src/test/java/nl/tudelft/labracore/security/api/APIUserDetailsServiceTest.java
index f2dcdae0d0c0c2507aa1aaa25dbb3edba5fc3b39..af65138269d3bd5c1ea29a0ec9b7369115c6f4cf 100644
--- a/src/test/java/nl/tudelft/labracore/security/api/APIUserDetailsServiceTest.java
+++ b/src/test/java/nl/tudelft/labracore/security/api/APIUserDetailsServiceTest.java
@@ -28,13 +28,6 @@ import java.util.stream.Collectors;
import javax.transaction.Transactional;
-import nl.tudelft.labracore.TestLabracoreApplication;
-import nl.tudelft.labracore.model.person.ConcretePerson;
-import nl.tudelft.labracore.model.security.APIKey;
-import nl.tudelft.labracore.repository.APIKeyRepository;
-import nl.tudelft.labracore.repository.ConcretePersonRepository;
-import nl.tudelft.labracore.test.TestDatabaseLoader;
-
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +36,13 @@ import org.springframework.security.core.AuthenticationException;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken;
+import nl.tudelft.labracore.TestLabracoreApplication;
+import nl.tudelft.labracore.model.person.ConcretePerson;
+import nl.tudelft.labracore.model.security.APIKey;
+import nl.tudelft.labracore.repository.APIKeyRepository;
+import nl.tudelft.labracore.repository.ConcretePersonRepository;
+import nl.tudelft.labracore.test.TestDatabaseLoader;
+
@Transactional
@SpringBootTest(classes = TestLabracoreApplication.class)
public class APIUserDetailsServiceTest {
diff --git a/src/test/java/nl/tudelft/labracore/security/api/APIUserDetailsTest.java b/src/test/java/nl/tudelft/labracore/security/api/APIUserDetailsTest.java
index 6446fc2a022ec98c99710937fe8f7894559e0e16..e2e1ff35e47aac48cab4f79b699be059acb495af 100644
--- a/src/test/java/nl/tudelft/labracore/security/api/APIUserDetailsTest.java
+++ b/src/test/java/nl/tudelft/labracore/security/api/APIUserDetailsTest.java
@@ -23,11 +23,11 @@ import static org.mockito.Mockito.*;
import java.time.LocalDateTime;
import java.util.Collections;
-import nl.tudelft.labracore.model.security.APIKey;
-
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import nl.tudelft.labracore.model.security.APIKey;
+
public class APIUserDetailsTest {
private APIKey key;
diff --git a/src/test/java/nl/tudelft/labracore/security/api/APIUserDetailsWithPersonTest.java b/src/test/java/nl/tudelft/labracore/security/api/APIUserDetailsWithPersonTest.java
index 82ebda3f1b55ec780f9cd6a317712244273d2162..6b6a5f7dbab0588453e010577233740ad28419e2 100644
--- a/src/test/java/nl/tudelft/labracore/security/api/APIUserDetailsWithPersonTest.java
+++ b/src/test/java/nl/tudelft/labracore/security/api/APIUserDetailsWithPersonTest.java
@@ -24,12 +24,12 @@ import static org.mockito.Mockito.when;
import java.util.Collections;
-import nl.tudelft.labracore.model.person.ConcretePerson;
-import nl.tudelft.labracore.model.security.APIKey;
-
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import nl.tudelft.labracore.model.person.ConcretePerson;
+import nl.tudelft.labracore.model.security.APIKey;
+
public class APIUserDetailsWithPersonTest {
private APIKey key;
diff --git a/src/test/java/nl/tudelft/labracore/service/APIKeyServiceTest.java b/src/test/java/nl/tudelft/labracore/service/APIKeyServiceTest.java
index e3b3ba082d1332c9f76ae3393711935681460e6d..aed6097d5e4c55b559f9e6dee4b975b78046c398 100644
--- a/src/test/java/nl/tudelft/labracore/service/APIKeyServiceTest.java
+++ b/src/test/java/nl/tudelft/labracore/service/APIKeyServiceTest.java
@@ -24,18 +24,18 @@ import java.util.Set;
import javax.transaction.Transactional;
-import nl.tudelft.labracore.TestLabracoreApplication;
-import nl.tudelft.labracore.model.Person;
-import nl.tudelft.labracore.model.security.APIKey;
-import nl.tudelft.labracore.repository.APIKeyRepository;
-import nl.tudelft.labracore.test.TestDatabaseLoader;
-
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
+import nl.tudelft.labracore.TestLabracoreApplication;
+import nl.tudelft.labracore.model.Person;
+import nl.tudelft.labracore.model.security.APIKey;
+import nl.tudelft.labracore.repository.APIKeyRepository;
+import nl.tudelft.labracore.test.TestDatabaseLoader;
+
@Transactional
@SpringBootTest(classes = TestLabracoreApplication.class)
@AutoConfigureMockMvc
diff --git a/src/test/java/nl/tudelft/labracore/service/AssignmentServiceTest.java b/src/test/java/nl/tudelft/labracore/service/AssignmentServiceTest.java
index 68a76d10ec2377b9b75b48e0ce0355241fad6c65..36b5c12ede7a9e31275746f79f5b69f8c9b16822 100644
--- a/src/test/java/nl/tudelft/labracore/service/AssignmentServiceTest.java
+++ b/src/test/java/nl/tudelft/labracore/service/AssignmentServiceTest.java
@@ -23,16 +23,16 @@ import java.util.List;
import javax.transaction.Transactional;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
import nl.tudelft.labracore.TestLabracoreApplication;
import nl.tudelft.labracore.dto.view.structured.summary.AssignmentSummaryDTO;
import nl.tudelft.labracore.model.Module;
import nl.tudelft.labracore.test.TestDatabaseLoader;
import nl.tudelft.librador.dto.view.View;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
@Transactional
@SpringBootTest(classes = TestLabracoreApplication.class)
class AssignmentServiceTest {
diff --git a/src/test/java/nl/tudelft/labracore/service/ClusterServiceTest.java b/src/test/java/nl/tudelft/labracore/service/ClusterServiceTest.java
index 1fc5a5dffccb20bbce9c3fd01acf3399b9d3a2b9..0fcc56839ae0b2f3b38d0c839b4a85e22263deb2 100644
--- a/src/test/java/nl/tudelft/labracore/service/ClusterServiceTest.java
+++ b/src/test/java/nl/tudelft/labracore/service/ClusterServiceTest.java
@@ -23,6 +23,10 @@ import java.util.List;
import javax.transaction.Transactional;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
import nl.tudelft.labracore.TestLabracoreApplication;
import nl.tudelft.labracore.model.Cluster;
import nl.tudelft.labracore.model.Person;
@@ -30,10 +34,6 @@ import nl.tudelft.labracore.repository.ClusterRepository;
import nl.tudelft.labracore.repository.PersonRepository;
import nl.tudelft.labracore.test.TestDatabaseLoader;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
@Transactional
@SpringBootTest(classes = TestLabracoreApplication.class)
class ClusterServiceTest {
diff --git a/src/test/java/nl/tudelft/labracore/service/CohortServiceTest.java b/src/test/java/nl/tudelft/labracore/service/CohortServiceTest.java
index 6b738f8413d8e752e9cccbc74a55834d6fc8316f..1f1924d80e53f2f421c4d3f30c912bc87f93a3b7 100644
--- a/src/test/java/nl/tudelft/labracore/service/CohortServiceTest.java
+++ b/src/test/java/nl/tudelft/labracore/service/CohortServiceTest.java
@@ -26,6 +26,10 @@ import java.util.stream.Collectors;
import javax.transaction.Transactional;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
import nl.tudelft.labracore.TestLabracoreApplication;
import nl.tudelft.labracore.dto.helper.ClusterImportDTO;
import nl.tudelft.labracore.model.Cluster;
@@ -36,10 +40,6 @@ import nl.tudelft.labracore.repository.CohortRepository;
import nl.tudelft.labracore.repository.PersonRepository;
import nl.tudelft.labracore.test.TestDatabaseLoader;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
@Transactional
@SpringBootTest(classes = TestLabracoreApplication.class)
class CohortServiceTest {
@@ -93,7 +93,7 @@ class CohortServiceTest {
assertThat(clusters.stream()
.flatMap(cluster -> cluster.getPeople().stream().map(Person::getUsername))
.collect(Collectors.toList()))
- .containsExactlyInAnyOrder(db.getIronMan().getUsername(),
- db.getCAmerica().getUsername(), db.getBlackPanther().getUsername());
+ .containsExactlyInAnyOrder(db.getIronMan().getUsername(),
+ db.getCAmerica().getUsername(), db.getBlackPanther().getUsername());
}
}
diff --git a/src/test/java/nl/tudelft/labracore/service/CourseServiceTest.java b/src/test/java/nl/tudelft/labracore/service/CourseServiceTest.java
index b0740a906ef204adf9c92252d5ca56a9c35c0f2a..4b8c3f00f325214f154f58b22ffbbdcce4f4e2a4 100644
--- a/src/test/java/nl/tudelft/labracore/service/CourseServiceTest.java
+++ b/src/test/java/nl/tudelft/labracore/service/CourseServiceTest.java
@@ -20,6 +20,12 @@ package nl.tudelft.labracore.service;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.transaction.annotation.Transactional;
+
import nl.tudelft.labracore.TestLabracoreApplication;
import nl.tudelft.labracore.dto.view.structured.details.CourseDetailsDTO;
import nl.tudelft.labracore.dto.view.structured.summary.CourseSummaryDTO;
@@ -28,12 +34,6 @@ import nl.tudelft.labracore.repository.ProgramRepository;
import nl.tudelft.labracore.test.TestDatabaseLoader;
import nl.tudelft.librador.dto.view.View;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.rest.webmvc.ResourceNotFoundException;
-import org.springframework.transaction.annotation.Transactional;
-
@SpringBootTest(classes = TestLabracoreApplication.class)
@Transactional
public class CourseServiceTest {
diff --git a/src/test/java/nl/tudelft/labracore/service/DBLoaderServiceTest.java b/src/test/java/nl/tudelft/labracore/service/DBLoaderServiceTest.java
index 02f46d9c5f922502eacec6a791c2bb34a05d30ac..7814cb079411d631312339680a9df60908c31492 100644
--- a/src/test/java/nl/tudelft/labracore/service/DBLoaderServiceTest.java
+++ b/src/test/java/nl/tudelft/labracore/service/DBLoaderServiceTest.java
@@ -24,6 +24,10 @@ import java.util.stream.Collectors;
import javax.transaction.Transactional;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
import nl.tudelft.labracore.TestLabracoreApplication;
import nl.tudelft.labracore.enums.RoleType;
import nl.tudelft.labracore.model.Role;
@@ -31,10 +35,6 @@ import nl.tudelft.labracore.model.Submission;
import nl.tudelft.labracore.repository.RoleRepository;
import nl.tudelft.labracore.test.TestDatabaseLoader;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
@Transactional
@SpringBootTest(classes = TestLabracoreApplication.class)
class DBLoaderServiceTest {
diff --git a/src/test/java/nl/tudelft/labracore/service/EditionServiceTest.java b/src/test/java/nl/tudelft/labracore/service/EditionServiceTest.java
index 212e23fdced29f35d447f376a77523061a01add4..b6bf3633392c4f0e5a1899f3420dc266f4bba87c 100644
--- a/src/test/java/nl/tudelft/labracore/service/EditionServiceTest.java
+++ b/src/test/java/nl/tudelft/labracore/service/EditionServiceTest.java
@@ -27,6 +27,11 @@ import java.util.stream.Collectors;
import javax.transaction.Transactional;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+
import nl.tudelft.labracore.TestLabracoreApplication;
import nl.tudelft.labracore.dto.view.structured.details.EditionDetailsDTO;
import nl.tudelft.labracore.enums.ParticipantsImportError;
@@ -39,11 +44,6 @@ import nl.tudelft.labracore.repository.RoleRepository;
import nl.tudelft.labracore.test.TestDatabaseLoader;
import nl.tudelft.librador.dto.view.View;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.rest.webmvc.ResourceNotFoundException;
-
@Transactional
@SpringBootTest(classes = TestLabracoreApplication.class)
class EditionServiceTest {
diff --git a/src/test/java/nl/tudelft/labracore/service/GradeServiceTest.java b/src/test/java/nl/tudelft/labracore/service/GradeServiceTest.java
index 9b415a0eff38db3878c026df5caddd5668bb7531..a635e6b3ee5d2f8a96693004a3291d9640b6fed8 100644
--- a/src/test/java/nl/tudelft/labracore/service/GradeServiceTest.java
+++ b/src/test/java/nl/tudelft/labracore/service/GradeServiceTest.java
@@ -24,6 +24,11 @@ import java.util.List;
import javax.transaction.Transactional;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
import nl.tudelft.labracore.TestLabracoreApplication;
import nl.tudelft.labracore.dto.create.GradeBatchImportDTO;
import nl.tudelft.labracore.dto.create.GradeImportDTO;
@@ -35,11 +40,6 @@ import nl.tudelft.labracore.repository.StudentGroupRepository;
import nl.tudelft.labracore.repository.SubmissionRepository;
import nl.tudelft.labracore.test.TestDatabaseLoader;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
@Transactional
@SpringBootTest(classes = TestLabracoreApplication.class)
class GradeServiceTest {
diff --git a/src/test/java/nl/tudelft/labracore/service/ModuleDivisionServiceTest.java b/src/test/java/nl/tudelft/labracore/service/ModuleDivisionServiceTest.java
index 6c560459365e7a51203266fd9dd0ad57a88ee6aa..08f33b7d2e9d312ce0b596ba2bce0f335389d2e2 100644
--- a/src/test/java/nl/tudelft/labracore/service/ModuleDivisionServiceTest.java
+++ b/src/test/java/nl/tudelft/labracore/service/ModuleDivisionServiceTest.java
@@ -27,6 +27,12 @@ import java.util.stream.Collectors;
import javax.transaction.Transactional;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import com.google.common.collect.Sets;
+
import nl.tudelft.labracore.TestLabracoreApplication;
import nl.tudelft.labracore.dto.create.ModuleDivisionCreateDTO;
import nl.tudelft.labracore.dto.view.structured.details.ModuleDivisionDetailsDTO;
@@ -41,12 +47,6 @@ import nl.tudelft.labracore.repository.PersonRepository;
import nl.tudelft.labracore.test.TestDatabaseLoader;
import nl.tudelft.librador.dto.view.View;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import com.google.common.collect.Sets;
-
@Transactional
@SpringBootTest(classes = TestLabracoreApplication.class)
class ModuleDivisionServiceTest {
@@ -153,7 +153,8 @@ class ModuleDivisionServiceTest {
assertThat(
divs.get(i).getPeople().stream()
.map(Person::getUsername)
- .collect(Collectors.toList())).containsAll(clusters.get(i));
+ .collect(Collectors.toList()))
+ .containsAll(clusters.get(i));
}
}
@@ -179,7 +180,8 @@ class ModuleDivisionServiceTest {
assertThat(
divs.get(i).getPeople().stream()
.map(Person::getUsername)
- .collect(Collectors.toList())).containsAll(clusters.get(i));
+ .collect(Collectors.toList()))
+ .containsAll(clusters.get(i));
}
assertThat(divs.get(divs.size() - 1).getPeople().size()).isEqualTo(0);
diff --git a/src/test/java/nl/tudelft/labracore/service/PersonServiceTest.java b/src/test/java/nl/tudelft/labracore/service/PersonServiceTest.java
index 527d1ae422feaa3984cf2c2a8d71c8407ae24ccf..d9f11bcdcd37ceab77b8c20e115f34a33ef457ba 100644
--- a/src/test/java/nl/tudelft/labracore/service/PersonServiceTest.java
+++ b/src/test/java/nl/tudelft/labracore/service/PersonServiceTest.java
@@ -27,6 +27,11 @@ import java.util.Set;
import javax.transaction.Transactional;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
import nl.tudelft.labracore.TestLabracoreApplication;
import nl.tudelft.labracore.enums.GradeScheme;
import nl.tudelft.labracore.enums.RoleType;
@@ -38,11 +43,6 @@ import nl.tudelft.labracore.model.person.UsernameOnlyPerson;
import nl.tudelft.labracore.repository.*;
import nl.tudelft.labracore.test.TestDatabaseLoader;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
@Transactional
@SpringBootTest(classes = TestLabracoreApplication.class)
public class PersonServiceTest {
diff --git a/src/test/java/nl/tudelft/labracore/service/ProgramServiceTest.java b/src/test/java/nl/tudelft/labracore/service/ProgramServiceTest.java
index 788e8de9b18769fde06ef52508b84fa984e5a3ff..c2331e4cd9b7d45e8caf76ae6720d93908d82d05 100644
--- a/src/test/java/nl/tudelft/labracore/service/ProgramServiceTest.java
+++ b/src/test/java/nl/tudelft/labracore/service/ProgramServiceTest.java
@@ -21,14 +21,14 @@ import static org.assertj.core.api.Assertions.assertThat;
import javax.transaction.Transactional;
-import nl.tudelft.labracore.TestLabracoreApplication;
-import nl.tudelft.labracore.repository.ProgramRepository;
-import nl.tudelft.labracore.test.TestDatabaseLoader;
-
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
+import nl.tudelft.labracore.TestLabracoreApplication;
+import nl.tudelft.labracore.repository.ProgramRepository;
+import nl.tudelft.labracore.test.TestDatabaseLoader;
+
@Transactional
@SpringBootTest(classes = TestLabracoreApplication.class)
class ProgramServiceTest {
diff --git a/src/test/java/nl/tudelft/labracore/service/QuestionServiceTest.java b/src/test/java/nl/tudelft/labracore/service/QuestionServiceTest.java
index 561d68d3d1326a26751f28118586cb1b8d51ae2c..f099723430d38248250746c640e91dc0b04c9bb6 100644
--- a/src/test/java/nl/tudelft/labracore/service/QuestionServiceTest.java
+++ b/src/test/java/nl/tudelft/labracore/service/QuestionServiceTest.java
@@ -24,6 +24,13 @@ import static org.mockito.Mockito.verify;
import javax.transaction.Transactional;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.web.client.RestTemplate;
+
import nl.tudelft.labracore.TestLabracoreApplication;
import nl.tudelft.labracore.dto.create.QuestionCreateDTO;
import nl.tudelft.labracore.dto.id.EditionIdDTO;
@@ -33,13 +40,6 @@ import nl.tudelft.labracore.properties.ElasticProperties;
import nl.tudelft.labracore.repository.QuestionRepository;
import nl.tudelft.labracore.test.TestDatabaseLoader;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mock;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.web.client.RestTemplate;
-
@Transactional
@SpringBootTest(classes = TestLabracoreApplication.class)
class QuestionServiceTest {
diff --git a/src/test/java/nl/tudelft/labracore/service/RoleServiceTest.java b/src/test/java/nl/tudelft/labracore/service/RoleServiceTest.java
index 5e0738ba8dff9a21c0b7c87254dc170565f11bce..2a0c73fd87ce41396bcb258d13b40fd3d70cde94 100644
--- a/src/test/java/nl/tudelft/labracore/service/RoleServiceTest.java
+++ b/src/test/java/nl/tudelft/labracore/service/RoleServiceTest.java
@@ -23,15 +23,15 @@ import java.util.Set;
import javax.transaction.Transactional;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
import nl.tudelft.labracore.TestLabracoreApplication;
import nl.tudelft.labracore.model.StudentGroup;
import nl.tudelft.labracore.repository.StudentGroupRepository;
import nl.tudelft.labracore.test.TestDatabaseLoader;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
@Transactional
@SpringBootTest(classes = TestLabracoreApplication.class)
class RoleServiceTest {
diff --git a/src/test/java/nl/tudelft/labracore/service/StudentGroupServiceTest.java b/src/test/java/nl/tudelft/labracore/service/StudentGroupServiceTest.java
index 31693b608177e6cf227a9108fff3f5bd01236fdc..b105b08852745f94feae32e85a645cc41b7e92ac 100644
--- a/src/test/java/nl/tudelft/labracore/service/StudentGroupServiceTest.java
+++ b/src/test/java/nl/tudelft/labracore/service/StudentGroupServiceTest.java
@@ -27,6 +27,10 @@ import java.util.Set;
import javax.transaction.Transactional;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
import nl.tudelft.labracore.TestLabracoreApplication;
import nl.tudelft.labracore.dto.view.structured.details.StudentGroupDetailsDTO;
import nl.tudelft.labracore.dto.view.structured.summary.RoleSummaryDTO;
@@ -38,10 +42,6 @@ import nl.tudelft.labracore.repository.StudentGroupRepository;
import nl.tudelft.labracore.test.TestDatabaseLoader;
import nl.tudelft.librador.dto.view.View;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
@Transactional
@SpringBootTest(classes = TestLabracoreApplication.class)
class StudentGroupServiceTest {
@@ -190,7 +190,7 @@ class StudentGroupServiceTest {
assertThat(sgs.getRoleOfMember(
dbLoader.getHawkeye().getId(),
dbLoader.getBattle_g1().getId()))
- .isEqualTo(View.convert(dbLoader.getHawkeyeRoleNY(), RoleSummaryDTO.class));
+ .isEqualTo(View.convert(dbLoader.getHawkeyeRoleNY(), RoleSummaryDTO.class));
}
@Test
diff --git a/src/test/java/nl/tudelft/labracore/service/SubmissionServiceTest.java b/src/test/java/nl/tudelft/labracore/service/SubmissionServiceTest.java
index 1cc039d45dc93674a899edf1bf03ed9542f8f49d..6df8086bff5aa90d6d91d6eb3bc5af3b34c625e5 100644
--- a/src/test/java/nl/tudelft/labracore/service/SubmissionServiceTest.java
+++ b/src/test/java/nl/tudelft/labracore/service/SubmissionServiceTest.java
@@ -21,18 +21,18 @@ import static org.assertj.core.api.Assertions.assertThat;
import javax.transaction.Transactional;
-import nl.tudelft.labracore.TestLabracoreApplication;
-import nl.tudelft.labracore.model.Assignment;
-import nl.tudelft.labracore.model.StudentGroup;
-import nl.tudelft.labracore.repository.AssignmentRepository;
-import nl.tudelft.labracore.test.TestDatabaseLoader;
-
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
+import nl.tudelft.labracore.TestLabracoreApplication;
+import nl.tudelft.labracore.model.Assignment;
+import nl.tudelft.labracore.model.StudentGroup;
+import nl.tudelft.labracore.repository.AssignmentRepository;
+import nl.tudelft.labracore.test.TestDatabaseLoader;
+
@Transactional
@SpringBootTest(classes = TestLabracoreApplication.class)
public class SubmissionServiceTest {
diff --git a/src/test/java/nl/tudelft/labracore/test/MockUserDetailsService.java b/src/test/java/nl/tudelft/labracore/test/MockUserDetailsService.java
index a5b409392f1e5365d7f6b1689289039b6c134337..69280af838a4594c3106b17a70032d1ec93287ea 100644
--- a/src/test/java/nl/tudelft/labracore/test/MockUserDetailsService.java
+++ b/src/test/java/nl/tudelft/labracore/test/MockUserDetailsService.java
@@ -19,13 +19,6 @@ package nl.tudelft.labracore.test;
import java.util.stream.Collectors;
-import nl.tudelft.labracore.model.person.ConcretePerson;
-import nl.tudelft.labracore.model.security.APIKey;
-import nl.tudelft.labracore.repository.APIKeyRepository;
-import nl.tudelft.labracore.repository.PersonRepository;
-import nl.tudelft.labracore.security.api.APIUserDetails;
-import nl.tudelft.labracore.security.api.APIUserDetailsWithPerson;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
@@ -33,6 +26,13 @@ import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
+import nl.tudelft.labracore.model.person.ConcretePerson;
+import nl.tudelft.labracore.model.security.APIKey;
+import nl.tudelft.labracore.repository.APIKeyRepository;
+import nl.tudelft.labracore.repository.PersonRepository;
+import nl.tudelft.labracore.security.api.APIUserDetails;
+import nl.tudelft.labracore.security.api.APIUserDetailsWithPerson;
+
@Service
public class MockUserDetailsService implements UserDetailsService {
@Autowired
diff --git a/src/test/java/nl/tudelft/labracore/test/RestControllerTest.java b/src/test/java/nl/tudelft/labracore/test/RestControllerTest.java
index 0262f870fe7d4486ebb4c539c7e1c9b887800c07..604d76ea1227e396bcc6b67c8070705a0edf14e0 100644
--- a/src/test/java/nl/tudelft/labracore/test/RestControllerTest.java
+++ b/src/test/java/nl/tudelft/labracore/test/RestControllerTest.java
@@ -21,8 +21,6 @@ import static org.springframework.security.test.web.servlet.request.SecurityMock
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
-import lombok.SneakyThrows;
-
import org.springframework.http.MediaType;
import org.springframework.test.web.servlet.ResultMatcher;
import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
@@ -33,6 +31,8 @@ import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import com.fasterxml.jackson.module.paramnames.ParameterNamesModule;
+import lombok.SneakyThrows;
+
public abstract class RestControllerTest {
private static final ObjectMapper mapper = new ObjectMapper()
.registerModule(new ParameterNamesModule())
diff --git a/src/test/java/nl/tudelft/labracore/test/TestDatabaseLoader.java b/src/test/java/nl/tudelft/labracore/test/TestDatabaseLoader.java
index 0acc61d5158df8f17815619f2befb5cbb0a6baa1..ce4cd6e942b1f6b6c4753066223d4199358518d6 100644
--- a/src/test/java/nl/tudelft/labracore/test/TestDatabaseLoader.java
+++ b/src/test/java/nl/tudelft/labracore/test/TestDatabaseLoader.java
@@ -26,6 +26,9 @@ import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
import lombok.Data;
import nl.tudelft.labracore.enums.GradeScheme;
import nl.tudelft.labracore.enums.RoleType;
@@ -39,13 +42,9 @@ import nl.tudelft.labracore.model.security.TOTPKey;
import nl.tudelft.labracore.repository.*;
import nl.tudelft.labracore.service.PermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Profile;
-import org.springframework.stereotype.Service;
-
@Data
@Service
-@Profile("test")
+//@Profile("testing")
public class TestDatabaseLoader {
@Autowired
@@ -879,7 +878,7 @@ public class TestDatabaseLoader {
shawarma = sessionRepository.save(SingleSession.builder()
.name("Shawarma vol II")
.start(now())
- .end(now().plusHours(4))
+ .endTime(now().plusHours(4))
.edition(sokovia)
.description("It's gonna be a good time")
.rooms(Set.of(balcony, bar))
@@ -888,7 +887,7 @@ public class TestDatabaseLoader {
shawarma2 = sessionRepository.save(SingleSession.builder()
.name("Shawarma vol III")
.start(now())
- .end(now().plusHours(4))
+ .endTime(now().plusHours(4))
.edition(sokovia)
.description("It's gonna be a good time")
.rooms(Set.of(balcony, bar))
diff --git a/src/test/resources/application-h2.properties b/src/test/resources/application-h2.properties
index fd754bd0529fbc7f51109733fdd35fc2cc50de6e..56cc3ef890e2bec1b58be6a667f7679dc7347324 100644
--- a/src/test/resources/application-h2.properties
+++ b/src/test/resources/application-h2.properties
@@ -21,7 +21,9 @@
spring.jpa.hibernate.ddl-auto=create-drop
+spring.jpa.properties.hibernate.globally_quoted_identifiers=true
+
spring.liquibase.change-log=classpath:/changelog-master.yaml
spring.liquibase.enabled=false
-spring.datasource.url=jdbc:h2:mem:test-data
+spring.datasource.url=jdbc:h2:mem:test-data;DATABASE_TO_UPPER=false
diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
index 2b8ee43e0a21360c60caf06d45ceb85df97cb598..d6a5905a719b0a2a5698349244e884d4a9995ffc 100644
--- a/src/test/resources/application.yml
+++ b/src/test/resources/application.yml
@@ -26,6 +26,8 @@ spring:
hikari:
# Set the maximum pool size low to force closing of old connections
maximum-pool-size: 2
+ liquibase:
+ change-log: classpath:/changelog-master.yaml
server:
port: 8082