Skip to content
Snippets Groups Projects
Commit d5e38ba1 authored by Cédric Willekens's avatar Cédric Willekens
Browse files

Cleanup build file and test yaml

parent 1f1ef5c3
No related branches found
No related tags found
2 merge requests!249Version 1.5.0,!239Add query endpoints for courses
Pipeline #1159473 failed
......@@ -30,7 +30,7 @@ repositories {
url = uri("https://gitlab.ewi.tudelft.nl/api/v4/projects/3634/packages/maven")
}
maven {
name = "GitLab Librador repository"
name = "GitLab TU Delft API repository"
url = uri("https://gitlab.ewi.tudelft.nl/api/v4/projects/10478/packages/maven")
}
maven {
......@@ -197,7 +197,7 @@ dependencies {
}
// TU Delft API
implementation("nl.tudelft.labrador:tudelft-api:0.0.1-preview-local")
implementation("nl.tudelft.labrador:tudelft-api:0.0.1-preview")
// Hibernate for database-entity mapping and EntityManagers
implementation("org.hibernate.orm:hibernate-core")
......
......
......@@ -46,7 +46,7 @@ public class TuDelftApiController {
* @param mail The mail address for a teacher.
* @return List of courses related to this teacher.
*/
@PreAuthorize("@permissionService.isTeacherMail(mail)")
@PreAuthorize("@permissionService.isTeacherOrAdminMail(mail)")
@GetMapping("/courses-for-teacher")
public List<CourseViewDTO> getCoursesForTeacher(@RequestParam String mail) {
return this.tuDelftApiService.getCoursesForTeacher(mail);
......
......
......@@ -17,6 +17,7 @@
*/
package nl.tudelft.labracore.service;
import static nl.tudelft.labracore.enums.RoleType.ADMIN;
import static nl.tudelft.labracore.enums.RoleType.TEACHER;
import java.util.List;
......@@ -74,13 +75,14 @@ public class PermissionService {
}
/**
* Check if the email is assigned to a teacher.
* Check if the email is assigned to a teacher or an admin.
*
* @param mail The email to check for.
* @return True if the email is assigned to a teacher.
*/
public boolean isTeacherMail(String mail) {
public boolean isTeacherOrAdminMail(String mail) {
Optional<Person> person = personRepository.findByEmail(mail);
return person.isPresent() && person.get().getDefaultRole().equals(TEACHER);
return person.isPresent() && (person.get().getDefaultRole().equals(TEACHER)
|| person.get().getDefaultRole().equals(ADMIN));
}
}
......@@ -48,7 +48,6 @@ labracore:
db-api:
enabled: true
url: db-api
version: 1.2.3
otel:
sdk:
......
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment