From a0ad0068db8926bb197055d554c514d0481c0a36 Mon Sep 17 00:00:00 2001 From: entholzer Date: Fri, 25 Oct 2024 18:08:21 +0200 Subject: [PATCH] refactored filename --- .../ProgrammingExerciseRepository.java | 3 ++- .../web/ProgrammingExerciseResource.java | 2 +- ...ProgrammingExerciseGitIntegrationTest.java | 4 ++-- ...ProgrammingExerciseGradingServiceTest.java | 24 ++++++++++++------- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java index 40ccb3cf4c34..30a78e0339a3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java @@ -770,7 +770,8 @@ default ProgrammingExercise saveForCreation(ProgrammingExercise exercise) { * @throws EntityNotFoundException the programming exercise could not be found. */ @NotNull - default ProgrammingExercise findByIdWithTemplateAndSolutionParticipationLatestResultFeedbackTestCasesElseThrow(long programmingExerciseId) throws EntityNotFoundException { + default ProgrammingExercise findByIdWithTemplateAndSolutionParticipationAndAuxiliaryReposAndLatestResultFeedbackTestCasesElseThrow(long programmingExerciseId) + throws EntityNotFoundException { // TODO: This is a dark hack. Move this into a service where we properly load only the solution participation in the second step ProgrammingExercise programmingExerciseWithTemplate = getValueElseThrow(findWithTemplateParticipationLatestResultFeedbackTestCasesById(programmingExerciseId), programmingExerciseId); diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResource.java index 957f7435ce0d..dbc82173e534 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResource.java @@ -506,7 +506,7 @@ public ResponseEntity getProgrammingExercise(@PathVariable public ResponseEntity getProgrammingExerciseWithSetupParticipations(@PathVariable long exerciseId) { log.debug("REST request to get ProgrammingExercise with setup participations : {}", exerciseId); User user = userRepository.getUserWithGroupsAndAuthorities(); - var programmingExercise = programmingExerciseRepository.findByIdWithTemplateAndSolutionParticipationLatestResultFeedbackTestCasesElseThrow(exerciseId); + var programmingExercise = programmingExerciseRepository.findByIdWithTemplateAndSolutionParticipationAndAuxiliaryReposAndLatestResultFeedbackTestCasesElseThrow(exerciseId); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.EDITOR, programmingExercise, user); var assignmentParticipation = studentParticipationRepository.findByExerciseIdAndStudentIdAndTestRunWithLatestResult(programmingExercise.getId(), user.getId(), false); Set participations = new HashSet<>(); diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseGitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseGitIntegrationTest.java index 5882a3517915..e743904e72f6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseGitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseGitIntegrationTest.java @@ -113,8 +113,8 @@ void testRepositoryMethods() { assertThatExceptionOfType(EntityNotFoundException.class) .isThrownBy(() -> programmingExerciseRepository.findByIdWithTemplateAndSolutionParticipationElseThrow(Long.MAX_VALUE)); - assertThatExceptionOfType(EntityNotFoundException.class) - .isThrownBy(() -> programmingExerciseRepository.findByIdWithTemplateAndSolutionParticipationLatestResultFeedbackTestCasesElseThrow(Long.MAX_VALUE)); + assertThatExceptionOfType(EntityNotFoundException.class).isThrownBy( + () -> programmingExerciseRepository.findByIdWithTemplateAndSolutionParticipationAndAuxiliaryReposAndLatestResultFeedbackTestCasesElseThrow(Long.MAX_VALUE)); assertThatExceptionOfType(EntityNotFoundException.class) .isThrownBy(() -> programmingExerciseRepository.findByIdWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesElseThrow(Long.MAX_VALUE)); diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseGradingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseGradingServiceTest.java index 2993b02caccb..6b4c43477276 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseGradingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseGradingServiceTest.java @@ -551,7 +551,8 @@ void shouldReEvaluateScoreOfTheCorrectResults() throws Exception { programmingExercise = (ProgrammingExercise) exerciseUtilService.addMaxScoreAndBonusPointsToExercise(programmingExercise); programmingExercise = programmingExerciseUtilService.addTemplateParticipationForProgrammingExercise(programmingExercise); programmingExercise = programmingExerciseUtilService.addSolutionParticipationForProgrammingExercise(programmingExercise); - programmingExercise = programmingExerciseRepository.findByIdWithTemplateAndSolutionParticipationLatestResultFeedbackTestCasesElseThrow(programmingExercise.getId()); + programmingExercise = programmingExerciseRepository + .findByIdWithTemplateAndSolutionParticipationAndAuxiliaryReposAndLatestResultFeedbackTestCasesElseThrow(programmingExercise.getId()); var testCases = createTestCases(false); var testParticipations = createTestParticipations(); @@ -566,7 +567,8 @@ void shouldReEvaluateScoreOfTheCorrectResults() throws Exception { SecurityContextHolder.setContext(TestSecurityContextHolder.getContext()); // Tests - programmingExercise = programmingExerciseRepository.findByIdWithTemplateAndSolutionParticipationLatestResultFeedbackTestCasesElseThrow(programmingExercise.getId()); + programmingExercise = programmingExerciseRepository + .findByIdWithTemplateAndSolutionParticipationAndAuxiliaryReposAndLatestResultFeedbackTestCasesElseThrow(programmingExercise.getId()); // template 0 % { @@ -610,7 +612,8 @@ void shouldNotIncludeTestsMarkedAsNeverVisibleInScoreCalculation(boolean isAfter programmingExercise = (ProgrammingExercise) exerciseUtilService.addMaxScoreAndBonusPointsToExercise(programmingExercise); programmingExercise = programmingExerciseUtilService.addTemplateParticipationForProgrammingExercise(programmingExercise); programmingExercise = programmingExerciseUtilService.addSolutionParticipationForProgrammingExercise(programmingExercise); - programmingExercise = programmingExerciseRepository.findByIdWithTemplateAndSolutionParticipationLatestResultFeedbackTestCasesElseThrow(programmingExercise.getId()); + programmingExercise = programmingExerciseRepository + .findByIdWithTemplateAndSolutionParticipationAndAuxiliaryReposAndLatestResultFeedbackTestCasesElseThrow(programmingExercise.getId()); final var testCases = createTestCases(true); final var testParticipations = createTestParticipations(); @@ -625,7 +628,8 @@ void shouldNotIncludeTestsMarkedAsNeverVisibleInScoreCalculation(boolean isAfter SecurityContextHolder.setContext(TestSecurityContextHolder.getContext()); // Tests - programmingExercise = programmingExerciseRepository.findByIdWithTemplateAndSolutionParticipationLatestResultFeedbackTestCasesElseThrow(programmingExercise.getId()); + programmingExercise = programmingExerciseRepository + .findByIdWithTemplateAndSolutionParticipationAndAuxiliaryReposAndLatestResultFeedbackTestCasesElseThrow(programmingExercise.getId()); // the invisible test case should however be visible for the template and solution repos @@ -658,7 +662,8 @@ void shouldUpdateTheLatestResultOfASingleParticipation() { programmingExercise = (ProgrammingExercise) exerciseUtilService.addMaxScoreAndBonusPointsToExercise(programmingExercise); programmingExercise = programmingExerciseUtilService.addTemplateParticipationForProgrammingExercise(programmingExercise); programmingExercise = programmingExerciseUtilService.addSolutionParticipationForProgrammingExercise(programmingExercise); - programmingExercise = programmingExerciseRepository.findByIdWithTemplateAndSolutionParticipationLatestResultFeedbackTestCasesElseThrow(programmingExercise.getId()); + programmingExercise = programmingExerciseRepository + .findByIdWithTemplateAndSolutionParticipationAndAuxiliaryReposAndLatestResultFeedbackTestCasesElseThrow(programmingExercise.getId()); final var testCases = createTestCases(false); final var testParticipations = createTestParticipations(); @@ -679,7 +684,8 @@ void shouldUpdateOnlyResultsForParticipationsWithoutIndividualDueDate() { programmingExercise = (ProgrammingExercise) exerciseUtilService.addMaxScoreAndBonusPointsToExercise(programmingExercise); programmingExercise = programmingExerciseUtilService.addTemplateParticipationForProgrammingExercise(programmingExercise); programmingExercise = programmingExerciseUtilService.addSolutionParticipationForProgrammingExercise(programmingExercise); - programmingExercise = programmingExerciseRepository.findByIdWithTemplateAndSolutionParticipationLatestResultFeedbackTestCasesElseThrow(programmingExercise.getId()); + programmingExercise = programmingExerciseRepository + .findByIdWithTemplateAndSolutionParticipationAndAuxiliaryReposAndLatestResultFeedbackTestCasesElseThrow(programmingExercise.getId()); final var testCases = createTestCases(false); final var testParticipations = createTestParticipations(); @@ -690,7 +696,8 @@ void shouldUpdateOnlyResultsForParticipationsWithoutIndividualDueDate() { participationWithIndividualDueDate = studentParticipationRepository.save((StudentParticipation) participationWithIndividualDueDate); final Long participationWithIndividualDueDateId = participationWithIndividualDueDate.getId(); - programmingExercise = programmingExerciseRepository.findByIdWithTemplateAndSolutionParticipationLatestResultFeedbackTestCasesElseThrow(programmingExercise.getId()); + programmingExercise = programmingExerciseRepository + .findByIdWithTemplateAndSolutionParticipationAndAuxiliaryReposAndLatestResultFeedbackTestCasesElseThrow(programmingExercise.getId()); final var updated = programmingExerciseGradingService.updateResultsOnlyRegularDueDateParticipations(programmingExercise); // four student results + template + solution @@ -706,7 +713,8 @@ void testWeightSumZero() { programmingExercise = (ProgrammingExercise) exerciseUtilService.addMaxScoreAndBonusPointsToExercise(programmingExercise); programmingExercise = programmingExerciseUtilService.addTemplateParticipationForProgrammingExercise(programmingExercise); programmingExercise = programmingExerciseUtilService.addSolutionParticipationForProgrammingExercise(programmingExercise); - programmingExercise = programmingExerciseRepository.findByIdWithTemplateAndSolutionParticipationLatestResultFeedbackTestCasesElseThrow(programmingExercise.getId()); + programmingExercise = programmingExerciseRepository + .findByIdWithTemplateAndSolutionParticipationAndAuxiliaryReposAndLatestResultFeedbackTestCasesElseThrow(programmingExercise.getId()); final var testCases = createTestCases(false); createTestParticipations();