Development: Improve metrics integration test coverage

src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/CompetencyInformationDTO.java

@@ -4,6 +4,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
+import de.tum.cit.aet.artemis.atlas.domain.competency.Competency;
 import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy;
 
 /**
@@ -19,4 +20,15 @@
  */
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public record CompetencyInformationDTO(long id, String title, String description, CompetencyTaxonomy taxonomy, ZonedDateTime softDueDate, boolean optional, int masteryThreshold) {
+
+    /**
+     * Creates a CompetencyInformationDTO from a Competency.
+     *
+     * @param competency the Competency to create the DTO from
+     * @return the created DTO
+     */
+    public static <C extends Competency> CompetencyInformationDTO of(C competency) {
+        return new CompetencyInformationDTO(competency.getId(), competency.getTitle(), competency.getDescription(), competency.getTaxonomy(), competency.getSoftDueDate(),
+                competency.isOptional(), competency.getMasteryThreshold());
+    }
 }

src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/LectureUnitInformationDTO.java

@@ -18,4 +18,15 @@
  */
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public record LectureUnitInformationDTO(long id, long lectureId, String lectureTitle, String name, ZonedDateTime releaseDate, Class<? extends LectureUnit> type) {
+
+    /**
+     * Creates a LectureUnitInformationDTO from a LectureUnit.
+     *
+     * @param lectureUnit the LectureUnit to create the DTO from
+     * @return the created DTO
+     */
+    public static <L extends LectureUnit> LectureUnitInformationDTO of(L lectureUnit) {
+        return new LectureUnitInformationDTO(lectureUnit.getId(), lectureUnit.getLecture().getId(), lectureUnit.getLecture().getTitle(), lectureUnit.getName(),
+                lectureUnit.getReleaseDate(), lectureUnit.getClass());
+    }
 }

src/test/java/de/tum/cit/aet/artemis/assessment/service/CourseScoreCalculationServiceTest.java

@@ -35,7 +35,6 @@
 import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore;
 import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation;
 import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService;
-import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository;
 import de.tum.cit.aet.artemis.exercise.test_repository.StudentParticipationTestRepository;
 import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict;
 import de.tum.cit.aet.artemis.quiz.domain.QuizExercise;
@@ -45,9 +44,6 @@ class CourseScoreCalculationServiceTest extends AbstractSpringIntegrationIndepen
 
     private static final String TEST_PREFIX = "cscservicetest";
 
-    @Autowired
-    private ExerciseRepository exerciseRepository;
-
     @Autowired
     private StudentParticipationTestRepository studentParticipationRepository;
 

src/test/java/de/tum/cit/aet/artemis/assessment/util/StudentScoreUtilService.java

@@ -34,6 +34,23 @@ public void createStudentScore(Exercise exercise, User user, double score) {
         studentScoreRepository.save(studentScore);
     }
 
