prepare sub-objects for findByIds

src/Repository/ActivityRepository.php

@@ -72,7 +72,7 @@ class ActivityRepository extends EntityRepository
             ->setParameter('id', $ids)
         ;
 
-        return $this->getActivities($qb->getQuery());
+        return $this->getActivities($this->prepareActivityQuery($qb->getQuery()));
     }
 
     public function saveActivity(Activity $activity): void

src/Repository/CustomerRepository.php

@@ -60,7 +60,7 @@ class CustomerRepository extends EntityRepository
             ->setParameter('id', $ids)
         ;
 
-        return $this->getCustomers($qb->getQuery(), new CustomerQuery());
+        return $this->getCustomers($this->prepareCustomerQuery($qb->getQuery()), new CustomerQuery());
     }
 
     public function saveCustomer(Customer $customer): void

src/Repository/ProjectRepository.php

@@ -63,7 +63,7 @@ class ProjectRepository extends EntityRepository
             ->setParameter('id', $ids)
         ;
 
-        return $this->getProjects($qb->getQuery());
+        return $this->getProjects($this->prepareProjectQuery($qb->getQuery()));
     }
 
     public function saveProject(Project $project): void

src/Repository/TeamRepository.php

@@ -50,7 +50,7 @@ class TeamRepository extends EntityRepository
             ->setParameter('id', $ids)
         ;
 
-        return $this->getTeams($qb->getQuery());
+        return $this->getTeams($this->prepareTeamQuery($qb->getQuery()));
     }
 
     public function saveTeam(Team $team): void

src/Repository/UserRepository.php

@@ -76,15 +76,13 @@ class UserRepository extends EntityRepository implements UserLoaderInterface, Us
 
     public function getUserById(int $id): ?User
     {
-        /** @var User|null $user */
-        $user = $this->find($id);
+        $users = $this->findByIds([$id]);
 
-        if ($user !== null) {
-            $loader = new UserLoader($this->getEntityManager(), true);
-            $loader->loadResults([$user]);
+        if (\count($users) === 1) {
+            return $users[0];
         }
 
-        return $user;
+        return null;
     }
 
     /**
@@ -110,7 +108,7 @@ class UserRepository extends EntityRepository implements UserLoaderInterface, Us
             ->setParameter('id', $ids)
         ;
 
-        return $this->getUsers($qb->getQuery());
+        return $this->getUsers($this->prepareUserQuery($qb->getQuery()));
     }
 
     /**