fix null to empty list

conferatus-inc · Jun 24, 2024 · 301da67 · 301da67
1 parent b7f3d47
commit 301da67
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/backend/src/main/java/org/conferatus/timetable/backend/controller/TimeTableController.java b/backend/src/main/java/org/conferatus/timetable/backend/controller/TimeTableController.java
@@ -112,11 +112,14 @@ public ResponseEntity<TimeListDTO> getGroupLessons(
                 ? (group) -> Objects.equals(group.id(), id)
                 : (group) -> group.name().equals(name);
 
-        for (LessonDTO lessonDTO : currentScheduleByUniversity.get(user.getUniversity().id()).timeListDTO().cells()) {
-            for (StudyGroupResponseDTO group : lessonDTO.groups()) {
-                if (predicate.test(group)) {
-                    res.cells().add(lessonDTO);
-                    break;
+        Nasrano nasrano = currentScheduleByUniversity.get(user.getUniversity().id());
+        if (nasrano != null) {
+            for (LessonDTO lessonDTO : nasrano.timeListDTO().cells()) {
+                for (StudyGroupResponseDTO group : lessonDTO.groups()) {
+                    if (predicate.test(group)) {
+                        res.cells().add(lessonDTO);
+                        break;
+                    }
                 }
             }
         }