Improved caching for /courses endpoint

Author: sealexan

src/main/kotlin/ch/uzh/ifi/access/config/CacheConfig.kt

@@ -30,6 +30,7 @@ class CacheConfig {
             "PointsService.calculateAvgTaskPoints",
             "PointsService.calculateAssignmentMaxPoints",
             "CourseService.getStudents",
+            "CourseService.calculateCoursePoints",
         )
     }
 }

src/main/kotlin/ch/uzh/ifi/access/service/CourseService.kt

@@ -243,11 +243,18 @@ class CourseService(
 
     fun calculateCoursePoints(slug: String): Double {
         val userId = roleService.getUserId() ?: return 0.0
+        return proxy.calculateCoursePoints(slug, userId)
+    }
+
+    @Cacheable(value = ["CourseService.calculateCoursePoints"], key = "#slug + '-' + #userId")
+    fun calculateCoursePoints(slug: String, userId: String): Double {
         return courseRepository.getTotalPoints(slug, userId) ?: 0.0
     }
 
     fun getTeamMembers(memberIds: List<String>): Set<MemberOverview> {
-        return memberIds.mapNotNull { courseRepository.getTeamMemberName(it) }.toSet()
+        return setOf()
+        // TODO: re-enable if needed
+        //return memberIds.mapNotNull { courseRepository.getTeamMemberName(it) }.toSet()
     }
 
     fun getTaskBySlug(courseSlug: String, assignmentSlug: String, taskSlug: String): Task {
@@ -309,6 +316,7 @@ class CourseService(
         evict = [
             CacheEvict(value = ["PointsService.getMaxPoints"], key = "#courseSlug"),
             CacheEvict(value = ["PointsService.calculateAssignmentMaxPoints"], allEntries = true),
+            CacheEvict(value = ["CourseService.calculateCoursePoints"], allEntries = true),
         ]
     )
     fun updateCourse(courseSlug: String): Course {

src/main/kotlin/ch/uzh/ifi/access/service/PointsService.kt

@@ -42,4 +42,12 @@ class PointsService(
     )
     fun evictTaskPoints(taskId: Long, userId: String) {
     }
+
+    @Caching(
+        evict = [
+            CacheEvict("CourseService.calculateCoursePoints", key = "#courseSlug + '-' + #userId"),
+        ]
+    )
+    fun evictCoursePoints(courseSlug: String?, userId: String) {
+    }
 }

src/main/kotlin/ch/uzh/ifi/access/service/SubmissionService.kt

@@ -113,6 +113,7 @@ class SubmissionService(
             )
         }
         pointsService.evictTaskPoints(task.id!!, submissionDTO.userId!!)
+        pointsService.evictCoursePoints(courseSlug, submissionDTO.userId!!)
         val evaluation =
             evaluationService.getEvaluation(task.id, submissionDTO.userId)
                 ?: task.createEvaluation(submissionDTO.userId)
@@ -145,6 +146,7 @@ class SubmissionService(
             submissionRepository.save(submission)
             evaluationRepository.save(evaluation)
             pointsService.evictTaskPoints(task.id!!, submissionDTO.userId!!)
+            pointsService.evictCoursePoints(courseSlug, submissionDTO.userId!!)
         }
         return submission
     }