Integrated code lifecycle: Simplify repository handling for commit history

src/main/java/de/tum/in/www1/artemis/domain/Repository.java

@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Collection;
-import java.util.Map;
 
 import org.eclipse.jgit.lib.BaseRepositoryBuilder;
 
@@ -25,8 +24,6 @@ public class Repository extends org.eclipse.jgit.internal.storage.file.FileRepos
 
     private final VcsRepositoryUri remoteRepositoryUri;
 
-    private Map<File, FileType> filesAndFolders;
-
     private Collection<File> files;
 
     public Repository(File gitDir, VcsRepositoryUri remoteRepositoryUri) throws IOException {
@@ -77,14 +74,6 @@ public Path getLocalPath() {
         return localPath;
     }
 
-    public Map<File, FileType> getContent() {
-        return filesAndFolders;
-    }
-
-    public void setContent(Map<File, FileType> filesAndFolders) {
-        this.filesAndFolders = filesAndFolders;
-    }
-
     public Collection<File> getFiles() {
         return files;
     }

src/main/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseRepository.java

@@ -559,6 +559,7 @@ default ProgrammingExercise findByIdWithSubmissionPolicyElseThrow(long programmi
      * @throws EntityNotFoundException the programming exercise could not be found.
      */
     @NotNull
+    // TODO: rename, this method does more than it promises
     default ProgrammingExercise findByIdWithTemplateAndSolutionParticipationElseThrow(long programmingExerciseId) throws EntityNotFoundException {
         Optional<ProgrammingExercise> programmingExercise = findWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesById(programmingExerciseId);
         return programmingExercise.orElseThrow(() -> new EntityNotFoundException("Programming Exercise", programmingExerciseId));

src/main/java/de/tum/in/www1/artemis/service/ResultService.java

@@ -273,15 +273,8 @@ public void filterSensitiveInformationIfNecessary(final Participation participat
      */
     public void filterSensitiveInformationIfNecessary(final Participation participation, final Collection<Result> results, Optional<User> user) {
         results.forEach(Result::filterSensitiveInformation);
-        if (user.isPresent()) {
-            if (!authCheckService.isAtLeastTeachingAssistantForExercise(participation.getExercise(), user.get())) {
-                filterInformation(participation, results);
-            }
-        }
-        else {
-            if (!authCheckService.isAtLeastTeachingAssistantForExercise(participation.getExercise())) {
-                filterInformation(participation, results);
-            }
+        if (!authCheckService.isAtLeastTeachingAssistantForExercise(participation.getExercise(), user.orElse(null))) {
+            filterInformation(participation, results);
         }
     }
 

src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCServletService.java

@@ -44,13 +44,13 @@
 import de.tum.in.www1.artemis.repository.UserRepository;
 import de.tum.in.www1.artemis.security.SecurityUtils;
 import de.tum.in.www1.artemis.service.AuthorizationCheckService;
-import de.tum.in.www1.artemis.service.RepositoryAccessService;
 import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationTriggerService;
 import de.tum.in.www1.artemis.service.programming.AuxiliaryRepositoryService;
 import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseParticipationService;
 import de.tum.in.www1.artemis.service.programming.ProgrammingMessagingService;
 import de.tum.in.www1.artemis.service.programming.ProgrammingSubmissionService;
 import de.tum.in.www1.artemis.service.programming.ProgrammingTriggerService;
+import de.tum.in.www1.artemis.service.programming.RepositoryAccessService;
 import de.tum.in.www1.artemis.service.util.TimeLogUtil;
 import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException;
 import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException;

src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisDTOService.java

@@ -22,7 +22,6 @@
 import de.tum.in.www1.artemis.domain.iris.message.IrisMessage;
 import de.tum.in.www1.artemis.domain.iris.message.IrisTextMessageContent;
 import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation;
-import de.tum.in.www1.artemis.service.RepositoryService;
 import de.tum.in.www1.artemis.service.connectors.GitService;
 import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisBuildLogEntryDTO;
 import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisFeedbackDTO;
@@ -33,6 +32,7 @@
 import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisResultDTO;
 import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisSubmissionDTO;
 import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisTextMessageContentDTO;
+import de.tum.in.www1.artemis.service.programming.RepositoryService;
 
 @Service
 @Profile("iris")
@@ -57,16 +57,16 @@ public PyrisDTOService(GitService gitService, RepositoryService repositoryServic
      * @return the converted PyrisProgrammingExerciseDTO
      */
     public PyrisProgrammingExerciseDTO toPyrisDTO(ProgrammingExercise exercise) {
-        var templateRepositoryContents = getRepository(exercise.getTemplateParticipation()).map(repositoryService::getFilesWithContent).orElse(Map.of());
-        var solutionRepositoryContents = getRepository(exercise.getSolutionParticipation()).map(repositoryService::getFilesWithContent).orElse(Map.of());
+        var templateRepositoryContents = getRepository(exercise.getTemplateParticipation()).map(repositoryService::getFilesContentFromWorkingCopy).orElse(Map.of());
+        var solutionRepositoryContents = getRepository(exercise.getSolutionParticipation()).map(repositoryService::getFilesContentFromWorkingCopy).orElse(Map.of());
         Optional<Repository> testRepo = Optional.empty();
         try {
             testRepo = Optional.ofNullable(gitService.getOrCheckoutRepository(exercise.getVcsTestRepositoryUri(), true));
         }
         catch (GitAPIException e) {
             log.error("Could not fetch existing test repository", e);
         }
-        var testsRepositoryContents = testRepo.map(repositoryService::getFilesWithContent).orElse(Map.of());
+        var testsRepositoryContents = testRepo.map(repositoryService::getFilesContentFromWorkingCopy).orElse(Map.of());
 
         return new PyrisProgrammingExerciseDTO(exercise.getId(), exercise.getTitle(), exercise.getProgrammingLanguage(), templateRepositoryContents, solutionRepositoryContents,
                 testsRepositoryContents, exercise.getProblemStatement(), toInstant(exercise.getReleaseDate()), toInstant(exercise.getDueDate()));
@@ -82,7 +82,7 @@ public PyrisProgrammingExerciseDTO toPyrisDTO(ProgrammingExercise exercise) {
     public PyrisSubmissionDTO toPyrisDTO(ProgrammingSubmission submission) {
         var buildLogEntries = submission.getBuildLogEntries().stream().map(buildLogEntry -> new PyrisBuildLogEntryDTO(toInstant(buildLogEntry.getTime()), buildLogEntry.getLog()))
                 .toList();
-        var studentRepositoryContents = getRepository((ProgrammingExerciseParticipation) submission.getParticipation()).map(repositoryService::getFilesWithContent)
+        var studentRepositoryContents = getRepository((ProgrammingExerciseParticipation) submission.getParticipation()).map(repositoryService::getFilesContentFromWorkingCopy)
                 .orElse(Map.of());
         return new PyrisSubmissionDTO(submission.getId(), toInstant(submission.getSubmissionDate()), studentRepositoryContents, submission.getParticipation().isPracticeMode(),
                 submission.isBuildFailed(), buildLogEntries, getLatestResult(submission));

src/main/java/de/tum/in/www1/artemis/service/hestia/TestwiseCoverageService.java

@@ -30,9 +30,9 @@
 import de.tum.in.www1.artemis.repository.hestia.CoverageFileReportRepository;
 import de.tum.in.www1.artemis.repository.hestia.CoverageReportRepository;
 import de.tum.in.www1.artemis.repository.hestia.TestwiseCoverageReportEntryRepository;
-import de.tum.in.www1.artemis.service.RepositoryService;
 import de.tum.in.www1.artemis.service.connectors.GitService;
 import de.tum.in.www1.artemis.service.connectors.ci.notification.dto.TestwiseCoverageReportDTO;
+import de.tum.in.www1.artemis.service.programming.RepositoryService;
 import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException;
 
 /**
@@ -225,7 +225,7 @@ private Map<String, Integer> getLineCountByFilePath(ProgrammingSubmission submis
             var solutionRepo = gitService.getOrCheckoutRepository(solutionParticipation.getVcsRepositoryUri(), true);
             gitService.resetToOriginHead(solutionRepo);
             gitService.pullIgnoreConflicts(solutionRepo);
-            var solutionFiles = repositoryService.getFilesWithContent(solutionRepo);
+            var solutionFiles = repositoryService.getFilesContentFromWorkingCopy(solutionRepo);
             var result = new HashMap<String, Integer>();
             solutionFiles.forEach((filePath, value) -> {
                 // do not count lines for non-java/kotlin files

src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/BehavioralTestCaseService.java

@@ -19,7 +19,6 @@
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository;
 import de.tum.in.www1.artemis.repository.SolutionProgrammingExerciseParticipationRepository;
 import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository;
-import de.tum.in.www1.artemis.service.RepositoryService;
 import de.tum.in.www1.artemis.service.connectors.GitService;
 import de.tum.in.www1.artemis.service.hestia.ProgrammingExerciseGitDiffReportService;
 import de.tum.in.www1.artemis.service.hestia.TestwiseCoverageService;
@@ -34,6 +33,7 @@
 import de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.FindCommonLines;
 import de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.GroupGitDiffAndCoverageEntriesByFilePathAndTestCase;
 import de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.InsertFileContents;
+import de.tum.in.www1.artemis.service.programming.RepositoryService;
 
 /**
  * Service for handling Solution Entries of behavioral Test Cases.
@@ -192,7 +192,7 @@ private Map<String, String> readSolutionRepo(ProgrammingExercise programmingExer
             gitService.resetToOriginHead(solutionRepo);
             gitService.pullIgnoreConflicts(solutionRepo);
 
-            return repositoryService.getFilesWithContent(solutionRepo);
+            return repositoryService.getFilesContentFromWorkingCopy(solutionRepo);
         }
         catch (GitAPIException e) {
             throw new BehavioralSolutionEntryGenerationException("Error while reading solution repository", e);

src/main/java/de/tum/in/www1/artemis/service/programming/CommitHistoryService.java

@@ -22,6 +22,7 @@
 import de.tum.in.www1.artemis.domain.VcsRepositoryUri;
 import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry;
 import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffReport;
+import de.tum.in.www1.artemis.service.ProfileService;
 import de.tum.in.www1.artemis.service.connectors.GitService;
 import de.tum.in.www1.artemis.web.rest.GitDiffReportParserService;
 
@@ -33,10 +34,13 @@ public class CommitHistoryService {
 
     private final GitService gitService;
 
+    private final ProfileService profileService;
+
     private final GitDiffReportParserService gitDiffReportParserService;
 
-    public CommitHistoryService(GitService gitService, GitDiffReportParserService gitDiffReportParserService) {
+    public CommitHistoryService(GitService gitService, ProfileService profileService, GitDiffReportParserService gitDiffReportParserService) {
         this.gitService = gitService;
+        this.profileService = profileService;
         this.gitDiffReportParserService = gitDiffReportParserService;
     }
 
@@ -51,7 +55,17 @@ public CommitHistoryService(GitService gitService, GitDiffReportParserService gi
      * @throws IOException     If an error occurs while accessing the file system
      */
     public ProgrammingExerciseGitDiffReport generateReportForCommits(VcsRepositoryUri repositoryUri, String commitHash1, String commitHash2) throws GitAPIException, IOException {
-        Repository repository = gitService.getOrCheckoutRepository(repositoryUri, true);
+
+        Repository repository;
+        if (profileService.isLocalVcsActive()) {
+            log.debug("Using local VCS generateReportForCommits on repo {}", repositoryUri);
+            repository = gitService.getBareRepository(repositoryUri);
+        }
+        else {
+            log.debug("Checking out repo {} for generateReportForCommits", repositoryUri);
+            repository = gitService.getOrCheckoutRepository(repositoryUri, true);
+        }
+
         RevCommit commitOld = repository.parseCommit(repository.resolve(commitHash1));
         RevCommit commitNew = repository.parseCommit(repository.resolve(commitHash2));
 

src/main/java/de/tum/in/www1/artemis/service/programming/JavaTemplateUpgradeService.java

@@ -34,7 +34,6 @@
 import de.tum.in.www1.artemis.domain.enumeration.RepositoryType;
 import de.tum.in.www1.artemis.repository.UserRepository;
 import de.tum.in.www1.artemis.service.FileService;
-import de.tum.in.www1.artemis.service.RepositoryService;
 import de.tum.in.www1.artemis.service.ResourceLoaderService;
 import de.tum.in.www1.artemis.service.connectors.GitService;
 

src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseImportFromFileService.java

@@ -36,7 +36,6 @@
 import de.tum.in.www1.artemis.service.FilePathService;
 import de.tum.in.www1.artemis.service.FileService;
 import de.tum.in.www1.artemis.service.ProfileService;
-import de.tum.in.www1.artemis.service.RepositoryService;
 import de.tum.in.www1.artemis.service.StaticCodeAnalysisService;
 import de.tum.in.www1.artemis.service.ZipFileService;
 import de.tum.in.www1.artemis.service.connectors.GitService;
@@ -214,7 +213,6 @@ private void copyExerciseContentToRepository(Repository repository, RepositoryTy
         try (var files = Files.walk(repository.getLocalPath())) {
             files.filter(file -> "gradlew".equals(file.getFileName().toString())).forEach(file -> file.toFile().setExecutable(true));
         }
-        repository.setContent(null);
     }
 
     private ProgrammingExercise getProgrammingExerciseFromDetailsFile(Path extractedZipPath) throws IOException {

src/main/java/de/tum/in/www1/artemis/service/RepositoryAccessService.java → src/main/java/de/tum/in/www1/artemis/service/programming/RepositoryAccessService.java

@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.service;
+package de.tum.in.www1.artemis.service.programming;
 
 import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE;
 
@@ -10,6 +10,8 @@
 import de.tum.in.www1.artemis.domain.participation.Participation;
 import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation;
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
+import de.tum.in.www1.artemis.service.AuthorizationCheckService;
+import de.tum.in.www1.artemis.service.ExerciseDateService;
 import de.tum.in.www1.artemis.service.plagiarism.PlagiarismService;
 import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException;
 import de.tum.in.www1.artemis.web.rest.repository.RepositoryActionType;

src/main/java/de/tum/in/www1/artemis/service/RepositoryParticipationService.java → src/main/java/de/tum/in/www1/artemis/service/programming/RepositoryParticipationService.java

@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.service;
+package de.tum.in.www1.artemis.service.programming;
 
 import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE;