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,9 @@ public class Result extends DomainObject implements Comparable<Result> {
     @JsonIgnore
     private Instant lastModifiedDate;
 
+    @Column(name = "exercise_id", nullable = false)
+    private long exerciseId;
+
     public ZonedDateTime getCompletionDate() {
         return completionDate;
     }
@@ -169,10 +172,23 @@ public Result score(Double score) {
         return this;
     }
 
+    public Result exerciseId(long exerciseId) {
+        this.exerciseId = exerciseId;
+        return this;
+    }
+
     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,22 @@ 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 exerciseIds   - of the exercises we want to filter by
+     * @return number of complaints response associated to the given exercise ids
      *
-     * @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 +56,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 +71,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 +93,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

@@ -49,9 +49,9 @@ 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);
 
@@ -220,7 +220,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);
 

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

@@ -264,16 +264,17 @@ private Result submitManualAssessment(long resultId, Exercise exercise) {
      * @param feedbackList       the assessment as a feedback list that should be added to the result of the corresponding submission
      * @param resultId           id of the result we want to save the feedbackList to, null if no result exists
      * @param assessmentNoteText the text of the assessment note of the result
+     * @param exerciseId         the id of the exercise the assessment belongs to
      * @return the saved result
      */
-    public Result saveManualAssessment(final Submission submission, final List<Feedback> feedbackList, Long resultId, String assessmentNoteText) {
+    public Result saveManualAssessment(final Submission submission, final List<Feedback> feedbackList, Long resultId, String assessmentNoteText, long exerciseId) {
         Result result = null;
         if (resultId != null) {
             result = resultRepository.findWithEagerSubmissionAndFeedbackAndTestCasesAndAssessmentNoteById(resultId).orElse(null);
         }
 
         if (result == null) {
-            result = submissionService.saveNewEmptyResult(submission);
+            result = submissionService.saveNewEmptyResult(submission, exerciseId);
         }
 
         // important to not lose complaint information when overriding an assessment
@@ -325,7 +326,7 @@ public Result saveManualAssessment(final Submission submission, final List<Feedb
      */
     public Result saveAndSubmitManualAssessment(final Exercise exercise, final Submission submission, final List<Feedback> feedbackList, Long resultId, String assessmentNoteText,
             boolean submit) {
-        Result result = saveManualAssessment(submission, feedbackList, resultId, assessmentNoteText);
+        Result result = saveManualAssessment(submission, feedbackList, resultId, assessmentNoteText, exercise.getId());
         if (!submit) {
             return result;
         }

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

@@ -174,34 +174,56 @@ else if (participant instanceof Team) {
         }
     }
 
-    public long countComplaintsByCourseId(long courseId) {
-        return complaintRepository.countByResult_Submission_Participation_Exercise_Course_IdAndComplaintType(courseId, ComplaintType.COMPLAINT);
+    /**
+     * Counts the number of complaints for the given exercise ids
+     *
+     * @param exerciseIds the ids of the exercises
+     * @return the number of complaints
+     */
+    public long countComplaintsByExerciseIds(Set<Long> exerciseIds) {
+        if (exerciseIds == null || exerciseIds.isEmpty()) {
+            return 0L;
+        }
+        return complaintRepository.countByExerciseIdsAndComplaintType(exerciseIds, ComplaintType.COMPLAINT);
     }
 
-    public long countMoreFeedbackRequestsByCourseId(long courseId) {
-        return complaintRepository.countByResult_Submission_Participation_Exercise_Course_IdAndComplaintType(courseId, ComplaintType.MORE_FEEDBACK);
+    /**
+     * Counts the number of more feedback requests for the given exercise ids
+     *
+     * @param exerciseIds the ids of the exercises
+     * @return the number of more feedback requests
+     */
+    public long countMoreFeedbackRequestsByExerciseIds(Set<Long> exerciseIds) {
+        if (exerciseIds == null || exerciseIds.isEmpty()) {
+            return 0L;
+        }
+        return complaintRepository.countByExerciseIdsAndComplaintType(exerciseIds, ComplaintType.MORE_FEEDBACK);
     }
 
     /**
-     * Counts the number of responses to complaints for the given course id
+     * Counts the number of responses to complaints for the given exercise ids
      *
-     * @param courseId the id of the course
+     * @param exerciseIds the ids of the exercises
      * @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) {
+        if (exerciseIds == null || exerciseIds.isEmpty()) {
+            return 0L;
+        }
+        return complaintResponseRepository.countComplaintResponsesForExerciseIdsAndComplaintType(exerciseIds, ComplaintType.COMPLAINT);
     }
 
     /**
-     * Counts the number of responses to feedback requests for the given course id
+     * Counts the number of responses to feedback requests for the given exercise ids
      *
-     * @param courseId the id of the course
+     * @param exerciseIds the ids of the exercises
      * @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) {
+        if (exerciseIds == null || exerciseIds.isEmpty()) {
+            return 0L;
+        }
+        return complaintResponseRepository.countComplaintResponsesForExerciseIdsAndComplaintType(exerciseIds, ComplaintType.MORE_FEEDBACK);
     }
 
     /**

src/main/java/de/tum/cit/aet/artemis/assessment/web/AssessmentResource.java

@@ -138,10 +138,10 @@ protected Result saveExampleAssessment(long exampleSubmissionId, List<Feedback>
         // as parameter resultId is not set, we use the latest Result, if no latest Result exists, we use null
         Result result;
         if (submission.getLatestResult() == null) {
-            result = assessmentService.saveManualAssessment(submission, feedbacks, null, null);
+            result = assessmentService.saveManualAssessment(submission, feedbacks, null, null, exercise.getId());
         }
         else {
-            result = assessmentService.saveManualAssessment(submission, feedbacks, submission.getLatestResult().getId(), null);
+            result = assessmentService.saveManualAssessment(submission, feedbacks, submission.getLatestResult().getId(), null, exercise.getId());
         }
         return resultRepository.submitResult(result, exercise);
     }

src/main/java/de/tum/cit/aet/artemis/core/dto/StatisticsEntry.java

@@ -37,6 +37,12 @@ public StatisticsEntry(String date, String username) {
         this.username = username;
     }
 
+    public StatisticsEntry(int year, int month, int day, String username) {
+        this.date = String.format("%04d-%02d-%02d", year, month, day);
+        this.amount = 1L;
+        this.username = username;
+    }
+
     // empty constructor
     public StatisticsEntry() {
         this.amount = 0L;