+    /**
+     * Creates rated and normal score (which are set equal) for given exercise and user.
+     *
+     * @param exercise the exercise to link the student score to
+     * @param user     the user that is linked to the score
+     * @param score    the score and rated score that the specified user has reached for the given exercise
+     */
+    public void createRatedStudentScore(Exercise exercise, User user, double score) {
+        final var studentScore = new StudentScore();
+        studentScore.setExercise(exercise);
+        studentScore.setUser(user);
+        studentScore.setLastScore(score);
+        studentScore.setLastPoints(exercise.getMaxPoints() * score / 100);
+        studentScore.setLastRatedScore(score);
+        studentScoreRepository.save(studentScore);
+    }
+
     /**
      * Creates student score for given exercise and user.
      *

src/test/java/de/tum/cit/aet/artemis/atlas/competency/util/CompetencyUtilService.java

@@ -18,7 +18,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.exercise.domain.Exercise;
-import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository;
+import de.tum.cit.aet.artemis.exercise.repository.ExerciseTestRepository;
 import de.tum.cit.aet.artemis.lecture.domain.LectureUnit;
 import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository;
 
@@ -35,7 +35,7 @@ public class CompetencyUtilService {
     private LectureUnitRepository lectureUnitRepository;
 
     @Autowired
-    private ExerciseRepository exerciseRepository;
+    private ExerciseTestRepository exerciseRepository;
 
     @Autowired
     private CompetencyRelationRepository competencyRelationRepository;

src/test/java/de/tum/cit/aet/artemis/atlas/service/LearningPathServiceTest.java

@@ -41,7 +41,6 @@
 import de.tum.cit.aet.artemis.core.util.CourseUtilService;
 import de.tum.cit.aet.artemis.exercise.domain.DifficultyLevel;
 import de.tum.cit.aet.artemis.exercise.domain.Exercise;
-import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository;
 import de.tum.cit.aet.artemis.lecture.domain.Lecture;
 import de.tum.cit.aet.artemis.lecture.domain.LectureUnit;
 import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository;
@@ -80,9 +79,6 @@ class LearningPathServiceTest extends AbstractSpringIntegrationIndependentTest {
     @Autowired
     private CompetencyProgressUtilService competencyProgressUtilService;
 
-    @Autowired
-    private ExerciseRepository exerciseRepository;
-
     @Autowired
     private StudentScoreUtilService studentScoreUtilService;
 

src/test/java/de/tum/cit/aet/artemis/communication/notification/GroupNotificationServiceTest.java

@@ -61,7 +61,6 @@
 import de.tum.cit.aet.artemis.exam.repository.ExamRepository;
 import de.tum.cit.aet.artemis.exam.util.ExamUtilService;
 import de.tum.cit.aet.artemis.exercise.domain.Exercise;
-import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository;
 import de.tum.cit.aet.artemis.lecture.domain.Attachment;
 import de.tum.cit.aet.artemis.lecture.domain.Lecture;
 import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise;
@@ -82,9 +81,6 @@ class GroupNotificationServiceTest extends AbstractSpringIntegrationIndependentT
     @Autowired
     private NotificationSettingRepository notificationSettingRepository;
 
-    @Autowired
-    private ExerciseRepository exerciseRepository;
-
     @Autowired
     private ExamRepository examRepository;
 

src/test/java/de/tum/cit/aet/artemis/communication/notification/NotificationScheduleServiceTest.java

@@ -32,7 +32,6 @@
 import de.tum.cit.aet.artemis.core.util.CourseUtilService;
 import de.tum.cit.aet.artemis.exercise.domain.Exercise;
 import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService;
-import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository;
 import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationLocalCILocalVCTest;
 import de.tum.cit.aet.artemis.text.domain.TextSubmission;
 import de.tum.cit.aet.artemis.text.util.TextExerciseFactory;
@@ -44,9 +43,6 @@ class NotificationScheduleServiceTest extends AbstractSpringIntegrationLocalCILo
     @Autowired
     private InstanceMessageReceiveService instanceMessageReceiveService;
 
-    @Autowired
-    private ExerciseRepository exerciseRepository;
-
     @Autowired
     private NotificationRepository notificationRepository;
 

src/test/java/de/tum/cit/aet/artemis/communication/notification/SingleUserNotificationServiceTest.java

@@ -90,7 +90,6 @@
 import de.tum.cit.aet.artemis.core.util.CourseUtilService;
 import de.tum.cit.aet.artemis.exercise.domain.Exercise;
 import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService;
-import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository;
 import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise;
 import de.tum.cit.aet.artemis.fileupload.util.FileUploadExerciseUtilService;
 import de.tum.cit.aet.artemis.lecture.domain.Lecture;
@@ -118,9 +117,6 @@ class SingleUserNotificationServiceTest extends AbstractSpringIntegrationIndepen
     @Autowired
     private NotificationSettingRepository notificationSettingRepository;
 
-    @Autowired
-    private ExerciseRepository exerciseRepository;
-
     @Autowired
     private ResultTestRepository resultRepository;
 

src/test/java/de/tum/cit/aet/artemis/communication/service/EmailSummaryServiceTest.java

@@ -29,7 +29,6 @@
 import de.tum.cit.aet.artemis.core.util.CourseUtilService;
 import de.tum.cit.aet.artemis.exercise.domain.DifficultyLevel;
 import de.tum.cit.aet.artemis.exercise.domain.Exercise;
-import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository;
 import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest;
 import de.tum.cit.aet.artemis.text.util.TextExerciseFactory;
 
@@ -40,9 +39,6 @@ class EmailSummaryServiceTest extends AbstractSpringIntegrationIndependentTest {
     @Autowired
     private EmailSummaryService weeklyEmailSummaryService;
 
-    @Autowired
-    private ExerciseRepository exerciseRepository;
-
     @Autowired
     private NotificationSettingRepository notificationSettingRepository;
 

src/test/java/de/tum/cit/aet/artemis/communication/util/ConversationUtilService.java

@@ -37,7 +37,7 @@
 import de.tum.cit.aet.artemis.core.user.util.UserUtilService;
 import de.tum.cit.aet.artemis.core.util.CourseFactory;
 import de.tum.cit.aet.artemis.core.util.CourseUtilService;
-import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository;
+import de.tum.cit.aet.artemis.exercise.repository.ExerciseTestRepository;
 import de.tum.cit.aet.artemis.exercise.util.ExerciseUtilService;
 import de.tum.cit.aet.artemis.lecture.domain.Lecture;
 import de.tum.cit.aet.artemis.lecture.repository.LectureRepository;
@@ -64,7 +64,7 @@ public class ConversationUtilService {
     private CourseTestRepository courseRepo;
 
     @Autowired
-    private ExerciseRepository exerciseRepo;
+    private ExerciseTestRepository exerciseRepo;
 
     @Autowired
     private LectureRepository lectureRepo;

src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java

@@ -55,7 +55,7 @@
 import de.tum.cit.aet.artemis.core.test_repository.UserTestRepository;
 import de.tum.cit.aet.artemis.exercise.domain.Exercise;
 import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation;
-import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository;
+import de.tum.cit.aet.artemis.exercise.repository.ExerciseTestRepository;
 import de.tum.cit.aet.artemis.lti.config.Lti13TokenRetriever;
 import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration;
 import de.tum.cit.aet.artemis.lti.domain.LtiResourceLaunch;
@@ -78,7 +78,7 @@ class Lti13ServiceTest {
     private UserTestRepository userRepository;
 
     @Mock
-    private ExerciseRepository exerciseRepository;
+    private ExerciseTestRepository exerciseRepository;
 
     @Mock
     private CourseTestRepository courseRepository;