From 7cad252d1abb6727740cbcfb15659739b384a487 Mon Sep 17 00:00:00 2001
From: Stephan Krusche <krusche@tum.de>
Date: Mon, 25 Nov 2024 16:42:49 +0100
Subject: [PATCH 1/8] Quiz exercises: Show all participations with filter
 options

---
 .../StudentParticipationRepository.java       | 175 ++++++++++--------
 .../exercise/web/ParticipationResource.java   |   5 +-
 .../ProgrammingSubmissionRepository.java      |  10 +-
 ...grammingExerciseParticipationResource.java |   4 +-
 .../participation.component.html              |  50 +++--
 .../ParticipationIntegrationTest.java         |  12 +-
 6 files changed, 137 insertions(+), 119 deletions(-)

diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java
index 1101f94d4708..bb775298efb5 100644
--- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java
+++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java
@@ -59,7 +59,8 @@ public interface StudentParticipationRepository extends ArtemisJpaRepository<Stu
                 LEFT JOIN FETCH p.team t
                 LEFT JOIN FETCH t.students
             WHERE p.exercise.course.id = :courseId
-                AND (r.rated IS NULL OR r.rated = TRUE)
+                AND (r.rated IS NULL
+                    OR r.rated = TRUE)
             """)
     List<StudentParticipation> findByCourseIdWithEagerRatedResults(@Param("courseId") long courseId);
 
@@ -69,8 +70,10 @@ public interface StudentParticipationRepository extends ArtemisJpaRepository<Stu
                 LEFT JOIN FETCH p.results r
                 LEFT JOIN p.team.students ts
             WHERE p.exercise.course.id = :courseId
-                AND (p.student.id = :studentId OR ts.id = :studentId)
-                AND (r.rated IS NULL OR r.rated = TRUE)
+                AND (p.student.id = :studentId
+                    OR ts.id = :studentId)
+                AND (r.rated IS NULL
+                    OR r.rated = TRUE)
             """)
     List<StudentParticipation> findByCourseIdAndStudentIdWithEagerRatedResults(@Param("courseId") long courseId, @Param("studentId") long studentId);
 
@@ -79,7 +82,8 @@ SELECT COUNT(p.id) > 0
             FROM StudentParticipation p
                 LEFT JOIN p.team.students ts
             WHERE p.exercise.course.id = :courseId
-                AND (p.student.id = :studentId OR ts.id = :studentId)
+                AND (p.student.id = :studentId
+                    OR ts.id = :studentId)
             """)
     boolean existsByCourseIdAndStudentId(@Param("courseId") long courseId, @Param("studentId") long studentId);
 
@@ -91,7 +95,8 @@ SELECT COUNT(p.id) > 0
             WHERE p.testRun = FALSE
                 AND p.exercise.exerciseGroup.exam.id = :examId
                 AND r.rated = TRUE
-                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL)
+                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL
+                    OR s.type IS NULL)
             """)
     List<StudentParticipation> findByExamIdWithEagerLegalSubmissionsRatedResults(@Param("examId") long examId);
 
@@ -125,7 +130,8 @@ SELECT COUNT(p.id) > 0
                 LEFT JOIN FETCH p.submissions s
             WHERE p.exercise.id = :exerciseId
                 AND p.student.login = :username
-                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL)
+                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL
+                    OR s.type IS NULL)
             """)
     Optional<StudentParticipation> findWithEagerLegalSubmissionsByExerciseIdAndStudentLogin(@Param("exerciseId") long exerciseId, @Param("username") String username);
 
@@ -135,7 +141,8 @@ SELECT COUNT(p.id) > 0
                 LEFT JOIN FETCH p.submissions s
             WHERE p.exercise.id = :exerciseId
                 AND p.student.login = :username
-                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL)
+                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL
+                    OR s.type IS NULL)
                 AND p.testRun = :testRun
             """)
     Optional<StudentParticipation> findWithEagerLegalSubmissionsByExerciseIdAndStudentLoginAndTestRun(@Param("exerciseId") long exerciseId, @Param("username") String username,
@@ -157,7 +164,8 @@ Optional<StudentParticipation> findWithEagerLegalSubmissionsByExerciseIdAndStude
                 LEFT JOIN FETCH t.students
             WHERE p.exercise.id = :exerciseId
                 AND p.team.id = :teamId
-                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL)
+                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL
+                    OR s.type IS NULL)
             """)
     Optional<StudentParticipation> findWithEagerLegalSubmissionsAndTeamStudentsByExerciseIdAndTeamId(@Param("exerciseId") long exerciseId, @Param("teamId") long teamId);
 
@@ -175,8 +183,9 @@ SELECT COUNT(p) > 0
             FROM StudentParticipation p
                 LEFT JOIN p.team.students u
                 LEFT JOIN p.student s
-            WHERE p.id = :participationId AND
-                (s.login = :login OR u.login = :login)
+            WHERE p.id = :participationId
+                AND (s.login = :login
+                    OR u.login = :login)
             """)
     boolean existsByIdAndParticipatingStudentLogin(@Param("participationId") long participationId, @Param("login") String login);
 
@@ -187,7 +196,8 @@ SELECT COUNT(p) > 0
                 LEFT JOIN FETCH s.results
             WHERE p.exercise.id = :exerciseId
                 AND p.testRun = :testRun
-                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL)
+                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL
+                    OR s.type IS NULL)
             """)
     List<StudentParticipation> findByExerciseIdAndTestRunWithEagerLegalSubmissionsResult(@Param("exerciseId") long exerciseId, @Param("testRun") boolean testRun);
 
@@ -235,7 +245,10 @@ Optional<StudentParticipation> findByExerciseIdAndStudentIdAndTestRunWithEagerSu
                 LEFT JOIN FETCH r.assessmentNote
             WHERE p.exercise.id = :exerciseId
                 AND (
-                    r.id = (SELECT MAX(p_r.id) FROM p.results p_r)
+                    r.id = (
+                         SELECT MAX(p_r.id)
+                         FROM p.results p_r
+                    )
                     OR r.assessmentType <> de.tum.cit.aet.artemis.assessment.domain.AssessmentType.AUTOMATIC
                     OR r IS NULL
                 )
@@ -260,29 +273,16 @@ Optional<StudentParticipation> findByExerciseIdAndStudentIdAndTestRunWithEagerSu
                 LEFT JOIN FETCH t.students
             WHERE p.exercise.id = :exerciseId
                 AND (
-                    r.id = (SELECT MAX(p_r.id) FROM p.results p_r)
+                    r.id = (
+                         SELECT MAX(p_r.id)
+                         FROM p.results p_r
+                    )
                     OR r.assessmentType <> de.tum.cit.aet.artemis.assessment.domain.AssessmentType.AUTOMATIC
                     OR r IS NULL
                 )
             """)
     Set<StudentParticipation> findByExerciseIdWithLatestAndManualResultsWithTeamInformation(@Param("exerciseId") long exerciseId);
 
-    @Query("""
-            SELECT DISTINCT p
-            FROM StudentParticipation p
-                LEFT JOIN FETCH p.results r
-                LEFT JOIN FETCH r.submission s
-                LEFT JOIN FETCH p.submissions
-                LEFT JOIN FETCH r.assessmentNote
-            WHERE p.exercise.id = :exerciseId
-                AND (
-                    r.id = (SELECT MAX(p_r.id) FROM p.results p_r WHERE p_r.rated = TRUE)
-                    OR r.assessmentType <> de.tum.cit.aet.artemis.assessment.domain.AssessmentType.AUTOMATIC
-                    OR r IS NULL
-                )
-            """)
-    Set<StudentParticipation> findByExerciseIdWithLatestAndManualRatedResultsAndAssessmentNote(@Param("exerciseId") long exerciseId);
-
     @Query("""
             SELECT DISTINCT p
             FROM StudentParticipation p
@@ -292,7 +292,11 @@ Optional<StudentParticipation> findByExerciseIdAndStudentIdAndTestRunWithEagerSu
                 AND p.testRun = :testRun
                 AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL)
                 AND r.assessmentType <> de.tum.cit.aet.artemis.assessment.domain.AssessmentType.AUTOMATIC
-                AND r.id = (SELECT MAX(r2.id) FROM p.results r2 WHERE r2.completionDate IS NOT NULL)
+                AND r.id = (
+                    SELECT MAX(r2.id)
+                    FROM p.results r2
+                    WHERE r2.completionDate IS NOT NULL
+                )
             """)
     Set<StudentParticipation> findByExerciseIdAndTestRunWithEagerLegalSubmissionsAndLatestResultWithCompletionDate(@Param("exerciseId") long exerciseId,
             @Param("testRun") boolean testRun);
@@ -343,16 +347,14 @@ default List<StudentParticipation> findByExerciseIdWithLatestAutomaticResultAndF
                 LEFT JOIN FETCH f.testCase
                 LEFT JOIN FETCH r.submission s
             WHERE p.id = :participationId
-                AND (r.id = (
+                AND r.id = (
                     SELECT MAX(pr.id)
                     FROM p.results pr
                         LEFT JOIN pr.submission prs
                     WHERE pr.assessmentType = de.tum.cit.aet.artemis.assessment.domain.AssessmentType.AUTOMATIC
-                        AND (
-                            prs.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL
-                            OR prs.type IS NULL
-                        )
-                ))
+                        AND (prs.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL
+                            OR prs.type IS NULL)
+                )
             """)
     Optional<StudentParticipation> findByIdWithLatestAutomaticResultAndFeedbacksAndTestCases(@Param("participationId") long participationId);
 
@@ -366,10 +368,8 @@ SELECT MAX(pr.id)
                 LEFT JOIN FETCH r.submission s
             WHERE p.exercise.id = :exerciseId
                 AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL)
-                AND (
-                    r.assessmentType = de.tum.cit.aet.artemis.assessment.domain.AssessmentType.MANUAL
-                    OR r.assessmentType = de.tum.cit.aet.artemis.assessment.domain.AssessmentType.SEMI_AUTOMATIC
-                )
+                AND (r.assessmentType = de.tum.cit.aet.artemis.assessment.domain.AssessmentType.MANUAL
+                    OR r.assessmentType = de.tum.cit.aet.artemis.assessment.domain.AssessmentType.SEMI_AUTOMATIC)
             """)
     List<StudentParticipation> findByExerciseIdWithManualResultAndFeedbacksAndTestCases(@Param("exerciseId") long exerciseId);
 
@@ -385,11 +385,10 @@ default List<StudentParticipation> findByExerciseIdWithManualResultAndFeedbacksA
                 LEFT JOIN FETCH f.testCase
                 LEFT JOIN FETCH r.submission s
             WHERE p.id = :participationId
-                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL)
-                AND (
-                    r.assessmentType = de.tum.cit.aet.artemis.assessment.domain.AssessmentType.MANUAL
-                    OR r.assessmentType = de.tum.cit.aet.artemis.assessment.domain.AssessmentType.SEMI_AUTOMATIC
-                )
+                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL
+                    OR s.type IS NULL)
+                AND (r.assessmentType = de.tum.cit.aet.artemis.assessment.domain.AssessmentType.MANUAL
+                    OR r.assessmentType = de.tum.cit.aet.artemis.assessment.domain.AssessmentType.SEMI_AUTOMATIC)
             """)
     Optional<StudentParticipation> findByIdWithManualResultAndFeedbacks(@Param("participationId") long participationId);
 
@@ -399,7 +398,8 @@ default List<StudentParticipation> findByExerciseIdWithManualResultAndFeedbacksA
                 LEFT JOIN FETCH p.submissions s
             WHERE p.exercise.id = :exerciseId
                 AND p.student.id = :studentId
-                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL)
+                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL
+                    OR s.type IS NULL)
             """)
     List<StudentParticipation> findByExerciseIdAndStudentIdWithEagerLegalSubmissions(@Param("exerciseId") long exerciseId, @Param("studentId") long studentId);
 
@@ -427,7 +427,8 @@ default List<StudentParticipation> findByExerciseIdWithManualResultAndFeedbacksA
                 LEFT JOIN FETCH p.submissions s
             WHERE p.exercise.id = :exerciseId
                 AND p.team.id = :teamId
-                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL)
+                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL
+                    OR s.type IS NULL)
             """)
     List<StudentParticipation> findByExerciseIdAndTeamIdWithEagerLegalSubmissions(@Param("exerciseId") long exerciseId, @Param("teamId") long teamId);
 
@@ -451,8 +452,10 @@ default List<StudentParticipation> findByExerciseIdWithManualResultAndFeedbacksA
                 LEFT JOIN FETCH t.students
             WHERE p.exercise.id = :exerciseId
                 AND p.team.id = :teamId
-                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL)
-                AND (rs.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR rs.type IS NULL)
+                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL
+                    OR s.type IS NULL)
+                AND (rs.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL
+                    OR rs.type IS NULL)
             """)
     List<StudentParticipation> findByExerciseIdAndTeamIdWithEagerResultsAndLegalSubmissionsAndTeamStudents(@Param("exerciseId") long exerciseId, @Param("teamId") long teamId);
 
