From 0ffa44f80c3654f8e0e18ccee007a6acf6bf0e9f Mon Sep 17 00:00:00 2001
From: Simon Entholzer <33342534+SimonEntholzer@users.noreply.github.com>
Date: Sat, 16 Nov 2024 10:12:17 +0100
Subject: [PATCH 1/7] Lectures: Use attachment name for file downloads (#9775)

---
 .../aet/artemis/core/web/FileResource.java    | 50 ++++++++++++-------
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/FileResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/FileResource.java
index ac1e03f866da..27332e5343a7 100644
--- a/src/main/java/de/tum/cit/aet/artemis/core/web/FileResource.java
+++ b/src/main/java/de/tum/cit/aet/artemis/core/web/FileResource.java
@@ -219,7 +219,7 @@ public ResponseEntity<byte[]> getMarkdownFileForConversation(@PathVariable Long
     public ResponseEntity<byte[]> getMarkdownFile(@PathVariable String filename) {
         log.debug("REST request to get file : {}", filename);
         sanitizeFilenameElseThrow(filename);
-        return buildFileResponse(FilePathService.getMarkdownFilePath(), filename);
+        return buildFileResponse(FilePathService.getMarkdownFilePath(), filename, false);
     }
 
     /**
@@ -431,7 +431,7 @@ public ResponseEntity<byte[]> getLectureAttachment(@PathVariable Long lectureId,
         // check if the user is authorized to access the requested attachment unit
         checkAttachmentAuthorizationOrThrow(course, attachment);
 
-        return buildFileResponse(getActualPathFromPublicPathString(attachment.getLink()), false);
+        return buildFileResponse(getActualPathFromPublicPathString(attachment.getLink()), Optional.of(attachment.getName()));
     }
 
     /**
@@ -470,13 +470,13 @@ public ResponseEntity<byte[]> getLecturePdfAttachmentsMerged(@PathVariable Long
 
     /**
      * GET files/attachments/attachment-unit/:attachmentUnitId/:filename : Get the lecture unit attachment
+     * Accesses to this endpoint are created by the server itself in the FilePathService
      *
      * @param attachmentUnitId ID of the attachment unit, the attachment belongs to
      * @return The requested file, 403 if the logged-in user is not allowed to access it, or 404 if the file doesn't exist
      */
     @GetMapping("files/attachments/attachment-unit/{attachmentUnitId}/*")
     @EnforceAtLeastStudent
-    // TODO: this method is kind of redundant to the method getAttachmentFile below, double check if both are actually needed
     public ResponseEntity<byte[]> getAttachmentUnitAttachment(@PathVariable Long attachmentUnitId) {
         log.debug("REST request to get the file for attachment unit {} for students", attachmentUnitId);
         AttachmentUnit attachmentUnit = attachmentUnitRepository.findByIdElseThrow(attachmentUnitId);
@@ -487,8 +487,7 @@ public ResponseEntity<byte[]> getAttachmentUnitAttachment(@PathVariable Long att
 
         // check if the user is authorized to access the requested attachment unit
         checkAttachmentAuthorizationOrThrow(course, attachment);
-
-        return buildFileResponse(getActualPathFromPublicPathString(attachment.getLink()), false);
+        return buildFileResponse(getActualPathFromPublicPathString(attachment.getLink()), Optional.of(attachment.getName()));
     }
 
     /**
@@ -567,36 +566,49 @@ public ResponseEntity<byte[]> getAttachmentUnitAttachmentSlide(@PathVariable Lon
     }
 
     /**
-     * Builds the response with headers, body and content type for specified path and file name
+     * Builds the response with headers, body and content type for specified path containing the file name
      *
-     * @param path     to the file
-     * @param filename the name of the file
+     * @param path  to the file including the file name
+     * @param cache true if the response should contain a header that allows caching; false otherwise
      * @return response entity
      */
-    private ResponseEntity<byte[]> buildFileResponse(Path path, String filename) {
-        return buildFileResponse(path, filename, false);
+    private ResponseEntity<byte[]> buildFileResponse(Path path, boolean cache) {
+        return buildFileResponse(path.getParent(), path.getFileName().toString(), Optional.empty(), cache);
     }
 
     /**
      * Builds the response with headers, body and content type for specified path containing the file name
      *
-     * @param path  to the file including the file name
-     * @param cache true if the response should contain a header that allows caching; false otherwise
+     * @param path     to the file including the file name
+     * @param filename the name of the file
+     * @param cache    true if the response should contain a header that allows caching; false otherwise
      * @return response entity
      */
-    private ResponseEntity<byte[]> buildFileResponse(Path path, boolean cache) {
-        return buildFileResponse(path.getParent(), path.getFileName().toString(), cache);
+    private ResponseEntity<byte[]> buildFileResponse(Path path, String filename, boolean cache) {
+        return buildFileResponse(path, filename, Optional.empty(), cache);
     }
 
     /**
      * Builds the response with headers, body and content type for specified path and file name
      *
-     * @param path     to the file
-     * @param filename the name of the file
-     * @param cache    true if the response should contain a header that allows caching; false otherwise
+     * @param path            to the file
+     * @param replaceFilename replaces the downloaded file's name, if provided
      * @return response entity
      */
-    private ResponseEntity<byte[]> buildFileResponse(Path path, String filename, boolean cache) {
+    private ResponseEntity<byte[]> buildFileResponse(Path path, Optional<String> replaceFilename) {
+        return buildFileResponse(path.getParent(), path.getFileName().toString(), replaceFilename, false);
+    }
+
+    /**
+     * Builds the response with headers, body and content type for specified path and file name
+     *
+     * @param path            to the file
+     * @param filename        the name of the file
+     * @param replaceFilename replaces the downloaded file's name, if provided
+     * @param cache           true if the response should contain a header that allows caching; false otherwise
+     * @return response entity
+     */
+    private ResponseEntity<byte[]> buildFileResponse(Path path, String filename, Optional<String> replaceFilename, boolean cache) {
         try {
             Path actualPath = path.resolve(filename);
             byte[] file = fileService.getFileForPath(actualPath);
@@ -611,7 +623,7 @@ private ResponseEntity<byte[]> buildFileResponse(Path path, String filename, boo
             String contentType = lowerCaseFilename.endsWith("htm") || lowerCaseFilename.endsWith("html") || lowerCaseFilename.endsWith("svg") || lowerCaseFilename.endsWith("svgz")
                     ? "attachment"
                     : "inline";
-            headers.setContentDisposition(ContentDisposition.builder(contentType).filename(filename).build());
+            headers.setContentDisposition(ContentDisposition.builder(contentType).filename(replaceFilename.orElse(filename)).build());
 
             var response = ResponseEntity.ok().headers(headers).contentType(getMediaTypeFromFilename(filename)).header("filename", filename);
             if (cache) {

From 7bf8bcdb5850129c511849cff81960a919623483 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20St=C3=B6hr?=
 <38322605+JohannesStoehr@users.noreply.github.com>
Date: Sat, 16 Nov 2024 10:13:43 +0100
Subject: [PATCH 2/7] Adaptive learning: Improve import of competencies when
 some already exist (#9774)

---
 .../service/competency/CompetencyService.java | 14 +-----
 .../competency/CourseCompetencyService.java   | 44 ++++++++++---------
 .../competency/PrerequisiteService.java       | 14 +-----
 .../competency-management-table.component.ts  |  3 +-
 .../competency-management.component.ts        |  5 ++-
 ...CompetencyPrerequisiteIntegrationTest.java | 24 ++++++++++
 .../competency/CompetencyIntegrationTest.java |  6 +++
 .../CourseCompetencyIntegrationTest.java      |  6 +++
 .../PrerequisiteIntegrationTest.java          |  6 +++
 9 files changed, 74 insertions(+), 48 deletions(-)

diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java
index 9fc79520601b..705c162c6341 100644
--- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java
@@ -2,9 +2,7 @@
 
 import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -68,17 +66,7 @@ public CompetencyService(CompetencyRepository competencyRepository, Authorizatio
      * @return The set of imported competencies, each also containing the relations it is the tail competency for.
      */
     public Set<CompetencyWithTailRelationDTO> importCompetencies(Course course, Collection<? extends CourseCompetency> competencies, CompetencyImportOptionsDTO importOptions) {
-        var idToImportedCompetency = new HashMap<Long, CompetencyWithTailRelationDTO>();
-
-        for (var competency : competencies) {
-            Competency importedCompetency = new Competency(competency);
-            importedCompetency.setCourse(course);
-
-            importedCompetency = competencyRepository.save(importedCompetency);
-            idToImportedCompetency.put(competency.getId(), new CompetencyWithTailRelationDTO(importedCompetency, new ArrayList<>()));
-        }
-
-        return importCourseCompetencies(course, competencies, idToImportedCompetency, importOptions);
+        return importCourseCompetencies(course, competencies, importOptions, Competency::new);
     }
 
     /**
diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java
index 8e47f7443297..cbe33e70b710 100644
--- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java
@@ -8,7 +8,6 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
@@ -213,34 +212,39 @@ public void filterOutLearningObjectsThatUserShouldNotSee(CourseCompetency compet
      * @return The set of imported course competencies, each also containing the relations it is the tail competency for.
      */
     public Set<CompetencyWithTailRelationDTO> importCourseCompetencies(Course course, Collection<CourseCompetency> courseCompetencies, CompetencyImportOptionsDTO importOptions) {
-        var idToImportedCompetency = new HashMap<Long, CompetencyWithTailRelationDTO>();
-
-        for (var courseCompetency : courseCompetencies) {
-            CourseCompetency importedCompetency = switch (courseCompetency) {
-                case Competency competency -> new Competency(competency);
-                case Prerequisite prerequisite -> new Prerequisite(prerequisite);
-                default -> throw new IllegalStateException("Unexpected value: " + courseCompetency);
-            };
-            importedCompetency.setCourse(course);
+        Function<CourseCompetency, CourseCompetency> createNewCourseCompetency = courseCompetency -> switch (courseCompetency) {
+            case Competency competency -> new Competency(competency);
+            case Prerequisite prerequisite -> new Prerequisite(prerequisite);
+            default -> throw new IllegalStateException("Unexpected value: " + courseCompetency);
+        };
 
-            importedCompetency = courseCompetencyRepository.save(importedCompetency);
-            idToImportedCompetency.put(courseCompetency.getId(), new CompetencyWithTailRelationDTO(importedCompetency, new ArrayList<>()));
-        }
-
-        return importCourseCompetencies(course, courseCompetencies, idToImportedCompetency, importOptions);
+        return importCourseCompetencies(course, courseCompetencies, importOptions, createNewCourseCompetency);
     }
 
     /**
      * Imports the given competencies and relations into a course
      *
-     * @param course                 the course to import into
-     * @param competenciesToImport   the source competencies that were imported
-     * @param idToImportedCompetency map of original competency id to imported competency
-     * @param importOptions          the import options
+     * @param course                    the course to import into
+     * @param competenciesToImport      the source competencies that were imported
+     * @param importOptions             the import options
+     * @param createNewCourseCompetency the function that creates new course competencies
      * @return The set of imported competencies, each also containing the relations it is the tail competency for.
      */
     public Set<CompetencyWithTailRelationDTO> importCourseCompetencies(Course course, Collection<? extends CourseCompetency> competenciesToImport,
-            Map<Long, CompetencyWithTailRelationDTO> idToImportedCompetency, CompetencyImportOptionsDTO importOptions) {
+            CompetencyImportOptionsDTO importOptions, Function<CourseCompetency, CourseCompetency> createNewCourseCompetency) {
+        var idToImportedCompetency = new HashMap<Long, CompetencyWithTailRelationDTO>();
+
+        Set<CourseCompetency> competenciesInCourse = courseCompetencyRepository.findAllForCourse(course.getId());
+
+        for (var courseCompetency : competenciesToImport) {
+            Optional<CourseCompetency> existingCompetency = competenciesInCourse.stream().filter(competency -> competency.getTitle().equals(courseCompetency.getTitle()))
+                    .filter(competency -> competency.getType().equals(courseCompetency.getType())).findFirst();
+            CourseCompetency importedCompetency = existingCompetency.orElse(createNewCourseCompetency.apply(courseCompetency));
+            importedCompetency.setCourse(course);
+            idToImportedCompetency.put(courseCompetency.getId(), new CompetencyWithTailRelationDTO(importedCompetency, new ArrayList<>()));
+        }
+        courseCompetencyRepository.saveAll(idToImportedCompetency.values().stream().map(CompetencyWithTailRelationDTO::competency).toList());
+
         if (course.getLearningPathsEnabled()) {
             var importedCompetencies = idToImportedCompetency.values().stream().map(CompetencyWithTailRelationDTO::competency).toList();
             learningPathService.linkCompetenciesToLearningPathsOfCourse(importedCompetencies, course.getId());
diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/PrerequisiteService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/PrerequisiteService.java
index 996ebd7d4385..eb66a98d641f 100644
--- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/PrerequisiteService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/PrerequisiteService.java
@@ -2,9 +2,7 @@
 
 import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 
@@ -59,17 +57,7 @@ public PrerequisiteService(PrerequisiteRepository prerequisiteRepository, Author
      * @return The set of imported prerequisites, each also containing the relations for which it is the tail prerequisite for.
      */
     public Set<CompetencyWithTailRelationDTO> importPrerequisites(Course course, Collection<? extends CourseCompetency> prerequisites, CompetencyImportOptionsDTO importOptions) {
-        var idToImportedPrerequisite = new HashMap<Long, CompetencyWithTailRelationDTO>();
-
-        for (var prerequisite : prerequisites) {
-            Prerequisite importedPrerequisite = new Prerequisite(prerequisite);
-            importedPrerequisite.setCourse(course);
-
-            importedPrerequisite = prerequisiteRepository.save(importedPrerequisite);
-            idToImportedPrerequisite.put(prerequisite.getId(), new CompetencyWithTailRelationDTO(importedPrerequisite, new ArrayList<>()));
-        }
-
-        return importCourseCompetencies(course, prerequisites, idToImportedPrerequisite, importOptions);
+        return importCourseCompetencies(course, prerequisites, importOptions, Prerequisite::new);
     }
 
     /**
diff --git a/src/main/webapp/app/course/competencies/competency-management/competency-management-table.component.ts b/src/main/webapp/app/course/competencies/competency-management/competency-management-table.component.ts
index 28d4e4399ed9..7d939bdf5c67 100644
--- a/src/main/webapp/app/course/competencies/competency-management/competency-management-table.component.ts
+++ b/src/main/webapp/app/course/competencies/competency-management/competency-management-table.component.ts
@@ -95,7 +95,8 @@ export class CompetencyManagementTableComponent implements OnInit, OnDestroy {
      */
     updateDataAfterImportAll(res: Array<CompetencyWithTailRelationDTO>) {
         const importedCompetencies = res.map((dto) => dto.competency).filter((element): element is CourseCompetency => !!element);
-        this.courseCompetencies.push(...importedCompetencies);
+        const newCourseCompetencies = importedCompetencies.filter((competency) => !this.courseCompetencies.some((existingCompetency) => existingCompetency.id === competency.id));
+        this.courseCompetencies.push(...newCourseCompetencies);
         this.allCompetencies.update((allCourseCompetencies) => allCourseCompetencies.concat(importedCompetencies));
     }
 
diff --git a/src/main/webapp/app/course/competencies/competency-management/competency-management.component.ts b/src/main/webapp/app/course/competencies/competency-management/competency-management.component.ts
index ddad887fc1a2..c0c3c3936f71 100644
--- a/src/main/webapp/app/course/competencies/competency-management/competency-management.component.ts
+++ b/src/main/webapp/app/course/competencies/competency-management/competency-management.component.ts
@@ -155,7 +155,10 @@ export class CompetencyManagementComponent implements OnInit {
      */
     updateDataAfterImportAll(res: Array<CompetencyWithTailRelationDTO>) {
         const importedCourseCompetencies = res.map((dto) => dto.competency!);
-        this.courseCompetencies.update((courseCompetencies) => courseCompetencies.concat(importedCourseCompetencies));
+        const newCourseCompetencies = importedCourseCompetencies.filter(
+            (competency) => !this.courseCompetencies().some((existingCompetency) => existingCompetency.id === competency.id),
+        );
+        this.courseCompetencies.update((courseCompetencies) => courseCompetencies.concat(newCourseCompetencies));
     }
 
     onRemoveCompetency(competencyId: number) {
diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/AbstractCompetencyPrerequisiteIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/AbstractCompetencyPrerequisiteIntegrationTest.java
index f2f393231477..3a2f639c719f 100644
--- a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/AbstractCompetencyPrerequisiteIntegrationTest.java
+++ b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/AbstractCompetencyPrerequisiteIntegrationTest.java
@@ -2,6 +2,7 @@
 
 import static de.tum.cit.aet.artemis.core.util.TestResourceUtils.HalfSecond;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Fail.fail;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
@@ -16,6 +17,7 @@
 import org.springframework.http.HttpStatus;
 
 import de.tum.cit.aet.artemis.atlas.AbstractAtlasIntegrationTest;
+import de.tum.cit.aet.artemis.atlas.domain.competency.Competency;
 import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyExerciseLink;
 import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyLectureUnitLink;
 import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyRelation;
@@ -27,6 +29,7 @@
 import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportResponseDTO;
 import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO;
 import de.tum.cit.aet.artemis.core.domain.Course;
+import de.tum.cit.aet.artemis.core.domain.DomainObject;
 import de.tum.cit.aet.artemis.core.domain.User;
 import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode;
 import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore;
@@ -511,6 +514,27 @@ void shouldImportAllCompetencies(Function<Course, CourseCompetency> createCourse
         assertThat(competencyDTOList.get(1).tailRelations()).isNull();
     }
 
+    // Test
+    void shouldImportAllCompetenciesWithSomeExisting(Function<CourseCompetency, CourseCompetency> copyCourseCompetency, int expectedCourseCompetencies) throws Exception {
+        competencyUtilService.createCompetencies(course, 2);
+        prerequisiteUtilService.createPrerequisites(course, 2);
+
+        CourseCompetency newCompetency = copyCourseCompetency.apply(courseCompetency);
+        newCompetency.setCourse(course2);
+        newCompetency = courseCompetencyRepository.save(newCompetency);
+
+        CompetencyImportOptionsDTO importOptions = new CompetencyImportOptionsDTO(Set.of(), Optional.of(course.getId()), false, false, false, Optional.empty(), false);
+        importAllCall(course2.getId(), importOptions, HttpStatus.CREATED);
+
+        course2 = courseRepository.findByIdWithExercisesAndLecturesAndLectureUnitsAndCompetenciesElseThrow(course2.getId());
+        assertThat(course2.getPrerequisites().size() + course2.getCompetencies().size()).isEqualTo(expectedCourseCompetencies);
+        switch (newCompetency) {
+            case Competency competency -> assertThat(course2.getCompetencies().stream().map(DomainObject::getId)).contains(competency.getId());
+            case Prerequisite prerequisite -> assertThat(course2.getPrerequisites().stream().map(DomainObject::getId)).contains(prerequisite.getId());
+            default -> fail("Unexpected CourseCompetency subclass");
+        }
+    }
+
     // Test
     void shouldImportAllExerciseAndLectureWithCompetency() throws Exception {
         createProgrammingExercise(ZonedDateTime.now(), ZonedDateTime.now());
diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CompetencyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CompetencyIntegrationTest.java
index e4e59099d9e5..2f1ccc5c8536 100644
--- a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CompetencyIntegrationTest.java
+++ b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CompetencyIntegrationTest.java
@@ -284,6 +284,12 @@ void shouldImportAllCompetencies() throws Exception {
         super.shouldImportAllCompetencies(competencyUtilService::createCompetency);
     }
 
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void shouldImportAllCompetenciesWithSomeExisting() throws Exception {
+        shouldImportAllCompetenciesWithSomeExisting(Competency::new, 3);
+    }
+
     @Test
     @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
     void shouldImportAllExerciseAndLectureWithCompetency() throws Exception {
diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CourseCompetencyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CourseCompetencyIntegrationTest.java
index 9b33684117fa..b12b09b6e191 100644
--- a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CourseCompetencyIntegrationTest.java
+++ b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CourseCompetencyIntegrationTest.java
@@ -194,6 +194,12 @@ void shouldImportAllCompetencies() throws Exception {
         super.shouldImportAllCompetencies(competencyUtilService::createCompetency);
     }
 
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void shouldImportAllCompetenciesWithSomeExisting() throws Exception {
+        shouldImportAllCompetenciesWithSomeExisting(Competency::new, 5);
+    }
+
     @Test
     @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
     void shouldImportAllExerciseAndLectureWithCompetency() throws Exception {
diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/PrerequisiteIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/PrerequisiteIntegrationTest.java
index 42293964287f..9e84044aa6c9 100644
--- a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/PrerequisiteIntegrationTest.java
+++ b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/PrerequisiteIntegrationTest.java
@@ -278,6 +278,12 @@ void shouldImportAllCompetencies() throws Exception {
         super.shouldImportAllCompetencies(prerequisiteUtilService::createPrerequisite);
     }
 
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void shouldImportAllCompetenciesWithSomeExisting() throws Exception {
+        shouldImportAllCompetenciesWithSomeExisting(Prerequisite::new, 3);
+    }
+
     @Test
     @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
     void shouldImportAllExerciseAndLectureWithCompetency() throws Exception {

From 9d543b972cb1c63a18d99d764c2eff1c385962c3 Mon Sep 17 00:00:00 2001
From: Asli Aykan <56061820+asliayk@users.noreply.github.com>
Date: Sat, 16 Nov 2024 10:18:12 +0100
Subject: [PATCH 3/7] Communication: Add profile picture to user selector
 (#9764)

---
 .../course-users-selector.component.html      | 19 ++++++++++++++++++-
 .../course-users-selector.module.ts           |  3 ++-
 .../course-users-selector.component.spec.ts   | 17 +++++++++++++++--
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/app/shared/course-users-selector/course-users-selector.component.html b/src/main/webapp/app/shared/course-users-selector/course-users-selector.component.html
index e2bc97df120d..d3e4254e97d6 100644
--- a/src/main/webapp/app/shared/course-users-selector/course-users-selector.component.html
+++ b/src/main/webapp/app/shared/course-users-selector/course-users-selector.component.html
@@ -13,13 +13,30 @@
             [placeholder]="'artemisApp.userSelector.placeholderText' | artemisTranslate"
             [ngbTypeahead]="search"
             [inputFormatter]="usersFormatter"
-            [resultFormatter]="usersFormatter"
+            [resultTemplate]="resultTemplate"
             [editable]="false"
             [focusFirst]="false"
             (input)="onInputChange($event)"
             placement="bottom-start"
             #instance="ngbTypeahead"
         />
+        <ng-template #resultTemplate let-user="result">
+            <div class="d-flex align-items-center">
+                <jhi-profile-picture
+                    [imageSizeInRem]="'1.1'"
+                    [fontSizeInRem]="'0.5'"
+                    [imageId]="'sidebar-profile-picture'"
+                    [defaultPictureId]="'sidebar-default-profile-picture'"
+                    [isGray]="false"
+                    [authorId]="user.id"
+                    [authorName]="user.name"
+                    [imageUrl]="user.imageUrl"
+                    [isEditable]="false"
+                    class="me-2"
+                ></jhi-profile-picture>
+                <span>{{ getUserLabel(user) }}</span>
+            </div>
+        </ng-template>
         @if (isSearching) {
             <small class="form-text text-body-secondary" jhiTranslate="artemisApp.userSelector.searchingText"></small>
             <br />
diff --git a/src/main/webapp/app/shared/course-users-selector/course-users-selector.module.ts b/src/main/webapp/app/shared/course-users-selector/course-users-selector.module.ts
index ca44726f11bb..8c47180607d0 100644
--- a/src/main/webapp/app/shared/course-users-selector/course-users-selector.module.ts
+++ b/src/main/webapp/app/shared/course-users-selector/course-users-selector.module.ts
@@ -4,9 +4,10 @@ import { ArtemisSharedModule } from 'app/shared/shared.module';
 import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
 import { NgModule } from '@angular/core';
 import { CourseUsersSelectorComponent } from 'app/shared/course-users-selector/course-users-selector.component';
+import { ProfilePictureComponent } from 'app/shared/profile-picture/profile-picture.component';
 
 @NgModule({
-    imports: [CommonModule, FormsModule, ReactiveFormsModule, ArtemisSharedModule, ArtemisSharedComponentModule],
+    imports: [CommonModule, FormsModule, ReactiveFormsModule, ArtemisSharedModule, ArtemisSharedComponentModule, ProfilePictureComponent],
     exports: [CourseUsersSelectorComponent],
     declarations: [CourseUsersSelectorComponent],
 })
diff --git a/src/test/javascript/spec/component/shared/course-users-selector/course-users-selector.component.spec.ts b/src/test/javascript/spec/component/shared/course-users-selector/course-users-selector.component.spec.ts
index ffb59f1825a3..74693eb15ba5 100644
--- a/src/test/javascript/spec/component/shared/course-users-selector/course-users-selector.component.spec.ts
+++ b/src/test/javascript/spec/component/shared/course-users-selector/course-users-selector.component.spec.ts
@@ -6,7 +6,7 @@ import { NgbTypeaheadModule } from '@ng-bootstrap/ng-bootstrap';
 import { By } from '@angular/platform-browser';
 import { of } from 'rxjs';
 import { HttpResponse } from '@angular/common/http';
-import { MockPipe, MockProvider } from 'ng-mocks';
+import { MockComponent, MockPipe, MockProvider } from 'ng-mocks';
 import { CourseManagementService } from 'app/course/manage/course-management.service';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { CourseUsersSelectorComponent, SearchRoleGroup } from 'app/shared/course-users-selector/course-users-selector.component';
@@ -14,6 +14,7 @@ import { UserPublicInfoDTO } from 'app/core/user/user.model';
 import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
 import { ArtemisSharedModule } from 'app/shared/shared.module';
 import { TranslateModule } from '@ngx-translate/core';
+import { ProfilePictureComponent } from 'app/shared/profile-picture/profile-picture.component';
 
 @Component({
     template: `
@@ -48,7 +49,7 @@ describe('CourseUsersSelectorComponent', () => {
     beforeEach(waitForAsync(() => {
         TestBed.configureTestingModule({
             imports: [CommonModule, FormsModule, ReactiveFormsModule, NgbTypeaheadModule, ArtemisSharedModule, ArtemisSharedComponentModule, TranslateModule.forRoot()],
-            declarations: [CourseUsersSelectorComponent, WrapperComponent, MockPipe(ArtemisTranslatePipe)],
+            declarations: [CourseUsersSelectorComponent, WrapperComponent, MockPipe(ArtemisTranslatePipe), MockComponent(ProfilePictureComponent)],
             providers: [MockProvider(CourseManagementService)],
         }).compileComponents();
     }));
@@ -142,6 +143,18 @@ describe('CourseUsersSelectorComponent', () => {
             expect(userSelectorComponent.selectedUsers).toEqual([exampleUserPublicInfoDTO]);
             expect(fixture.debugElement.query(By.css('.delete-user'))).toBeFalsy();
         }));
+
+        it('should render profile picture for users in dropdown', fakeAsync(() => {
+            const user = generateExampleUserPublicInfoDTO({});
+            searchUsersSpy.mockReturnValue(of(new HttpResponse({ body: [user], status: 200 })));
+
+            changeInput(fixture.debugElement.nativeElement, 'test');
+            tick(1000);
+            fixture.detectChanges();
+
+            const profilePicture = fixture.debugElement.query(By.directive(MockComponent(ProfilePictureComponent)));
+            expect(profilePicture).not.toBeNull();
+        }));
     });
 
     function getNativeInput(element: HTMLElement): HTMLInputElement {

From 7bf4a93b29fff1a9e5a990897325165fb054d0f0 Mon Sep 17 00:00:00 2001
From: Simon Entholzer <33342534+SimonEntholzer@users.noreply.github.com>
Date: Sat, 16 Nov 2024 10:19:26 +0100
Subject: [PATCH 4/7] Development: Reactivate auxiliary repository integration
 tests for LocalVC (#9763)

---
 ...grammingIntegrationLocalCILocalVCTest.java |   3 +
 ...gExerciseIntegrationJenkinsGitlabTest.java |  18 ++
 ...rammingExerciseIntegrationTestService.java |  37 ++--
 ...rammingExerciseLocalVCIntegrationTest.java | 203 ++++++++++++++++++
 4 files changed, 238 insertions(+), 23 deletions(-)
 create mode 100644 src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseLocalVCIntegrationTest.java

diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/AbstractProgrammingIntegrationLocalCILocalVCTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/AbstractProgrammingIntegrationLocalCILocalVCTest.java
index fcbdc0bdef78..56adec3eb361 100644
--- a/src/test/java/de/tum/cit/aet/artemis/programming/AbstractProgrammingIntegrationLocalCILocalVCTest.java
+++ b/src/test/java/de/tum/cit/aet/artemis/programming/AbstractProgrammingIntegrationLocalCILocalVCTest.java
@@ -52,6 +52,9 @@ public abstract class AbstractProgrammingIntegrationLocalCILocalVCTest extends A
     // External Repositories
 
     // Services
+    @Autowired
+    protected ProgrammingExerciseIntegrationTestService programmingExerciseIntegrationTestService;
+
     @Autowired
     protected AeolusRequestMockProvider aeolusRequestMockProvider;
 
diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java
index 5812c2923e0e..4646464e8458 100644
--- a/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java
+++ b/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java
@@ -74,6 +74,18 @@ void testExportSubmissionsByParticipationIds_includePracticeSubmissions() throws
         programmingExerciseIntegrationTestService.testExportSubmissionsByParticipationIds_includePracticeSubmissions();
     }
 
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testExportSubmissionsByParticipationIds_addParticipantIdentifierToProjectNameError() throws Exception {
+        programmingExerciseIntegrationTestService.testExportSubmissionsByParticipationIds_addParticipantIdentifierToProjectNameError();
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testExportSubmissionsByParticipationIds_addParticipantIdentifierToProjectName() throws Exception {
+        programmingExerciseIntegrationTestService.testExportSubmissionsByParticipationIds_addParticipantIdentifierToProjectName();
+    }
+
     @Test
     @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
     void testExportSubmissionsByParticipationIds() throws Exception {
@@ -562,6 +574,12 @@ void createProgrammingExercise_projectTypeNotExpected_badRequest() throws Except
         programmingExerciseIntegrationTestService.createProgrammingExercise_projectTypeNotExpected_badRequest();
     }
 
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void createProgrammingExercise_onlineCodeEditorNotExpected_badRequest() throws Exception {
+        programmingExerciseIntegrationTestService.createProgrammingExercise_onlineCodeEditorNotExpected_badRequest();
+    }
+
     private static Set<ProgrammingLanguage> generateSupportedLanguagesWithoutHaskell() {
         Set<ProgrammingLanguage> supportedLanguages = ArgumentSources.generateJenkinsSupportedLanguages();
         supportedLanguages.remove(ProgrammingLanguage.HASKELL);
diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseIntegrationTestService.java
index d35b974e32c7..6b716d45b5a9 100644
--- a/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseIntegrationTestService.java
+++ b/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseIntegrationTestService.java
@@ -16,6 +16,7 @@
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -292,10 +293,6 @@ void setup(String userPrefix, MockDelegate mockDelegate, VersionControlService v
         GitService.commit(localGit).setMessage("empty").setAllowEmpty(true).setSign(false).setAuthor("test", "test@test.com").call();
         localGit.push().call();
 
-        // we use the temp repository as remote origin for all repositories that are created during the
-        // TODO: distinguish between template, test and solution
-        doReturn(new GitUtilService.MockFileRepositoryUri(remoteRepoFile)).when(versionControlService).getCloneRepositoryUri(anyString(), anyString());
-
         this.plagiarismChecksTestReposDir = Files.createTempDirectory("jplag-repos").toFile();
     }
 
@@ -1433,6 +1430,8 @@ void importProgrammingExercise_vcsProjectWithSameTitleAlreadyExists_badRequest()
     }
 
     void importProgrammingExercise_updatesTestCaseIds() throws Exception {
+        doReturn(new GitUtilService.MockFileRepositoryUri(remoteRepoFile)).when(versionControlService).getCloneRepositoryUri(anyString(), anyString());
+
         programmingExercise = programmingExerciseRepository.findByIdWithTemplateAndSolutionParticipationAndAuxiliaryRepositoriesElseThrow(programmingExercise.getId());
         var tests = programmingExerciseUtilService.addTestCasesToProgrammingExercise(programmingExercise);
         var test1 = tests.getFirst();
@@ -1464,6 +1463,8 @@ void importProgrammingExercise_updatesTestCaseIds() throws Exception {
         var savedProgrammingExercise = programmingExerciseRepository.findByIdElseThrow(response.getId());
 
         assertThat(savedProgrammingExercise.getProblemStatement()).isEqualTo(newProblemStatement);
+
+        reset(versionControlService);
     }
 
     void exportSubmissionsByStudentLogins_notInstructorForExercise_forbidden() throws Exception {
@@ -1920,11 +1921,11 @@ void testGetPlagiarismResultWithoutExercise() throws Exception {
 
     void testValidateValidAuxiliaryRepository() throws Exception {
         AuxiliaryRepositoryBuilder auxRepoBuilder = AuxiliaryRepositoryBuilder.defaults();
-        testAuxRepo(auxRepoBuilder, HttpStatus.CREATED);
+        testAuxRepo(auxRepoBuilder, HttpStatus.OK);
     }
 
     void testValidateAuxiliaryRepositoryIdSetOnRequest() throws Exception {
-        testAuxRepo(AuxiliaryRepositoryBuilder.defaults().withId(0L), HttpStatus.BAD_REQUEST);
+        testAuxRepo(AuxiliaryRepositoryBuilder.defaults().withId(0L), HttpStatus.INTERNAL_SERVER_ERROR);
 
     }
 
@@ -1953,12 +1954,12 @@ void testValidateAuxiliaryRepositoryWithInvalidCheckoutDirectory() throws Except
 
     void testValidateAuxiliaryRepositoryWithoutCheckoutDirectory() throws Exception {
         AuxiliaryRepositoryBuilder auxRepoBuilder = AuxiliaryRepositoryBuilder.defaults().withoutCheckoutDirectory();
-        testAuxRepo(auxRepoBuilder, HttpStatus.CREATED);
+        testAuxRepo(auxRepoBuilder, HttpStatus.OK);
     }
 
     void testValidateAuxiliaryRepositoryWithBlankCheckoutDirectory() throws Exception {
         AuxiliaryRepositoryBuilder auxRepoBuilder = AuxiliaryRepositoryBuilder.defaults().withCheckoutDirectory("   ");
-        testAuxRepo(auxRepoBuilder, HttpStatus.CREATED);
+        testAuxRepo(auxRepoBuilder, HttpStatus.OK);
     }
 
     void testValidateAuxiliaryRepositoryWithTooLongCheckoutDirectory() throws Exception {
@@ -1981,7 +1982,7 @@ void testValidateAuxiliaryRepositoryWithTooLongDescription() throws Exception {
 
     void testValidateAuxiliaryRepositoryWithoutDescription() throws Exception {
         AuxiliaryRepositoryBuilder auxRepoBuilder = AuxiliaryRepositoryBuilder.defaults().withoutDescription();
-        testAuxRepo(auxRepoBuilder, HttpStatus.CREATED);
+        testAuxRepo(auxRepoBuilder, HttpStatus.OK);
     }
 
     void testGetAuxiliaryRepositoriesMissingExercise() throws Exception {
@@ -2158,7 +2159,7 @@ public void addAuxiliaryRepositoryToExercise(ProgrammingExercise exercise) {
     }
 
     private String defaultAuxiliaryRepositoryEndpoint() {
-        return "/api/programming-exercises/setup";
+        return "/api/programming-exercises";
     }
 
     private String defaultResetEndpoint() {
@@ -2191,17 +2192,7 @@ private void testAuxRepo(AuxiliaryRepositoryBuilder body, HttpStatus expectedSta
 
     private void testAuxRepo(List<AuxiliaryRepository> body, HttpStatus expectedStatus) throws Exception {
         programmingExercise.setAuxiliaryRepositories(body);
-        programmingExercise.setId(null);
-        programmingExercise.setSolutionParticipation(null);
-        programmingExercise.setTemplateParticipation(null);
-        programmingExercise.setChannelName("pe-test");
-        programmingExercise.setShortName("ExerciseTitle");
-        programmingExercise.setTitle("Title");
-        if (expectedStatus == HttpStatus.CREATED) {
-            mockDelegate.mockConnectorRequestsForSetup(programmingExercise, false, false, false);
-            mockDelegate.mockGetProjectKeyFromAnyUrl(programmingExercise.getProjectKey());
-        }
-        request.postWithResponseBody(defaultAuxiliaryRepositoryEndpoint(), programmingExercise, ProgrammingExercise.class, expectedStatus);
+        request.putWithResponseBody(defaultAuxiliaryRepositoryEndpoint(), programmingExercise, ProgrammingExercise.class, expectedStatus);
     }
 
     private static class AuxiliaryRepositoryBuilder {
@@ -2275,8 +2266,8 @@ AuxiliaryRepository get() {
         }
     }
 
-    void testReEvaluateAndUpdateProgrammingExercise_instructorNotInCourse_forbidden() throws Exception {
-        userUtilService.addInstructor("other-instructors", userPrefix + "instructoralt");
+    void testReEvaluateAndUpdateProgrammingExercise_instructorNotInCourse_forbidden(String testPrefix) throws Exception {
+        userUtilService.addInstructor("other-instructors", testPrefix + "instructoralt");
         programmingExerciseUtilService.addCourseWithOneProgrammingExercise();
         ProgrammingExercise programmingExercise = programmingExerciseTestRepository.findAllWithEagerTemplateAndSolutionParticipations().getFirst();
         request.put("/api/programming-exercises/" + programmingExercise.getId() + "/re-evaluate", programmingExercise, HttpStatus.FORBIDDEN);
diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseLocalVCIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseLocalVCIntegrationTest.java
new file mode 100644
index 000000000000..0194806e6028
--- /dev/null
+++ b/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseLocalVCIntegrationTest.java
@@ -0,0 +1,203 @@
+package de.tum.cit.aet.artemis.programming;
+
+import java.io.IOException;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.security.test.context.support.WithMockUser;
+
+class ProgrammingExerciseLocalVCIntegrationTest extends AbstractProgrammingIntegrationLocalCILocalVCTest {
+
+    private static final String TEST_PREFIX = "programmingexerciselocalvc";
+
+    @BeforeEach
+    void initTestCase() throws Exception {
+        programmingExerciseIntegrationTestService.setup(TEST_PREFIX, this, versionControlService, continuousIntegrationService);
+    }
+
+    @AfterEach
+    void tearDown() throws IOException {
+        programmingExerciseIntegrationTestService.tearDown();
+    }
+
+    protected String getTestPrefix() {
+        return TEST_PREFIX;
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testValidateValidAuxiliaryRepository() throws Exception {
+        programmingExerciseIntegrationTestService.testValidateValidAuxiliaryRepository();
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testValidateAuxiliaryRepositoryIdSetOnRequest() throws Exception {
+        programmingExerciseIntegrationTestService.testValidateAuxiliaryRepositoryIdSetOnRequest();
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testValidateAuxiliaryRepositoryWithoutName() throws Exception {
+        programmingExerciseIntegrationTestService.testValidateAuxiliaryRepositoryWithoutName();
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testValidateAuxiliaryRepositoryWithTooLongName() throws Exception {
+        programmingExerciseIntegrationTestService.testValidateAuxiliaryRepositoryWithTooLongName();
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testValidateAuxiliaryRepositoryWithDuplicatedName() throws Exception {
+        programmingExerciseIntegrationTestService.testValidateAuxiliaryRepositoryWithDuplicatedName();
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testValidateAuxiliaryRepositoryWithRestrictedName() throws Exception {
+        programmingExerciseIntegrationTestService.testValidateAuxiliaryRepositoryWithRestrictedName();
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testValidateAuxiliaryRepositoryWithInvalidCheckoutDirectory() throws Exception {
+        programmingExerciseIntegrationTestService.testValidateAuxiliaryRepositoryWithInvalidCheckoutDirectory();
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testValidateAuxiliaryRepositoryWithoutCheckoutDirectory() throws Exception {
+        programmingExerciseIntegrationTestService.testValidateAuxiliaryRepositoryWithoutCheckoutDirectory();
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testValidateAuxiliaryRepositoryWithBlankCheckoutDirectory() throws Exception {
+        programmingExerciseIntegrationTestService.testValidateAuxiliaryRepositoryWithBlankCheckoutDirectory();
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testValidateAuxiliaryRepositoryWithTooLongCheckoutDirectory() throws Exception {
+        programmingExerciseIntegrationTestService.testValidateAuxiliaryRepositoryWithTooLongCheckoutDirectory();
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testValidateAuxiliaryRepositoryWithDuplicatedCheckoutDirectory() throws Exception {
+        programmingExerciseIntegrationTestService.testValidateAuxiliaryRepositoryWithDuplicatedCheckoutDirectory();
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testValidateAuxiliaryRepositoryWithNullCheckoutDirectory() throws Exception {
+        programmingExerciseIntegrationTestService.testValidateAuxiliaryRepositoryWithNullCheckoutDirectory();
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testValidateAuxiliaryRepositoryWithTooLongDescription() throws Exception {
+        programmingExerciseIntegrationTestService.testValidateAuxiliaryRepositoryWithTooLongDescription();
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testValidateAuxiliaryRepositoryWithoutDescription() throws Exception {
+        programmingExerciseIntegrationTestService.testValidateAuxiliaryRepositoryWithoutDescription();
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testGetAuxiliaryRepositoriesMissingExercise() throws Exception {
+        programmingExerciseIntegrationTestService.testGetAuxiliaryRepositoriesMissingExercise();
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testGetAuxiliaryRepositoriesOk() throws Exception {
+        programmingExerciseIntegrationTestService.testGetAuxiliaryRepositoriesOk();
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testGetAuxiliaryRepositoriesEmptyOk() throws Exception {
+        programmingExerciseIntegrationTestService.testGetAuxiliaryRepositoriesEmptyOk();
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
+    void testGetAuxiliaryRepositoriesForbidden() throws Exception {
+        programmingExerciseIntegrationTestService.testGetAuxiliaryRepositoriesForbidden();
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
+    void testExportAuxiliaryRepositoryForbidden() throws Exception {
+        programmingExerciseIntegrationTestService.testExportAuxiliaryRepositoryForbidden();
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testExportAuxiliaryRepositoryBadRequest() throws Exception {
+        programmingExerciseIntegrationTestService.testExportAuxiliaryRepositoryBadRequest();
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testExportAuxiliaryRepositoryExerciseNotFound() throws Exception {
+        programmingExerciseIntegrationTestService.testExportAuxiliaryRepositoryExerciseNotFound();
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testExportAuxiliaryRepositoryRepositoryNotFound() throws Exception {
+        programmingExerciseIntegrationTestService.testExportAuxiliaryRepositoryRepositoryNotFound();
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructoralt1", roles = "INSTRUCTOR")
+    void testReEvaluateAndUpdateProgrammingExercise_instructorNotInCourse_forbidden() throws Exception {
+        programmingExerciseIntegrationTestService.testReEvaluateAndUpdateProgrammingExercise_instructorNotInCourse_forbidden(TEST_PREFIX);
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testReEvaluateAndUpdateProgrammingExercise_notFound() throws Exception {
+        programmingExerciseIntegrationTestService.testReEvaluateAndUpdateProgrammingExercise_notFound();
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testReEvaluateAndUpdateProgrammingExercise_isNotSameGivenExerciseIdInRequestBody_conflict() throws Exception {
+        programmingExerciseIntegrationTestService.testReEvaluateAndUpdateProgrammingExercise_isNotSameGivenExerciseIdInRequestBody_conflict();
+    }
+    //
+    // @Test
+    // @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    // void test_redirectGetSolutionRepositoryFilesWithoutContent() throws Exception {
+    // programmingExerciseIntegrationTestService.test_redirectGetSolutionRepositoryFilesWithoutContent();
+    // }
+    //
+    // @Test
+    // @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    // void test_redirectGetTemplateRepositoryFilesWithContent() throws Exception {
+    // programmingExerciseIntegrationTestService.test_redirectGetTemplateRepositoryFilesWithContent();
+    // }
+    //
+    // @Test
+    // @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    // void testRedirectGetParticipationRepositoryFilesWithContentAtCommit() throws Exception {
+    // programmingExerciseIntegrationTestService.testRedirectGetParticipationRepositoryFilesWithContentAtCommit();
+    // }
+    //
+    // @Test
+    // @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    // void testRedirectGetParticipationRepositoryFilesWithContentAtCommitForbidden() throws Exception {
+    // programmingExerciseIntegrationTestService.testRedirectGetParticipationRepositoryFilesWithContentAtCommitForbidden();
+    // }
+
+    // TODO add all other tests
+}

From f05b0a5214d0f59d6722113a22c437fab927c577 Mon Sep 17 00:00:00 2001
From: Ajayvir Singh <38434017+AjayvirS@users.noreply.github.com>
Date: Sat, 16 Nov 2024 10:22:40 +0100
Subject: [PATCH 5/7] Plagiarism checks: Fix scrolling issue on side-by-side
 viewer for modeling (#9748)

---
 .../shared/modeling-editor.component.html     |  6 +++++-
 .../shared/modeling-editor.component.scss     | 19 ++++++++++++++++++-
 .../exam/ExamExerciseGroupsPage.ts            |  3 ++-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/app/exercises/modeling/shared/modeling-editor.component.html b/src/main/webapp/app/exercises/modeling/shared/modeling-editor.component.html
index d29c46e6c02f..1c7637eb8455 100644
--- a/src/main/webapp/app/exercises/modeling/shared/modeling-editor.component.html
+++ b/src/main/webapp/app/exercises/modeling/shared/modeling-editor.component.html
@@ -108,7 +108,11 @@ <h4 class="modal-title" jhiTranslate="artemisApp.modelingEditor.helpModal.title"
         }
     </div>
     @if (readOnly) {
-        <div class="d-flex align-items-center justify-content-center readonly-diagram" [innerHtml]="readOnlySVG" [style.margin-top]="isFullScreen ? '30px' : ''"></div>
+        <div
+            class="d-flex align-items-center justify-content-center readonly-diagram scroll-container"
+            [innerHtml]="readOnlySVG"
+            [ngClass]="{ 'full-screen-margin': isFullScreen }"
+        ></div>
     }
 
     @if (withExplanation) {
diff --git a/src/main/webapp/app/exercises/modeling/shared/modeling-editor.component.scss b/src/main/webapp/app/exercises/modeling/shared/modeling-editor.component.scss
index b15f7440d9e6..788be9f011a2 100644
--- a/src/main/webapp/app/exercises/modeling/shared/modeling-editor.component.scss
+++ b/src/main/webapp/app/exercises/modeling/shared/modeling-editor.component.scss
@@ -49,7 +49,24 @@ $draggable-width: 15px;
 
 .readonly-diagram {
     height: 100%;
-    overflow: hidden;
+    overflow-x: auto;
+    overflow-y: auto;
+}
+
+.scroll-container {
+    scrollbar-width: thin; /* Firefox */
+    &::-webkit-scrollbar {
+        width: 6px; /* WebKit */
+    }
+
+    &::-webkit-scrollbar-thumb {
+        background-color: rgba(0, 0, 0, 0.2);
+        border-radius: 3px;
+    }
+}
+
+.full-screen-margin {
+    margin-top: 30px;
 }
 
 @keyframes spin {
diff --git a/src/test/playwright/support/pageobjects/exam/ExamExerciseGroupsPage.ts b/src/test/playwright/support/pageobjects/exam/ExamExerciseGroupsPage.ts
index e2f510b6a0f2..4e4379f12817 100644
--- a/src/test/playwright/support/pageobjects/exam/ExamExerciseGroupsPage.ts
+++ b/src/test/playwright/support/pageobjects/exam/ExamExerciseGroupsPage.ts
@@ -22,8 +22,9 @@ export class ExamExerciseGroupsPage {
     async clickEditGroup(groupID: number) {
         await this.page.click(`#group-${groupID} .edit-group`);
     }
+
     async clickEditGroupForTestExam() {
-        await this.page.getByText('Edit').click();
+        await this.page.getByRole('link', { name: 'Edit' }).click();
     }
 
     async clickDeleteGroup(groupID: number, groupName: string) {

From d3311aea4bec102465d21e593f3c1a14a54f9583 Mon Sep 17 00:00:00 2001
From: Paul Rangger <48455539+PaRangger@users.noreply.github.com>
Date: Sat, 16 Nov 2024 10:23:53 +0100
Subject: [PATCH 6/7] Communication: Fix an issue that stops channels from
 loading messages (#9745)

---
 .../shared/metis/posting-header/posting-header.directive.ts | 4 ++++
 src/main/webapp/i18n/de/metis.json                          | 6 ++++--
 src/main/webapp/i18n/en/metis.json                          | 6 ++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/app/shared/metis/posting-header/posting-header.directive.ts b/src/main/webapp/app/shared/metis/posting-header/posting-header.directive.ts
index e6deddb407b8..f07ef5e1ed04 100644
--- a/src/main/webapp/app/shared/metis/posting-header/posting-header.directive.ts
+++ b/src/main/webapp/app/shared/metis/posting-header/posting-header.directive.ts
@@ -95,6 +95,10 @@ export abstract class PostingHeaderDirective<T extends Posting> implements OnIni
             this.userAuthority = 'tutor';
             this.userRoleBadge = roleBadgeTranslationPath + this.userAuthority;
             this.userAuthorityTooltip = toolTipTranslationPath + this.userAuthority;
+        } else {
+            this.userAuthority = 'student';
+            this.userRoleBadge = 'artemisApp.metis.userRoles.deleted';
+            this.userAuthorityTooltip = 'artemisApp.metis.userAuthorityTooltips.deleted';
         }
     }
 }
diff --git a/src/main/webapp/i18n/de/metis.json b/src/main/webapp/i18n/de/metis.json
index d7fa19710c0d..f88d74bce4f9 100644
--- a/src/main/webapp/i18n/de/metis.json
+++ b/src/main/webapp/i18n/de/metis.json
@@ -142,12 +142,14 @@
             "userRoles": {
                 "instructor": "Instruktor",
                 "tutor": "Tutor",
-                "student": "Student"
+                "student": "Student",
+                "deleted": "Gelöscht"
             },
             "userAuthorityTooltips": {
                 "instructor": "Lehrkraft: Verantwortlich für die Kursdurchführung.",
                 "tutor": "Tutor:in: Verantwortlich für die Unterstützung der Studierenden bei ihren Fragen zum Kurs und zu den Übungen.",
-                "student": "Studierende:r: Nimmt an Kursen und Übungen teil und stellt Fragen."
+                "student": "Studierende:r: Nimmt an Kursen und Übungen teil und stellt Fragen.",
+                "deleted": "Gelöscht: Nutzer:in wurde gelöscht."
             }
         }
     }
diff --git a/src/main/webapp/i18n/en/metis.json b/src/main/webapp/i18n/en/metis.json
index bfb25d30252b..034f9f3b624a 100644
--- a/src/main/webapp/i18n/en/metis.json
+++ b/src/main/webapp/i18n/en/metis.json
@@ -142,12 +142,14 @@
             "userRoles": {
                 "instructor": "Instructor",
                 "tutor": "Tutor",
-                "student": "Student"
+                "student": "Student",
+                "deleted": "Deleted"
             },
             "userAuthorityTooltips": {
                 "instructor": "Instructor: Responsible for course conduction.",
                 "tutor": "Tutor: Responsible for helping users with their questions about the course and exercises.",
-                "student": "Student: Takes courses, participates in exercises, and asks questions."
+                "student": "Student: Takes courses, participates in exercises, and asks questions.",
+                "deleted": "Deleted: This user was deleted."
             }
         }
     }

From 7896ff92ba441632cef661120423a6306a6dac6c Mon Sep 17 00:00:00 2001
From: Aniruddh Zaveri <92953467+az108@users.noreply.github.com>
Date: Sat, 16 Nov 2024 10:25:48 +0100
Subject: [PATCH 7/7] Programming exercises: Add affected students to feedback
 analysis table (#9728)

---
 .../dto/FeedbackAffectedStudentDTO.java       |  4 +
 .../assessment/dto/FeedbackDetailDTO.java     | 11 ++-
 .../assessment/service/ResultService.java     | 26 ++++++-
 .../assessment/web/ResultResource.java        | 31 +++++++-
 .../cit/aet/artemis/core/util/PageUtil.java   |  3 +
 .../StudentParticipationRepository.java       | 47 ++++++++++--
 ...ack-affected-students-modal.component.html | 49 ++++++++++++
 ...dback-affected-students-modal.component.ts | 59 +++++++++++++++
 .../feedback-analysis.component.html          | 34 +++------
 .../feedback-analysis.component.ts            | 10 ++-
 .../feedback-analysis.service.ts              | 27 ++++++-
 .../webapp/app/shared/table/pageable-table.ts |  6 ++
 .../webapp/i18n/de/programmingExercise.json   | 10 ++-
 .../webapp/i18n/en/programmingExercise.json   | 10 ++-
 .../ResultServiceIntegrationTest.java         | 42 +++++++++++
 .../feedback-analysis.component.spec.ts       | 18 ++++-
 .../feedback-analysis.service.spec.ts         | 72 +++++++++++++++++-
 ...-affected-students-modal.component.spec.ts | 75 +++++++++++++++++++
 .../modals/feedback-modal.component.spec.ts   |  1 +
 19 files changed, 486 insertions(+), 49 deletions(-)
 create mode 100644 src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAffectedStudentDTO.java
 create mode 100644 src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html
 create mode 100644 src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts
 create mode 100644 src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts

diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAffectedStudentDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAffectedStudentDTO.java
new file mode 100644
index 000000000000..71c6b73a208f
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAffectedStudentDTO.java
@@ -0,0 +1,4 @@
+package de.tum.cit.aet.artemis.assessment.dto;
+
+public record FeedbackAffectedStudentDTO(long courseId, long participationId, String firstName, String lastName, String login, String repositoryURI) {
+}
diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java
index 6d31e250f5d5..d22a036e7489 100644
--- a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java
+++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java
@@ -1,7 +1,16 @@
 package de.tum.cit.aet.artemis.assessment.dto;
 
+import java.util.Arrays;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
-public record FeedbackDetailDTO(long count, double relativeCount, String detailText, String testCaseName, String taskName, String errorCategory) {
+public record FeedbackDetailDTO(List<Long> concatenatedFeedbackIds, long count, double relativeCount, String detailText, String testCaseName, String taskName,
+        String errorCategory) {
+
+    public FeedbackDetailDTO(String concatenatedFeedbackIds, long count, double relativeCount, String detailText, String testCaseName, String taskName, String errorCategory) {
+        this(Arrays.stream(concatenatedFeedbackIds.split(",")).map(Long::valueOf).toList(), count, relativeCount, detailText, testCaseName, taskName, errorCategory);
+    }
+
 }
diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java
index d0c25898b6a3..50576953916b 100644
--- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java
@@ -4,6 +4,7 @@
 
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -24,6 +25,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Profile;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 
 import de.tum.cit.aet.artemis.assessment.domain.AssessmentType;
@@ -31,6 +33,7 @@
 import de.tum.cit.aet.artemis.assessment.domain.FeedbackType;
 import de.tum.cit.aet.artemis.assessment.domain.LongFeedbackText;
 import de.tum.cit.aet.artemis.assessment.domain.Result;
+import de.tum.cit.aet.artemis.assessment.dto.FeedbackAffectedStudentDTO;
 import de.tum.cit.aet.artemis.assessment.dto.FeedbackAnalysisResponseDTO;
 import de.tum.cit.aet.artemis.assessment.dto.FeedbackDetailDTO;
 import de.tum.cit.aet.artemis.assessment.dto.FeedbackPageableDTO;
@@ -46,6 +49,7 @@
 import de.tum.cit.aet.artemis.core.domain.Course;
 import de.tum.cit.aet.artemis.core.domain.User;
 import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO;
+import de.tum.cit.aet.artemis.core.dto.pageablesearch.PageableSearchDTO;
 import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException;
 import de.tum.cit.aet.artemis.core.repository.UserRepository;
 import de.tum.cit.aet.artemis.core.security.Role;
@@ -618,9 +622,8 @@ public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, Fee
                 maxOccurrence, filterErrorCategories, pageable);
 
         // 10. Process and map feedback details, calculating relative count and assigning task names
-        List<FeedbackDetailDTO> processedDetails = feedbackDetailPage.getContent().stream().map(detail -> new FeedbackDetailDTO(detail.count(),
+        List<FeedbackDetailDTO> processedDetails = feedbackDetailPage.getContent().stream().map(detail -> new FeedbackDetailDTO(detail.concatenatedFeedbackIds(), detail.count(),
                 (detail.count() * 100.00) / distinctResultCount, detail.detailText(), detail.testCaseName(), detail.taskName(), detail.errorCategory())).toList();
-
         // 11. Predefined error categories available for filtering on the client side
         final List<String> ERROR_CATEGORIES = List.of("Student Error", "Ares Error", "AST Error");
 
@@ -642,6 +645,25 @@ public long getMaxCountForExercise(long exerciseId) {
         return studentParticipationRepository.findMaxCountForExercise(exerciseId);
     }
 
+    /**
+     * Retrieves a paginated list of students affected by specific feedback entries for a given exercise.
+     * <br>
+     * This method filters students based on feedback IDs and returns participation details for each affected student. It uses
+     * pagination and sorting (order based on the {@link PageUtil.ColumnMapping#AFFECTED_STUDENTS}) to allow efficient retrieval and sorting of the results, thus supporting large
+     * datasets.
+     * <br>
+     *
+     * @param exerciseId  for which the affected student participation data is requested.
+     * @param feedbackIds used to filter the participation to only those affected by specific feedback entries.
+     * @param data        A {@link PageableSearchDTO} object containing pagination and sorting parameters.
+     * @return A {@link Page} of {@link FeedbackAffectedStudentDTO} objects, each representing a student affected by the feedback.
+     */
+    public Page<FeedbackAffectedStudentDTO> getAffectedStudentsWithFeedbackId(long exerciseId, String feedbackIds, PageableSearchDTO<String> data) {
+        List<Long> feedbackIdLongs = Arrays.stream(feedbackIds.split(",")).map(Long::valueOf).toList();
+        PageRequest pageRequest = PageUtil.createDefaultPageRequest(data, PageUtil.ColumnMapping.AFFECTED_STUDENTS);
+        return studentParticipationRepository.findAffectedStudentsByFeedbackId(exerciseId, feedbackIdLongs, pageRequest);
+    }
+
     /**
      * Deletes long feedback texts for the provided list of feedback items to prevent duplicate entries in the {@link LongFeedbackTextRepository}.
      * <br>
diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java
index 2a235145a04b..431fb66373e8 100644
--- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java
+++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java
@@ -14,6 +14,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Profile;
+import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -22,12 +23,14 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import de.tum.cit.aet.artemis.assessment.domain.Feedback;
 import de.tum.cit.aet.artemis.assessment.domain.Result;
+import de.tum.cit.aet.artemis.assessment.dto.FeedbackAffectedStudentDTO;
 import de.tum.cit.aet.artemis.assessment.dto.FeedbackAnalysisResponseDTO;
 import de.tum.cit.aet.artemis.assessment.dto.FeedbackPageableDTO;
 import de.tum.cit.aet.artemis.assessment.dto.ResultWithPointsPerGradingCriterionDTO;
@@ -36,13 +39,14 @@
 import de.tum.cit.aet.artemis.core.domain.Course;
 import de.tum.cit.aet.artemis.core.domain.User;
 import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO;
+import de.tum.cit.aet.artemis.core.dto.pageablesearch.PageableSearchDTO;
 import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException;
 import de.tum.cit.aet.artemis.core.repository.UserRepository;
 import de.tum.cit.aet.artemis.core.security.Role;
 import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor;
 import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent;
 import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor;
-import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastInstructorInExercise;
+import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise;
 import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService;
 import de.tum.cit.aet.artemis.core.util.HeaderUtil;
 import de.tum.cit.aet.artemis.exam.domain.Exam;
@@ -328,7 +332,7 @@ public ResponseEntity<Result> createResultForExternalSubmission(@PathVariable Lo
      *         </ul>
      */
     @GetMapping("exercises/{exerciseId}/feedback-details")
-    @EnforceAtLeastInstructorInExercise
+    @EnforceAtLeastEditorInExercise
     public ResponseEntity<FeedbackAnalysisResponseDTO> getFeedbackDetailsPaged(@PathVariable long exerciseId, @ModelAttribute FeedbackPageableDTO data) {
         FeedbackAnalysisResponseDTO response = resultService.getFeedbackDetailsOnPage(exerciseId, data);
         return ResponseEntity.ok(response);
@@ -343,9 +347,30 @@ public ResponseEntity<FeedbackAnalysisResponseDTO> getFeedbackDetailsPaged(@Path
      * @return A {@link ResponseEntity} containing the maximum count of feedback occurrences (long).
      */
     @GetMapping("exercises/{exerciseId}/feedback-details-max-count")
-    @EnforceAtLeastInstructorInExercise
+    @EnforceAtLeastEditorInExercise
     public ResponseEntity<Long> getMaxCount(@PathVariable long exerciseId) {
         long maxCount = resultService.getMaxCountForExercise(exerciseId);
         return ResponseEntity.ok(maxCount);
     }
+
+    /**
+     * GET /exercises/{exerciseId}/feedback-details-participation : Retrieves paginated details of students affected by specific feedback entries for a specified exercise.
+     * This endpoint returns details of students whose submissions were impacted by specified feedback entries, including student information
+     * and participation details.
+     * <br>
+     *
+     * @param exerciseId        for which the participation data is requested.
+     * @param feedbackIdsHeader to filter affected students by specific feedback entries.
+     * @param data              A {@link PageableSearchDTO} object containing pagination and sorting parameters.
+     * @return A {@link ResponseEntity} containing a {@link Page} of {@link FeedbackAffectedStudentDTO}, each representing a student affected by the feedback entries.
+     */
+    @GetMapping("exercises/{exerciseId}/feedback-details-participation")
+    @EnforceAtLeastEditorInExercise
+    public ResponseEntity<Page<FeedbackAffectedStudentDTO>> getAffectedStudentsWithFeedback(@PathVariable long exerciseId, @RequestHeader("feedbackIds") String feedbackIdsHeader,
+            @ModelAttribute PageableSearchDTO<String> data) {
+
+        Page<FeedbackAffectedStudentDTO> participation = resultService.getAffectedStudentsWithFeedbackId(exerciseId, feedbackIdsHeader, data);
+
+        return ResponseEntity.ok(participation);
+    }
 }
diff --git a/src/main/java/de/tum/cit/aet/artemis/core/util/PageUtil.java b/src/main/java/de/tum/cit/aet/artemis/core/util/PageUtil.java
index 7417fe060e93..88f7bb7302e6 100644
--- a/src/main/java/de/tum/cit/aet/artemis/core/util/PageUtil.java
+++ b/src/main/java/de/tum/cit/aet/artemis/core/util/PageUtil.java
@@ -82,6 +82,9 @@ SELECT MAX(t.taskName)
                     JOIN t.testCases tct
                     WHERE t.exercise.id = :exerciseId AND tct.testName = f.testCase.testName
                 ), '')"""
+        )),
+        AFFECTED_STUDENTS(Map.of(
+            "participationId", "p.id"
         ));
         // @formatter:on
 
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 b617ae44948f..1101f94d4708 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
@@ -29,6 +29,7 @@
 
 import de.tum.cit.aet.artemis.assessment.domain.AssessmentType;
 import de.tum.cit.aet.artemis.assessment.domain.Result;
+import de.tum.cit.aet.artemis.assessment.dto.FeedbackAffectedStudentDTO;
 import de.tum.cit.aet.artemis.assessment.dto.FeedbackDetailDTO;
 import de.tum.cit.aet.artemis.core.domain.User;
 import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository;
@@ -1217,7 +1218,7 @@ SELECT COALESCE(AVG(p.presentationScore), 0)
      * - Occurrence range: Filters feedback where the number of occurrences (COUNT) is between the specified minimum and maximum values (inclusive).
      * - Error categories: Filters feedback based on error categories, which can be "Student Error", "Ares Error", or "AST Error".
      * <br>
-     * Grouping is done by feedback detail text, test case name, and error category. The occurrence count is filtered using the HAVING clause.
+     * Grouping is done by feedback detail text, test case name and error category. The occurrence count is filtered using the HAVING clause.
      *
      * @param exerciseId            The ID of the exercise for which feedback details should be retrieved.
      * @param searchTerm            The search term used for filtering the feedback detail text (optional).
@@ -1233,6 +1234,7 @@ SELECT COALESCE(AVG(p.presentationScore), 0)
      */
     @Query("""
                 SELECT new de.tum.cit.aet.artemis.assessment.dto.FeedbackDetailDTO(
+                    LISTAGG(CAST(f.id AS string), ',') WITHIN GROUP (ORDER BY f.id),
                     COUNT(f.id),
                     0,
                     f.detailText,
@@ -1240,7 +1242,7 @@ SELECT COALESCE(AVG(p.presentationScore), 0)
                     COALESCE((
                         SELECT MAX(t.taskName)
                         FROM ProgrammingExerciseTask t
-                        JOIN t.testCases tct
+                        LEFT JOIN t.testCases tct
                         WHERE t.exercise.id = :exerciseId AND tct.testName = f.testCase.testName
                     ), 'Not assigned to task'),
                     CASE
@@ -1250,12 +1252,12 @@ SELECT MAX(t.taskName)
                     END
                 )
                 FROM StudentParticipation p
-                JOIN p.results r ON r.id = (
+                LEFT JOIN p.results r ON r.id = (
                     SELECT MAX(pr.id)
                     FROM p.results pr
                     WHERE pr.participation.id = p.id
                 )
-                JOIN r.feedbacks f
+                LEFT JOIN r.feedbacks f
                 WHERE p.exercise.id = :exerciseId
                     AND p.testRun = FALSE
                     AND f.positive = FALSE
@@ -1264,7 +1266,7 @@ SELECT MAX(pr.id)
                     AND (:#{#filterTaskNames != NULL && #filterTaskNames.size() < 1} = TRUE OR f.testCase.testName NOT IN (
                             SELECT tct.testName
                             FROM ProgrammingExerciseTask t
-                            JOIN t.testCases tct
+                            LEFT JOIN t.testCases tct
                             WHERE t.taskName IN (:filterTaskNames)
                         ))
                     AND (:#{#filterErrorCategories != NULL && #filterErrorCategories.size() < 1} = TRUE OR CASE
@@ -1290,7 +1292,7 @@ Page<FeedbackDetailDTO> findFilteredFeedbackByExerciseId(@Param("exerciseId") lo
     @Query("""
             SELECT COUNT(DISTINCT r.id)
             FROM StudentParticipation p
-                JOIN p.results r ON r.id = (
+                LEFT JOIN p.results r ON r.id = (
                          SELECT MAX(pr.id)
                          FROM p.results pr
                          WHERE pr.participation.id = p.id
@@ -1317,12 +1319,12 @@ SELECT MAX(feedbackCounts.feedbackCount)
             FROM (
                 SELECT COUNT(f.id) AS feedbackCount
                 FROM StudentParticipation p
-                JOIN p.results r ON r.id = (
+                LEFT JOIN p.results r ON r.id = (
                     SELECT MAX(pr.id)
                     FROM p.results pr
                     WHERE pr.participation.id = p.id
                 )
-                JOIN r.feedbacks f
+                LEFT JOIN r.feedbacks f
                 WHERE p.exercise.id = :exerciseId
                   AND p.testRun = FALSE
                   AND f.positive = FALSE
@@ -1330,4 +1332,33 @@ SELECT MAX(pr.id)
             ) AS feedbackCounts
             """)
     long findMaxCountForExercise(@Param("exerciseId") long exerciseId);
+
+    /**
+     * Retrieves a paginated list of students affected by specific feedback entries for a given programming exercise.
+     * <br>
+     *
+     * @param exerciseId  for which the affected student participation data is requested.
+     * @param feedbackIds used to filter the participation to only those affected by specific feedback entries.
+     * @param pageable    A {@link Pageable} object to control pagination and sorting of the results, specifying page number, page size, and sort order.
+     * @return A {@link Page} of {@link FeedbackAffectedStudentDTO} objects, each representing a student affected by the feedback.
+     */
+    @Query("""
+                SELECT new de.tum.cit.aet.artemis.assessment.dto.FeedbackAffectedStudentDTO(
+                                p.exercise.course.id,
+                                p.id,
+                                p.student.firstName,
+                                p.student.lastName,
+                                p.student.login,
+                                p.repositoryUri
+                            )
+                FROM ProgrammingExerciseStudentParticipation p
+                LEFT JOIN p.submissions s
+                LEFT JOIN s.results r
+                LEFT JOIN r.feedbacks f
+                WHERE p.exercise.id = :exerciseId
+                      AND f.id IN :feedbackIds
+                      AND p.testRun = FALSE
+                ORDER BY p.student.firstName ASC
+            """)
+    Page<FeedbackAffectedStudentDTO> findAffectedStudentsByFeedbackId(@Param("exerciseId") long exerciseId, @Param("feedbackIds") List<Long> feedbackIds, Pageable pageable);
 }
diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html
new file mode 100644
index 000000000000..4f53792a04e5
--- /dev/null
+++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.html
@@ -0,0 +1,49 @@
+<ng-template #headerTemplate let-label="label" let-colSize="colSize">
+    <th scope="col" [class]="colSize">
+        <span [jhiTranslate]="label"></span>
+    </th>
+</ng-template>
+<div class="modal-header">
+    <h4 class="modal-title" [jhiTranslate]="TRANSLATION_BASE + '.header'"></h4>
+    <button type="button" class="btn-close" aria-label="Close" (click)="activeModal.dismiss()"></button>
+</div>
+<div class="modal-body">
+    <table class="table table-striped mb-3">
+        <colgroup>
+            <col class="col" />
+            <col class="col" />
+            <col class="col" />
+        </colgroup>
+        <thead>
+            <tr>
+                <ng-container *ngTemplateOutlet="headerTemplate; context: { label: TRANSLATION_BASE + '.name', colSize: 'col-4' }"></ng-container>
+                <ng-container *ngTemplateOutlet="headerTemplate; context: { label: TRANSLATION_BASE + '.login', colSize: 'col-4' }"></ng-container>
+                <ng-container *ngTemplateOutlet="headerTemplate; context: { label: TRANSLATION_BASE + '.repository', colSize: 'col-2' }"></ng-container>
+            </tr>
+        </thead>
+        <tbody class="table-group-divider">
+            @for (item of participation().content; track item) {
+                <tr>
+                    <td>{{ item.firstName }} {{ item.lastName }}</td>
+                    <td>{{ item.login }}</td>
+                    <td>
+                        <jhi-code-button
+                            class="ms-2"
+                            [smallButtons]="true"
+                            [repositoryUri]="item.repositoryURI"
+                            [routerLinkForRepositoryView]="['/courses', item.courseId, 'exercises', exerciseId(), 'repository', item.participationId]"
+                        />
+                    </td>
+                </tr>
+            }
+        </tbody>
+    </table>
+    <div class="d-flex flex-column align-items-end mt-2">
+        @if (participation().totalElements >= pageSize()) {
+            <ngb-pagination [collectionSize]="collectionsSize()" [pageSize]="pageSize()" [page]="page()" (pageChange)="setPage($event)" size="sm" [maxSize]="5"></ngb-pagination>
+        }
+        <div class="text-muted text-end">
+            <span [jhiTranslate]="TRANSLATION_BASE + '.totalItems'" [translateValues]="{ count: participation().totalElements }"></span>
+        </div>
+    </div>
+</div>
diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts
new file mode 100644
index 000000000000..947f3f3d44cd
--- /dev/null
+++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts
@@ -0,0 +1,59 @@
+import { Component, computed, effect, inject, input, signal, untracked } from '@angular/core';
+import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module';
+import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
+import { FeedbackAffectedStudentDTO, FeedbackAnalysisService, FeedbackDetail } from 'app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { AlertService } from 'app/core/util/alert.service';
+import { PageableResult, PageableSearch, SortingOrder } from 'app/shared/table/pageable-table';
+
+@Component({
+    selector: 'jhi-affected-students-modal',
+    templateUrl: './feedback-affected-students-modal.component.html',
+    imports: [ArtemisSharedCommonModule, ArtemisSharedComponentModule],
+    providers: [FeedbackAnalysisService],
+    standalone: true,
+})
+export class AffectedStudentsModalComponent {
+    exerciseId = input.required<number>();
+    feedbackDetail = input.required<FeedbackDetail>();
+    readonly participation = signal<PageableResult<FeedbackAffectedStudentDTO>>({ content: [], totalPages: 0, totalElements: 0 });
+    readonly TRANSLATION_BASE = 'artemisApp.programmingExercise.configureGrading.feedbackAnalysis.affectedStudentsModal';
+
+    page = signal<number>(1);
+    pageSize = signal<number>(10);
+    readonly collectionsSize = computed(() => this.participation().totalPages * this.pageSize());
+
+    activeModal = inject(NgbActiveModal);
+    feedbackService = inject(FeedbackAnalysisService);
+    alertService = inject(AlertService);
+
+    constructor() {
+        effect(() => {
+            untracked(async () => {
+                await this.loadAffected();
+            });
+        });
+    }
+
+    private async loadAffected() {
+        const feedbackDetail = this.feedbackDetail();
+        const pageable: PageableSearch = {
+            page: this.page(),
+            pageSize: this.pageSize(),
+            sortedColumn: 'participationId',
+            sortingOrder: SortingOrder.ASCENDING,
+        };
+
+        try {
+            const response = await this.feedbackService.getParticipationForFeedbackIds(this.exerciseId(), feedbackDetail.concatenatedFeedbackIds, pageable);
+            this.participation.set(response);
+        } catch (error) {
+            this.alertService.error(this.TRANSLATION_BASE + '.error');
+        }
+    }
+
+    setPage(newPage: number): void {
+        this.page.set(newPage);
+        this.loadAffected();
+    }
+}
diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html
index 9a17640e3d72..20206a2c4ae3 100644
--- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html
+++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html
@@ -1,5 +1,5 @@
-<ng-template #headerTemplate let-column="column" let-label="label">
-    <th scope="col" [class.clickable]="column !== 'errorCategory'" (click)="column !== 'errorCategory' && setSortedColumn(column)">
+<ng-template #headerTemplate let-column="column" let-label="label" let-colSize="colSize">
+    <th scope="col" [class]="colSize" [class.clickable]="column !== 'errorCategory'" (click)="column !== 'errorCategory' && setSortedColumn(column)">
         <div class="d-flex align-items-center">
             <span [jhiTranslate]="label"></span>
             @if (column !== 'errorCategory') {
@@ -33,21 +33,13 @@ <h3 class="m-0 col p-0" [jhiTranslate]="TRANSLATION_BASE + '.title'" [translateV
         </div>
     </div>
     <table class="table table-striped mb-3">
-        <colgroup>
-            <col class="col" />
-            <col class="col" />
-            <col class="col" />
-            <col class="col" />
-            <col class="col" />
-            <col class="col" />
-        </colgroup>
         <thead>
             <tr>
-                <ng-container *ngTemplateOutlet="headerTemplate; context: { column: 'count', label: TRANSLATION_BASE + '.occurrence' }"></ng-container>
-                <ng-container *ngTemplateOutlet="headerTemplate; context: { column: 'detailText', label: TRANSLATION_BASE + '.feedback' }"></ng-container>
-                <ng-container *ngTemplateOutlet="headerTemplate; context: { column: 'taskName', label: TRANSLATION_BASE + '.task' }"></ng-container>
-                <ng-container *ngTemplateOutlet="headerTemplate; context: { column: 'testCaseName', label: TRANSLATION_BASE + '.testcase' }"></ng-container>
-                <ng-container *ngTemplateOutlet="headerTemplate; context: { column: 'errorCategory', label: TRANSLATION_BASE + '.errorCategory' }"></ng-container>
+                <ng-container *ngTemplateOutlet="headerTemplate; context: { column: 'count', label: TRANSLATION_BASE + '.occurrence', colSize: 'col-1' }"></ng-container>
+                <ng-container *ngTemplateOutlet="headerTemplate; context: { column: 'detailText', label: TRANSLATION_BASE + '.feedback', colSize: 'col-6' }"></ng-container>
+                <ng-container *ngTemplateOutlet="headerTemplate; context: { column: 'taskName', label: TRANSLATION_BASE + '.task', colSize: 'col-1' }"></ng-container>
+                <ng-container *ngTemplateOutlet="headerTemplate; context: { column: 'testCaseName', label: TRANSLATION_BASE + '.testcase', colSize: 'col-2' }"></ng-container>
+                <ng-container *ngTemplateOutlet="headerTemplate; context: { column: 'errorCategory', label: TRANSLATION_BASE + '.errorCategory', colSize: 'col-1' }"></ng-container>
             </tr>
         </thead>
         <tbody class="table-group-divider">
@@ -69,6 +61,7 @@ <h3 class="m-0 col p-0" [jhiTranslate]="TRANSLATION_BASE + '.title'" [translateV
                         <td>{{ item.errorCategory }}</td>
                         <td class="text-center">
                             <fa-icon [icon]="faUpRightAndDownLeftFromCenter" class="ms-2 clickable" (click)="openFeedbackModal(item)"></fa-icon>
+                            <fa-icon [icon]="faUsers" class="ms-2 clickable" (click)="openAffectedStudentsModal(item)"></fa-icon>
                         </td>
                     </tr>
                 }
@@ -76,16 +69,7 @@ <h3 class="m-0 col p-0" [jhiTranslate]="TRANSLATION_BASE + '.title'" [translateV
         </tbody>
     </table>
     <div class="d-flex flex-column align-items-end mt-2">
-        <ngb-pagination
-            [collectionSize]="collectionsSize()"
-            [pageSize]="pageSize()"
-            [page]="page()"
-            (pageChange)="setPage($event)"
-            size="sm"
-            class="pagination justify-content-end"
-            [maxSize]="5"
-        >
-        </ngb-pagination>
+        <ngb-pagination [collectionSize]="collectionsSize()" [pageSize]="pageSize()" [page]="page()" (pageChange)="setPage($event)" size="sm" [maxSize]="5"></ngb-pagination>
         <div class="text-muted text-end">
             <span [jhiTranslate]="TRANSLATION_BASE + '.totalItems'" [translateValues]="{ count: totalItems() }"></span>
         </div>
diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts
index b36b453109fd..9026d7cbb1ec 100644
--- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts
@@ -2,7 +2,7 @@ import { Component, computed, effect, inject, input, signal, untracked } from '@
 import { FeedbackAnalysisService, FeedbackDetail } from './feedback-analysis.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { AlertService } from 'app/core/util/alert.service';
-import { faFilter, faSort, faSortDown, faSortUp, faUpRightAndDownLeftFromCenter } from '@fortawesome/free-solid-svg-icons';
+import { faFilter, faSort, faSortDown, faSortUp, faUpRightAndDownLeftFromCenter, faUsers } from '@fortawesome/free-solid-svg-icons';
 import { SearchResult, SortingOrder } from 'app/shared/table/pageable-table';
 import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module';
 import { FeedbackModalComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-modal.component';
@@ -10,6 +10,7 @@ import { FeedbackFilterModalComponent, FilterData } from 'app/exercises/programm
 import { LocalStorageService } from 'ngx-webstorage';
 import { BaseApiHttpService } from 'app/course/learning-paths/services/base-api-http.service';
 import { SortIconComponent } from 'app/shared/sort/sort-icon.component';
+import { AffectedStudentsModalComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component';
 
 @Component({
     selector: 'jhi-feedback-analysis',
@@ -44,6 +45,7 @@ export class FeedbackAnalysisComponent {
     readonly faSortDown = faSortDown;
     readonly faFilter = faFilter;
     readonly faUpRightAndDownLeftFromCenter = faUpRightAndDownLeftFromCenter;
+    readonly faUsers = faUsers;
     readonly SortingOrder = SortingOrder;
     readonly MAX_FEEDBACK_DETAIL_TEXT_LENGTH = 200;
 
@@ -183,4 +185,10 @@ export class FeedbackAnalysisComponent {
         }
         return count;
     }
+
+    async openAffectedStudentsModal(feedbackDetail: FeedbackDetail): Promise<void> {
+        const modalRef = this.modalService.open(AffectedStudentsModalComponent, { centered: true, size: 'lg' });
+        modalRef.componentInstance.exerciseId = this.exerciseId;
+        modalRef.componentInstance.feedbackDetail = signal(feedbackDetail);
+    }
 }
diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts
index 4228e50c329a..214c9a4e4f4c 100644
--- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts
+++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
-import { SearchResult, SearchTermPageableSearch } from 'app/shared/table/pageable-table';
+import { PageableResult, PageableSearch, SearchResult, SearchTermPageableSearch } from 'app/shared/table/pageable-table';
 import { BaseApiHttpService } from 'app/course/learning-paths/services/base-api-http.service';
-import { HttpParams } from '@angular/common/http';
+import { HttpHeaders, HttpParams } from '@angular/common/http';
 import { FilterData } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-filter-modal.component';
 
 export interface FeedbackAnalysisResponse {
@@ -12,6 +12,7 @@ export interface FeedbackAnalysisResponse {
     errorCategories: string[];
 }
 export interface FeedbackDetail {
+    concatenatedFeedbackIds: number[];
     count: number;
     relativeCount: number;
     detailText: string;
@@ -19,6 +20,14 @@ export interface FeedbackDetail {
     taskName: string;
     errorCategory: string;
 }
+export interface FeedbackAffectedStudentDTO {
+    courseId: number;
+    participationId: number;
+    firstName: string;
+    lastName: string;
+    login: string;
+    repositoryURI: string;
+}
 @Injectable()
 export class FeedbackAnalysisService extends BaseApiHttpService {
     search(pageable: SearchTermPageableSearch, options: { exerciseId: number; filters: FilterData }): Promise<FeedbackAnalysisResponse> {
@@ -39,4 +48,18 @@ export class FeedbackAnalysisService extends BaseApiHttpService {
     getMaxCount(exerciseId: number): Promise<number> {
         return this.get<number>(`exercises/${exerciseId}/feedback-details-max-count`);
     }
+
+    async getParticipationForFeedbackIds(exerciseId: number, feedbackIds: number[], pageable: PageableSearch): Promise<PageableResult<FeedbackAffectedStudentDTO>> {
+        const feedbackIdsHeader = feedbackIds.join(',');
+
+        const params = new HttpParams()
+            .set('page', pageable.page.toString())
+            .set('pageSize', pageable.pageSize.toString())
+            .set('sortedColumn', pageable.sortedColumn)
+            .set('sortingOrder', pageable.sortingOrder);
+
+        const headers = new HttpHeaders().set('feedbackIds', feedbackIdsHeader);
+
+        return this.get<PageableResult<FeedbackAffectedStudentDTO>>(`exercises/${exerciseId}/feedback-details-participation`, { params, headers });
+    }
 }
diff --git a/src/main/webapp/app/shared/table/pageable-table.ts b/src/main/webapp/app/shared/table/pageable-table.ts
index 82c9d4f0ef5e..131648d7737b 100644
--- a/src/main/webapp/app/shared/table/pageable-table.ts
+++ b/src/main/webapp/app/shared/table/pageable-table.ts
@@ -1,3 +1,9 @@
+export interface PageableResult<T> {
+    content: T[];
+    totalElements: number;
+    totalPages: number;
+}
+
 export interface SearchResult<T> {
     resultsOnPage: T[];
     numberOfPages: number;
diff --git a/src/main/webapp/i18n/de/programmingExercise.json b/src/main/webapp/i18n/de/programmingExercise.json
index 79c6a18a57c8..41533417cf1e 100644
--- a/src/main/webapp/i18n/de/programmingExercise.json
+++ b/src/main/webapp/i18n/de/programmingExercise.json
@@ -351,7 +351,7 @@
                     "task": "Aufgabe",
                     "testcase": "Testfall",
                     "errorCategory": "Fehlerkategorie",
-                    "totalItems": "Insgesamt {{count}} Elemente",
+                    "totalItems": "Insgesamt {{count}} Element(e)",
                     "error": "Beim Laden des Feedbacks ist ein Fehler aufgetreten.",
                     "search": "Suche ...",
                     "filter": "Filter",
@@ -371,6 +371,14 @@
                         "clear": "Filter zurücksetzen",
                         "cancel": "Abbrechen",
                         "apply": "Filter anwenden"
+                    },
+                    "affectedStudentsModal": {
+                        "header": "Betroffene Studierende",
+                        "name": "Name",
+                        "login": "Login",
+                        "repository": "Repository",
+                        "totalItems": "Insgesamt {{count}} Element(e)",
+                        "error": "Beim Laden der betroffenen Studierenden ist ein Fehler aufgetreten."
                     }
                 },
                 "help": {
diff --git a/src/main/webapp/i18n/en/programmingExercise.json b/src/main/webapp/i18n/en/programmingExercise.json
index 244334cb61c8..d3a53f20f180 100644
--- a/src/main/webapp/i18n/en/programmingExercise.json
+++ b/src/main/webapp/i18n/en/programmingExercise.json
@@ -351,7 +351,7 @@
                     "task": "Task",
                     "testcase": "Test Case",
                     "errorCategory": "Error Category",
-                    "totalItems": "In total {{count}} items",
+                    "totalItems": "In total {{count}} item(s)",
                     "error": "An error occurred while loading the feedback.",
                     "search": "Search ...",
                     "filter": "Filters",
@@ -371,6 +371,14 @@
                         "clear": "Clear Filter",
                         "cancel": "Cancel",
                         "apply": "Apply Filter"
+                    },
+                    "affectedStudentsModal": {
+                        "header": "Affected Students",
+                        "name": "Name",
+                        "login": "Login",
+                        "repository": "Repository",
+                        "totalItems": "In total {{count}} item(s)",
+                        "error": "There was an error while loading the affected Students for this feedback."
                     }
                 },
                 "help": {
diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java
index 2413dcab2078..6b02b3e4d247 100644
--- a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java
+++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java
@@ -22,9 +22,13 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.ArgumentMatchers;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.test.context.support.WithMockUser;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import de.tum.cit.aet.artemis.assessment.domain.AssessmentType;
 import de.tum.cit.aet.artemis.assessment.domain.Feedback;
 import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion;
@@ -861,4 +865,42 @@ void testGetMaxCountForExerciseWithMultipleFeedback() throws Exception {
 
         assertThat(maxCount).isEqualTo(2);
     }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testGetParticipationForFeedbackId() throws Exception {
+        ProgrammingExercise programmingExercise = programmingExerciseUtilService.addProgrammingExerciseToCourse(course);
+        StudentParticipation participation = participationUtilService.createAndSaveParticipationForExercise(programmingExercise, TEST_PREFIX + "student1");
+        ProgrammingExerciseTestCase testCase = programmingExerciseUtilService.addTestCaseToProgrammingExercise(programmingExercise, "test1");
+        testCase.setId(1L);
+
+        Feedback feedback = new Feedback();
+        feedback.setPositive(false);
+        feedback.setDetailText("Feedback for student");
+        feedback.setTestCase(testCase);
+        feedback = feedbackRepository.saveAndFlush(feedback);
+
+        Result result = participationUtilService.addResultToParticipation(AssessmentType.AUTOMATIC, null, participation);
+        participationUtilService.addFeedbackToResult(feedback, result);
+
+        String url = "/api/exercises/" + programmingExercise.getId() + "/feedback-details-participation?page=1&pageSize=10&sortedColumn=participationId&sortingOrder=ASCENDING";
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("feedbackIds", String.valueOf(feedback.getId()));
+
+        String jsonResponse = request.get(url, HttpStatus.OK, String.class, headers);
+
+        JsonNode jsonNode = new ObjectMapper().readTree(jsonResponse);
+        assertThat(jsonNode.has("content")).isTrue();
+        assertThat(jsonNode.has("pageable")).isTrue();
+        assertThat(jsonNode.has("last")).isTrue();
+        assertThat(jsonNode.has("totalElements")).isTrue();
+        assertThat(jsonNode.has("totalPages")).isTrue();
+        assertThat(jsonNode.has("first")).isTrue();
+        assertThat(jsonNode.has("size")).isTrue();
+        assertThat(jsonNode.has("number")).isTrue();
+        assertThat(jsonNode.has("sort")).isTrue();
+        assertThat(jsonNode.has("numberOfElements")).isTrue();
+        assertThat(jsonNode.has("empty")).isTrue();
+    }
+
 }
diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts
index 37e7821fe502..09d22ab65dd6 100644
--- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts
@@ -8,6 +8,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { LocalStorageService } from 'ngx-webstorage';
 import '@angular/localize/init';
 import { FeedbackFilterModalComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-filter-modal.component';
+import { AffectedStudentsModalComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component';
 
 describe('FeedbackAnalysisComponent', () => {
     let fixture: ComponentFixture<FeedbackAnalysisComponent>;
@@ -18,6 +19,7 @@ describe('FeedbackAnalysisComponent', () => {
 
     const feedbackMock: FeedbackDetail[] = [
         {
+            concatenatedFeedbackIds: [1, 2],
             detailText: 'Test feedback 1 detail',
             testCaseName: 'test1',
             count: 10,
@@ -26,6 +28,7 @@ describe('FeedbackAnalysisComponent', () => {
             errorCategory: 'Student Error',
         },
         {
+            concatenatedFeedbackIds: [3, 4],
             detailText: 'Test feedback 2 detail',
             testCaseName: 'test2',
             count: 5,
@@ -62,9 +65,9 @@ describe('FeedbackAnalysisComponent', () => {
         localStorageService = fixture.debugElement.injector.get(LocalStorageService);
 
         jest.spyOn(localStorageService, 'retrieve').mockReturnValue([]);
-
         searchSpy = jest.spyOn(feedbackAnalysisService, 'search').mockResolvedValue(feedbackResponseMock);
 
+        // Initial input setup
         fixture.componentRef.setInput('exerciseId', 1);
         fixture.componentRef.setInput('exerciseTitle', 'Sample Exercise Title');
 
@@ -238,4 +241,17 @@ describe('FeedbackAnalysisComponent', () => {
             expect(modalSpy).toHaveBeenCalledOnce();
         });
     });
+
+    describe('openAffectedStudentsModal', () => {
+        it('should open affected students modal with the correct feedback detail', () => {
+            const modalService = fixture.debugElement.injector.get(NgbModal);
+            const modalSpy = jest.spyOn(modalService, 'open').mockReturnValue({ componentInstance: {} } as any);
+
+            const feedbackDetail = feedbackMock[1];
+            component.openAffectedStudentsModal(feedbackDetail);
+
+            expect(modalSpy).toHaveBeenCalledWith(AffectedStudentsModalComponent, { centered: true, size: 'lg' });
+            expect(modalSpy).toHaveBeenCalledOnce();
+        });
+    });
 });
diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts
index 60b280966bb1..23b9bfaf0f49 100644
--- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts
@@ -9,15 +9,32 @@ describe('FeedbackAnalysisService', () => {
     let httpMock: HttpTestingController;
 
     const feedbackDetailsMock: FeedbackDetail[] = [
-        { detailText: 'Feedback 1', testCaseName: 'test1', count: 5, relativeCount: 25.0, taskName: '1', errorCategory: 'StudentError' },
-        { detailText: 'Feedback 2', testCaseName: 'test2', count: 3, relativeCount: 15.0, taskName: '2', errorCategory: 'StudentError' },
+        {
+            concatenatedFeedbackIds: [1, 2],
+            detailText: 'Feedback 1',
+            testCaseName: 'test1',
+            count: 5,
+            relativeCount: 25.0,
+            taskName: '1',
+            errorCategory: 'StudentError',
+        },
+        {
+            concatenatedFeedbackIds: [3, 4],
+            detailText: 'Feedback 2',
+            testCaseName: 'test2',
+            count: 3,
+            relativeCount: 15.0,
+            taskName: '2',
+            errorCategory: 'StudentError',
+        },
     ];
 
     const feedbackAnalysisResponseMock = {
         feedbackDetails: { resultsOnPage: feedbackDetailsMock, numberOfPages: 1 },
         totalItems: 2,
-        totalAmountOfTasks: 2,
+        taskNames: ['task1', 'task2'],
         testCaseNames: ['test1', 'test2'],
+        errorCategories: ['StudentError'],
     };
 
     beforeEach(() => {
@@ -34,7 +51,7 @@ describe('FeedbackAnalysisService', () => {
     });
 
     describe('search', () => {
-        it('should retrieve feedback details for a given exercise', async () => {
+        it('should retrieve feedback details for a given exercise with concatenatedFeedbackIds', async () => {
             const pageable = {
                 page: 1,
                 pageSize: 10,
@@ -53,6 +70,8 @@ describe('FeedbackAnalysisService', () => {
 
             const result = await responsePromise;
             expect(result).toEqual(feedbackAnalysisResponseMock);
+            expect(result.feedbackDetails.resultsOnPage[0].concatenatedFeedbackIds).toStrictEqual([1, 2]);
+            expect(result.feedbackDetails.resultsOnPage[1].concatenatedFeedbackIds).toStrictEqual([3, 4]);
         });
     });
 
@@ -68,4 +87,49 @@ describe('FeedbackAnalysisService', () => {
             expect(result).toBe(10);
         });
     });
+
+    describe('getParticipationForFeedbackIds', () => {
+        it('should retrieve paginated participation details for specified feedback IDs', async () => {
+            const feedbackIds = [1, 2];
+            const pageable = {
+                page: 1,
+                pageSize: 10,
+                sortedColumn: 'participationId',
+                sortingOrder: SortingOrder.ASCENDING,
+            };
+            const participationResponseMock = {
+                content: [
+                    {
+                        courseId: 1,
+                        participationId: 101,
+                        firstName: 'John',
+                        lastName: 'Doe',
+                        login: 'johndoe',
+                        repositoryName: 'repo1',
+                    },
+                    {
+                        courseId: 1,
+                        participationId: 102,
+                        firstName: 'Jane',
+                        lastName: 'Smith',
+                        login: 'janesmith',
+                        repositoryName: 'repo2',
+                    },
+                ],
+                numberOfPages: 1,
+                totalItems: 2,
+            };
+
+            const responsePromise = service.getParticipationForFeedbackIds(1, feedbackIds, pageable);
+
+            const req = httpMock.expectOne('api/exercises/1/feedback-details-participation?page=1&pageSize=10&sortedColumn=participationId&sortingOrder=ASCENDING');
+            expect(req.request.method).toBe('GET');
+            req.flush(participationResponseMock);
+
+            const result = await responsePromise;
+            expect(result).toEqual(participationResponseMock);
+            expect(result.content[0].firstName).toBe('John');
+            expect(result.content[1].firstName).toBe('Jane');
+        });
+    });
 });
diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts
new file mode 100644
index 000000000000..bf8b1b77141a
--- /dev/null
+++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts
@@ -0,0 +1,75 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { AffectedStudentsModalComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component';
+import { FeedbackAffectedStudentDTO, FeedbackAnalysisService, FeedbackDetail } from 'app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of } from 'rxjs';
+import { provideHttpClient } from '@angular/common/http';
+import '@angular/localize/init';
+
+describe('AffectedStudentsModalComponent', () => {
+    let fixture: ComponentFixture<AffectedStudentsModalComponent>;
+    let component: AffectedStudentsModalComponent;
+    let feedbackService: FeedbackAnalysisService;
+
+    const feedbackDetailMock: FeedbackDetail = {
+        concatenatedFeedbackIds: [1, 2],
+        count: 5,
+        relativeCount: 25.0,
+        detailText: 'Some feedback detail',
+        testCaseName: 'testCase1',
+        taskName: '1',
+        errorCategory: 'StudentError',
+    };
+
+    const participationMock: FeedbackAffectedStudentDTO[] = [
+        { courseId: 1, participationId: 101, firstName: 'John', lastName: 'Doe', login: 'johndoe', repositoryURI: 'repo1' },
+        { courseId: 1, participationId: 102, firstName: 'Jane', lastName: 'Smith', login: 'janesmith', repositoryURI: 'repo2' },
+    ];
+
+    beforeEach(async () => {
+        await TestBed.configureTestingModule({
+            imports: [TranslateModule.forRoot(), AffectedStudentsModalComponent],
+            providers: [
+                provideHttpClient(),
+                NgbActiveModal,
+                {
+                    provide: FeedbackAnalysisService,
+                    useValue: {
+                        getParticipationForFeedbackIds: jest.fn().mockReturnValue(of({ content: participationMock, totalPages: 1, totalElements: 2 })),
+                    },
+                },
+            ],
+        }).compileComponents();
+
+        fixture = TestBed.createComponent(AffectedStudentsModalComponent);
+        component = fixture.componentInstance;
+        feedbackService = TestBed.inject(FeedbackAnalysisService);
+
+        fixture.componentRef.setInput('exerciseId', 1);
+        fixture.componentRef.setInput('feedbackDetail', feedbackDetailMock);
+        fixture.detectChanges();
+    });
+
+    it('should update page and reload data when setPage is called', async () => {
+        const loadAffectedSpy = jest.spyOn(component as any, 'loadAffected');
+
+        component.setPage(2);
+        expect(component.page()).toBe(2);
+        expect(loadAffectedSpy).toHaveBeenCalledOnce();
+    });
+
+    it('should handle error when loadAffected fails', async () => {
+        jest.spyOn(feedbackService, 'getParticipationForFeedbackIds').mockReturnValueOnce(Promise.reject(new Error('Error loading data')));
+        const alertServiceSpy = jest.spyOn(component.alertService, 'error');
+        const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
+
+        await component['loadAffected']();
+
+        expect(component.participation().content).toEqual([]);
+        expect(alertServiceSpy).toHaveBeenCalled();
+        expect(consoleErrorSpy).toHaveBeenCalled();
+
+        consoleErrorSpy.mockRestore();
+    });
+});
diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts
index f3a6c0361e9f..cf31d3b2b9e0 100644
--- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts
@@ -10,6 +10,7 @@ describe('FeedbackModalComponent', () => {
     let activeModal: NgbActiveModal;
 
     const mockFeedbackDetail: FeedbackDetail = {
+        concatenatedFeedbackIds: [1, 2],
         count: 5,
         relativeCount: 25.0,
         detailText: 'Some feedback detail',