:deleteFrom
+ )
+ """)
+ int countTextBlockForRatedResultsWhereCourseDateBetween(@Param("deleteFrom") ZonedDateTime deleteFrom, @Param("deleteTo") ZonedDateTime deleteTo);
+
/**
* Deletes {@link TextBlock} entries linked to non-rated {@link Result} that are not the latest non-rated result
* for a {@link Participation}, where the associated course's start and end dates
@@ -130,4 +194,36 @@ SELECT MAX(r2.id)
)
""")
int deleteTextBlockForNonRatedResultsWhereCourseDateBetween(@Param("deleteFrom") ZonedDateTime deleteFrom, @Param("deleteTo") ZonedDateTime deleteTo);
+
+ /**
+ * Counts {@link TextBlock} entries linked to non-rated {@link Result} that are not the latest non-rated result
+ * for a {@link Participation}, where the associated course's start and end dates
+ * are between the specified date range.
+ *
+ * @param deleteFrom the start date for selecting courses
+ * @param deleteTo the end date for selecting courses
+ * @return the number of entities that would be deleted
+ */
+ @Query("""
+ SELECT COUNT(tb)
+ FROM TextBlock tb
+ WHERE tb.feedback IN (
+ SELECT f
+ FROM Feedback f
+ LEFT JOIN f.result r
+ LEFT JOIN r.participation p
+ LEFT JOIN p.exercise e
+ LEFT JOIN e.course c
+ WHERE f.result.id NOT IN (
+ SELECT MAX(r2.id)
+ FROM Result r2
+ WHERE r2.participation.id = p.id
+ AND r2.rated = FALSE
+ )
+ AND r.rated = FALSE
+ AND c.endDate < :deleteTo
+ AND c.startDate > :deleteFrom
+ )
+ """)
+ int countTextBlockForNonRatedResultsWhereCourseDateBetween(@Param("deleteFrom") ZonedDateTime deleteFrom, @Param("deleteTo") ZonedDateTime deleteTo);
}
diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreScheduleService.java
index a3b7521668f4..f8095e57a686 100644
--- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreScheduleService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreScheduleService.java
@@ -55,7 +55,8 @@
*
* The approach is two-sided, to make the participant scores eventually consistent within seconds without overloading the database.
* Using a listener on the {@link Result} entity, changes are detected and forwarded (via the broker if not on the main instance) to this service.
- * This method is fast, but not 100% reliable. Therefore, a cron job regularly checks for invalid participant scores and updates them.
+ * This method is fast, but not 100% reliable. For example, network outages could cause this service to miss result updates.
+ * Therefore, a cron job regularly checks for invalid participant scores and updates them.
* In all cases, using asynchronous scheduled tasks speeds up all requests that modify results.
*
* @see ResultListener
@@ -70,11 +71,11 @@ public class ParticipantScoreScheduleService {
private final TaskScheduler scheduler;
- private final Map> scheduledTasks = new ConcurrentHashMap<>();
+ private final Map> scheduledTasks = new ConcurrentHashMap<>();
private Optional lastScheduledRun = Optional.empty();
- private final CompetencyProgressApi competencyProgressApi;
+ private final Optional competencyProgressApi;
private final ParticipantScoreRepository participantScoreRepository;
@@ -96,7 +97,7 @@ public class ParticipantScoreScheduleService {
*/
private final AtomicBoolean isRunning = new AtomicBoolean(false);
- public ParticipantScoreScheduleService(@Qualifier("taskScheduler") TaskScheduler scheduler, CompetencyProgressApi competencyProgressApi,
+ public ParticipantScoreScheduleService(@Qualifier("taskScheduler") TaskScheduler scheduler, Optional competencyProgressApi,
ParticipantScoreRepository participantScoreRepository, StudentScoreRepository studentScoreRepository, TeamScoreRepository teamScoreRepository,
ExerciseRepository exerciseRepository, ResultRepository resultRepository, UserRepository userRepository, TeamRepository teamRepository) {
this.scheduler = scheduler;
@@ -156,6 +157,7 @@ public void shutdown() {
/**
* Every minute, query for modified results and schedule a task to update the participant scores.
+ * This is used as a fallback in case Result updates are lost for any reason.
* We schedule all results that were created/updated since the last run of the cron job.
* Additionally, we schedule all participant scores that are outdated/invalid.
*/
@@ -223,17 +225,17 @@ public void scheduleTask(@NotNull Long exerciseId, @NotNull Long participantId,
* @param resultIdToBeDeleted the id of the result that is about to be deleted (or null, if result is created/updated)
*/
private void scheduleTask(Long exerciseId, Long participantId, Instant resultLastModified, Long resultIdToBeDeleted) {
- final int participantScoreHash = new ParticipantScoreId(exerciseId, participantId).hashCode();
- var task = scheduledTasks.get(participantScoreHash);
+ final var participantScoreId = new ParticipantScoreId(exerciseId, participantId);
+ var task = scheduledTasks.get(participantScoreId);
if (task != null) {
// If a task is already scheduled, cancel it and reschedule it with the latest result
task.cancel(true);
- scheduledTasks.remove(participantScoreHash);
+ scheduledTasks.remove(participantScoreId);
}
var schedulingTime = ZonedDateTime.now().plus(DEFAULT_WAITING_TIME_FOR_SCHEDULED_TASKS, ChronoUnit.MILLIS);
var future = scheduler.schedule(() -> this.executeTask(exerciseId, participantId, resultLastModified, resultIdToBeDeleted), schedulingTime.toInstant());
- scheduledTasks.put(participantScoreHash, future);
+ scheduledTasks.put(participantScoreId, future);
log.debug("Scheduled task for exercise {} and participant {} at {}.", exerciseId, participantId, schedulingTime);
}
@@ -336,13 +338,14 @@ private void executeTask(Long exerciseId, Long participantId, Instant resultLast
if (scoreParticipant instanceof Team team && !Hibernate.isInitialized(team.getStudents())) {
scoreParticipant = teamRepository.findWithStudentsByIdElseThrow(team.getId());
}
- competencyProgressApi.updateProgressByLearningObjectSync(score.getExercise(), scoreParticipant.getParticipants());
+ Participant finalScoreParticipant = scoreParticipant;
+ competencyProgressApi.ifPresent(api -> api.updateProgressByLearningObjectSync(score.getExercise(), finalScoreParticipant.getParticipants()));
}
catch (Exception e) {
log.error("Exception while processing participant score for exercise {} and participant {} for participant scores:", exerciseId, participantId, e);
}
finally {
- scheduledTasks.remove(new ParticipantScoreId(exerciseId, participantId).hashCode());
+ scheduledTasks.remove(new ParticipantScoreId(exerciseId, participantId));
}
long end = System.currentTimeMillis();
log.debug("Updating the participant score for exercise {} and participant {} took {} ms.", exerciseId, participantId, end - start);
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 1f62ef78665b..17ccb2ca9fa6 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,7 +4,6 @@
import java.time.ZonedDateTime;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Comparator;
import java.util.HashMap;
@@ -25,7 +24,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.data.domain.Pageable;
import org.springframework.stereotype.Service;
import de.tum.cit.aet.artemis.assessment.domain.AssessmentType;
@@ -49,7 +48,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.dto.SortingOrder;
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;
@@ -64,19 +63,20 @@
import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository;
import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService;
import de.tum.cit.aet.artemis.lti.service.LtiNewResultService;
+import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity;
import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise;
import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation;
import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation;
+import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTask;
import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase;
import de.tum.cit.aet.artemis.programming.domain.build.BuildPlanType;
-import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask;
import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository;
import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository;
import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository;
import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository;
import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository;
import de.tum.cit.aet.artemis.programming.service.BuildLogEntryService;
-import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService;
+import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseTaskService;
@Profile(PROFILE_CORE)
@Service
@@ -126,6 +126,10 @@ public class ResultService {
private final ProgrammingExerciseRepository programmingExerciseRepository;
+ private static final int MAX_FEEDBACK_IDS = 5;
+
+ private static final double SIMILARITY_THRESHOLD = 0.7;
+
public ResultService(UserRepository userRepository, ResultRepository resultRepository, Optional ltiNewResultService,
ResultWebsocketService resultWebsocketService, ComplaintResponseRepository complaintResponseRepository, RatingRepository ratingRepository,
FeedbackRepository feedbackRepository, LongFeedbackTextRepository longFeedbackTextRepository, ComplaintRepository complaintRepository,
@@ -194,8 +198,8 @@ public Result createNewManualResult(Result result, boolean ratedResult) {
return savedResult;
}
- public Result createNewRatedManualResult(Result result) {
- return createNewManualResult(result, true);
+ public void createNewRatedManualResult(Result result) {
+ createNewManualResult(result, true);
}
/**
@@ -518,23 +522,26 @@ private void handleFeedbackPersistence(Feedback feedback, Result result, Map taskNames = tasks.stream().map(ProgrammingExerciseTask::getTaskName).collect(Collectors.toSet());
// 5. Include unassigned tasks if specified by the filter; otherwise, only include specified tasks
- List includeUnassignedTasks = new ArrayList<>(taskNames);
+ List includeNotAssignedToTask = new ArrayList<>(taskNames);
if (!data.getFilterTasks().isEmpty()) {
- includeUnassignedTasks.removeAll(data.getFilterTasks());
+ includeNotAssignedToTask.removeAll(data.getFilterTasks());
}
else {
- includeUnassignedTasks.clear();
+ includeNotAssignedToTask.clear();
}
// 6. Define the occurrence range based on filter parameters
@@ -614,22 +623,116 @@ public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, Fee
List