Development: Add exercise id to result table to speed up database queries

src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java

@@ -134,6 +134,10 @@ public class Result extends DomainObject implements Comparable<Result> {
     @JsonIgnore
     private Instant lastModifiedDate;
 
+    @Column(name = "exercise_id")
+    @JsonIgnore
+    private Long exerciseId;
+
     public ZonedDateTime getCompletionDate() {
         return completionDate;
     }
@@ -173,6 +177,14 @@ public Instant getLastModifiedDate() {
         return lastModifiedDate;
     }
 
+    public Long getExerciseId() {
+        return exerciseId;
+    }
+
+    public void setExerciseId(Long exerciseId) {
+        this.exerciseId = exerciseId;
+    }
+
     /**
      * Sets the score to the specified score rounded to 4 decimal places.
      * If you are handling student results that potentially need rounding, use {@link Result#setScore(Double score, Course course)} instead!

src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintRepository.java

@@ -64,23 +64,13 @@ public interface ComplaintRepository extends ArtemisJpaRepository<Complaint, Lon
             """)
     Optional<Complaint> findByIdWithEagerAssessor(@Param("complaintId") Long complaintId);
 
-    /**
-     * This magic method counts the number of complaints by complaint type associated to a course id
-     *
-     * @param courseId      - the id of the course we want to filter by
-     * @param complaintType - type of complaint we want to filter by
-     * @return number of more feedback requests associated to course courseId
-     */
-    long countByResult_Submission_Participation_Exercise_Course_IdAndComplaintType(Long courseId, ComplaintType complaintType);
-
-    /**
-     * This magic method counts the number of complaints by complaint type associated to an exam id
-     *
-     * @param examId        - the id of the exam we want to filter by
-     * @param complaintType - type of complaint we want to filter by
-     * @return number of complaints associated to course examId
-     */
-    long countByResult_Submission_Participation_Exercise_ExerciseGroup_Exam_IdAndComplaintType(Long examId, ComplaintType complaintType);
+    @Query("""
+            SELECT COUNT(c)
+            FROM Complaint c
+            WHERE c.result.exerciseId IN :exerciseIds
+                AND c.complaintType = :complaintType
+            """)
+    long countByExerciseIdsAndComplaintType(@Param("exerciseIds") Set<Long> exerciseIds, @Param("complaintType") ComplaintType complaintType);
 
     @Query("""
             SELECT c
@@ -142,7 +132,7 @@ SELECT COUNT(c)
     @Query("""
             SELECT COUNT(c)
             FROM Complaint c
-            WHERE c.result.submission.participation.exercise.id = :exerciseId
+            WHERE c.result.exerciseId = :exerciseId
                 AND c.complaintType = :complaintType
             """)
     long countComplaintsByExerciseIdAndComplaintType(@Param("exerciseId") Long exerciseId, @Param("complaintType") ComplaintType complaintType);
@@ -156,13 +146,13 @@ SELECT COUNT(c)
      */
     @Query("""
             SELECT new de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseMapEntryDTO(
-                c.result.submission.participation.exercise.id,
+                c.result.exerciseId,
                 COUNT(DISTINCT c)
             )
             FROM Complaint c
-            WHERE c.result.submission.participation.exercise.id IN :exerciseIds
+            WHERE c.result.exerciseId IN :exerciseIds
                 AND c.complaintType = :complaintType
-            GROUP BY c.result.submission.participation.exercise.id
+            GROUP BY c.result.exerciseId
             """)
     List<ExerciseMapEntryDTO> countComplaintsByExerciseIdsAndComplaintType(@Param("exerciseIds") Set<Long> exerciseIds, @Param("complaintType") ComplaintType complaintType);
 
@@ -175,14 +165,14 @@ SELECT COUNT(c)
      */
     @Query("""
             SELECT new de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseMapEntryDTO(
-                c.result.submission.participation.exercise.id,
+                c.result.exerciseId,
                 COUNT(DISTINCT c)
             )
             FROM Complaint c
-            WHERE c.result.submission.participation.exercise.id IN :exerciseIds
+            WHERE c.result.exerciseId IN :exerciseIds
                 AND c.complaintType = :complaintType
                 AND c.result.submission.participation.testRun = FALSE
-            GROUP BY c.result.submission.participation.exercise.id
+            GROUP BY c.result.exerciseId
             """)
     List<ExerciseMapEntryDTO> countComplaintsByExerciseIdsAndComplaintTypeIgnoreTestRuns(@Param("exerciseIds") Set<Long> exerciseIds,
             @Param("complaintType") ComplaintType complaintType);

src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintResponseRepository.java

@@ -29,21 +29,21 @@ public interface ComplaintResponseRepository extends ArtemisJpaRepository<Compla
     /**
      * This magic method counts the number of complaints responses by complaint type associated to a course id
      *
-     * @param courseId      - the id of the course we want to filter by
      * @param complaintType - complaint type we want to filter by
      * @return number of complaints response associated to course courseId
-     */
-    long countByComplaint_Result_Submission_Participation_Exercise_Course_Id_AndComplaint_ComplaintType_AndSubmittedTimeIsNotNull(Long courseId, ComplaintType complaintType);
-
-    /**
-     * This magic method counts the number of complaints responses by complaint type associated to an exam id
      *
-     * @param examId        - the id of the exam we want to filter by
-     * @param complaintType - complaint type we want to filter by
-     * @return number of complaints response associated to exam examId
      */
-    long countByComplaint_Result_Submission_Participation_Exercise_ExerciseGroup_Exam_Id_AndComplaint_ComplaintType_AndSubmittedTimeIsNotNull(Long examId,
-            ComplaintType complaintType);
+
+    @Query("""
+            SELECT COUNT(DISTINCT cr)
+            FROM ComplaintResponse cr
+            JOIN cr.complaint c
+            JOIN c.result r
+            WHERE r.exerciseId IN :exerciseIds
+                AND cr.submittedTime IS NOT NULL
+                AND c.complaintType = :complaintType
+            """)
+    long countComplaintResponsesForExerciseIdsAndComplaintType(@Param("exerciseIds") Set<Long> exerciseIds, @Param("complaintType") ComplaintType complaintType);
 
     /**
      * This magic method counts the number of complaints responses by complaint type associated to an exercise id
@@ -55,7 +55,7 @@ long countByComplaint_Result_Submission_Participation_Exercise_ExerciseGroup_Exa
     @Query("""
             SELECT COUNT(DISTINCT cr)
             FROM ComplaintResponse cr
-            WHERE cr.complaint.result.submission.participation.exercise.id = :exerciseId
+            WHERE cr.complaint.result.exerciseId = :exerciseId
                 AND cr.complaint.complaintType = :complaintType
                 AND cr.submittedTime IS NOT NULL
             """)
@@ -70,15 +70,15 @@ SELECT COUNT(DISTINCT cr)
      */
     @Query("""
             SELECT new de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseMapEntryDTO(
-                cr.complaint.result.submission.participation.exercise.id,
+                cr.complaint.result.exerciseId,
                 COUNT(DISTINCT cr)
             )
             FROM ComplaintResponse cr
-            WHERE cr.complaint.result.submission.participation.exercise.id IN :exerciseIds
+            WHERE cr.complaint.result.exerciseId IN :exerciseIds
                 AND cr.submittedTime IS NOT NULL
                 AND cr.complaint.complaintType = :complaintType
                 AND cr.complaint.result.submission.participation.testRun = FALSE
-            GROUP BY cr.complaint.result.submission.participation.exercise.id
+            GROUP BY cr.complaint.result.exerciseId
             """)
     List<ExerciseMapEntryDTO> countComplaintsByExerciseIdsAndComplaintComplaintTypeIgnoreTestRuns(@Param("exerciseIds") Set<Long> exerciseIds,
             @Param("complaintType") ComplaintType complaintType);
@@ -92,14 +92,14 @@ List<ExerciseMapEntryDTO> countComplaintsByExerciseIdsAndComplaintComplaintTypeI
      */
     @Query("""
             SELECT new de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseMapEntryDTO(
-                cr.complaint.result.submission.participation.exercise.id,
+                cr.complaint.result.exerciseId,
                 COUNT(DISTINCT cr)
             )
             FROM ComplaintResponse cr
-            WHERE cr.complaint.result.submission.participation.exercise.id IN :exerciseIds
+            WHERE cr.complaint.result.exerciseId IN :exerciseIds
                 AND cr.submittedTime IS NOT NULL
                 AND cr.complaint.complaintType = :complaintType
-            GROUP BY cr.complaint.result.submission.participation.exercise.id
+            GROUP BY cr.complaint.result.exerciseId
             """)
     List<ExerciseMapEntryDTO> countComplaintsByExerciseIdsAndComplaintComplaintType(@Param("exerciseIds") Set<Long> exerciseIds,
             @Param("complaintType") ComplaintType complaintType);

src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java

@@ -17,10 +17,14 @@
 
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Profile;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
 import org.springframework.data.jpa.repository.EntityGraph;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
 import de.tum.cit.aet.artemis.assessment.domain.AssessmentType;
 import de.tum.cit.aet.artemis.assessment.domain.ExampleSubmission;
@@ -48,11 +52,12 @@
 public interface ResultRepository extends ArtemisJpaRepository<Result, Long> {
 
     @Query("""
+
             SELECT r
-            FROM Result r
-                LEFT JOIN FETCH r.assessor
-            WHERE r.id = :resultId
-            """)
+                FROM Result r
+                    LEFT JOIN FETCH r.assessor
+                WHERE r.id = :resultId
+                """)
     Optional<Result> findByIdWithEagerAssessor(@Param("resultId") long resultId);
 
     @EntityGraph(type = LOAD, attributePaths = "submission")
@@ -220,7 +225,7 @@ SELECT COUNT(r)
             WHERE r.completionDate IS NOT NULL
                 AND r.assessor IS NOT NULL
                 AND p.testRun = FALSE
-                AND p.exercise.id IN :exerciseIds
+                AND r.exerciseId IN :exerciseIds
             """)
     long countAssessmentsForExerciseIdsIgnoreTestRuns(@Param("exerciseIds") Set<Long> exerciseIdsWithManualAssessment);
 
@@ -931,4 +936,37 @@ SELECT MAX(r2.id)
                )
             """)
     Set<Result> findLatestResultsByParticipationIds(@Param("participationIds") Set<Long> participationIds);
