support multiple teamleads in each team (#2702)

* fix jumping avatars
* fix line-break after color dot for long names
This commit is contained in:
Kevin Papst
2021-08-07 18:05:41 +02:00
committed by GitHub
parent e9986c92d6
commit b2d3272151
101 changed files with 1952 additions and 649 deletions

View File

@@ -10,6 +10,7 @@
namespace App\Repository\Loader;
use App\Entity\Customer;
use App\Entity\Team;
use Doctrine\ORM\EntityManagerInterface;
/**
@@ -17,14 +18,13 @@ use Doctrine\ORM\EntityManagerInterface;
*/
final class CustomerIdLoader implements LoaderInterface
{
/**
* @var EntityManagerInterface
*/
private $entityManager;
private $fullyHydrated;
public function __construct(EntityManagerInterface $entityManager)
public function __construct(EntityManagerInterface $entityManager, bool $fullyHydrated = false)
{
$this->entityManager = $entityManager;
$this->fullyHydrated = $fullyHydrated;
}
/**
@@ -39,7 +39,8 @@ final class CustomerIdLoader implements LoaderInterface
$em = $this->entityManager;
$qb = $em->createQueryBuilder();
$qb->select('PARTIAL c.{id}', 'meta')
/** @var Customer[] $customers */
$customers = $qb->select('PARTIAL c.{id}', 'meta')
->from(Customer::class, 'c')
->leftJoin('c.meta', 'meta')
->andWhere($qb->expr()->in('c.id', $ids))
@@ -47,12 +48,34 @@ final class CustomerIdLoader implements LoaderInterface
->execute();
$qb = $em->createQueryBuilder();
$qb->select('PARTIAL c.{id}', 'teams', 'teamlead')
$qb->select('PARTIAL c.{id}', 'teams')
->from(Customer::class, 'c')
->leftJoin('c.teams', 'teams')
->leftJoin('teams.teamlead', 'teamlead')
->andWhere($qb->expr()->in('c.id', $ids))
->getQuery()
->execute();
// do not load team members or leads by default, because they will only be used on detail pages
// and there is no benefit in adding multiple queries for most requests when they are only needed in one place
if ($this->fullyHydrated) {
$teamIds = [];
foreach ($customers as $customer) {
foreach ($customer->getTeams() as $team) {
$teamIds[] = $team->getId();
}
}
$teamIds = array_unique($teamIds);
if (\count($teamIds) > 0) {
$qb = $em->createQueryBuilder();
$qb->select('PARTIAL team.{id}', 'members', 'user')
->from(Team::class, 'team')
->leftJoin('team.members', 'members')
->leftJoin('members.user', 'user')
->andWhere($qb->expr()->in('team.id', $teamIds))
->getQuery()
->execute();
}
}
}
}