change dto name to use the correct term repo name

janthoXO · janthoXO · commit 994c55589425 · 2025-04-21T13:45:34.000+02:00
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/dto/RepoNameProgrammingStudentParticipationDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/dto/RepoNameProgrammingStudentParticipationDTO.java
@@ -28,8 +28,8 @@
 import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission;
 
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
-public record RepoIdentifierProgrammingStudentParticipationDTO(long id, ZonedDateTime individualDueDate, Set<RepoIdentifierSubmissionDTO> submissions, String participantName,
-        String participantIdentifier, String repositoryUri, String buildPlanId, String branch, RepoIdentifierProgrammingExerciseDTO exercise) {
+public record RepoNameProgrammingStudentParticipationDTO(long id, ZonedDateTime individualDueDate, Set<RepoNameSubmissionDTO> submissions, String participantName,
+        String participantIdentifier, String repositoryUri, String buildPlanId, String branch, RepoNameProgrammingExerciseDTO exercise) {
 
     /**
      * Converts a ProgrammingExerciseStudentParticipation into a dto for the endpoint
@@ -38,19 +38,19 @@ public record RepoIdentifierProgrammingStudentParticipationDTO(long id, ZonedDat
      * @param participation to convert
      * @return the converted DTO
      */
-    public static RepoIdentifierProgrammingStudentParticipationDTO of(ProgrammingExerciseStudentParticipation participation) {
+    public static RepoNameProgrammingStudentParticipationDTO of(ProgrammingExerciseStudentParticipation participation) {
         return Optional.ofNullable(participation)
-                .map(p -> new RepoIdentifierProgrammingStudentParticipationDTO(p.getId(), p.getIndividualDueDate(),
-                        Optional.ofNullable(p.getSubmissions()).orElse(Set.of()).stream().filter(Objects::nonNull)
-                                .map(s -> RepoIdentifierSubmissionDTO.of((ProgrammingSubmission) s)).collect(Collectors.toSet()),
+                .map(p -> new RepoNameProgrammingStudentParticipationDTO(p.getId(), p.getIndividualDueDate(),
+                        Optional.ofNullable(p.getSubmissions()).orElse(Set.of()).stream().filter(Objects::nonNull).map(s -> RepoNameSubmissionDTO.of((ProgrammingSubmission) s))
+                                .collect(Collectors.toSet()),
                         p.getParticipantName(), p.getParticipantIdentifier(), p.getRepositoryUri(), p.getBuildPlanId(), p.getBranch(),
-                        RepoIdentifierProgrammingExerciseDTO.of(p.getProgrammingExercise())))
+                        RepoNameProgrammingExerciseDTO.of(p.getProgrammingExercise())))
                 .orElse(null);
     }
 
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public record RepoIdentifierSubmissionDTO(long id, Boolean submitted, ZonedDateTime submissionDate, SubmissionType type, Boolean exampleSubmission, Long durationInMinutes,
-            List<RepoIdentifierResultDTO> results, String commitHash, boolean buildFailed) {
+    public record RepoNameSubmissionDTO(long id, Boolean submitted, ZonedDateTime submissionDate, SubmissionType type, Boolean exampleSubmission, Long durationInMinutes,
+            List<RepoNameResultDTO> results, String commitHash, boolean buildFailed) {
 
         /**
          * Converts a ProgrammingSubmission into a dto for the endpoint
@@ -59,19 +59,19 @@ public record RepoIdentifierSubmissionDTO(long id, Boolean submitted, ZonedDateT
          * @param submission to convert
          * @return the converted DTO
          */
-        public static RepoIdentifierSubmissionDTO of(ProgrammingSubmission submission) {
+        public static RepoNameSubmissionDTO of(ProgrammingSubmission submission) {
             return Optional.ofNullable(submission)
-                    .map(s -> new RepoIdentifierSubmissionDTO(s.getId(), s.isSubmitted(), s.getSubmissionDate(), s.getType(), s.isExampleSubmission(), s.getDurationInMinutes(),
-                            Optional.ofNullable(s.getResults()).orElse(List.of()).stream().filter(Objects::nonNull).map(RepoIdentifierResultDTO::of).toList(), s.getCommitHash(),
+                    .map(s -> new RepoNameSubmissionDTO(s.getId(), s.isSubmitted(), s.getSubmissionDate(), s.getType(), s.isExampleSubmission(), s.getDurationInMinutes(),
+                            Optional.ofNullable(s.getResults()).orElse(List.of()).stream().filter(Objects::nonNull).map(RepoNameResultDTO::of).toList(), s.getCommitHash(),
                             s.isBuildFailed()))
                     .orElse(null);
         }
 
     }
 
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public record RepoIdentifierResultDTO(long id, ZonedDateTime completionDate, Boolean successful, Double score, AssessmentType assessmentType, Boolean rated,
-            Boolean hasComplaint, Boolean exampleResult, Integer testCaseCount, Integer passedTestCaseCount, Integer codeIssueCount, List<RepoIdentifierFeedbackDTO> feedbacks) {
+    public record RepoNameResultDTO(long id, ZonedDateTime completionDate, Boolean successful, Double score, AssessmentType assessmentType, Boolean rated, Boolean hasComplaint,
+            Boolean exampleResult, Integer testCaseCount, Integer passedTestCaseCount, Integer codeIssueCount, List<RepoNameFeedbackDTO> feedbacks) {
 
         /**
          * Converts a Result into a dto for the endpoint
@@ -80,19 +80,19 @@ public record RepoIdentifierResultDTO(long id, ZonedDateTime completionDate, Boo
          * @param result to convert
          * @return the converted DTO
          */
-        public static RepoIdentifierResultDTO of(Result result) {
+        public static RepoNameResultDTO of(Result result) {
             return Optional.ofNullable(result)
-                    .map(r -> new RepoIdentifierResultDTO(r.getId(), r.getCompletionDate(), r.isSuccessful(), r.getScore(), r.getAssessmentType(), r.isRated(), r.hasComplaint(),
+                    .map(r -> new RepoNameResultDTO(r.getId(), r.getCompletionDate(), r.isSuccessful(), r.getScore(), r.getAssessmentType(), r.isRated(), r.hasComplaint(),
                             r.isExampleResult(), r.getTestCaseCount(), r.getPassedTestCaseCount(), r.getCodeIssueCount(),
-                            Optional.ofNullable(r.getFeedbacks()).orElse(List.of()).stream().filter(Objects::nonNull).map(RepoIdentifierFeedbackDTO::of).toList()))
+                            Optional.ofNullable(r.getFeedbacks()).orElse(List.of()).stream().filter(Objects::nonNull).map(RepoNameFeedbackDTO::of).toList()))
                     .orElse(null);
         }
 
     }
 
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public record RepoIdentifierFeedbackDTO(long id, String text, String detailText, boolean hasLongFeedbackText, String reference, Double credits, FeedbackType type,
-            Boolean positive, Long testCaseId) {
+    public record RepoNameFeedbackDTO(long id, String text, String detailText, boolean hasLongFeedbackText, String reference, Double credits, FeedbackType type, Boolean positive,
+            Long testCaseId) {
 
         /**
          * Converts a Feedback into a dto for the endpoint
@@ -101,18 +101,18 @@ public record RepoIdentifierFeedbackDTO(long id, String text, String detailText,
          * @param feedback to convert
          * @return the converted DTO
          */
-        public static RepoIdentifierFeedbackDTO of(Feedback feedback) {
-            return Optional.ofNullable(feedback).map(f -> new RepoIdentifierFeedbackDTO(f.getId(), f.getText(), f.getDetailText(), f.getHasLongFeedbackText(), f.getReference(),
+        public static RepoNameFeedbackDTO of(Feedback feedback) {
+            return Optional.ofNullable(feedback).map(f -> new RepoNameFeedbackDTO(f.getId(), f.getText(), f.getDetailText(), f.getHasLongFeedbackText(), f.getReference(),
                     f.getCredits(), f.getType(), f.isPositive(), f.getTestCaseId())).orElse(null);
         }
     }
 
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public record RepoIdentifierProgrammingExerciseDTO(long id, String problemStatement, String title, String shortName, ZonedDateTime releaseDate, ZonedDateTime startDate,
+    public record RepoNameProgrammingExerciseDTO(long id, String problemStatement, String title, String shortName, ZonedDateTime releaseDate, ZonedDateTime startDate,
             ZonedDateTime dueDate, ZonedDateTime assessmentDueDate, Double maxPoints, Double bonusPoints, AssessmentType assessmentType,
             boolean allowComplaintsForAutomaticAssessments, boolean allowFeedbackRequests, DifficultyLevel difficulty, ExerciseMode mode,
-            IncludedInOverallScore includedInOverallScore, ExerciseType exerciseType, ZonedDateTime exampleSolutionPublicationDate, RepoIdentifierCourseDTO course,
-            String projectKey, ProgrammingLanguage programmingLanguage, Boolean showTestNamesToStudents, Set<RepoIdentifierTestCaseDTO> testCases) {
+            IncludedInOverallScore includedInOverallScore, ExerciseType exerciseType, ZonedDateTime exampleSolutionPublicationDate, RepoNameCourseDTO course, String projectKey,
+            ProgrammingLanguage programmingLanguage, Boolean showTestNamesToStudents, Set<RepoNameTestCaseDTO> testCases) {
 
         /**
          * Converts a ProgrammingExercise into a dto for the endpoint
@@ -121,19 +121,19 @@ public record RepoIdentifierProgrammingExerciseDTO(long id, String problemStatem
          * @param exercise to convert
          * @return the converted DTO
          */
-        public static RepoIdentifierProgrammingExerciseDTO of(ProgrammingExercise exercise) {
-            return Optional.ofNullable(exercise).map(e -> new RepoIdentifierProgrammingExerciseDTO(e.getId(), e.getProblemStatement(), e.getTitle(), e.getShortName(),
-                    e.getReleaseDate(), e.getStartDate(), e.getDueDate(), e.getAssessmentDueDate(), e.getMaxPoints(), e.getBonusPoints(), e.getAssessmentType(),
-                    e.getAllowComplaintsForAutomaticAssessments(), e.getAllowFeedbackRequests(), e.getDifficulty(), e.getMode(), e.getIncludedInOverallScore(), e.getExerciseType(),
-                    e.getExampleSolutionPublicationDate(), RepoIdentifierCourseDTO.of(e.getCourseViaExerciseGroupOrCourseMember()), e.getProjectKey(), e.getProgrammingLanguage(),
-                    e.getShowTestNamesToStudents(),
-                    Optional.ofNullable(e.getTestCases()).orElse(Set.of()).stream().filter(Objects::nonNull).map(RepoIdentifierTestCaseDTO::of).collect(Collectors.toSet())))
+        public static RepoNameProgrammingExerciseDTO of(ProgrammingExercise exercise) {
+            return Optional.ofNullable(exercise)
+                    .map(e -> new RepoNameProgrammingExerciseDTO(e.getId(), e.getProblemStatement(), e.getTitle(), e.getShortName(), e.getReleaseDate(), e.getStartDate(),
+                            e.getDueDate(), e.getAssessmentDueDate(), e.getMaxPoints(), e.getBonusPoints(), e.getAssessmentType(), e.getAllowComplaintsForAutomaticAssessments(),
+                            e.getAllowFeedbackRequests(), e.getDifficulty(), e.getMode(), e.getIncludedInOverallScore(), e.getExerciseType(), e.getExampleSolutionPublicationDate(),
+                            RepoNameCourseDTO.of(e.getCourseViaExerciseGroupOrCourseMember()), e.getProjectKey(), e.getProgrammingLanguage(), e.getShowTestNamesToStudents(),
+                            Optional.ofNullable(e.getTestCases()).orElse(Set.of()).stream().filter(Objects::nonNull).map(RepoNameTestCaseDTO::of).collect(Collectors.toSet())))
                     .orElse(null);
         }
     }
 
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public record RepoIdentifierCourseDTO(long id, String title, String shortName) {
+    public record RepoNameCourseDTO(long id, String title, String shortName) {
 
         /**
          * Converts a Course into a dto for the endpoint
@@ -142,13 +142,13 @@ public record RepoIdentifierCourseDTO(long id, String title, String shortName) {
          * @param course to convert
          * @return the converted DTO
          */
-        public static RepoIdentifierCourseDTO of(Course course) {
-            return new RepoIdentifierCourseDTO(course.getId(), course.getTitle(), course.getShortName());
+        public static RepoNameCourseDTO of(Course course) {
+            return new RepoNameCourseDTO(course.getId(), course.getTitle(), course.getShortName());
         }
     }
 
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public record RepoIdentifierTestCaseDTO(long id, String testName, Double weight, double bonusMultiplier, double bonusPoints, Boolean active, Visibility visibility,
+    public record RepoNameTestCaseDTO(long id, String testName, Double weight, double bonusMultiplier, double bonusPoints, Boolean active, Visibility visibility,
             ProgrammingExerciseTestCaseType type) {
 
         /**
@@ -158,8 +158,8 @@ public record RepoIdentifierTestCaseDTO(long id, String testName, Double weight,
          * @param testCase to convert
          * @return the converted DTO
          */
-        public static RepoIdentifierTestCaseDTO of(ProgrammingExerciseTestCase testCase) {
-            return Optional.ofNullable(testCase).map(t -> new RepoIdentifierTestCaseDTO(t.getId(), t.getTestName(), t.getWeight(), t.getBonusMultiplier(), t.getBonusPoints(),
+        public static RepoNameTestCaseDTO of(ProgrammingExerciseTestCase testCase) {
+            return Optional.ofNullable(testCase).map(t -> new RepoNameTestCaseDTO(t.getId(), t.getTestName(), t.getWeight(), t.getBonusMultiplier(), t.getBonusPoints(),
                     t.isActive(), t.getVisibility(), t.getType())).orElse(null);
         }
     }
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseParticipationResource.java
@@ -56,7 +56,7 @@
 import de.tum.cit.aet.artemis.programming.domain.VcsAccessLog;
 import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri;
 import de.tum.cit.aet.artemis.programming.dto.CommitInfoDTO;
-import de.tum.cit.aet.artemis.programming.dto.RepoIdentifierProgrammingStudentParticipationDTO;
+import de.tum.cit.aet.artemis.programming.dto.RepoNameProgrammingStudentParticipationDTO;
 import de.tum.cit.aet.artemis.programming.dto.VcsAccessLogDTO;
 import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository;
 import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository;
@@ -201,7 +201,7 @@ public ResponseEntity<ProgrammingExerciseStudentParticipation> getParticipationW
     @GetMapping("programming-exercise-participations/repo-name/{repoName}")
     @EnforceAtLeastStudent
     @AllowedTools(ToolTokenType.SCORPIO)
-    public ResponseEntity<RepoIdentifierProgrammingStudentParticipationDTO> getStudentParticipationWithLatestSubmissionLatestResultFeedbacksByRepoName(
+    public ResponseEntity<RepoNameProgrammingStudentParticipationDTO> getStudentParticipationWithLatestSubmissionLatestResultFeedbacksByRepoName(
             @PathVariable("repoName") String repoName) {
 
         String repoUrl;
@@ -242,7 +242,7 @@ public ResponseEntity<RepoIdentifierProgrammingStudentParticipationDTO> getStude
             resultService.filterSensitiveInformationIfNecessary(participation, results, Optional.empty());
         }
 
-        return ResponseEntity.ok(RepoIdentifierProgrammingStudentParticipationDTO.of(participation));
+        return ResponseEntity.ok(RepoNameProgrammingStudentParticipationDTO.of(participation));
     }
 
     /**
diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseParticipationIntegrationTest.java
@@ -51,7 +51,7 @@
 import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation;
 import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri;
 import de.tum.cit.aet.artemis.programming.dto.CommitInfoDTO;
-import de.tum.cit.aet.artemis.programming.dto.RepoIdentifierProgrammingStudentParticipationDTO;
+import de.tum.cit.aet.artemis.programming.dto.RepoNameProgrammingStudentParticipationDTO;
 
 class ProgrammingExerciseParticipationIntegrationTest extends AbstractProgrammingIntegrationIndependentTest {
 
@@ -666,8 +666,8 @@ void testGetProgrammingExerciseStudentParticipationByRepoName() throws Exception
         var participation = participationUtilService.addStudentParticipationForProgrammingExercise(programmingExercise, TEST_PREFIX + "student1");
 
         var repoName = extractRepoName(participation.getRepositoryUri());
-        RepoIdentifierProgrammingStudentParticipationDTO participationDTO = request.get("/api/programming/programming-exercise-participations/repo-name/" + repoName, HttpStatus.OK,
-                RepoIdentifierProgrammingStudentParticipationDTO.class);
+        RepoNameProgrammingStudentParticipationDTO participationDTO = request.get("/api/programming/programming-exercise-participations/repo-name/" + repoName, HttpStatus.OK,
+                RepoNameProgrammingStudentParticipationDTO.class);
 
         assertThat(participationDTO.id()).isEqualTo(participation.getId());
         assertThat(participationDTO.exercise().id()).isEqualTo(participation.getExercise().getId());
@@ -692,18 +692,18 @@ void testGetProgrammingExerciseStudentParticipationByRepoNameWithSubmissionAndRe
         latestResult = participationUtilService.addFeedbackToResult(new Feedback().testCase(testCases[0]), latestResult);
 
         var repoName = extractRepoName(participation.getRepositoryUri());
-        RepoIdentifierProgrammingStudentParticipationDTO participationDTO = request.get("/api/programming/programming-exercise-participations/repo-name/" + repoName, HttpStatus.OK,
-                RepoIdentifierProgrammingStudentParticipationDTO.class);
+        RepoNameProgrammingStudentParticipationDTO participationDTO = request.get("/api/programming/programming-exercise-participations/repo-name/" + repoName, HttpStatus.OK,
+                RepoNameProgrammingStudentParticipationDTO.class);
 
         assertThat(participationDTO.id()).isEqualTo(participation.getId());
         assertThat(participationDTO.exercise().id()).isEqualTo(participation.getExercise().getId());
         assertThat(participationDTO.exercise().course().id()).isEqualTo(participation.getExercise().getCourseViaExerciseGroupOrCourseMember().getId());
 
         assertThat(participationDTO.submissions()).hasSize(1);
-        var submissionDTO = participationDTO.submissions().toArray(RepoIdentifierProgrammingStudentParticipationDTO.RepoIdentifierSubmissionDTO[]::new)[0];
+        var submissionDTO = participationDTO.submissions().toArray(RepoNameProgrammingStudentParticipationDTO.RepoNameSubmissionDTO[]::new)[0];
         assertThat(submissionDTO.id()).isEqualTo(latestResult.getSubmission().getId());
         assertThat(submissionDTO.results()).hasSize(1);
-        var resultDTO = submissionDTO.results().toArray(RepoIdentifierProgrammingStudentParticipationDTO.RepoIdentifierResultDTO[]::new)[0];
+        var resultDTO = submissionDTO.results().toArray(RepoNameProgrammingStudentParticipationDTO.RepoNameResultDTO[]::new)[0];
         assertThat(resultDTO.id()).isEqualTo(latestResult.getId());
         assertThat(resultDTO.feedbacks()).isNotEmpty();
         for (var feedbackDTO : resultDTO.feedbacks()) {