+
+    @Transactional
+    @Modifying
+    @Query("""
+                UPDATE Result r
+                   SET r.exerciseId = (
+                       SELECT p.exercise.id
+                         FROM Submission s
+                         JOIN s.participation p
+                        WHERE s.id = r.submission.id
+                   )
+                 WHERE r.exerciseId IS NULL
+                   AND r.id IN :ids
+            """)
+    int backfillExerciseIdBatch(@Param("ids") List<Long> ids);
+
+    @Query("""
+                SELECT r.id
+                  FROM Result r
+                 WHERE r.exerciseId IS NULL
+                 ORDER BY r.id
+            """)
+    Slice<Long> findResultIdsWithoutExerciseId(Pageable pageable);
+
+    @Query("""
+              SELECT r.id
+                FROM Result r
+               WHERE r.exerciseId IS NULL
+                 AND r.id > :afterId
+            ORDER BY r.id
+            """)
+    List<Long> findNextIds(@Param("afterId") long afterId, Pageable pageable);
+
 }

src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintService.java

@@ -174,12 +174,12 @@ else if (participant instanceof Team) {
         }
     }
 
-    public long countComplaintsByCourseId(long courseId) {
-        return complaintRepository.countByResult_Submission_Participation_Exercise_Course_IdAndComplaintType(courseId, ComplaintType.COMPLAINT);
+    public long countComplaintsByExerciseIds(Set<Long> exerciseIds) {
+        return complaintRepository.countByExerciseIdsAndComplaintType(exerciseIds, ComplaintType.COMPLAINT);
     }
 
-    public long countMoreFeedbackRequestsByCourseId(long courseId) {
-        return complaintRepository.countByResult_Submission_Participation_Exercise_Course_IdAndComplaintType(courseId, ComplaintType.MORE_FEEDBACK);
+    public long countMoreFeedbackRequestsByCourseId(Set<Long> exerciseIds) {
+        return complaintRepository.countByExerciseIdsAndComplaintType(exerciseIds, ComplaintType.MORE_FEEDBACK);
     }
 
     /**
@@ -188,9 +188,8 @@ public long countMoreFeedbackRequestsByCourseId(long courseId) {
      * @param courseId the id of the course
      * @return the number of responses
      */
-    public long countComplaintResponsesByCourseId(long courseId) {
-        return complaintResponseRepository.countByComplaint_Result_Submission_Participation_Exercise_Course_Id_AndComplaint_ComplaintType_AndSubmittedTimeIsNotNull(courseId,
-                ComplaintType.COMPLAINT);
+    public long countComplaintResponsesByExerciseIds(Set<Long> exerciseIds) {
+        return complaintResponseRepository.countComplaintResponsesForExerciseIdsAndComplaintType(exerciseIds, ComplaintType.COMPLAINT);
     }
 
     /**
@@ -199,9 +198,8 @@ public long countComplaintResponsesByCourseId(long courseId) {
      * @param courseId the id of the course
      * @return the number of responses
      */
-    public long countMoreFeedbackRequestResponsesByCourseId(long courseId) {
-        return complaintResponseRepository.countByComplaint_Result_Submission_Participation_Exercise_Course_Id_AndComplaint_ComplaintType_AndSubmittedTimeIsNotNull(courseId,
-                ComplaintType.MORE_FEEDBACK);
+    public long countMoreFeedbackRequestResponsesByExerciseIds(Set<Long> exerciseIds) {
+        return complaintResponseRepository.countComplaintResponsesForExerciseIdsAndComplaintType(exerciseIds, ComplaintType.MORE_FEEDBACK);
     }
 
     /**

src/main/java/de/tum/cit/aet/artemis/core/config/migration/MigrationRegistry.java

@@ -13,6 +13,8 @@
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
 
+import de.tum.cit.aet.artemis.core.config.migration.entries.ResultExerciseIdMigrationEntry;
+
 /**
  * This component allows registering certain entries containing functionality that gets executed on application startup. The entries must extend {@link MigrationEntry}.
  * It should definitely be executed on startup, so we make it non-lazy.
@@ -30,6 +32,7 @@ public class MigrationRegistry {
     public MigrationRegistry(MigrationService migrationService) {
         this.migrationService = migrationService;
         // Here we define the order of the ChangeEntries
+        migrationEntryMap.put(1, ResultExerciseIdMigrationEntry.class);
     }
 
     /**