Development: Speedup loading active courses

ls1intum · Nov 13, 2024 · bf6296a · bf6296a
1 parent 054476c
commit bf6296a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/CourseRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/CourseRepository.java
@@ -580,5 +580,16 @@ Set<CourseForArchiveDTO> findInactiveCoursesForUserRolesWithNonNullSemester(@Par
                OR c.instructorGroupName IN :userGroups
                OR :isAdmin = TRUE
             """)
-    List<Course> findCoursesForAtLeastTutorWithGroups(@Param("userGroups") Set<String> userGroups, @Param("isAdmin") boolean isAdmin);
+    List<Course> findAllCoursesForAtLeastTutorWithGroups(@Param("userGroups") Set<String> userGroups, @Param("isAdmin") boolean isAdmin);
+
+    @Query("""
+            SELECT c
+            FROM Course c
+            WHERE (c.teachingAssistantGroupName IN :userGroups
+               OR c.editorGroupName IN :userGroups
+               OR c.instructorGroupName IN :userGroups
+               OR :isAdmin = TRUE)
+               AND (c.endDate >= :now OR c.endDate IS NULL)
+            """)
+    List<Course> findActiveCoursesForAtLeastTutorWithGroups(@Param("userGroups") Set<String> userGroups, @Param("isAdmin") boolean isAdmin, @Param("now") ZonedDateTime now);
 }
diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/CourseResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/CourseResource.java
@@ -445,13 +445,14 @@ public ResponseEntity<List<Course>> getCourses(@RequestParam(defaultValue = "fal
     }
 
     private List<Course> getCoursesForTutors(User user, boolean onlyActive) {
-        List<Course> userCourses = courseRepository.findCoursesForAtLeastTutorWithGroups(user.getGroups(), authCheckService.isAdmin(user));
         if (onlyActive) {
             // only include courses that have NOT been finished
             final var now = ZonedDateTime.now();
-            userCourses = userCourses.stream().filter(course -> course.getEndDate() == null || course.getEndDate().isAfter(now)).toList();
+            return courseRepository.findActiveCoursesForAtLeastTutorWithGroups(user.getGroups(), authCheckService.isAdmin(user), now);
+        }
+        else {
+            return courseRepository.findAllCoursesForAtLeastTutorWithGroups(user.getGroups(), authCheckService.isAdmin(user));
         }
-        return userCourses;
     }
 
     /**