fix audiences and teachers

conferatus-inc · Jun 24, 2024 · 6633dd4 · 6633dd4
1 parent 4db82df
commit 6633dd4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/backend/src/main/java/org/conferatus/timetable/backend/services/AudienceService.java b/backend/src/main/java/org/conferatus/timetable/backend/services/AudienceService.java
@@ -27,7 +27,7 @@ public Audience getAudienceByIdOrThrow(Long id) {
 
     private Audience getAudienceByIdAndUserOrThrow(User user, Long id) {
         var audience = audienceRepository.findAudienceById(id);
-        if (audience.isEmpty() || audience.get().getUniversity() != null &&
+        if (audience.isEmpty() || audience.get().getUniversity() == null ||
                 !user.checkUniversityAccess(audience.get().getUniversity().id())) {
             throw new ServerException(HttpStatus.NOT_FOUND,
                     String.format("Audience with id %s does dont exist within university %s",
@@ -40,7 +40,7 @@ private Audience getAudienceByIdAndUserOrThrow(User user, Long id) {
     private Audience getAudienceByNameAndUserOrThrow(User user, String name) {
         var audience = audienceRepository.findAudienceByName(name);
         if (audience.isEmpty() ||
-                audience.get().getUniversity() != null &&
+                audience.get().getUniversity() == null ||
                         !user.checkUniversityAccess(audience.get().getUniversity().id())) {
             throw new ServerException(HttpStatus.NOT_FOUND,
                     String.format("Audience with name %s does dont exist within university %s",

diff --git a/backend/src/main/java/org/conferatus/timetable/backend/services/TeacherService.java b/backend/src/main/java/org/conferatus/timetable/backend/services/TeacherService.java
@@ -22,7 +22,9 @@ public class TeacherService {
 
     public Teacher getTeacherByUserAndIdOrThrow(User user, Long id) {
         var teacher = teacherRepository.findTeacherById(id);
-        if (teacher.isEmpty() || !user.checkUniversityAccess(teacher.get().getUniversity().id())) {
+        if (teacher.isEmpty() ||
+                teacher.get().getUniversity() == null ||
+                !user.checkUniversityAccess(teacher.get().getUniversity().id())) {
             throw new ServerException(HttpStatus.NOT_FOUND,
                     String.format("Teacher with id %s in university %s does not exist",
                             id, user.getUniversity().id()));