From a59395860f458bd117ca26169b772273fab25771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Fuch=C3=9F?= <dominik.fuchss@kit.edu>
Date: Thu, 7 Dec 2023 10:46:48 +0100
Subject: [PATCH] Update Artemis4J

---
 pom.xml                                       |  2 +-
 .../core/assessment/PrefixMatcher.java        |  8 ++---
 .../core/client/Artemis4JArtemisClient.java   | 29 ++-----------------
 .../FeedbackGroupFailedFrequency.java         |  2 +-
 4 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9bf17ae..685e5c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>edu.kit.kastel.sdq</groupId>
       <artifactId>artemis4j</artifactId>
-      <version>6.7.0</version>
+      <version>6.7.1</version>
     </dependency>
     <dependency>
       <groupId>org.jcommander</groupId>
diff --git a/src/main/java/edu/kit/kastel/sdq/scorestats/core/assessment/PrefixMatcher.java b/src/main/java/edu/kit/kastel/sdq/scorestats/core/assessment/PrefixMatcher.java
index 29359e1..bcc3221 100644
--- a/src/main/java/edu/kit/kastel/sdq/scorestats/core/assessment/PrefixMatcher.java
+++ b/src/main/java/edu/kit/kastel/sdq/scorestats/core/assessment/PrefixMatcher.java
@@ -17,17 +17,17 @@ public PrefixMatcher(String prefix) {
 	}
 
 	/**
-	 * Returns {@code true} if {@link Feedback#getText()} begins with the prefix.
+	 * Returns {@code true} if {@link Feedback#getTestName()} begins with the prefix.
 	 * 
 	 * @param feedback the feedback
-	 * @return {@code true} if {@link Feedback#getText()} begins with the prefix
+	 * @return {@code true} if {@link Feedback#getTestName()} begins with the prefix
 	 */
 	@Override
 	public boolean matches(Feedback feedback) {
-		if (feedback.getFeedbackType() == FeedbackType.MANUAL_UNREFERENCED) {
+		if (feedback.getFeedbackType() == FeedbackType.MANUAL_UNREFERENCED || !feedback.isTest()) {
 			throw new IllegalArgumentException();
 		}
 
-		return feedback.getText().startsWith(this.prefix);
+		return feedback.getTestName().startsWith(this.prefix);
 	}
 }
diff --git a/src/main/java/edu/kit/kastel/sdq/scorestats/core/client/Artemis4JArtemisClient.java b/src/main/java/edu/kit/kastel/sdq/scorestats/core/client/Artemis4JArtemisClient.java
index 622020d..73665b0 100644
--- a/src/main/java/edu/kit/kastel/sdq/scorestats/core/client/Artemis4JArtemisClient.java
+++ b/src/main/java/edu/kit/kastel/sdq/scorestats/core/client/Artemis4JArtemisClient.java
@@ -14,6 +14,7 @@
 import edu.kit.kastel.sdq.artemis4j.api.artemis.assessment.Result;
 import edu.kit.kastel.sdq.artemis4j.api.artemis.assessment.Submission;
 import edu.kit.kastel.sdq.artemis4j.api.grading.IAnnotation;
+import edu.kit.kastel.sdq.artemis4j.client.AssessmentArtemisClient;
 import edu.kit.kastel.sdq.artemis4j.client.RestClientManager;
 import edu.kit.kastel.sdq.artemis4j.grading.artemis.AnnotationDeserializer;
 import edu.kit.kastel.sdq.artemis4j.grading.config.ExerciseConfig;
@@ -65,13 +66,7 @@ public Assessments<K> loadAssessments(Exercise exercise, ExerciseConfig config)
 		for (Submission submission : submissions) {
 			Result result = submission.getLatestResult();
 			List<Feedback> feedbacks = this.client.getAssessmentArtemisClient().getFeedbacks(submission, result);
-			feedbacks.forEach(Feedback::init);
-			boolean success = loadDetailText(result, feedbacks);
-			if (!success) {
-				skippedStudents.add(submission.getParticipantIdentifier());
-				continue;
-			}
-
+			feedbacks.forEach(f -> f.init((AssessmentArtemisClient)this.client.getAssessmentArtemisClient(), result.id));
 			List<IAnnotation> annotations = List.of();
 			if (config != null) {
 				try {
@@ -94,24 +89,4 @@ public Assessments<K> loadAssessments(Exercise exercise, ExerciseConfig config)
 
 		return new Assessments<>(skippedStudents, assessments);
 	}
-
-	private boolean loadDetailText(Result result, List<Feedback> feedbacks) {
-		for (Feedback feedback : feedbacks) {
-			if (!feedback.hasLongFeedbackText()) {
-				continue;
-			}
-
-			String longText;
-			try {
-				longText = this.client.getAssessmentArtemisClient().getLongFeedback(result.id, feedback);
-			} catch (ArtemisClientException e) {
-				return false;
-			}
-
-			feedback.setDetailTextComplete(longText);
-		}
-
-		return true;
-	}
-
 }
diff --git a/src/main/java/edu/kit/kastel/sdq/scorestats/core/report/visitors/FeedbackGroupFailedFrequency.java b/src/main/java/edu/kit/kastel/sdq/scorestats/core/report/visitors/FeedbackGroupFailedFrequency.java
index ec966c2..cd8d841 100644
--- a/src/main/java/edu/kit/kastel/sdq/scorestats/core/report/visitors/FeedbackGroupFailedFrequency.java
+++ b/src/main/java/edu/kit/kastel/sdq/scorestats/core/report/visitors/FeedbackGroupFailedFrequency.java
@@ -33,7 +33,7 @@ public Iterable<Assessment<K>> iterable(ReportData<K> data) {
 	@Override
 	public List<String> count(Assessment<K> value) {
 		FeedbackGroup feedbackGroup = value.getFeedbackGroup(this.key);
-		return feedbackGroup.getFailedFeedbacks().stream().map(Feedback::getText).toList();
+		return feedbackGroup.getFailedFeedbacks().stream().map(Feedback::getTestName).toList();
 	}
 
 	@Override