@@ -471,7 +474,8 @@ SELECT MAX(pr.id)
                         LEFT JOIN pr.submission prs
                     WHERE prs.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL
                         OR prs.type IS NULL
-                ) OR r.id IS NULL)
+                )
+                    OR r.id IS NULL)
             """)
     Optional<StudentParticipation> findByExerciseIdAndStudentIdAndTestRunWithLatestResult(@Param("exerciseId") long exerciseId, @Param("studentId") long studentId,
             @Param("testRun") boolean testRun);
@@ -524,7 +528,10 @@ WHERE prs.assessmentType IN (
                     )
                 )
                 AND submission.submitted = TRUE
-                AND submission.id = (SELECT MAX(s.id) FROM p.submissions s)
+                AND submission.id = (
+                    SELECT MAX(s.id)
+                    FROM p.submissions s
+                )
             """)
     List<StudentParticipation> findByExerciseIdWithLatestSubmissionWithoutManualResultsAndIgnoreTestRunParticipation(@Param("exerciseId") long exerciseId,
             @Param("correctionRound") long correctionRound);
@@ -548,7 +555,10 @@ WHERE prs.assessmentType IN (
                         de.tum.cit.aet.artemis.assessment.domain.AssessmentType.SEMI_AUTOMATIC
                     )
                 ) AND s.submitted = TRUE
-                AND s.id = (SELECT MAX(s.id) FROM p.submissions s)
+                AND s.id = (
+                    SELECT MAX(s.id)
+                    FROM p.submissions s
+                )
             """)
     List<StudentParticipation> findByExerciseIdWithLatestSubmissionWithoutManualResultsWithPassedIndividualDueDateIgnoreTestRuns(@Param("exerciseId") long exerciseId,
             @Param("now") ZonedDateTime now);
@@ -558,7 +568,8 @@ List<StudentParticipation> findByExerciseIdWithLatestSubmissionWithoutManualResu
             FROM Participation p
                 LEFT JOIN FETCH p.submissions s
             WHERE p.id = :participationId
-                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL)
+                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL
+                    OR s.type IS NULL)
             """)
     Optional<StudentParticipation> findWithEagerLegalSubmissionsById(@Param("participationId") long participationId);
 
@@ -593,8 +604,10 @@ List<StudentParticipation> findByExerciseIdWithLatestSubmissionWithoutManualResu
                 LEFT JOIN FETCH p.team t
                 LEFT JOIN FETCH t.students
             WHERE p.id = :participationId
-                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL)
-                AND (rs.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR rs.type IS NULL)
+                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL
+                    OR s.type IS NULL)
+                AND (rs.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL
+                    OR rs.type IS NULL)
             """)
     Optional<StudentParticipation> findWithEagerLegalSubmissionsResultsFeedbacksById(@Param("participationId") long participationId);
 
@@ -617,10 +630,9 @@ List<StudentParticipation> findByExerciseIdWithLatestSubmissionWithoutManualResu
             FROM StudentParticipation p
                 JOIN Result r ON r.participation.id = p.id
             WHERE p.exercise.id = :exerciseId
-                AND (
-                    p.student.firstName LIKE %:partialStudentName%
-                    OR p.student.lastName LIKE %:partialStudentName%
-                ) AND r.completionDate IS NOT NULL
+                AND (p.student.firstName LIKE %:partialStudentName%
+                    OR p.student.lastName LIKE %:partialStudentName%)
+                AND r.completionDate IS NOT NULL
             """)
     List<Long> findIdsByExerciseIdAndStudentName(@Param("exerciseId") long exerciseId, @Param("partialStudentName") String partialStudentName, Pageable pageable);
 
@@ -632,10 +644,9 @@ SELECT COUNT(p)
             FROM StudentParticipation p
                 JOIN Result r ON r.participation.id = p.id
             WHERE p.exercise.id = :exerciseId
-                AND (
-                    p.student.firstName LIKE %:partialStudentName%
-                    OR p.student.lastName LIKE %:partialStudentName%
-                ) AND r.completionDate IS NOT NULL
+                AND (p.student.firstName LIKE %:partialStudentName%
+                    OR p.student.lastName LIKE %:partialStudentName%)
+                AND r.completionDate IS NOT NULL
             """)
     long countByExerciseIdAndStudentName(@Param("exerciseId") long exerciseId, @Param("partialStudentName") String partialStudentName);
 
@@ -666,8 +677,10 @@ default Page<StudentParticipation> findAllWithEagerSubmissionsAndResultsByExerci
                 LEFT JOIN FETCH p.submissions s
                 LEFT JOIN FETCH s.results sr
             WHERE p.exercise.id = :exerciseId
-                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL)
-                AND (rs.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR rs.type IS NULL)
+                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL
+                    OR s.type IS NULL)
+                AND (rs.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL
+                    OR rs.type IS NULL)
             """)
     List<StudentParticipation> findAllWithEagerLegalSubmissionsAndEagerResultsByExerciseId(@Param("exerciseId") long exerciseId);
 
@@ -697,12 +710,17 @@ default Page<StudentParticipation> findAllWithEagerSubmissionsAndResultsByExerci
                 LEFT JOIN FETCH p.team
             WHERE p.exercise.id = :exerciseId
                 AND p.testRun = FALSE
-                AND s.id = (SELECT MAX(s2.id)
-                            FROM p.submissions s2
-                            WHERE s2.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s2.type IS NULL)
-                AND r.id = (SELECT MAX(r2.id)
-                            FROM s.results r2
-                            WHERE r2.rated = TRUE)
+                AND s.id = (
+                    SELECT MAX(s2.id)
+                    FROM p.submissions s2
+                    WHERE s2.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL
+                        OR s2.type IS NULL
+                )
+                AND r.id = (
+                    SELECT MAX(r2.id)
+                    FROM s.results r2
+                    WHERE r2.rated = TRUE
+                )
             """)
     List<StudentParticipation> findAllForPlagiarism(@Param("exerciseId") long exerciseId);
 
@@ -713,7 +731,8 @@ default Page<StudentParticipation> findAllWithEagerSubmissionsAndResultsByExerci
                 LEFT JOIN FETCH s.results r
             WHERE p.student.id = :studentId
                 AND p.exercise IN :exercises
-                AND (p.testRun = FALSE OR :includeTestRuns = TRUE)
+                AND (p.testRun = FALSE
+                    OR :includeTestRuns = TRUE)
             """)
     Set<StudentParticipation> findByStudentIdAndIndividualExercisesWithEagerSubmissionsResult(@Param("studentId") long studentId,
             @Param("exercises") Collection<Exercise> exercises, @Param("includeTestRuns") boolean includeTestRuns);
@@ -786,7 +805,8 @@ List<StudentParticipation> findTestRunParticipationsByStudentIdAndIndividualExer
                 LEFT JOIN FETCH t.students teamStudent
             WHERE teamStudent.id = :studentId
                 AND p.exercise IN :exercises
-                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL)
+                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL
+                    OR s.type IS NULL)
             """)
     Set<StudentParticipation> findByStudentIdAndTeamExercisesWithEagerLegalSubmissionsResult(@Param("studentId") long studentId,
             @Param("exercises") Collection<Exercise> exercises);
@@ -799,7 +819,8 @@ Set<StudentParticipation> findByStudentIdAndTeamExercisesWithEagerLegalSubmissio
                 LEFT JOIN FETCH p.team t
             WHERE p.exercise.course.id = :courseId
                 AND t.shortName = :teamShortName
-                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL)
+                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL
+                    OR s.type IS NULL)
             """)
     List<StudentParticipation> findAllByCourseIdAndTeamShortNameWithEagerLegalSubmissionsResult(@Param("courseId") long courseId, @Param("teamShortName") String teamShortName);
 
@@ -831,7 +852,8 @@ SELECT p.id, COUNT(s)
                 LEFT JOIN p.submissions s
             WHERE p.team.shortName = :teamShortName
                 AND p.exercise.course.id = :courseId
