refactor: explicit per-repository query filtering + @Transactional cleanup (Option B)

server/application-server/src/main/java/de/tum/cit/aet/helios/branch/Branch.java

@@ -14,15 +14,13 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
-import org.hibernate.annotations.Filter;
 
 @Entity
 @IdClass(BranchId.class)
 @Getter
 @Setter
 @NoArgsConstructor
 @ToString(callSuper = true)
-@Filter(name = "gitRepositoryFilter")
 public class Branch {
 
   @Id private String name;

server/application-server/src/main/java/de/tum/cit/aet/helios/branch/BranchRepository.java

@@ -7,8 +7,6 @@
 
 @Repository
 public interface BranchRepository extends JpaRepository<Branch, BranchId> {
-  Optional<Branch> findByName(String name);
-
   Optional<Branch> findByNameAndRepositoryRepositoryId(String name, Long repositoryId);
 
   void deleteByNameAndRepositoryRepositoryId(String name, Long repositoryId);

server/application-server/src/main/java/de/tum/cit/aet/helios/branch/BranchService.java

@@ -2,6 +2,7 @@
 
 import de.tum.cit.aet.helios.auth.AuthService;
 import de.tum.cit.aet.helios.commit.CommitRepository;
+import de.tum.cit.aet.helios.filters.RepositoryContext;
 import de.tum.cit.aet.helios.releaseinfo.releasecandidate.ReleaseCandidate;
 import de.tum.cit.aet.helios.releaseinfo.releasecandidate.ReleaseCandidateRepository;
 import de.tum.cit.aet.helios.userpreference.UserPreference;
@@ -17,7 +18,6 @@
 import org.springframework.transaction.annotation.Transactional;
 
 @Service
-@Transactional
 @RequiredArgsConstructor
 public class BranchService {
 
@@ -32,7 +32,11 @@ public List<BranchInfoDto> getAllBranches(String sortField, String sortDirection
         ? userPreferenceRepository.findByUser(authService.getUserFromGithubId())
         : Optional.empty();
     Comparator<BranchInfoDto> comparator = buildBranchInfoDtoComparator(sortField, sortDirection);
-    return branchRepository.findAll().stream()
+    Long repositoryId = RepositoryContext.getRepositoryId();
+    if (repositoryId == null) {
+      return List.of();
+    }
+    return branchRepository.findByRepositoryRepositoryId(repositoryId).stream()
         .map((branch) -> BranchInfoDto.fromBranchAndUserPreference(branch, userPreference,
             commitRepository))
         .sorted(comparator)

server/application-server/src/main/java/de/tum/cit/aet/helios/config/SecurityConfig.java

@@ -95,10 +95,7 @@ public WebMvcConfigurer corsConfigurer() {
 
       @Override
       public void addInterceptors(@NonNull InterceptorRegistry registry) {
-        // Order last (Integer.MAX_VALUE == Ordered.LOWEST_PRECEDENCE) so this runs AFTER Spring's
-        // Open-Session-In-View interceptor. That guarantees the request's EntityManager is already
-        // bound when RepositoryInterceptor enables the tenant filter on it.
-        registry.addWebRequestInterceptor(requestInterceptor).order(Integer.MAX_VALUE);
+        registry.addWebRequestInterceptor(requestInterceptor);
       }
 
       @Override

server/application-server/src/main/java/de/tum/cit/aet/helios/deployment/DeploymentRepository.java

@@ -18,6 +18,11 @@ public interface DeploymentRepository extends JpaRepository<Deployment, Long> {
 
   List<Deployment> findByRepositoryRepositoryIdAndSha(Long repositoryId, String sha);
 
+  // Explicit per-repository scoped finders (Option B).
+  List<Deployment> findByRepositoryRepositoryIdOrderByCreatedAtDesc(Long repositoryId);
+
+  Optional<Deployment> findByIdAndRepositoryRepositoryId(Long id, Long repositoryId);
+
   List<Deployment> findByRepositoryRepositoryIdAndRefOrderByCreatedAtDesc(
       Long repositoryId, String ref);
 

server/application-server/src/main/java/de/tum/cit/aet/helios/deployment/DeploymentService.java

@@ -22,7 +22,6 @@
 import de.tum.cit.aet.helios.workflow.Workflow;
 import de.tum.cit.aet.helios.workflow.WorkflowRunRepository;
 import jakarta.persistence.EntityNotFoundException;
-import jakarta.transaction.Transactional;
 import java.io.IOException;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
@@ -40,7 +39,6 @@
 
 @Log4j2
 @Service
-@Transactional
 @RequiredArgsConstructor
 public class DeploymentService {
 
@@ -60,22 +58,49 @@ public class DeploymentService {
   private final WorkflowRunRepository workflowRunRepository;
 
   public Optional<DeploymentDto> getDeploymentById(Long id) {
-    return deploymentRepository.findById(id).map(DeploymentDto::fromDeployment);
+    Long repositoryId = RepositoryContext.getRepositoryId();
+    Optional<Deployment> deployment =
+        repositoryId == null
+            ? Optional.empty()
+            : deploymentRepository.findByIdAndRepositoryRepositoryId(id, repositoryId);
+    return deployment.map(DeploymentDto::fromDeployment);
   }
 
   public List<DeploymentDto> getAllDeployments() {
-    return deploymentRepository.findAll().stream()
+    Long repositoryId = RepositoryContext.getRepositoryId();
+    if (repositoryId == null) {
+      return List.of();
+    }
+    return deploymentRepository.findByRepositoryRepositoryIdOrderByCreatedAtDesc(repositoryId)
+        .stream()
         .map(DeploymentDto::fromDeployment)
         .collect(Collectors.toList());
   }
 
+  // Deployments/activity are keyed only by environment id; scope to the current repository so a
+  // foreign environment id cannot surface another repository's deployment data (the removed
+  // gitRepositoryFilter used to enforce this on the derived Deployment queries).
+  private boolean environmentInCurrentRepository(Long environmentId) {
+    Long repositoryId = RepositoryContext.getRepositoryId();
+    return repositoryId != null
+        && environmentRepository
+            .findByIdAndRepositoryRepositoryId(environmentId, repositoryId)
+            .isPresent();
+  }
+
   public List<DeploymentDto> getDeploymentsByEnvironmentId(Long environmentId) {
+    if (!environmentInCurrentRepository(environmentId)) {
+      return List.of();
+    }
     return deploymentRepository.findByEnvironmentIdOrderByCreatedAtDesc(environmentId).stream()
         .map(DeploymentDto::fromDeployment)
         .collect(Collectors.toList());
   }
 
   public Optional<DeploymentDto> getLatestDeploymentByEnvironmentId(Long environmentId) {
+    if (!environmentInCurrentRepository(environmentId)) {
+      return Optional.empty();
+    }
     return deploymentRepository
         .findFirstByEnvironmentIdOrderByCreatedAtDesc(environmentId)
         .map(DeploymentDto::fromDeployment);
@@ -298,6 +323,9 @@ private boolean canRedeploy(Environment environment, long timeoutMinutes) {
    *     </ul>
    */
   public List<ActivityHistoryDto> getActivityHistoryByEnvironmentId(Long environmentId) {
+    if (!environmentInCurrentRepository(environmentId)) {
+      return List.of();
+    }
     // 1) Real deployments
     List<ActivityHistoryDto> deploymentDtos =
         deploymentRepository.findByEnvironmentIdOrderByCreatedAtDesc(environmentId).stream()
@@ -356,7 +384,9 @@ public List<ActivityHistoryDto> getActivityHistoryByEnvironmentId(Long environme
    * @throws EntityNotFoundException if the pull request does not exist
    */
   public List<ActivityHistoryDto> getActivityHistoryByPullRequestId(Long pullRequestId) {
-    if (pullRequestRepository.findById(pullRequestId).isEmpty()) {
+    if (pullRequestRepository
+        .findByIdAndRepositoryRepositoryId(pullRequestId, RepositoryContext.getRepositoryId())
+        .isEmpty()) {
       throw new EntityNotFoundException("Pull request not found with id: " + pullRequestId);
     }
 
@@ -420,7 +450,6 @@ public List<ActivityHistoryDto> getActivityHistoryByRepositoryIdAndBranchName(
    * @return Basic success message
    * @throws DeploymentException if the deployment cannot be canceled
    */
-  @Transactional
   public String cancelDeployment(CancelDeploymentRequest cancelRequest) {
     Long workflowRunId = cancelRequest.workflowRunId();
 
@@ -523,20 +552,34 @@ public WorkflowJobsResponse getWorkflowJobStatus(Long workflowRunId) {
   }
 
   private String resolveWorkflowRunRepositoryName(Long workflowRunId) {
+    // Resolve strictly within the current repository so a foreign run id can never resolve another
+    // repository's name (which would proxy that repo's GitHub job status back to the caller).
+    final Long repositoryId = RepositoryContext.getRepositoryId();
+    if (repositoryId == null) {
+      throw new DeploymentException(
+          "No repository context to resolve workflow run " + workflowRunId);
+    }
     return workflowRunRepository
-        .findById(workflowRunId.longValue())
+        .findByIdAndRepositoryRepositoryId(workflowRunId, repositoryId)
         .map(workflowRun -> workflowRun.getRepository().getNameWithOwner())
         .or(
             () ->
                 heliosDeploymentRepository
                     .findByWorkflowRunId(workflowRunId)
+                    .filter(
+                        heliosDeployment ->
+                            repositoryId.equals(
+                                heliosDeployment
+                                    .getEnvironment()
+                                    .getRepository()
+                                    .getRepositoryId()))
                     .map(
                         heliosDeployment ->
                             heliosDeployment.getEnvironment().getRepository().getNameWithOwner()))
         .or(
             () ->
-                Optional.ofNullable(RepositoryContext.getRepositoryId())
-                    .flatMap(gitRepoRepository::findById)
+                gitRepoRepository
+                    .findById(repositoryId)
                     .map(GitRepository::getNameWithOwner))
         .orElseThrow(
             () ->

server/application-server/src/main/java/de/tum/cit/aet/helios/environment/EnvironmentRepository.java

@@ -10,8 +10,6 @@
 
 @Repository
 public interface EnvironmentRepository extends JpaRepository<Environment, Long> {
-  List<Environment> findAllByOrderByNameAsc();
-
   List<Environment> findByRepository(GitRepository repository);
 
   @Query("SELECT e FROM Environment e "
@@ -22,7 +20,12 @@ public interface EnvironmentRepository extends JpaRepository<Environment, Long>
 
   List<Environment> findByRepositoryRepositoryIdOrderByCreatedAtDesc(Long repositoryId);
 
-  List<Environment> findByEnabledTrueOrderByNameAsc();
+  // Explicit per-repository scoped finders (Option B: replaces the ambient gitRepositoryFilter).
+  List<Environment> findByRepositoryRepositoryIdOrderByNameAsc(Long repositoryId);
+
+  List<Environment> findByEnabledTrueAndRepositoryRepositoryIdOrderByNameAsc(Long repositoryId);
+
+  Optional<Environment> findByIdAndRepositoryRepositoryId(Long id, Long repositoryId);
 
   @Query("SELECT DISTINCT e FROM Environment e "
       + "LEFT JOIN FETCH e.statusHistory es "