Merge branch 'develop' into development/fix-PostIntegrationTest

build.gradle

@@ -29,7 +29,7 @@ plugins {
 }
 
 group = "de.tum.in.www1.artemis"
-version = "6.5.0"
+version = "6.5.1"
 description = "Interactive Learning with Individual Feedback"
 
 sourceCompatibility=17

jest.config.js

@@ -60,7 +60,7 @@ module.exports = {
             statements: 85.6,
             branches: 72.8,
             functions: 79.4,
-            lines: 85.9,
+            lines: 85.8,
         },
     },
     coverageReporters: ["clover", "json", "lcov", "text-summary"],

package.json

@@ -1,6 +1,6 @@
 {
     "name": "artemis",
-    "version": "6.5.0",
+    "version": "6.5.1",
     "description": "Interactive Learning with Individual Feedback",
     "private": true,
     "license": "MIT",

src/main/java/de/tum/in/www1/artemis/config/Constants.java

@@ -176,6 +176,10 @@ public final class Constants {
 
     public static final String UNENROLL_FROM_COURSE = "UNENROLL_FROM_COURSE";
 
+    public static final String CLEANUP_COURSE = "CLEANUP_COURSE";
+
+    public static final String CLEANUP_EXAM = "CLEANUP_EXAM";
+
     public static final String DELETE_EXERCISE = "DELETE_EXERCISE";
 
     public static final String EDIT_EXERCISE = "EDIT_EXERCISE";

src/main/java/de/tum/in/www1/artemis/service/CourseService.java

@@ -7,6 +7,7 @@
 
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.security.Principal;
 import java.time.DayOfWeek;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -782,30 +783,31 @@ public void archiveCourse(Course course) {
 
     /**
      * Cleans up a course by cleaning up all exercises from that course. This deletes all student
-     * submissions. Note that a course has to be archived first before being cleaned up.
+     * repositories and build plans. Note that a course has to be archived first before being cleaned up.
      *
-     * @param courseId The id of the course to clean up
+     * @param courseId  The id of the course to clean up
+     * @param principal the user that wants to cleanup the course
      */
-    public void cleanupCourse(Long courseId) {
+    public void cleanupCourse(Long courseId, Principal principal) {
+        final var auditEvent = new AuditEvent(principal.getName(), Constants.CLEANUP_COURSE, "course=" + courseId);
+        auditEventRepository.add(auditEvent);
         // Get the course with all exercises
-        var course = courseRepository.findByIdWithExercisesAndLecturesElseThrow(courseId);
+        var course = courseRepository.findByIdWithEagerExercisesElseThrow(courseId);
         if (!course.hasCourseArchive()) {
             log.info("Cannot clean up course {} because it hasn't been archived.", courseId);
             return;
         }
 
         // The Objects::nonNull is needed here because the relationship exam -> exercise groups is ordered and
-        // hibernate sometimes adds nulls to in the list of exercise groups to keep the order
-        Set<Exercise> examExercises = examRepository.findByCourseIdWithExerciseGroupsAndExercises(courseId).stream().map(Exam::getExerciseGroups).flatMap(Collection::stream)
+        // hibernate sometimes adds nulls into the list of exercise groups to keep the order
+        Set<Exercise> examExercises = examRepository.findByCourseIdWithExerciseGroupsAndExercises(courseId).stream().flatMap(e -> e.getExerciseGroups().stream())
                 .filter(Objects::nonNull).map(ExerciseGroup::getExercises).flatMap(Collection::stream).collect(Collectors.toSet());
 
         var exercisesToCleanup = Stream.concat(course.getExercises().stream(), examExercises.stream()).collect(Collectors.toSet());
         exercisesToCleanup.forEach(exercise -> {
             if (exercise instanceof ProgrammingExercise) {
                 exerciseDeletionService.cleanup(exercise.getId(), true);
             }
-
-            // TODO: extend exerciseDeletionService.cleanup to clean up all exercise types
         });
 
         log.info("The course {} has been cleaned up!", courseId);

src/main/java/de/tum/in/www1/artemis/service/ExerciseDeletionService.java

@@ -3,6 +3,8 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executors;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -16,7 +18,6 @@
 import de.tum.in.www1.artemis.domain.metis.conversation.Channel;
 import de.tum.in.www1.artemis.domain.modeling.ModelingExercise;
 import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation;
-import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
 import de.tum.in.www1.artemis.domain.quiz.QuizExercise;
 import de.tum.in.www1.artemis.repository.*;
 import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository;
@@ -89,26 +90,29 @@ public ExerciseDeletionService(ExerciseRepository exerciseRepository, ExerciseUn
      * @param deleteRepositories if true, the repositories gets deleted
      */
     public void cleanup(Long exerciseId, boolean deleteRepositories) {
+        log.info("Cleanup all participations for exercise {} in parallel", exerciseId);
         Exercise exercise = exerciseRepository.findByIdWithStudentParticipationsElseThrow(exerciseId);
-        log.info("Request to cleanup all participations for Exercise : {}", exercise.getTitle());
+        if (!(exercise instanceof ProgrammingExercise)) {
+            log.warn("Exercise with exerciseId {} is not an instance of ProgrammingExercise. Ignoring the request to cleanup repositories and build plan", exerciseId);
+            return;
+        }
 
-        if (exercise instanceof ProgrammingExercise) {
-            for (StudentParticipation participation : exercise.getStudentParticipations()) {
+        // Cleanup in parallel to speedup the process
+        var threadPool = Executors.newFixedThreadPool(10);
+        var futures = exercise.getStudentParticipations().stream().map(participation -> CompletableFuture.runAsync(() -> {
+            try {
                 participationService.cleanupBuildPlan((ProgrammingExerciseStudentParticipation) participation);
-            }
-
-            if (!deleteRepositories) {
-                return; // in this case, we are done
-            }
-
-            for (StudentParticipation participation : exercise.getStudentParticipations()) {
+                if (!deleteRepositories) {
+                    return; // in this case, we are done with the participation
+                }
                 participationService.cleanupRepository((ProgrammingExerciseStudentParticipation) participation);
             }
-
-        }
-        else {
-            log.warn("Exercise with exerciseId {} is not an instance of ProgrammingExercise. Ignoring the request to cleanup repositories and build plan", exerciseId);
-        }
+            catch (Exception exception) {
+                log.error("Failed to clean the student participation {} for programming exercise {}", participation.getId(), exerciseId);
+            }
+        }, threadPool).toCompletableFuture()).toArray(CompletableFuture[]::new);
+        // wait until all operations finish before returning
+        CompletableFuture.allOf(futures).thenRun(threadPool::shutdown).join();
     }
 
     /**

src/main/java/de/tum/in/www1/artemis/service/exam/ExamService.java

@@ -5,6 +5,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.security.Principal;
 import java.time.ZonedDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -16,13 +17,16 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.actuate.audit.AuditEvent;
+import org.springframework.boot.actuate.audit.AuditEventRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import de.tum.in.www1.artemis.config.Constants;
 import de.tum.in.www1.artemis.domain.*;
 import de.tum.in.www1.artemis.domain.enumeration.*;
 import de.tum.in.www1.artemis.domain.exam.Exam;
@@ -107,8 +111,12 @@ public class ExamService {
 
     private final BonusService bonusService;
 
+    private final ExerciseDeletionService exerciseDeletionService;
+
     private final SubmittedAnswerRepository submittedAnswerRepository;
 
+    private final AuditEventRepository auditEventRepository;
+
     private final CourseScoreCalculationService courseScoreCalculationService;
 
     private final CourseRepository courseRepository;
@@ -121,8 +129,8 @@ public ExamService(ExamRepository examRepository, StudentExamRepository studentE
             ProgrammingExerciseRepository programmingExerciseRepository, QuizExerciseRepository quizExerciseRepository, ResultRepository resultRepository,
             SubmissionRepository submissionRepository, CourseExamExportService courseExamExportService, GitService gitService, GroupNotificationService groupNotificationService,
             GradingScaleRepository gradingScaleRepository, PlagiarismCaseRepository plagiarismCaseRepository, AuthorizationCheckService authorizationCheckService,
-            BonusService bonusService, SubmittedAnswerRepository submittedAnswerRepository, CourseScoreCalculationService courseScoreCalculationService,
-            CourseRepository courseRepository) {
+            BonusService bonusService, ExerciseDeletionService exerciseDeletionService, SubmittedAnswerRepository submittedAnswerRepository,
+            AuditEventRepository auditEventRepository, CourseScoreCalculationService courseScoreCalculationService, CourseRepository courseRepository) {
         this.examRepository = examRepository;
         this.studentExamRepository = studentExamRepository;
         this.userRepository = userRepository;
@@ -143,7 +151,9 @@ public ExamService(ExamRepository examRepository, StudentExamRepository studentE
         this.plagiarismCaseRepository = plagiarismCaseRepository;
         this.authorizationCheckService = authorizationCheckService;
         this.bonusService = bonusService;
+        this.exerciseDeletionService = exerciseDeletionService;
         this.submittedAnswerRepository = submittedAnswerRepository;
+        this.auditEventRepository = auditEventRepository;
         this.courseScoreCalculationService = courseScoreCalculationService;
         this.courseRepository = courseRepository;
         this.defaultObjectMapper = new ObjectMapper();
@@ -1307,6 +1317,31 @@ public Page<Exam> getAllActiveExams(final Pageable pageable, final User user) {
                 ZonedDateTime.now().plusDays(EXAM_ACTIVE_DAYS));
     }
 
+    /**
+     * Cleans up an exam by cleaning up all exercises from that course. This deletes all student
+     * repositories and build plans. Note that an exam has to be archived first before being cleaned up.
+     *
+     * @param examId    The id of the exam to clean up
+     * @param principal the user that wants to cleanup the exam
+     */
+    public void cleanupExam(Long examId, Principal principal) {
+        final var auditEvent = new AuditEvent(principal.getName(), Constants.CLEANUP_EXAM, "exam=" + examId);
+        auditEventRepository.add(auditEvent);
+
+        // The Objects::nonNull is needed here because the relationship exam -> exercise groups is ordered and
+        // hibernate sometimes adds nulls into the list of exercise groups to keep the order
+        Set<Exercise> examExercises = examRepository.findByIdWithExamUsersExerciseGroupsAndExercisesElseThrow(examId).getExerciseGroups().stream().filter(Objects::nonNull)
+                .map(ExerciseGroup::getExercises).flatMap(Collection::stream).collect(Collectors.toSet());
+
+        examExercises.forEach(exercise -> {
+            if (exercise instanceof ProgrammingExercise) {
+                exerciseDeletionService.cleanup(exercise.getId(), true);
+            }
+        });
+
+        log.info("The exam {} has been cleaned up!", examId);
+    }
+
     /**
      * A specialized BiFunction<Long, Double, BonusResultDTO> functional interface to provide a simple interface
      * for passing the data dependencies needed for a Bonus calculation (like source course/exam results).

src/main/java/de/tum/in/www1/artemis/service/exam/StudentExamService.java

@@ -39,9 +39,7 @@
 import de.tum.in.www1.artemis.service.*;
 import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseParticipationService;
 import de.tum.in.www1.artemis.service.programming.ProgrammingTriggerService;
-import de.tum.in.www1.artemis.service.scheduled.ProgrammingExerciseScheduleService;
 import de.tum.in.www1.artemis.service.util.ExamExerciseStartPreparationStatus;
-import de.tum.in.www1.artemis.service.util.Tuple;
 import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException;
 import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException;
 
@@ -89,8 +87,6 @@ public class StudentExamService {
 
     private final WebsocketMessagingService websocketMessagingService;
 
-    private final ProgrammingExerciseScheduleService programmingExerciseScheduleService;
-
     private final TaskScheduler scheduler;
 
     public StudentExamService(StudentExamRepository studentExamRepository, UserRepository userRepository, ParticipationService participationService,
@@ -99,7 +95,7 @@ public StudentExamService(StudentExamRepository studentExamRepository, UserRepos
             ProgrammingExerciseParticipationService programmingExerciseParticipationService, SubmissionService submissionService,
             StudentParticipationRepository studentParticipationRepository, ExamQuizService examQuizService, ProgrammingExerciseRepository programmingExerciseRepository,
             ProgrammingTriggerService programmingTriggerService, ExamRepository examRepository, CacheManager cacheManager, WebsocketMessagingService websocketMessagingService,
-            ProgrammingExerciseScheduleService programmingExerciseScheduleService, @Qualifier("taskScheduler") TaskScheduler scheduler) {
+            @Qualifier("taskScheduler") TaskScheduler scheduler) {
         this.participationService = participationService;
         this.studentExamRepository = studentExamRepository;
         this.userRepository = userRepository;
@@ -117,7 +113,6 @@ public StudentExamService(StudentExamRepository studentExamRepository, UserRepos
         this.examRepository = examRepository;
         this.cacheManager = cacheManager;
         this.websocketMessagingService = websocketMessagingService;
-        this.programmingExerciseScheduleService = programmingExerciseScheduleService;
         this.scheduler = scheduler;
     }
 
@@ -654,8 +649,9 @@ private void setUpExerciseParticipationsAndSubmissionsWithInitializationDate(Stu
                             // Normally, the locking operation at the end of the exam gets scheduled during the initial unlocking process
                             // (see ProgrammingExerciseScheduleService#scheduleIndividualRepositoryAndParticipationLockTasks)
                             // Since this gets never executed here, we need to manually schedule the locking.
-                            var tupel = new Tuple<>(studentExam.getIndividualEndDate(), programmingParticipation);
-                            programmingExerciseScheduleService.scheduleIndividualRepositoryAndParticipationLockTasks(programmingExercise, Set.of(tupel));
+                            // TODO: reconsider this edge case and instead send a message to over the instanceMessageSendService
+                            // var tupel = new Tuple<>(studentExam.getIndividualEndDate(), programmingParticipation);
+                            // programmingExerciseScheduleService.scheduleIndividualRepositoryAndParticipationLockTasks(programmingExercise, Set.of(tupel));
                         }
                         else {
                             programmingExerciseParticipationService.lockStudentParticipation(programmingParticipation);

src/main/java/de/tum/in/www1/artemis/service/scheduled/ProgrammingExerciseScheduleService.java

@@ -803,7 +803,7 @@ public Runnable unlockAllStudentParticipationsWithEarlierStartDateAndLaterDueDat
      * @param exercise                             the programming exercise for which the lock is executed
      * @param individualParticipationsWithDueDates the set of student participations with their individual due dates
      */
-    public void scheduleIndividualRepositoryAndParticipationLockTasks(ProgrammingExercise exercise,
+    private void scheduleIndividualRepositoryAndParticipationLockTasks(ProgrammingExercise exercise,
             Set<Tuple<ZonedDateTime, ProgrammingExerciseStudentParticipation>> individualParticipationsWithDueDates) {
         // 1. Group all participations by due date
         // TODO: use student exams for safety if some participations are not pre-generated

src/main/java/de/tum/in/www1/artemis/web/rest/ComplaintResource.java

@@ -236,7 +236,7 @@ public ResponseEntity<Long> getNumberOfAllowedComplaintsInCourse(@PathVariable L
      * exercises
      *
      * @param exerciseId the id of the exercise we are interested in
-     * @param principal  that wants to get complaints
+     * @param principal  the user that wants to get complaints
      * @return the ResponseEntity with status 200 (OK) and a list of complaints. The list can be empty
      */
     @GetMapping("exercises/{exerciseId}/complaints-for-test-run-dashboard")

src/main/java/de/tum/in/www1/artemis/web/rest/CourseResource.java

@@ -6,6 +6,7 @@
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.nio.file.Path;
+import java.security.Principal;
 import java.time.ZonedDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -769,20 +770,21 @@ public ResponseEntity<Resource> downloadCourseArchive(@PathVariable Long courseI
     /**
      * DELETE /courses/:course/cleanup : Cleans up a course by deleting all student submissions.
      *
-     * @param courseId id of the course to clean up
+     * @param courseId  id of the course to clean up
+     * @param principal the user that wants to cleanup the course
      * @return ResponseEntity with status
      */
     @DeleteMapping("courses/{courseId}/cleanup")
     @EnforceAtLeastInstructor
-    public ResponseEntity<Resource> cleanup(@PathVariable Long courseId) {
+    public ResponseEntity<Resource> cleanup(@PathVariable Long courseId, Principal principal) {
         log.info("REST request to cleanup the Course : {}", courseId);
         final Course course = courseRepository.findByIdElseThrow(courseId);
         authCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.INSTRUCTOR, course, null);
         // Forbid cleaning the course if no archive has been created
         if (!course.hasCourseArchive()) {
             throw new BadRequestAlertException("Failed to clean up course " + courseId + " because it needs to be archived first.", Course.ENTITY_NAME, "archivenonexistant");
         }
-        courseService.cleanupCourse(courseId);
+        courseService.cleanupCourse(courseId, principal);
         return ResponseEntity.ok().build();
     }