-                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL)
+                AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL
+                    OR s.type IS NULL)
             GROUP BY p.id
             """)
     List<long[]> countLegalSubmissionsPerParticipationByCourseIdAndTeamShortName(@Param("courseId") long courseId, @Param("teamShortName") String teamShortName);
@@ -850,7 +872,8 @@ AND EXISTS (
                     FROM p.submissions s1
                     WHERE s1.participation.id = p.id
                         AND s1.submitted = TRUE
-                        AND (r.assessor = :assessor OR r.assessor.id IS NULL)
+                        AND (r.assessor = :assessor
+                            OR r.assessor.id IS NULL)
                 )
             """)
     List<StudentParticipation> findAllByParticipationExerciseIdAndResultAssessorAndCorrectionRoundIgnoreTestRuns(@Param("exerciseId") long exerciseId,
diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java
index 4d549bb3fe66..b56b2df2aed9 100644
--- a/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java
+++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java
@@ -66,7 +66,6 @@
 import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService;
 import de.tum.cit.aet.artemis.core.util.HeaderUtil;
 import de.tum.cit.aet.artemis.exercise.domain.Exercise;
-import de.tum.cit.aet.artemis.exercise.domain.ExerciseType;
 import de.tum.cit.aet.artemis.exercise.domain.InitializationState;
 import de.tum.cit.aet.artemis.exercise.domain.Submission;
 import de.tum.cit.aet.artemis.exercise.domain.SubmissionType;
@@ -595,9 +594,7 @@ public ResponseEntity<List<StudentParticipation>> updateParticipationDueDates(@P
     }
 
     private Set<StudentParticipation> findParticipationWithLatestResults(Exercise exercise) {
-        if (exercise.getExerciseType() == ExerciseType.QUIZ) {
-            return studentParticipationRepository.findByExerciseIdWithLatestAndManualRatedResultsAndAssessmentNote(exercise.getId());
-        }
+        // TODO: we should reduce the amount of data fetched here and sent to the client, because submissions and results are not used at all
         if (exercise.isTeamMode()) {
             // For team exercises the students need to be eagerly fetched
             return studentParticipationRepository.findByExerciseIdWithLatestAndManualResultsWithTeamInformation(exercise.getId());
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingSubmissionRepository.java
index ffe438217b64..90d514ca4b68 100644
--- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingSubmissionRepository.java
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingSubmissionRepository.java
@@ -50,7 +50,8 @@ default ProgrammingSubmission findFirstByParticipationIdAndCommitHashOrderByIdDe
     @Query(value = """
             SELECT new de.tum.cit.aet.artemis.programming.dto.ProgrammingSubmissionIdAndSubmissionDateDTO(ps.id, ps.submissionDate)
             FROM ProgrammingSubmission ps
-            WHERE ps.participation.id = :participationId ORDER BY ps.submissionDate DESC
+            WHERE ps.participation.id = :participationId
+            ORDER BY ps.submissionDate DESC
             """)
     List<ProgrammingSubmissionIdAndSubmissionDateDTO> findFirstIdByParticipationIdOrderBySubmissionDateDesc(@Param("participationId") long participationId, Pageable pageable);
 
@@ -72,8 +73,8 @@ default Optional<ProgrammingSubmission> findFirstByParticipationIdWithResultsOrd
         if (result.isEmpty()) {
             return Optional.empty();
         }
-        long id = result.getFirst().programmingSubmissionId();
-        return findProgrammingSubmissionWithResultsById(id);
+        long submissionId = result.getFirst().programmingSubmissionId();
+        return findProgrammingSubmissionWithResultsById(submissionId);
     }
 
     @Query("""
@@ -104,8 +105,7 @@ default Optional<ProgrammingSubmission> findFirstByParticipationIdWithResultsOrd
      * @return ProgrammingSubmission list (can be empty!)
      */
     default List<ProgrammingSubmission> findGradedByParticipationIdWithResultsOrderBySubmissionDateDesc(long participationId, Pageable pageable) {
-        List<Long> ids = findSubmissionIdsAndDatesByParticipationId(participationId, pageable).stream().map(ProgrammingSubmissionIdAndSubmissionDateDTO::programmingSubmissionId)
-                .toList();
+        var ids = findSubmissionIdsAndDatesByParticipationId(participationId, pageable).stream().map(ProgrammingSubmissionIdAndSubmissionDateDTO::programmingSubmissionId).toList();
 
         if (ids.isEmpty()) {
             return Collections.emptyList();
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseParticipationResource.java
index be1c99c67be6..debe78f111da 100644
--- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseParticipationResource.java
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseParticipationResource.java
@@ -231,12 +231,12 @@ public ResponseEntity<ProgrammingSubmission> getLatestPendingSubmission(@PathVar
     @GetMapping("programming-exercises/{exerciseId}/latest-pending-submissions")
     @EnforceAtLeastTutor
     public ResponseEntity<Map<Long, Optional<ProgrammingSubmission>>> getLatestPendingSubmissionsByExerciseId(@PathVariable Long exerciseId) {
-        ProgrammingExercise programmingExercise;
-        programmingExercise = programmingExerciseRepository.findByIdWithTemplateAndSolutionParticipationElseThrow(exerciseId);
+        ProgrammingExercise programmingExercise = programmingExerciseRepository.findByIdWithTemplateAndSolutionParticipationElseThrow(exerciseId);
 
         if (!authCheckService.isAtLeastTeachingAssistantForExercise(programmingExercise)) {
             throw new AccessForbiddenException("exercise", exerciseId);
         }
+        // TODO: this REST call is quite slow for > 100 participations. We should consider a more efficient way to get the latest pending submissions.
         Map<Long, Optional<ProgrammingSubmission>> pendingSubmissions = submissionService.getLatestPendingSubmissionsForProgrammingExercise(exerciseId);
         // Remove unnecessary data to make response smaller (exercise, student of participation).
         pendingSubmissions = pendingSubmissions.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, entry -> {
diff --git a/src/main/webapp/app/exercises/shared/participation/participation.component.html b/src/main/webapp/app/exercises/shared/participation/participation.component.html
index c3eadf5cd3e1..27f175995eef 100644
--- a/src/main/webapp/app/exercises/shared/participation/participation.component.html
+++ b/src/main/webapp/app/exercises/shared/participation/participation.component.html
@@ -4,38 +4,36 @@
             <h2>
                 <span>{{ exercise?.title }} - </span>{{ filteredParticipationsSize }} <span jhiTranslate="artemisApp.participation.home.title"></span>
             </h2>
-            @if (exercise?.type === ExerciseType.PROGRAMMING) {
-                <div class="d-flex align-items-center mt-2">
-                    <label class="radio-inline mb-0 d-flex align-items-center">
-                        <input type="radio" [ngModel]="participationCriteria.filterProp" (click)="updateParticipationFilter(FilterProp.ALL)" [value]="FilterProp.ALL" />
-                        <span class="ms-1" jhiTranslate="artemisApp.exercise.showAll"></span>
-                    </label>
-                    <label class="radio-inline ms-2 mb-0 d-flex align-items-center">
-                        <input type="radio" [ngModel]="participationCriteria.filterProp" (click)="updateParticipationFilter(FilterProp.FAILED)" [value]="FilterProp.FAILED" />
-                        <span class="ms-1" jhiTranslate="artemisApp.exercise.showFailed"></span>
-                    </label>
+            <div class="d-flex align-items-center mt-2">
+                <label class="radio-inline mb-0 d-flex align-items-center">
+                    <input type="radio" [ngModel]="participationCriteria.filterProp" (click)="updateParticipationFilter(FilterProp.ALL)" [value]="FilterProp.ALL" />
+                    <span class="ms-1" jhiTranslate="artemisApp.exercise.showAll"></span>
+                </label>
+                <label class="radio-inline ms-2 mb-0 d-flex align-items-center">
+                    <input type="radio" [ngModel]="participationCriteria.filterProp" (click)="updateParticipationFilter(FilterProp.FAILED)" [value]="FilterProp.FAILED" />
+                    <span class="ms-1" jhiTranslate="artemisApp.exercise.showFailed"></span>
+                </label>
+                <label class="radio-inline ms-2 mb-0 d-flex align-items-center">
+                    <input
+                        type="radio"
+                        [ngModel]="participationCriteria.filterProp"
+                        (click)="updateParticipationFilter(FilterProp.NO_SUBMISSIONS)"
+                        [value]="FilterProp.NO_SUBMISSIONS"
+                    />
+                    <span class="ms-1" jhiTranslate="artemisApp.exercise.showNoSubmissions"></span>
+                </label>
+                @if (exercise.type === ExerciseType.PROGRAMMING && afterDueDate) {
                     <label class="radio-inline ms-2 mb-0 d-flex align-items-center">
                         <input
                             type="radio"
                             [ngModel]="participationCriteria.filterProp"
-                            (click)="updateParticipationFilter(FilterProp.NO_SUBMISSIONS)"
-                            [value]="FilterProp.NO_SUBMISSIONS"
+                            (click)="updateParticipationFilter(FilterProp.NO_PRACTICE)"
+                            [value]="FilterProp.NO_PRACTICE"
                         />
-                        <span class="ms-1" jhiTranslate="artemisApp.exercise.showNoSubmissions"></span>
+                        <span class="ms-1" jhiTranslate="artemisApp.exercise.showNoPracticeMode"></span>
                     </label>
-                    @if (exercise.type === ExerciseType.PROGRAMMING && afterDueDate) {
-                        <label class="radio-inline ms-2 mb-0 d-flex align-items-center">
-                            <input
-                                type="radio"
-                                [ngModel]="participationCriteria.filterProp"
-                                (click)="updateParticipationFilter(FilterProp.NO_PRACTICE)"
-                                [value]="FilterProp.NO_PRACTICE"
-                            />
-                            <span class="ms-1" jhiTranslate="artemisApp.exercise.showNoPracticeMode"></span>
-                        </label>
-                    }
-                </div>
-            }
+                }
+            </div>
         </div>
         @if (exercise?.type !== ExerciseType.QUIZ && exercise?.isAtLeastInstructor) {
             <div class="p-2">
diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/participation/ParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/participation/ParticipationIntegrationTest.java
index 8e97d56893d8..3f32fb13ca5d 100644
--- a/src/test/java/de/tum/cit/aet/artemis/exercise/participation/ParticipationIntegrationTest.java
+++ b/src/test/java/de/tum/cit/aet/artemis/exercise/participation/ParticipationIntegrationTest.java
@@ -916,7 +916,8 @@ void getAllParticipationsForExercise_withLatestResults_forQuizExercise() throws
         courseRepository.save(course);
         exerciseRepository.save(quizExercise);
 
-        var participation = participationUtilService.createAndSaveParticipationForExercise(quizExercise, TEST_PREFIX + "student1");
+        final var login = TEST_PREFIX + "student1";
+        var participation = participationUtilService.createAndSaveParticipationForExercise(quizExercise, login);
         var result1 = participationUtilService.createSubmissionAndResult(participation, 42, true);
         var notGradedResult = participationUtilService.addResultToParticipation(participation, result1.getSubmission());
         notGradedResult.setRated(false);
@@ -926,11 +927,10 @@ void getAllParticipationsForExercise_withLatestResults_forQuizExercise() throws
         params.add("withLatestResults", "true");
         var participations = request.getList("/api/exercises/" + quizExercise.getId() + "/participations", HttpStatus.OK, StudentParticipation.class, params);
 
-        var receivedParticipationWithResult = participations.stream().filter(p -> ((User) p.getParticipant()).getLogin().equals(TEST_PREFIX + "student1")).findFirst()
-                .orElseThrow();
-        assertThat(receivedParticipationWithResult.getResults()).containsOnly(result1);
-        assertThat(receivedParticipationWithResult.getSubmissions()).isEmpty();
-        assertThat(receivedParticipationWithResult.getSubmissionCount()).isEqualTo(1);
+        var receivedParticipation = participations.stream().filter(p -> p.getParticipantIdentifier().equals(login)).findFirst().orElseThrow();
+        assertThat(receivedParticipation.getResults()).containsOnly(notGradedResult);
+        assertThat(receivedParticipation.getSubmissions()).isEmpty();
+        assertThat(receivedParticipation.getSubmissionCount()).isEqualTo(1);
     }
 
     @Test

From a4c674ca5b41b75ec3144969e373522787fedcde Mon Sep 17 00:00:00 2001
From: Stephan Krusche <krusche@tum.de>
Date: Mon, 25 Nov 2024 17:49:22 +0100
Subject: [PATCH 2/8] General: Improve performance of exercise participations
 view

---
 .../exercise/web/ParticipationResource.java   |  2 +-
 ...xerciseStudentParticipationRepository.java |  4 ++--
 .../service/ProgrammingSubmissionService.java | 19 +++++++++++--------
 ...grammingExerciseParticipationResource.java |  9 +++++----
 .../participation/participation.component.ts  |  2 +-
 .../participation.component.spec.ts           |  4 ++--
 6 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java
index b56b2df2aed9..05e3166ff171 100644
--- a/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java
+++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java
@@ -594,7 +594,7 @@ public ResponseEntity<List<StudentParticipation>> updateParticipationDueDates(@P
     }
 
     private Set<StudentParticipation> findParticipationWithLatestResults(Exercise exercise) {
-        // TODO: we should reduce the amount of data fetched here and sent to the client, because submissions and results are not used at all
+        // TODO: we should reduce the amount of data fetched here and sent to the client: double check which data is actually required in the exercise scores page
         if (exercise.isTeamMode()) {
             // For team exercises the students need to be eagerly fetched
             return studentParticipationRepository.findByExerciseIdWithLatestAndManualResultsWithTeamInformation(exercise.getId());
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseStudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseStudentParticipationRepository.java
index cc1f57c533fa..c88024f0835b 100644
--- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseStudentParticipationRepository.java
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseStudentParticipationRepository.java
@@ -136,8 +136,8 @@ Optional<ProgrammingExerciseStudentParticipation> findWithSubmissionsAndEagerStu
     @EntityGraph(type = LOAD, attributePaths = { "submissions", "team.students" })
     List<ProgrammingExerciseStudentParticipation> findWithSubmissionsById(long participationId);
 
-    @EntityGraph(type = LOAD, attributePaths = { "submissions" })
-    List<ProgrammingExerciseStudentParticipation> findWithSubmissionsByExerciseId(long exerciseId);
+    @EntityGraph(type = LOAD, attributePaths = { "submissions.results" })
+    List<ProgrammingExerciseStudentParticipation> findWithSubmissionsAndResultsByExerciseId(long exerciseId);
 
     @EntityGraph(type = LOAD, attributePaths = { "submissions", "team.students" })
     List<ProgrammingExerciseStudentParticipation> findWithSubmissionsAndTeamStudentsByExerciseId(long exerciseId);
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingSubmissionService.java
index 58665d8beae4..9de4485f16b2 100644
--- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingSubmissionService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingSubmissionService.java
@@ -6,6 +6,7 @@
 
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -341,14 +342,16 @@ public Optional<ProgrammingSubmission> getLatestPendingSubmission(Long participa
      * @return a Map of {[participationId]: ProgrammingSubmission | null}. Will contain an entry for every student participation of the exercise and a submission object if a
      *         pending submission exists or null if not.
      */
-    public Map<Long, Optional<ProgrammingSubmission>> getLatestPendingSubmissionsForProgrammingExercise(Long programmingExerciseId) {
-        List<ProgrammingExerciseStudentParticipation> participations = programmingExerciseStudentParticipationRepository.findWithSubmissionsByExerciseId(programmingExerciseId);
-        // TODO: find the latest pending submission directly using Java (the submissions are available now) and not with additional db queries
-        return participations.stream().collect(Collectors.toMap(Participation::getId, p -> findLatestPendingSubmissionForParticipation(p.getId())));
-    }
-
-    private Optional<ProgrammingSubmission> findLatestPendingSubmissionForParticipation(final long participationId) {
-        return findLatestPendingSubmissionForParticipation(participationId, false);
+    public Map<Long, Optional<Submission>> getLatestPendingSubmissionsForProgrammingExercise(Long programmingExerciseId) {
+        var participations = programmingExerciseStudentParticipationRepository.findWithSubmissionsAndResultsByExerciseId(programmingExerciseId);
+        return participations.stream().collect(Collectors.toMap(Participation::getId, p -> {
+            var latestSubmission = p.getSubmissions().stream().max(Comparator.comparing(Submission::getSubmissionDate));
+            if (latestSubmission.isEmpty() || latestSubmission.get().getLatestResult() != null) {
+                // This is not an error case, it is very likely that there is no pending submission for a participation.
+                return Optional.empty();
+            }
+            return latestSubmission;
+        }));
     }
 
     private Optional<ProgrammingSubmission> findLatestPendingSubmissionForParticipation(final long participationId, final boolean isGraded) {
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseParticipationResource.java
index debe78f111da..2566e1a87fb8 100644
--- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseParticipationResource.java
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseParticipationResource.java
@@ -37,6 +37,7 @@
 import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService;
 import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository;
 import de.tum.cit.aet.artemis.exam.service.ExamService;
+import de.tum.cit.aet.artemis.exercise.domain.Submission;
 import de.tum.cit.aet.artemis.exercise.domain.participation.Participation;
 import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository;
 import de.tum.cit.aet.artemis.exercise.service.ParticipationAuthorizationCheckService;
@@ -230,17 +231,17 @@ public ResponseEntity<ProgrammingSubmission> getLatestPendingSubmission(@PathVar
      */
     @GetMapping("programming-exercises/{exerciseId}/latest-pending-submissions")
     @EnforceAtLeastTutor
-    public ResponseEntity<Map<Long, Optional<ProgrammingSubmission>>> getLatestPendingSubmissionsByExerciseId(@PathVariable Long exerciseId) {
+    public ResponseEntity<Map<Long, Optional<Submission>>> getLatestPendingSubmissionsByExerciseId(@PathVariable Long exerciseId) {
         ProgrammingExercise programmingExercise = programmingExerciseRepository.findByIdWithTemplateAndSolutionParticipationElseThrow(exerciseId);
 
         if (!authCheckService.isAtLeastTeachingAssistantForExercise(programmingExercise)) {
             throw new AccessForbiddenException("exercise", exerciseId);
         }
-        // TODO: this REST call is quite slow for > 100 participations. We should consider a more efficient way to get the latest pending submissions.
-        Map<Long, Optional<ProgrammingSubmission>> pendingSubmissions = submissionService.getLatestPendingSubmissionsForProgrammingExercise(exerciseId);
+        // TODO: use a different data structure than map here
+        Map<Long, Optional<Submission>> pendingSubmissions = submissionService.getLatestPendingSubmissionsForProgrammingExercise(exerciseId);
         // Remove unnecessary data to make response smaller (exercise, student of participation).
         pendingSubmissions = pendingSubmissions.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, entry -> {
-            Optional<ProgrammingSubmission> submissionOpt = entry.getValue();
+            Optional<Submission> submissionOpt = entry.getValue();
             // Remove participation, is not needed in the response.
             submissionOpt.ifPresent(submission -> submission.setParticipation(null));
             return submissionOpt;
diff --git a/src/main/webapp/app/exercises/shared/participation/participation.component.ts b/src/main/webapp/app/exercises/shared/participation/participation.component.ts
index 627a33ce8815..c3e018e4b526 100644
--- a/src/main/webapp/app/exercises/shared/participation/participation.component.ts
+++ b/src/main/webapp/app/exercises/shared/participation/participation.component.ts
@@ -150,7 +150,7 @@ export class ParticipationComponent implements OnInit, OnDestroy {
     }
 
     private loadParticipations(exerciseId: number) {
-        this.participationService.findAllParticipationsByExercise(exerciseId, true).subscribe((participationsResponse) => {
+        this.participationService.findAllParticipationsByExercise(exerciseId, false).subscribe((participationsResponse) => {
             this.participations = participationsResponse.body!;
             if (this.exercise.type === ExerciseType.PROGRAMMING) {
                 const programmingExercise = this.exercise as ProgrammingExercise;
diff --git a/src/test/javascript/spec/component/participation/participation.component.spec.ts b/src/test/javascript/spec/component/participation/participation.component.spec.ts
index 6661b643ed31..62f43f1f2013 100644
--- a/src/test/javascript/spec/component/participation/participation.component.spec.ts
+++ b/src/test/javascript/spec/component/participation/participation.component.spec.ts
@@ -125,7 +125,7 @@ describe('ParticipationComponent', () => {
         expect(exerciseFindStub).toHaveBeenCalledOnce();
         expect(exerciseFindStub).toHaveBeenCalledWith(theExercise.id);
         expect(participationFindStub).toHaveBeenCalledOnce();
-        expect(participationFindStub).toHaveBeenCalledWith(theExercise.id, true);
+        expect(participationFindStub).toHaveBeenCalledWith(theExercise.id, false);
     }));
 
     it('should initialize for programming exercise', fakeAsync(() => {
@@ -154,7 +154,7 @@ describe('ParticipationComponent', () => {
         expect(exerciseFindStub).toHaveBeenCalledOnce();
         expect(exerciseFindStub).toHaveBeenCalledWith(theExercise.id);
         expect(participationFindStub).toHaveBeenCalledOnce();
-        expect(participationFindStub).toHaveBeenCalledWith(theExercise.id, true);
+        expect(participationFindStub).toHaveBeenCalledWith(theExercise.id, false);
         expect(submissionGetStateStub).toHaveBeenCalledOnce();
         expect(submissionGetStateStub).toHaveBeenCalledWith(theExercise.id);
     }));

From d2a82ea060e88b6acb046de86539a4c4add9f2ac Mon Sep 17 00:00:00 2001
From: Asli Aykan <56061820+asliayk@users.noreply.github.com>
Date: Mon, 25 Nov 2024 21:24:17 +0100
Subject: [PATCH 3/8] Communication: Fix visibility of the edit message option
 for non-authors (#9830)

---
 .../answer-post/answer-post.component.html    |  7 ++-
 .../answer-post/answer-post.component.ts      | 11 ++--
 .../app/shared/metis/post/post.component.html |  7 ++-
 .../app/shared/metis/post/post.component.ts   | 11 ++--
 .../answer-post-reactions-bar.component.html  |  5 +-
 .../answer-post-reactions-bar.component.ts    | 25 +++++++---
 .../post-reactions-bar.component.html         |  4 +-
 .../post-reactions-bar.component.ts           | 27 ++++++----
 ...nswer-post-reactions-bar.component.spec.ts | 23 ++++++++-
 .../post-reactions-bar.component.spec.ts      | 50 +++++++++++++++++--
 10 files changed, 132 insertions(+), 38 deletions(-)

diff --git a/src/main/webapp/app/shared/metis/answer-post/answer-post.component.html b/src/main/webapp/app/shared/metis/answer-post/answer-post.component.html
index 6682f5c146c0..1579e97f9a0f 100644
--- a/src/main/webapp/app/shared/metis/answer-post/answer-post.component.html
+++ b/src/main/webapp/app/shared/metis/answer-post/answer-post.component.html
@@ -31,7 +31,8 @@
                         [isThreadSidebar]="isThreadSidebar"
                         (openPostingCreateEditModal)="createAnswerPostModal.open()"
                         (reactionsUpdated)="onReactionsUpdated($event)"
-                        (mayEditOrDeleteOutput)="onMayEditOrDelete($event)"
+                        (mayDeleteOutput)="onMayDelete($event)"
+                        (mayEditOutput)="onMayEdit($event)"
                         (isDeleteEvent)="onDeleteEvent(true)"
                     />
                 </div>
@@ -63,11 +64,13 @@
         <fa-icon [icon]="faSmile" class="item-icon"></fa-icon>
         <span jhiTranslate="artemisApp.metis.post.addReaction"></span>
     </button>
-    @if (mayEditOrDelete) {
+    @if (mayEdit) {
         <button class="dropdown-item d-flex" (click)="editPosting()">
             <fa-icon [icon]="faPencilAlt" class="item-icon"></fa-icon>
             <span jhiTranslate="artemisApp.metis.post.editMessage"></span>
         </button>
+    }
+    @if (mayDelete) {
         <button class="dropdown-item d-flex" (click)="deletePost()">
             <fa-icon [icon]="faTrash" class="item-icon"></fa-icon>
             <span jhiTranslate="artemisApp.metis.post.deleteMessage"></span>
diff --git a/src/main/webapp/app/shared/metis/answer-post/answer-post.component.ts b/src/main/webapp/app/shared/metis/answer-post/answer-post.component.ts
index 3b3c5e7ffdf1..ea4d54ba7267 100644
--- a/src/main/webapp/app/shared/metis/answer-post/answer-post.component.ts
+++ b/src/main/webapp/app/shared/metis/answer-post/answer-post.component.ts
@@ -52,7 +52,8 @@ export class AnswerPostComponent extends PostingDirective<AnswerPost> {
     readonly faTrash = faTrash;
     readonly faThumbtack = faThumbtack;
     static activeDropdownPost: AnswerPostComponent | null = null;
-    mayEditOrDelete: boolean = false;
+    mayEdit: boolean = false;
+    mayDelete: boolean = false;
     @ViewChild(AnswerPostReactionsBarComponent) private reactionsBarComponent!: AnswerPostReactionsBarComponent;
 
     constructor(
@@ -95,8 +96,12 @@ export class AnswerPostComponent extends PostingDirective<AnswerPost> {
         }
     }
 
-    onMayEditOrDelete(value: boolean) {
-        this.mayEditOrDelete = value;
+    onMayDelete(value: boolean) {
+        this.mayDelete = value;
+    }
+
+    onMayEdit(value: boolean) {
+        this.mayEdit = value;
     }
 
     onRightClick(event: MouseEvent) {
diff --git a/src/main/webapp/app/shared/metis/post/post.component.html b/src/main/webapp/app/shared/metis/post/post.component.html
index 42352bdfa0d6..0c014cda695c 100644
--- a/src/main/webapp/app/shared/metis/post/post.component.html
+++ b/src/main/webapp/app/shared/metis/post/post.component.html
@@ -80,7 +80,8 @@
                                     (openPostingCreateEditModal)="openCreateAnswerPostModal()"
                                     (openThread)="openThread.emit()"
                                     (isModalOpen)="displayInlineInput = true"
-                                    (mayEditOrDeleteOutput)="onMayEditOrDelete($event)"
+                                    (mayEditOutput)="onMayEdit($event)"
+                                    (mayDeleteOutput)="onMayDelete($event)"
                                     (canPinOutput)="onCanPin($event)"
                                     (isDeleteEvent)="onDeleteEvent(true)"
                                 />
@@ -149,11 +150,13 @@
             <span [jhiTranslate]="checkIfPinned() === DisplayPriority.PINNED ? 'artemisApp.metis.post.unpinMessage' : 'artemisApp.metis.post.pinMessage'"></span>
         </button>
     }
-    @if (mayEditOrDelete) {
+    @if (mayEdit) {
         <button class="dropdown-item d-flex editIcon" (click)="editPosting()">
             <fa-icon [icon]="faPencilAlt" class="item-icon"></fa-icon>
             <span jhiTranslate="artemisApp.metis.post.editMessage"></span>
         </button>
+    }
+    @if (mayDelete) {
         <button class="dropdown-item d-flex deleteIcon" (click)="deletePost()">
             <fa-icon [icon]="faTrash" class="item-icon"></fa-icon>
             <span jhiTranslate="artemisApp.metis.post.deleteMessage"></span>
diff --git a/src/main/webapp/app/shared/metis/post/post.component.ts b/src/main/webapp/app/shared/metis/post/post.component.ts
index bd502fbea1ac..7bfe1d0c6f49 100644
--- a/src/main/webapp/app/shared/metis/post/post.component.ts
+++ b/src/main/webapp/app/shared/metis/post/post.component.ts
@@ -77,7 +77,8 @@ export class PostComponent extends PostingDirective<Post> implements OnInit, OnC
     contextInformation: ContextInformation;
     readonly PageType = PageType;
     readonly DisplayPriority = DisplayPriority;
-    mayEditOrDelete: boolean = false;
+    mayEdit: boolean = false;
+    mayDelete: boolean = false;
     canPin: boolean = false;
 
     // Icons
@@ -112,8 +113,12 @@ export class PostComponent extends PostingDirective<Post> implements OnInit, OnC
         return this.posting.displayPriority === DisplayPriority.PINNED;
     }
 
-    onMayEditOrDelete(value: boolean) {
-        this.mayEditOrDelete = value;
+    onMayEdit(value: boolean) {
+        this.mayEdit = value;
+    }
+
+    onMayDelete(value: boolean) {
+        this.mayDelete = value;
     }
 
     onCanPin(value: boolean) {
diff --git a/src/main/webapp/app/shared/metis/posting-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.html b/src/main/webapp/app/shared/metis/posting-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.html
index e0ed87168dc9..1d0c14bff56f 100644
--- a/src/main/webapp/app/shared/metis/posting-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.html
+++ b/src/main/webapp/app/shared/metis/posting-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.html
@@ -73,11 +73,12 @@
                     }
                 </button>
             }
-            @if (mayEditOrDelete) {
+            @if (mayEdit) {
                 <button class="reaction-button clickable px-2 fs-small edit" (click)="editPosting()" [ngbTooltip]="'artemisApp.metis.editPosting' | artemisTranslate">
                     <fa-icon [icon]="faPencilAlt" cdkOverlayOrigin></fa-icon>
                 </button>
-
+            }
+            @if (mayDelete) {
                 <button class="reaction-button clickable px-2 fs-small delete">
                     <jhi-confirm-icon
                         iconSize="sm"
diff --git a/src/main/webapp/app/shared/metis/posting-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.ts b/src/main/webapp/app/shared/metis/posting-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.ts
index 9023089670d5..c287db1b1d7b 100644
--- a/src/main/webapp/app/shared/metis/posting-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.ts
+++ b/src/main/webapp/app/shared/metis/posting-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, Input, OnChanges, OnInit, Output, output } from '@angular/core';
 import { Reaction } from 'app/entities/metis/reaction.model';
 import { PostingsReactionsBarDirective } from 'app/shared/metis/posting-reactions-bar/posting-reactions-bar.directive';
 import { AnswerPost } from 'app/entities/metis/answer-post.model';
@@ -22,8 +22,10 @@ export class AnswerPostReactionsBarComponent extends PostingsReactionsBarDirecti
     @Output() openPostingCreateEditModal = new EventEmitter<void>();
     isAuthorOfOriginalPost: boolean;
     isAnswerOfAnnouncement: boolean;
-    @Output() mayEditOrDeleteOutput = new EventEmitter<boolean>();
-    mayEditOrDelete: boolean;
+    mayDeleteOutput = output<boolean>();
+    mayDelete: boolean;
+    mayEditOutput = output<boolean>();
+    mayEdit: boolean;
     readonly faPencilAlt = faPencilAlt;
     @Input() isEmojiCount: boolean = false;
     @Output() postingUpdated = new EventEmitter<void>();
@@ -34,12 +36,14 @@ export class AnswerPostReactionsBarComponent extends PostingsReactionsBarDirecti
 
     ngOnInit() {
         super.ngOnInit();
-        this.setMayEditOrDelete();
+        this.setMayEdit();
+        this.setMayDelete();
     }
 
     ngOnChanges() {
         super.ngOnChanges();
-        this.setMayEditOrDelete();
+        this.setMayEdit();
+        this.setMayDelete();
     }
 
     isAnyReactionCountAboveZero(): boolean {
@@ -64,7 +68,7 @@ export class AnswerPostReactionsBarComponent extends PostingsReactionsBarDirecti
         return reaction;
     }
 
-    setMayEditOrDelete(): void {
+    setMayDelete(): void {
         // determines if the current user is the author of the original post, that the answer belongs to
         this.isAuthorOfOriginalPost = this.metisService.metisUserIsAuthorOfPosting(this.posting.post!);
         this.isAnswerOfAnnouncement = getAsChannelDTO(this.posting.post?.conversation)?.isAnnouncementChannel ?? false;
@@ -72,8 +76,13 @@ export class AnswerPostReactionsBarComponent extends PostingsReactionsBarDirecti
         const isAtLeastInstructorInCourse = this.metisService.metisUserIsAtLeastInstructorInCourse();
         const mayEditOrDeleteOtherUsersAnswer =
             (isCourseWideChannel && isAtLeastInstructorInCourse) || (getAsChannelDTO(this.metisService.getCurrentConversation())?.hasChannelModerationRights ?? false);
-        this.mayEditOrDelete = !this.isReadOnlyMode && (this.isAuthorOfPosting || mayEditOrDeleteOtherUsersAnswer);
-        this.mayEditOrDeleteOutput.emit(this.mayEditOrDelete);
+        this.mayDelete = !this.isReadOnlyMode && (this.isAuthorOfPosting || mayEditOrDeleteOtherUsersAnswer);
+        this.mayDeleteOutput.emit(this.mayDelete);
+    }
+
+    setMayEdit() {
+        this.mayEdit = this.isAuthorOfPosting;
+        this.mayEditOutput.emit(this.mayEdit);
     }
 
     editPosting() {
diff --git a/src/main/webapp/app/shared/metis/posting-reactions-bar/post-reactions-bar/post-reactions-bar.component.html b/src/main/webapp/app/shared/metis/posting-reactions-bar/post-reactions-bar/post-reactions-bar.component.html
index 500954b38df8..bf818ff12160 100644
--- a/src/main/webapp/app/shared/metis/posting-reactions-bar/post-reactions-bar/post-reactions-bar.component.html
+++ b/src/main/webapp/app/shared/metis/posting-reactions-bar/post-reactions-bar/post-reactions-bar.component.html
@@ -99,7 +99,7 @@
             </ng-container>
         }
 
-        @if (!isEmojiCount && mayEditOrDelete) {
+        @if (!isEmojiCount && mayEdit) {
             <button
                 class="reaction-button clickable px-2 fs-small edit"
                 [disabled]="readOnlyMode"
@@ -110,7 +110,7 @@
             </button>
         }
         <jhi-post-create-edit-modal #createEditModal [posting]="posting" [isCommunicationPage]="isCommunicationPage" (isModalOpen)="isModalOpen.emit()" />
-        @if (!isEmojiCount && mayEditOrDelete) {
+        @if (!isEmojiCount && mayDelete) {
             <button class="reaction-button clickable fs-small">
                 <jhi-confirm-icon
                     iconSize="sm"
diff --git a/src/main/webapp/app/shared/metis/posting-reactions-bar/post-reactions-bar/post-reactions-bar.component.ts b/src/main/webapp/app/shared/metis/posting-reactions-bar/post-reactions-bar/post-reactions-bar.component.ts
index 2ff96f282a6b..569eec43b75f 100644
--- a/src/main/webapp/app/shared/metis/posting-reactions-bar/post-reactions-bar/post-reactions-bar.component.ts
+++ b/src/main/webapp/app/shared/metis/posting-reactions-bar/post-reactions-bar/post-reactions-bar.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, ViewChild } from '@angular/core';
+import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, ViewChild, output } from '@angular/core';
 import { Reaction } from 'app/entities/metis/reaction.model';
 import { Post } from 'app/entities/metis/post.model';
 import { PostingsReactionsBarDirective } from 'app/shared/metis/posting-reactions-bar/posting-reactions-bar.directive';
@@ -45,9 +45,11 @@ export class PostReactionsBarComponent extends PostingsReactionsBarDirective<Pos
     @Output() openThread = new EventEmitter<void>();
     @Input() previewMode: boolean;
     isAtLeastInstructorInCourse: boolean;
-    @Output() mayEditOrDeleteOutput = new EventEmitter<boolean>();
+    mayDeleteOutput = output<boolean>();
+    mayEditOutput = output<boolean>();
     @Output() canPinOutput = new EventEmitter<boolean>();
-    mayEditOrDelete: boolean;
+    mayEdit: boolean;
+    mayDelete: boolean;
     @ViewChild(PostCreateEditModalComponent) postCreateEditModal?: PostCreateEditModalComponent;
     @Input() isEmojiCount = false;
     @Input() hoverBar: boolean = true;
@@ -82,8 +84,9 @@ export class PostReactionsBarComponent extends PostingsReactionsBarDirective<Pos
 
         const currentConversation = this.metisService.getCurrentConversation();
         this.setCanPin(currentConversation);
+        this.setMayDelete();
+        this.setMayEdit();
         this.resetTooltipsAndPriority();
-        this.setMayEditOrDelete();
     }
 
     ngOnDestroy() {
@@ -117,7 +120,8 @@ export class PostReactionsBarComponent extends PostingsReactionsBarDirective<Pos
     ngOnChanges() {
         super.ngOnChanges();
         this.resetTooltipsAndPriority();
-        this.setMayEditOrDelete();
+        this.setMayDelete();
+        this.setMayEdit();
     }
 
     /**
@@ -196,12 +200,17 @@ export class PostReactionsBarComponent extends PostingsReactionsBarDirective<Pos
         }
     }
 
-    setMayEditOrDelete(): void {
+    setMayDelete(): void {
         this.isAtLeastInstructorInCourse = this.metisService.metisUserIsAtLeastInstructorInCourse();
         const isCourseWideChannel = getAsChannelDTO(this.posting.conversation)?.isCourseWide ?? false;
-        const mayEditOrDeleteOtherUsersAnswer =
+        const mayDeleteOtherUsersAnswer =
             (isCourseWideChannel && this.isAtLeastInstructorInCourse) || (getAsChannelDTO(this.metisService.getCurrentConversation())?.hasChannelModerationRights ?? false);
-        this.mayEditOrDelete = !this.readOnlyMode && !this.previewMode && (this.isAuthorOfPosting || mayEditOrDeleteOtherUsersAnswer);
-        this.mayEditOrDeleteOutput.emit(this.mayEditOrDelete);
+        this.mayDelete = !this.readOnlyMode && !this.previewMode && (this.isAuthorOfPosting || mayDeleteOtherUsersAnswer);
+        this.mayDeleteOutput.emit(this.mayDelete);
+    }
+
+    setMayEdit(): void {
+        this.mayEdit = this.isAuthorOfPosting;
+        this.mayEditOutput.emit(this.mayEdit);
     }
 }
diff --git a/src/test/javascript/spec/component/shared/metis/postings-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.spec.ts b/src/test/javascript/spec/component/shared/metis/postings-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.spec.ts
index a3b889e8d146..583d160dda7a 100644
--- a/src/test/javascript/spec/component/shared/metis/postings-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.spec.ts
+++ b/src/test/javascript/spec/component/shared/metis/postings-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.spec.ts
@@ -128,17 +128,36 @@ describe('AnswerPostReactionsBarComponent', () => {
         expect(getDeleteButton()).not.toBeNull();
     });
 
-    it('should display edit and delete options to instructor if posting is in course-wide channel from a student', () => {
+    it('should display the delete option to instructor if posting is in course-wide channel from a student', () => {
         metisServiceUserIsAtLeastInstructorMock.mockReturnValue(true);
         metisServiceUserPostingAuthorMock.mockReturnValue(false);
         component.posting = { ...metisResolvingAnswerPostUser1, post: { ...metisPostInChannel } };
         component.posting.authorRole = UserRole.USER;
         component.ngOnInit();
         fixture.detectChanges();
-        expect(getEditButton()).not.toBeNull();
         expect(getDeleteButton()).not.toBeNull();
     });
 
+    it('should not display the edit option to user (even instructor) if s/he is not the author of posting', () => {
+        metisServiceUserIsAtLeastInstructorMock.mockReturnValue(true);
+        metisServiceUserPostingAuthorMock.mockReturnValue(false);
+
+        component.ngOnInit();
+        fixture.detectChanges();
+
+        expect(getEditButton()).toBeNull();
+    });
+
+    it('should display the edit option to user if s/he is the author of posting', () => {
+        metisServiceUserIsAtLeastInstructorMock.mockReturnValue(false);
+        metisServiceUserPostingAuthorMock.mockReturnValue(true);
+
+        component.ngOnInit();
+        fixture.detectChanges();
+
+        expect(getEditButton()).not.toBeNull();
+    });
+
     it('should not display edit and delete options to tutor if posting is in course-wide channel from a student', () => {
         metisServiceUserIsAtLeastInstructorMock.mockReturnValue(false);
         metisServiceUserIsAtLeastTutorMock.mockReturnValue(true);
diff --git a/src/test/javascript/spec/component/shared/metis/postings-reactions-bar/post-reactions-bar/post-reactions-bar.component.spec.ts b/src/test/javascript/spec/component/shared/metis/postings-reactions-bar/post-reactions-bar/post-reactions-bar.component.spec.ts
index d1b1607ffb1d..ce01de09f53b 100644
--- a/src/test/javascript/spec/component/shared/metis/postings-reactions-bar/post-reactions-bar/post-reactions-bar.component.spec.ts
+++ b/src/test/javascript/spec/component/shared/metis/postings-reactions-bar/post-reactions-bar/post-reactions-bar.component.spec.ts
@@ -149,7 +149,7 @@ describe('PostReactionsBarComponent', () => {
         expect(getEditButton()).not.toBeNull();
     });
 
-    it('should display edit and delete options to user with channel moderation rights when not the author', () => {
+    it('should display the delete option to user with channel moderation rights when not the author', () => {
         component.readOnlyMode = false;
         component.previewMode = false;
         component.isEmojiCount = false;
@@ -166,10 +166,49 @@ describe('PostReactionsBarComponent', () => {
         component.ngOnInit();
         fixture.detectChanges();
 
-        expect(getEditButton()).not.toBeNull();
         expect(getDeleteButton()).not.toBeNull();
     });
 
+    it('should not display the edit option to user (even instructor) if s/he is not the author of posting', () => {
+        component.readOnlyMode = false;
+        component.previewMode = false;
+        component.isEmojiCount = false;
+
+        const channelConversation = {
+            type: ConversationType.CHANNEL,
+            hasChannelModerationRights: true,
+        } as ChannelDTO;
+
+        jest.spyOn(metisService, 'metisUserIsAuthorOfPosting').mockReturnValue(false);
+        jest.spyOn(metisService, 'metisUserIsAtLeastInstructorInCourse').mockReturnValue(true);
+        jest.spyOn(metisService, 'getCurrentConversation').mockReturnValue(channelConversation);
+
+        component.ngOnInit();
+        fixture.detectChanges();
+
+        expect(getEditButton()).toBeNull();
+    });
+
+    it('should display the edit option to user if s/he is the author of posting', () => {
+        component.readOnlyMode = false;
+        component.previewMode = false;
+        component.isEmojiCount = false;
+
+        const channelConversation = {
+            type: ConversationType.CHANNEL,
+            hasChannelModerationRights: true,
+        } as ChannelDTO;
+
+        jest.spyOn(metisService, 'metisUserIsAuthorOfPosting').mockReturnValue(true);
+        jest.spyOn(metisService, 'metisUserIsAtLeastInstructorInCourse').mockReturnValue(false);
+        jest.spyOn(metisService, 'getCurrentConversation').mockReturnValue(channelConversation);
+
+        component.ngOnInit();
+        fixture.detectChanges();
+
+        expect(getEditButton()).not.toBeNull();
+    });
+
     it('should not display edit and delete options when user is not the author and lacks permissions', () => {
         component.readOnlyMode = false;
         component.previewMode = false;
@@ -198,6 +237,7 @@ describe('PostReactionsBarComponent', () => {
 
     it('should not display edit and delete options to tutor if posting is announcement', () => {
         metisServiceUserIsAtLeastInstructorStub.mockReturnValue(false);
+        metisServiceUserIsAuthorOfPostingStub.mockReturnValue(false);
         component.posting = metisAnnouncement;
         component.ngOnInit();
         fixture.detectChanges();
@@ -205,8 +245,9 @@ describe('PostReactionsBarComponent', () => {
         expect(getDeleteButton()).toBeNull();
     });
 
-    it('should display edit and delete options to instructor if posting is announcement', () => {
+    it('should display edit and delete options to instructor if his posting is announcement', () => {
         metisServiceUserIsAtLeastInstructorStub.mockReturnValue(true);
+        metisServiceUserIsAuthorOfPostingStub.mockReturnValue(true);
         component.posting = metisAnnouncement;
         component.ngOnInit();
         fixture.detectChanges();
@@ -214,14 +255,13 @@ describe('PostReactionsBarComponent', () => {
         expect(getDeleteButton()).not.toBeNull();
     });
 
-    it('should display edit and delete options to instructor if posting is in course-wide channel from a student', () => {
+    it('should display the delete option to instructor if posting is in course-wide channel from a student', () => {
         metisServiceUserIsAtLeastInstructorStub.mockReturnValue(true);
         metisServiceUserIsAuthorOfPostingStub.mockReturnValue(false);
         component.posting = { ...metisPostInChannel };
         component.posting.authorRole = UserRole.USER;
         component.ngOnInit();
         fixture.detectChanges();
-        expect(getEditButton()).not.toBeNull();
         expect(getDeleteButton()).not.toBeNull();
     });
 

From 37bcf8e97117671ccabb7bafa10f70eaddd1301d Mon Sep 17 00:00:00 2001
From: Stephan Krusche <krusche@tum.de>
Date: Mon, 25 Nov 2024 21:36:59 +0100
Subject: [PATCH 4/8] Development: Fix an issue with team information on
 participations page

---
 .../repository/StudentParticipationRepository.java         | 3 +++
 .../aet/artemis/exercise/web/ParticipationResource.java    | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java
index bb775298efb5..2c8e4e02eb7c 100644
--- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java
+++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java
@@ -50,6 +50,9 @@
 @Repository
 public interface StudentParticipationRepository extends ArtemisJpaRepository<StudentParticipation, Long> {
 
+    @EntityGraph(type = LOAD, attributePaths = { "team.students" })
+    Set<StudentParticipation> findWithTeamInformationByExerciseId(long exerciseId);
+
     Set<StudentParticipation> findByExerciseId(long exerciseId);
 
     @Query("""
diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java
index 05e3166ff171..3a8c0b6368b9 100644
--- a/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java
+++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java
@@ -633,7 +633,12 @@ else if (participation.getSubmissions() != null && !participation.getSubmissions
             });
         }
         else {
-            participations = studentParticipationRepository.findByExerciseId(exerciseId);
+            if (exercise.isTeamMode()) {
+                participations = studentParticipationRepository.findWithTeamInformationByExerciseId(exerciseId);
+            }
+            else {
+                participations = studentParticipationRepository.findByExerciseId(exerciseId);
+            }
 
             Map<Long, Integer> submissionCountMap = studentParticipationRepository.countSubmissionsPerParticipationByExerciseIdAsMap(exerciseId);
             participations.forEach(participation -> participation.setSubmissionCount(submissionCountMap.get(participation.getId())));

From ce8be251ea14154b40916c57f31e1195c5316301 Mon Sep 17 00:00:00 2001
From: Mohamed Bilel Besrour <58034472+BBesrour@users.noreply.github.com>
Date: Mon, 25 Nov 2024 22:49:50 +0100
Subject: [PATCH 5/8] Integrated code lifecycle: Limit build logs size (#9861)

---
 .../artemis/buildagent/dto/BuildLogDTO.java   | 13 ++++
 .../artemis/buildagent/dto/BuildResult.java   |  8 ++-
 .../buildagent/dto/ResultQueueItem.java       |  5 +-
 .../service/BuildAgentDockerService.java      |  6 +-
 .../service/BuildJobContainerService.java     |  4 +-
 .../service/BuildJobExecutionService.java     |  2 +-
 .../service/BuildJobManagementService.java    |  6 +-
 .../buildagent/service/BuildLogsMap.java      | 67 ++++++++++++++++---
 .../service/SharedQueueProcessingService.java |  6 +-
 .../service/BuildLogEntryService.java         |  9 +--
 .../LocalCIResultProcessingService.java       |  4 +-
 .../config/application-buildagent.yml         |  9 ++-
 .../icl/LocalCIResourceIntegrationTest.java   |  4 +-
 13 files changed, 102 insertions(+), 41 deletions(-)
 create mode 100644 src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildLogDTO.java

diff --git a/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildLogDTO.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildLogDTO.java
new file mode 100644
index 000000000000..62e9e2229a88
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildLogDTO.java
@@ -0,0 +1,13 @@
+package de.tum.cit.aet.artemis.buildagent.dto;
+
+import java.io.Serializable;
+import java.time.ZonedDateTime;
+
+import jakarta.validation.constraints.NotNull;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public record BuildLogDTO(@NotNull ZonedDateTime time, @NotNull String log) implements Serializable {
+
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildResult.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildResult.java
index fbb9bbbdbee1..f8fec009f4b9 100644
--- a/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildResult.java
+++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildResult.java
@@ -27,6 +27,7 @@
 // in the future are migrated or cleared. Changes should be communicated in release notes as potentially breaking changes.
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
+// TODO: this should be a record in the future
 public class BuildResult extends AbstractBuildResultNotificationDTO implements Serializable {
 
     private final String assignmentRepoBranchName;
@@ -41,7 +42,7 @@ public class BuildResult extends AbstractBuildResultNotificationDTO implements S
 
     private final List<LocalCIJobDTO> jobs;
 
-    private List<BuildLogEntry> buildLogEntries = new ArrayList<>();
+    private List<BuildLogDTO> buildLogEntries = new ArrayList<>();
 
     private final List<StaticCodeAnalysisReportDTO> staticCodeAnalysisReports;
 
@@ -123,7 +124,8 @@ public boolean hasLogs() {
 
     @Override
     public List<BuildLogEntry> extractBuildLogs() {
-        return buildLogEntries;
+        // convert the buildLogEntry DTOs to BuildLogEntry objects
+        return buildLogEntries.stream().map(log -> new BuildLogEntry(log.time(), log.log())).toList();
     }
 
     /**
@@ -131,7 +133,7 @@ public List<BuildLogEntry> extractBuildLogs() {
      *
      * @param buildLogEntries the buildLogEntries to be set
      */
-    public void setBuildLogEntries(List<BuildLogEntry> buildLogEntries) {
+    public void setBuildLogEntries(List<BuildLogDTO> buildLogEntries) {
         this.buildLogEntries = buildLogEntries;
         hasLogs = true;
     }
diff --git a/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/ResultQueueItem.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/ResultQueueItem.java
index 9ed86f7306f7..6964d2cd58a8 100644
--- a/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/ResultQueueItem.java
+++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/ResultQueueItem.java
@@ -5,11 +5,8 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
-import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry;
-
 // NOTE: this data structure is used in shared code between core and build agent nodes. Changing it requires that the shared data structures in Hazelcast (or potentially Redis)
 // in the future are migrated or cleared. Changes should be communicated in release notes as potentially breaking changes.
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
-// TODO: this data structure should not use BuildLogEntry because it's an entity class (and not a DTO)
-public record ResultQueueItem(BuildResult buildResult, BuildJobQueueItem buildJobQueueItem, List<BuildLogEntry> buildLogs, Throwable exception) implements Serializable {
+public record ResultQueueItem(BuildResult buildResult, BuildJobQueueItem buildJobQueueItem, List<BuildLogDTO> buildLogs, Throwable exception) implements Serializable {
 }
diff --git a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildAgentDockerService.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildAgentDockerService.java
index 378bd12ed247..c7aca819eb91 100644
--- a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildAgentDockerService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildAgentDockerService.java
@@ -180,16 +180,14 @@ public static class MyPullImageResultCallback extends PullImageResultCallback {
         @Override
         public void onNext(PullResponseItem item) {
             String msg = "~~~~~~~~~~~~~~~~~~~~ Pull image progress: " + item.getStatus() + " ~~~~~~~~~~~~~~~~~~~~";
-            log.info(msg);
-            buildLogsMap.appendBuildLogEntry(buildJobId, msg);
+            log.debug(msg);
             super.onNext(item);
         }
 
         @Override
         public void onComplete() {
             String msg = "~~~~~~~~~~~~~~~~~~~~ Pull image complete ~~~~~~~~~~~~~~~~~~~~";
-            log.info(msg);
-            buildLogsMap.appendBuildLogEntry(buildJobId, msg);
+            log.debug(msg);
             super.onComplete();
         }
     }
diff --git a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobContainerService.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobContainerService.java
index 5d4c72d5b491..b6f4c63019da 100644
--- a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobContainerService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobContainerService.java
@@ -43,9 +43,9 @@
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.HostConfig;
 
+import de.tum.cit.aet.artemis.buildagent.dto.BuildLogDTO;
 import de.tum.cit.aet.artemis.core.exception.LocalCIException;
 import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage;
-import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry;
 import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService.RepositoryCheckoutPath;
 
 /**
@@ -414,7 +414,7 @@ private void executeDockerCommand(String containerId, String buildJobId, boolean
                 @Override
                 public void onNext(Frame item) {
                     String text = new String(item.getPayload());
-                    BuildLogEntry buildLogEntry = new BuildLogEntry(ZonedDateTime.now(), text);
+                    BuildLogDTO buildLogEntry = new BuildLogDTO(ZonedDateTime.now(), text);
                     if (buildJobId != null) {
                         buildLogsMap.appendBuildLogEntry(buildJobId, buildLogEntry);
                     }
diff --git a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobExecutionService.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobExecutionService.java
index 75bbaf826b00..fd06f24e09f7 100644
--- a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobExecutionService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobExecutionService.java
@@ -345,7 +345,7 @@ private BuildResult runScriptAndParseResults(BuildJobQueueItem buildJob, String
         try {
             buildResult = parseTestResults(testResultsTarInputStream, buildJob.buildConfig().branch(), assignmentRepoCommitHash, testRepoCommitHash, buildCompletedDate,
                     buildJob.id());
-            buildResult.setBuildLogEntries(buildLogsMap.getBuildLogs(buildJob.id()));
+            buildResult.setBuildLogEntries(buildLogsMap.getAndTruncateBuildLogs(buildJob.id()));
         }
         catch (IOException | IllegalStateException e) {
             msg = "Error while parsing test results";
diff --git a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobManagementService.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobManagementService.java
index 551b20f8bdd9..be480892b8e3 100644
--- a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobManagementService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobManagementService.java
@@ -32,9 +32,9 @@
 import com.hazelcast.topic.ITopic;
 
 import de.tum.cit.aet.artemis.buildagent.dto.BuildJobQueueItem;
+import de.tum.cit.aet.artemis.buildagent.dto.BuildLogDTO;
 import de.tum.cit.aet.artemis.buildagent.dto.BuildResult;
 import de.tum.cit.aet.artemis.core.exception.LocalCIException;
-import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry;
 
 /**
  * This service is responsible for adding build jobs to the Integrated Code Lifecycle executor service.
@@ -171,7 +171,7 @@ public CompletableFuture<BuildResult> executeBuildJob(BuildJobQueueItem buildJob
                     finishCancelledBuildJob(buildJobItem.repositoryInfo().assignmentRepositoryUri(), buildJobItem.id(), containerName);
                     String msg = "Build job with id " + buildJobItem.id() + " was cancelled.";
                     String stackTrace = stackTraceToString(e);
-                    buildLogsMap.appendBuildLogEntry(buildJobItem.id(), new BuildLogEntry(ZonedDateTime.now(), msg + "\n" + stackTrace));
+                    buildLogsMap.appendBuildLogEntry(buildJobItem.id(), new BuildLogDTO(ZonedDateTime.now(), msg + "\n" + stackTrace));
                     throw new CompletionException(msg, e);
                 }
                 else {
@@ -232,7 +232,7 @@ private CompletableFuture<BuildResult> createCompletableFuture(Supplier<BuildRes
     private void finishBuildJobExceptionally(String buildJobId, String containerName, Exception exception) {
         String msg = "Error while executing build job " + buildJobId + ": " + exception.getMessage();
         String stackTrace = stackTraceToString(exception);
-        buildLogsMap.appendBuildLogEntry(buildJobId, new BuildLogEntry(ZonedDateTime.now(), msg + "\n" + stackTrace));
+        buildLogsMap.appendBuildLogEntry(buildJobId, new BuildLogDTO(ZonedDateTime.now(), msg + "\n" + stackTrace));
         log.error(msg);
 
         log.info("Getting ID of running container {}", containerName);
diff --git a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildLogsMap.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildLogsMap.java
index 5ea22f2911ec..8f9e0a6226a1 100644
--- a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildLogsMap.java
+++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildLogsMap.java
@@ -8,30 +8,77 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 
-import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry;
+import de.tum.cit.aet.artemis.buildagent.dto.BuildLogDTO;
 
 @Profile(PROFILE_BUILDAGENT)
 @Component
 public class BuildLogsMap {
 
-    private final ConcurrentMap<String, List<BuildLogEntry>> buildLogsMap = new ConcurrentHashMap<>();
+    @Value("${artemis.continuous-integration.build-logs.max-lines-per-job:10000}")
+    private int maxLogLinesPerBuildJob;
 
-    public List<BuildLogEntry> getBuildLogs(String buildLogId) {
-        return buildLogsMap.get(buildLogId);
+    @Value("${artemis.continuous-integration.build-logs.max-chars-per-line:1024}")
+    private int maxCharsPerLine;
+
+    // buildJobId --> List of build logs
+    private final ConcurrentMap<String, List<BuildLogDTO>> buildLogsMap = new ConcurrentHashMap<>();
+
+    /**
+     * Appends a new build log entry to the build logs for the specified build job ID.
+     *
+     * @param buildJobId the ID of the build job to append a log message to
+     * @param message    the message to append to the build log
+     */
+    public void appendBuildLogEntry(String buildJobId, String message) {
+        appendBuildLogEntry(buildJobId, new BuildLogDTO(ZonedDateTime.now(), message + "\n"));
     }
 
-    public void appendBuildLogEntry(String buildLogId, String message) {
-        appendBuildLogEntry(buildLogId, new BuildLogEntry(ZonedDateTime.now(), message + "\n"));
+    /**
+     * Appends a new build log entry to the build logs for the specified build job ID.
+     * Only the first maxCharsPerLine characters of the log message will be appended. Longer characters will be truncated to avoid memory issues.
+     * Only the first maxLogLinesPerBuildJob log entries will be stored. Newer logs will be ignored to avoid memory issues
+     *
+     * @param buildJobId the ID of the build job to append a log message to
+     * @param buildLog   the build log entry to append to the build log
+     */
+    public void appendBuildLogEntry(String buildJobId, BuildLogDTO buildLog) {
+        List<BuildLogDTO> buildLogs = buildLogsMap.computeIfAbsent(buildJobId, k -> new ArrayList<>());
+        if (buildLogs.size() < maxLogLinesPerBuildJob) {
+            if (buildLog.log() != null && buildLog.log().length() > maxCharsPerLine) {
+                buildLog = new BuildLogDTO(buildLog.time(), buildLog.log().substring(0, maxCharsPerLine) + "\n");
+            }
+            buildLogs.add(buildLog);
+        }
     }
 
-    public void appendBuildLogEntry(String buildLogId, BuildLogEntry buildLog) {
-        buildLogsMap.computeIfAbsent(buildLogId, k -> new ArrayList<>()).add(buildLog);
+    public void removeBuildLogs(String buildJobId) {
+        buildLogsMap.remove(buildJobId);
     }
 
-    public void removeBuildLogs(String buildLogId) {
-        buildLogsMap.remove(buildLogId);
+    /**
+     * Retrieves and truncates the build logs for the specified build job ID. Does not modify the original build logs.
+     *
+     * @param buildJobId the ID of the build job to retrieve and truncate
+     * @return a list of truncated build log entries, or null if no logs are found for the specified ID
+     */
+    public List<BuildLogDTO> getAndTruncateBuildLogs(String buildJobId) {
+        List<BuildLogDTO> buildLogs = buildLogsMap.get(buildJobId);
+
+        if (buildLogs == null) {
+            return null;
+        }
+
+        // Truncate the build logs to maxLogLinesPerBuildJob
+        if (buildLogs.size() > maxLogLinesPerBuildJob) {
+            List<BuildLogDTO> truncatedBuildLogs = new ArrayList<>(buildLogs.subList(0, maxLogLinesPerBuildJob));
+            truncatedBuildLogs.add(new BuildLogDTO(ZonedDateTime.now(), "Truncated build logs...\n"));
+            buildLogs = truncatedBuildLogs;
+        }
+
+        return buildLogs;
     }
 }
diff --git a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/SharedQueueProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/SharedQueueProcessingService.java
index 0823ec5a4f9b..2c2e8b8e16bb 100644
--- a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/SharedQueueProcessingService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/SharedQueueProcessingService.java
@@ -49,11 +49,11 @@
 import de.tum.cit.aet.artemis.buildagent.dto.BuildAgentDTO;
 import de.tum.cit.aet.artemis.buildagent.dto.BuildAgentInformation;
 import de.tum.cit.aet.artemis.buildagent.dto.BuildJobQueueItem;
+import de.tum.cit.aet.artemis.buildagent.dto.BuildLogDTO;
 import de.tum.cit.aet.artemis.buildagent.dto.BuildResult;
 import de.tum.cit.aet.artemis.buildagent.dto.JobTimingInfo;
 import de.tum.cit.aet.artemis.buildagent.dto.ResultQueueItem;
 import de.tum.cit.aet.artemis.core.security.SecurityUtils;
-import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry;
 import de.tum.cit.aet.artemis.programming.domain.build.BuildStatus;
 
 /**
@@ -397,7 +397,7 @@ private void processBuild(BuildJobQueueItem buildJob) {
                     buildJob.exerciseId(), buildJob.retryCount(), buildJob.priority(), BuildStatus.SUCCESSFUL, buildJob.repositoryInfo(), jobTimingInfo, buildJob.buildConfig(),
                     null);
 
-            List<BuildLogEntry> buildLogs = buildLogsMap.getBuildLogs(buildJob.id());
+            List<BuildLogDTO> buildLogs = buildLogsMap.getAndTruncateBuildLogs(buildJob.id());
             buildLogsMap.removeBuildLogs(buildJob.id());
 
             ResultQueueItem resultQueueItem = new ResultQueueItem(buildResult, finishedJob, buildLogs, null);
@@ -435,7 +435,7 @@ private void processBuild(BuildJobQueueItem buildJob) {
 
             job = new BuildJobQueueItem(buildJob, completionDate, status);
 
-            List<BuildLogEntry> buildLogs = buildLogsMap.getBuildLogs(buildJob.id());
+            List<BuildLogDTO> buildLogs = buildLogsMap.getAndTruncateBuildLogs(buildJob.id());
             buildLogsMap.removeBuildLogs(buildJob.id());
 
             BuildResult failedResult = new BuildResult(buildJob.buildConfig().branch(), buildJob.buildConfig().assignmentCommitHash(), buildJob.buildConfig().testCommitHash(),
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildLogEntryService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildLogEntryService.java
index f6143a43561c..039fce2c76bc 100644
--- a/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildLogEntryService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildLogEntryService.java
@@ -23,6 +23,7 @@
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
+import de.tum.cit.aet.artemis.buildagent.dto.BuildLogDTO;
 import de.tum.cit.aet.artemis.core.service.ProfileService;
 import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise;
 import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage;
@@ -300,14 +301,14 @@ public void deleteBuildLogEntriesForProgrammingSubmission(ProgrammingSubmission
      * and the build job ID. If the directory structure for the logs does not already exist, it is created.
      * Each log entry is written to the log file in the format of "time\tlog message".
      *
-     * @param buildLogEntries     A list of {@link BuildLogEntry} objects containing the build log information to be saved.
+     * @param buildLogEntries     A list of {@link BuildLogDTO} objects containing the build log information to be saved.
      * @param buildJobId          The unique identifier of the build job whose logs are being saved.
      * @param programmingExercise The programming exercise associated with the build job, used to
      *                                retrieve the course and exercise short names.
      * @throws IllegalStateException If the directory for storing the logs could not be created.
      * @throws RuntimeException      If an I/O error occurs while writing the log file.
      */
-    public void saveBuildLogsToFile(List<BuildLogEntry> buildLogEntries, String buildJobId, ProgrammingExercise programmingExercise) {
+    public void saveBuildLogsToFile(List<BuildLogDTO> buildLogEntries, String buildJobId, ProgrammingExercise programmingExercise) {
         String courseShortName = programmingExercise.getCourseViaExerciseGroupOrCourseMember().getShortName();
         String exerciseShortName = programmingExercise.getShortName();
         Path exerciseLogsPath = buildLogsPath.resolve(courseShortName).resolve(exerciseShortName);
@@ -323,8 +324,8 @@ public void saveBuildLogsToFile(List<BuildLogEntry> buildLogEntries, String buil
         Path logPath = exerciseLogsPath.resolve(buildJobId + ".log");
 
         StringBuilder logsStringBuilder = new StringBuilder();
-        for (BuildLogEntry buildLogEntry : buildLogEntries) {
-            logsStringBuilder.append(buildLogEntry.getTime()).append("\t").append(buildLogEntry.getLog());
+        for (BuildLogDTO buildLogEntry : buildLogEntries) {
+            logsStringBuilder.append(buildLogEntry.time()).append("\t").append(buildLogEntry.log());
         }
 
         try {
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultProcessingService.java
index 71edf64a3fa8..417ee5bdc630 100644
--- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultProcessingService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultProcessingService.java
@@ -27,6 +27,7 @@
 import de.tum.cit.aet.artemis.assessment.domain.Result;
 import de.tum.cit.aet.artemis.buildagent.dto.BuildAgentInformation;
 import de.tum.cit.aet.artemis.buildagent.dto.BuildJobQueueItem;
+import de.tum.cit.aet.artemis.buildagent.dto.BuildLogDTO;
 import de.tum.cit.aet.artemis.buildagent.dto.BuildResult;
 import de.tum.cit.aet.artemis.buildagent.dto.ResultQueueItem;
 import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException;
@@ -37,7 +38,6 @@
 import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation;
 import de.tum.cit.aet.artemis.programming.domain.RepositoryType;
 import de.tum.cit.aet.artemis.programming.domain.build.BuildJob;
-import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry;
 import de.tum.cit.aet.artemis.programming.domain.build.BuildStatus;
 import de.tum.cit.aet.artemis.programming.dto.ResultDTO;
 import de.tum.cit.aet.artemis.programming.exception.BuildTriggerWebsocketError;
@@ -133,7 +133,7 @@ public void processResult() {
 
         BuildJobQueueItem buildJob = resultQueueItem.buildJobQueueItem();
         BuildResult buildResult = resultQueueItem.buildResult();
-        List<BuildLogEntry> buildLogs = resultQueueItem.buildLogs();
+        List<BuildLogDTO> buildLogs = resultQueueItem.buildLogs();
         Throwable ex = resultQueueItem.exception();
 
         BuildJob savedBuildJob;
diff --git a/src/main/resources/config/application-buildagent.yml b/src/main/resources/config/application-buildagent.yml
index 2872d91575cc..e4c1d3013357 100644
--- a/src/main/resources/config/application-buildagent.yml
+++ b/src/main/resources/config/application-buildagent.yml
@@ -34,9 +34,12 @@ artemis:
             cleanup-schedule-minutes: 60
         pause-grace-period-seconds: 60
         build-timeout-seconds:
-          min: 10
-          default: 120
-          max: 240
+            min: 10
+            default: 120
+            max: 240
+        build-logs:
+            max-lines-per-job: 10000
+            max-chars-per-line: 1024
     git:
         name: Artemis
         email: artemis@xcit.tum.de
diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIResourceIntegrationTest.java
index a4d157d1a690..28a919289e61 100644
--- a/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIResourceIntegrationTest.java
+++ b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIResourceIntegrationTest.java
@@ -29,6 +29,7 @@
 import de.tum.cit.aet.artemis.buildagent.dto.BuildConfig;
 import de.tum.cit.aet.artemis.buildagent.dto.BuildJobQueueItem;
 import de.tum.cit.aet.artemis.buildagent.dto.BuildJobsStatisticsDTO;
+import de.tum.cit.aet.artemis.buildagent.dto.BuildLogDTO;
 import de.tum.cit.aet.artemis.buildagent.dto.FinishedBuildJobDTO;
 import de.tum.cit.aet.artemis.buildagent.dto.JobTimingInfo;
 import de.tum.cit.aet.artemis.buildagent.dto.RepositoryInfo;
@@ -37,7 +38,6 @@
 import de.tum.cit.aet.artemis.programming.AbstractProgrammingIntegrationLocalCILocalVCTestBase;
 import de.tum.cit.aet.artemis.programming.domain.RepositoryType;
 import de.tum.cit.aet.artemis.programming.domain.build.BuildJob;
-import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry;
 import de.tum.cit.aet.artemis.programming.domain.build.BuildStatus;
 
 class LocalCIResourceIntegrationTest extends AbstractProgrammingIntegrationLocalCILocalVCTestBase {
@@ -332,7 +332,7 @@ void testGetBuildAgents_instructorAccessForbidden() throws Exception {
     void testGetBuildLogsForResult() throws Exception {
         try {
             buildJobRepository.save(finishedJobForLogs);
-            BuildLogEntry buildLogEntry = new BuildLogEntry(ZonedDateTime.now(), "Dummy log");
+            BuildLogDTO buildLogEntry = new BuildLogDTO(ZonedDateTime.now(), "Dummy log");
             buildLogEntryService.saveBuildLogsToFile(List.of(buildLogEntry), "6", programmingExercise);
             var response = request.get("/api/build-log/6", HttpStatus.OK, String.class);
             assertThat(response).contains("Dummy log");

From bda8f19eab8ed88185355b79fca6e429bb915d95 Mon Sep 17 00:00:00 2001
From: Konstantin <47260935+KonstiAnon@users.noreply.github.com>
Date: Tue, 26 Nov 2024 00:07:14 +0100
Subject: [PATCH 6/8] Quiz exercises: Fix an issue with the evaluation when
 practice mode submissions are available (#9821)

---
 .../quiz/service/QuizResultService.java       | 63 +++++++++++--------
 1 file changed, 36 insertions(+), 27 deletions(-)

diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizResultService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizResultService.java
index b540fdc5f9bd..4d461ceb1a12 100644
--- a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizResultService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizResultService.java
@@ -6,6 +6,7 @@
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 
 import jakarta.validation.constraints.NotNull;
@@ -88,9 +89,12 @@ public void evaluateQuizAndUpdateStatistics(@NotNull Long quizExerciseId) {
      * Evaluate the given quiz exercise by performing the following actions for each participation:
      * 1. Get the submission for each participation (there should be only one as in exam mode, the submission gets created upfront and will be updated)
      * - If no submission is found, print a warning and continue as we cannot evaluate that submission
-     * - If more than one submission is found, select one of them
+     * - Filter out submissions that are not submitted before the quiz deadline (practice mode)
+     * - If more than one submission is found, select one with the highest ID
      * 2. mark submission and participation as evaluated
      * 3. Create a new result for the selected submission and calculate scores
+     * - If a rated result already exists, skip the evaluation
+     * - If no rated result exists, create a new one and evaluate the submission
      * 4. Save the updated submission & participation and the newly created result
      * <p>
      * After processing all participations, the created results will be returned for further processing
@@ -104,6 +108,7 @@ private Set<Result> evaluateSubmissions(@NotNull QuizExercise quizExercise) {
         Set<Result> createdResults = new HashSet<>();
         List<StudentParticipation> studentParticipations = studentParticipationRepository.findAllWithEagerLegalSubmissionsAndEagerResultsByExerciseId(quizExercise.getId());
         submittedAnswerRepository.loadQuizSubmissionsSubmittedAnswers(studentParticipations);
+        ZonedDateTime quizDeadline = quizExercise.getDueDate();
 
         for (var participation : studentParticipations) {
             if (participation.isTestRun()) {
@@ -122,8 +127,19 @@ private Set<Result> evaluateSubmissions(@NotNull QuizExercise quizExercise) {
                 else if (submissions.size() > 1) {
                     log.warn("Found multiple ({}) submissions for participation {} (Participant {}) in quiz {}, taking the one with highest id", submissions.size(),
                             participation.getId(), participation.getParticipant().getName(), quizExercise.getId());
-                    // Load submission with highest id
-                    quizSubmission = (QuizSubmission) submissions.stream().max(Comparator.comparing(Submission::getId)).get();
+                    // Filter submissions to only include those submitted before the quiz deadline if the due date is not null, otherwise select the one with the highest ID
+                    Optional<Submission> validSubmission = submissions.stream()
+                            .filter(submission -> quizExercise.getDueDate() == null
+                                    || (submission.getSubmissionDate() != null && !submission.getSubmissionDate().isAfter(quizExercise.getDueDate())))
+                            .max(Comparator.comparing(Submission::getId));
+                    if (validSubmission.isPresent()) {
+                        quizSubmission = (QuizSubmission) validSubmission.get();
+                    }
+                    else {
+                        log.warn("No valid submissions found for participation {} (Participant {}) in quiz {}", participation.getId(), participation.getParticipant().getName(),
+                                quizExercise.getId());
+                        continue;
+                    }
                 }
                 else {
                     quizSubmission = (QuizSubmission) submissions.iterator().next();
@@ -131,48 +147,41 @@ else if (submissions.size() > 1) {
 
                 participation.setInitializationState(InitializationState.FINISHED);
 
-                boolean resultExisting = false;
-                // create new result if none is existing
-                Result result;
-                if (participation.getResults().isEmpty()) {
-                    result = new Result().participation(participation);
+                Optional<Result> existingRatedResult = participation.getResults().stream().filter(result -> Boolean.TRUE.equals(result.isRated())).findFirst();
+
+                if (existingRatedResult.isPresent()) {
+                    // A rated result already exists; no need to create a new one
+                    log.debug("A rated result already exists for participation {} (Participant {}), skipping evaluation.", participation.getId(),
+                            participation.getParticipant().getName());
                 }
                 else {
-                    resultExisting = true;
-                    result = participation.getResults().iterator().next();
-                }
-                // Only create Results once after the first evaluation
-                if (!resultExisting) {
-                    // delete result from quizSubmission, to be able to set a new one
-                    if (quizSubmission.getLatestResult() != null) {
-                        resultService.deleteResult(quizSubmission.getLatestResult(), true);
-                    }
-                    result.setRated(true);
-                    result.setAssessmentType(AssessmentType.AUTOMATIC);
-                    result.setCompletionDate(ZonedDateTime.now());
+                    // No rated result exists; create a new one
+                    Result result = new Result().participation(participation).rated(true).assessmentType(AssessmentType.AUTOMATIC).completionDate(ZonedDateTime.now());
 
-                    // set submission to calculate scores
+                    // Associate submission with result
                     result.setSubmission(quizSubmission);
-                    // calculate scores and update result and submission accordingly
+
+                    // Calculate and update scores
                     quizSubmission.calculateAndUpdateScores(quizExercise.getQuizQuestions());
                     result.evaluateQuizSubmission(quizExercise);
-                    // remove submission to follow save order for ordered collections
+
+                    // Detach submission to maintain proper save order
                     result.setSubmission(null);
 
-                    // NOTE: we save participation, submission and result here individually so that one exception (e.g. duplicated key) cannot destroy multiple student answers
+                    // Save entities individually
                     submissionRepository.save(quizSubmission);
                     result = resultRepository.save(result);
 
-                    // add result to participation
+                    // Update participation with new result
                     participation.addResult(result);
                     studentParticipationRepository.save(participation);
 
-                    // add result to submission
+                    // Re-associate result with submission and save
                     result.setSubmission(quizSubmission);
                     quizSubmission.addResult(result);
                     submissionRepository.save(quizSubmission);
 
-                    // Add result so that it can be returned (and processed later)
+                    // Add result to the set of created results
                     createdResults.add(result);
                 }
             }

From 865a5f044329cd62b420a294825350cc59d52f7c Mon Sep 17 00:00:00 2001
From: Stephan Krusche <krusche@tum.de>
Date: Tue, 26 Nov 2024 09:37:30 +0100
Subject: [PATCH 7/8] Development: Bump version to 7.7.3

---
 README.md         | 2 +-
 build.gradle      | 2 +-
 package-lock.json | 4 ++--
 package.json      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index d3acf73cc0c4..c8f5bafa3eaf 100644
--- a/README.md
+++ b/README.md
@@ -193,7 +193,7 @@ Refer to [Using JHipster in production](http://www.jhipster.tech/production) for
 The following command can automate the deployment to a server. The example shows the deployment to the main Artemis test server (which runs a virtual machine):
 
 ```shell
-./artemis-server-cli deploy username@artemistest.ase.in.tum.de -w build/libs/Artemis-7.7.2.war
+./artemis-server-cli deploy username@artemistest.ase.in.tum.de -w build/libs/Artemis-7.7.3.war
 ```
 
 ## Architecture
diff --git a/build.gradle b/build.gradle
index 69bcdc972827..1dd978e9ddb8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,7 @@ plugins {
 }
 
 group = "de.tum.cit.aet.artemis"
-version = "7.7.2"
+version = "7.7.3"
 description = "Interactive Learning with Individual Feedback"
 
 java {
diff --git a/package-lock.json b/package-lock.json
index eec4beaec47e..cc5fa3584980 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "artemis",
-    "version": "7.7.2",
+    "version": "7.7.3",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "artemis",
-            "version": "7.7.2",
+            "version": "7.7.3",
             "hasInstallScript": true,
             "license": "MIT",
             "dependencies": {
diff --git a/package.json b/package.json
index 06aa6ac1cfe0..c26e50b915ce 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "artemis",
-    "version": "7.7.2",
+    "version": "7.7.3",
     "description": "Interactive Learning with Individual Feedback",
     "private": true,
     "license": "MIT",

From 17eb6ce6a2168ffd4564b13f7042c5b0d42061a8 Mon Sep 17 00:00:00 2001
From: Sebastian Loose <sebastian.loose@yahoo.de>
Date: Tue, 26 Nov 2024 14:16:02 +0100
Subject: [PATCH 8/8] Iris: Enable text copy-paste from Iris exercise chatbot
 window (#9761)

---
 .../exercise-chatbot/widget/chatbot-widget.component.html  | 1 +
 .../exercise-chatbot/widget/chatbot-widget.component.scss  | 7 +++++++
 .../exercise-chatbot/widget/chatbot-widget.component.ts    | 3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/app/iris/exercise-chatbot/widget/chatbot-widget.component.html b/src/main/webapp/app/iris/exercise-chatbot/widget/chatbot-widget.component.html
index 427b8bc2184a..9b19aeec3384 100644
--- a/src/main/webapp/app/iris/exercise-chatbot/widget/chatbot-widget.component.html
+++ b/src/main/webapp/app/iris/exercise-chatbot/widget/chatbot-widget.component.html
@@ -2,5 +2,6 @@
     <!-- chat box -->
     <div class="chat-widget">
         <jhi-iris-base-chatbot [fullSize]="fullSize" [showCloseButton]="true" (fullSizeToggle)="toggleFullSize()" (closeClicked)="closeChat()" />
+        <div class="chat-widget-top-resize-area"></div>
     </div>
 </div>
diff --git a/src/main/webapp/app/iris/exercise-chatbot/widget/chatbot-widget.component.scss b/src/main/webapp/app/iris/exercise-chatbot/widget/chatbot-widget.component.scss
index 23ff98fcc30b..e27dec60427a 100644
--- a/src/main/webapp/app/iris/exercise-chatbot/widget/chatbot-widget.component.scss
+++ b/src/main/webapp/app/iris/exercise-chatbot/widget/chatbot-widget.component.scss
@@ -15,6 +15,13 @@
     flex-direction: column;
 }
 
+.chat-widget-top-resize-area {
+    position: absolute;
+    height: 5px;
+    width: 100%;
+    z-index: 10;
+}
+
 .ng-draggable {
     cursor: grab;
 }
diff --git a/src/main/webapp/app/iris/exercise-chatbot/widget/chatbot-widget.component.ts b/src/main/webapp/app/iris/exercise-chatbot/widget/chatbot-widget.component.ts
index be84a8d62c97..11d27fdd8d12 100644
--- a/src/main/webapp/app/iris/exercise-chatbot/widget/chatbot-widget.component.ts
+++ b/src/main/webapp/app/iris/exercise-chatbot/widget/chatbot-widget.component.ts
@@ -44,7 +44,7 @@ export class IrisChatbotWidgetComponent implements OnDestroy, AfterViewInit {
         interact('.chat-widget')
             .resizable({
                 // resize from all edges and corners
-                edges: { left: true, right: true, bottom: true, top: true },
+                edges: { left: true, right: true, bottom: true, top: '.chat-widget-top-resize-area' },
 
                 listeners: {
                     move: (event) => {
@@ -85,6 +85,7 @@ export class IrisChatbotWidgetComponent implements OnDestroy, AfterViewInit {
                 inertia: true,
             })
             .draggable({
+                allowFrom: '.chat-header',
                 listeners: {
                     move: (event: any) => {
                         const target = event.target,