Examples submission count

* Rebased branch on dev

* Completed #179
- Added example submissions count endpoint
- Added getSubmissionsCount with native sql query
- Added new DTO
- Updated cache evicts
- Added caching for example submissions count

* Added submissions count cache evict to example reset

* Added grace period to submissions count query

Author: mmhlego

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

@@ -32,6 +32,7 @@ class CacheConfig {
             "PointsService.calculateAssignmentMaxPoints",
             "CourseService.getStudents",
             "CourseService.calculateCoursePoints",
+            "ExampleService.computeSubmissionsCount",
             "CourseService.getCoursesOverview",
             "ExampleService.studentHasVisibleExamples",
             "ExampleService.supervisorHasVisibleExamples",

src/main/kotlin/ch/uzh/ifi/access/controller/CourseController.kt

@@ -227,7 +227,7 @@ class CourseController(
     }
 
     @PostMapping("/{course}/participants")
-    @CacheEvict(value = ["CourseService.getStudents"], key = "#course")
+    @CacheEvict(value = ["CourseService.getStudents", "ExampleService.computeSubmissionsCount"], key = "#course")
     fun registerParticipants(@PathVariable course: String, @RequestBody registrationIDs: List<String>) {
         return updateRoles(course, registrationIDs, Role.STUDENT)
     }

src/main/kotlin/ch/uzh/ifi/access/controller/ExampleController.kt

@@ -12,6 +12,7 @@ import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import org.springframework.cache.annotation.CacheEvict
+import org.springframework.cache.annotation.Caching
 import org.springframework.http.HttpStatus
 import org.springframework.scheduling.annotation.EnableAsync
 import org.springframework.security.access.prepost.PreAuthorize
@@ -45,6 +46,15 @@ class ExampleController(
         return exampleService.getExamples(course)
     }
 
+    @GetMapping("/submissions-count")
+    @PreAuthorize("hasRole(#course+'-assistant')")
+    fun getSubmissionsCount(
+        @PathVariable course: String,
+        authentication: Authentication
+    ): ExampleSubmissionsCountDTO {
+        return exampleService.computeSubmissionsCount(course)
+    }
+
     @GetMapping("/interactive")
     @PreAuthorize("hasRole(#course)")
     fun getInteractiveExampleSlug(
@@ -101,6 +111,7 @@ class ExampleController(
 
     @PostMapping("/{example}/submit")
     @PreAuthorize("hasRole(#course) and (#submission.restricted or hasRole(#course + '-assistant'))")
+    @CacheEvict(value = ["ExampleService.computeSubmissionsCount"], key = "#course")
     fun evaluateExampleSubmission(
         @PathVariable course: String,
         @PathVariable example: String,
@@ -250,7 +261,12 @@ class ExampleController(
 
     @DeleteMapping("/{example}/reset")
     @PreAuthorize("hasRole(#course+'-supervisor')")
-    @CacheEvict(value = ["PointsService.calculateTaskPoints"], allEntries = true)
+    @Caching(
+        evict = [
+            CacheEvict(value = ["PointsService.calculateTaskPoints"], allEntries = true),
+            CacheEvict(value = ["ExampleService.computeSubmissionsCount"], key = "#course")
+        ]
+    )
     fun resetExample(
         @PathVariable course: String,
         @PathVariable example: String

src/main/kotlin/ch/uzh/ifi/access/model/dto/ExampleSubmissionsCountDTO.kt

@@ -0,0 +1,5 @@
+package ch.uzh.ifi.access.model.dto
+
+class ExampleSubmissionsCountDTO(
+    var submissionsCount: MutableMap<String, Int> = HashMap()
+)

src/main/kotlin/ch/uzh/ifi/access/repository/ExampleRepository.kt

@@ -4,6 +4,7 @@ import ch.uzh.ifi.access.model.Task
 import ch.uzh.ifi.access.projections.TaskOverview
 import ch.uzh.ifi.access.projections.TaskWorkspace
 import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Query
 
 interface ExampleRepository : JpaRepository<Task?, Long?> {
 
@@ -20,4 +21,19 @@ interface ExampleRepository : JpaRepository<Task?, Long?> {
         courseSlug: String?,
         exampleSlug: String?
     ): Task?
+
+    @Query(
+        """
+    SELECT submission.user_id, COUNT(*) AS entry_count FROM task
+    JOIN course ON course.id = task.course_id AND course.slug = :courseSlug
+    JOIN evaluation ON evaluation.task_id = task.id
+    JOIN submission ON submission.evaluation_id = evaluation.id AND submission.created_at >= task.start_date AND submission.created_at <= task.end_date + (:gracePeriod * INTERVAL '1 second')
+    GROUP BY submission.user_id
+    """,
+        nativeQuery = true
+    )
+    fun getSubmissionsCount(
+        courseSlug: String,
+        gracePeriod: Long,
+    ): List<Map<String, Any>>
 }

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

@@ -47,7 +47,7 @@ class ExampleService(
     }
 
     @Cacheable(value = ["ExampleService.getInteractiveExampleSlug"], key = "#courseSlug")
-    fun getInteractiveExampleSlug(courseSlug: String):InteractiveExampleDTO{
+    fun getInteractiveExampleSlug(courseSlug: String): InteractiveExampleDTO {
         val examples = getExamples(courseSlug)
         val now = LocalDateTime.now()
         val interactiveExampleSlug = examples
@@ -57,18 +57,18 @@ class ExampleService(
         return InteractiveExampleDTO(interactiveExampleSlug)
     }
 
-    @Cacheable(value = ["ExampleService.studentHasVisibleExamples"], key="#courseSlug")
-    fun studentHasVisibleExamples(courseSlug: String):Boolean{
-        return getExamples(courseSlug).any{it.start != null}
+    @Cacheable(value = ["ExampleService.studentHasVisibleExamples"], key = "#courseSlug")
+    fun studentHasVisibleExamples(courseSlug: String): Boolean {
+        return getExamples(courseSlug).any { it.start != null }
     }
 
-    @Cacheable(value = ["ExampleService.supervisorHasVisibleExamples"], key="#courseSlug")
-    fun supervisorHasVisibleExamples(courseSlug: String):Boolean{
+    @Cacheable(value = ["ExampleService.supervisorHasVisibleExamples"], key = "#courseSlug")
+    fun supervisorHasVisibleExamples(courseSlug: String): Boolean {
         return getExamples(courseSlug).isNotEmpty()
     }
 
-    fun hasVisibleExamples(courseSlug: String):Boolean {
-        if(roleService.isSupervisor(courseSlug)){
+    fun hasVisibleExamples(courseSlug: String): Boolean {
+        if (roleService.isSupervisor(courseSlug)) {
             return proxy.supervisorHasVisibleExamples(courseSlug)
         }
 
@@ -223,6 +223,21 @@ class ExampleService(
         return newSubmission
     }
 
+    @Cacheable(value = ["ExampleService.computeSubmissionsCount"], key = "#courseSlug")
+    fun computeSubmissionsCount(courseSlug: String): ExampleSubmissionsCountDTO {
+        val res = exampleRepository.getSubmissionsCount(courseSlug, gracePeriod)
+
+        val submissionsCount: Map<String, Int> = res.associate { row ->
+            val userId = row["user_id"] as String
+            val count = (row["entry_count"] as Number).toInt()
+            userId to count
+        }
+
+        return ExampleSubmissionsCountDTO(
+            submissionsCount = submissionsCount.toMutableMap()
+        )
+    }
+
     fun computeExampleInformation(courseSlug: String, exampleSlug: String): ExampleInformationDTO {
         val participantsOnline = visitQueueService.getRecentlyActiveCount(courseSlug)
         val totalParticipants = courseService.getCourseBySlug(courseSlug).participantCount