jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

support multiple teamleads in each team (#2702)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Repository/ActivityRepository.php
View File

@@ -46,7 +46,7 @@ class ActivityRepository extends EntityRepository
return null;
}
$loader = new ActivityLoader($this->getEntityManager());
$loader = new ActivityLoader($this->getEntityManager(), true);
$loader->loadResults([$activity]);
return $activity;
@@ -75,7 +75,7 @@ class ActivityRepository extends EntityRepository
$activities = $qb->getQuery()->getResult();
$loader = new ActivityLoader($qb->getEntityManager());
$loader = new ActivityLoader($qb->getEntityManager(), true);
$loader->loadResults($activities);
return $activities;
@@ -173,7 +173,7 @@ class ActivityRepository extends EntityRepository
}
if (null !== $user) {
$teams = array_merge($teams, $user->getTeams()->toArray());
$teams = array_merge($teams, $user->getTeams());
}
if (empty($teams)) {

4
src/Repository/CustomerRepository.php
View File

@@ -47,7 +47,7 @@ class CustomerRepository extends EntityRepository
return null;
}
$loader = new CustomerLoader($this->getEntityManager());
$loader = new CustomerLoader($this->getEntityManager(), true);
$loader->loadResults([$customer]);
return $customer;
@@ -168,7 +168,7 @@ class CustomerRepository extends EntityRepository
}
if (null !== $user) {
$teams = array_merge($teams, $user->getTeams()->toArray());
$teams = array_merge($teams, $user->getTeams());
}
if (empty($teams)) {

2
src/Repository/InvoiceRepository.php
View File

@@ -127,7 +127,7 @@ class InvoiceRepository extends EntityRepository
}
if (null !== $user) {
$teams = array_merge($teams, $user->getTeams()->toArray());
$teams = array_merge($teams, $user->getTeams());
}
$qb->leftJoin('i.customer', 'c');

89
src/Repository/Loader/ActivityIdLoader.php
View File

@@ -10,7 +10,9 @@
namespace App\Repository\Loader;
use App\Entity\Activity;
use App\Entity\Customer;
use App\Entity\Project;
use App\Entity\Team;
use Doctrine\ORM\EntityManagerInterface;
/**
@@ -18,14 +20,13 @@ use Doctrine\ORM\EntityManagerInterface;
*/
final class ActivityIdLoader 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;
}
/**
@@ -40,6 +41,7 @@ final class ActivityIdLoader implements LoaderInterface
$em = $this->entityManager;
$qb = $em->createQueryBuilder();
/** @var Activity[] $activities */
$activities = $qb->select('PARTIAL a.{id}', 'project')
->from(Activity::class, 'a')
->leftJoin('a.project', 'project')
@@ -58,51 +60,76 @@ final class ActivityIdLoader implements LoaderInterface
// global activities don't have projects
if (!empty($activities)) {
$projectIds = array_map(function (Activity $activity) {
$projectIds = array_unique(array_map(function (Activity $activity) {
if (null === $activity->getProject()) {
return null;
}
return $activity->getProject()->getId();
}, $activities);
}, $activities));
$qb = $em->createQueryBuilder();
$qb->select('PARTIAL p.{id}', 'customer')
->from(Project::class, 'p')
->leftJoin('p.customer', 'customer')
->andWhere($qb->expr()->in('p.id', $projectIds))
->getQuery()
->execute();
$qb = $em->createQueryBuilder();
$qb->select('PARTIAL a.{id}', 'PARTIAL project.{id}', 'teams', 'teamlead')
->from(Activity::class, 'a')
->leftJoin('a.project', 'project')
->leftJoin('project.teams', 'teams')
->leftJoin('teams.teamlead', 'teamlead')
->andWhere($qb->expr()->in('a.id', $ids))
->getQuery()
->execute();
$qb = $em->createQueryBuilder();
$qb->select('PARTIAL a.{id}', 'PARTIAL project.{id}', 'PARTIAL customer.{id}', 'teams', 'teamlead')
->from(Activity::class, 'a')
->leftJoin('a.project', 'project')
$qb->select('PARTIAL project.{id}', 'customer')
->from(Project::class, 'project')
->leftJoin('project.customer', 'customer')
->andWhere($qb->expr()->in('project.id', $projectIds))
->getQuery()
->execute();
$customerIds = array_unique(array_map(function (Activity $activity) {
if (null === $activity->getProject()) {
return null;
}
return $activity->getProject()->getCustomer()->getId();
}, $activities));
$qb = $em->createQueryBuilder();
$qb->select('PARTIAL project.{id}', 'teams')
->from(Project::class, 'project')
->leftJoin('project.teams', 'teams')
->andWhere($qb->expr()->in('project.id', $projectIds))
->getQuery()
->execute();
$qb = $em->createQueryBuilder();
$qb->select('PARTIAL customer.{id}', 'teams')
->from(Customer::class, 'customer')
->leftJoin('customer.teams', 'teams')
->leftJoin('teams.teamlead', 'teamlead')
->andWhere($qb->expr()->in('a.id', $ids))
->andWhere($qb->expr()->in('customer.id', $customerIds))
->getQuery()
->execute();
}
$qb = $em->createQueryBuilder();
$qb->select('PARTIAL a.{id}', 'teams', 'teamlead')
$qb->select('PARTIAL a.{id}', 'teams')
->from(Activity::class, 'a')
->leftJoin('a.teams', 'teams')
->leftJoin('teams.teamlead', 'teamlead')
->andWhere($qb->expr()->in('a.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 ($activities as $activity) {
foreach ($activity->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();
}
}
}
}

6
src/Repository/Loader/ActivityLoader.php
View File

@@ -15,10 +15,12 @@ use Doctrine\ORM\EntityManagerInterface;
final class ActivityLoader implements LoaderInterface
{
private $entityManager;
private $fullyHydrated;
public function __construct(EntityManagerInterface $entityManager)
public function __construct(EntityManagerInterface $entityManager, bool $fullyHydrated = false)
{
$this->entityManager = $entityManager;
$this->fullyHydrated = $fullyHydrated;
}
/**
@@ -30,7 +32,7 @@ final class ActivityLoader implements LoaderInterface
return $activity->getId();
}, $activities);
$loader = new ActivityIdLoader($this->entityManager);
$loader = new ActivityIdLoader($this->entityManager, $this->fullyHydrated);
$loader->loadResults($ids);
}
}

37
src/Repository/Loader/CustomerIdLoader.php
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();
}
}
}
}

6
src/Repository/Loader/CustomerLoader.php
View File

@@ -15,10 +15,12 @@ use Doctrine\ORM\EntityManagerInterface;
final class CustomerLoader implements LoaderInterface
{
private $entityManager;
private $fullyHydrated;
public function __construct(EntityManagerInterface $entityManager)
public function __construct(EntityManagerInterface $entityManager, bool $fullyHydrated = false)
{
$this->entityManager = $entityManager;
$this->fullyHydrated = $fullyHydrated;
}
/**
@@ -30,7 +32,7 @@ final class CustomerLoader implements LoaderInterface
return $customer->getId();
}, $customers);
$loader = new CustomerIdLoader($this->entityManager);
$loader = new CustomerIdLoader($this->entityManager, $this->fullyHydrated);
$loader->loadResults($ids);
}
}

70
src/Repository/Loader/ProjectIdLoader.php
View File

@@ -9,7 +9,9 @@
namespace App\Repository\Loader;
use App\Entity\Customer;
use App\Entity\Project;
use App\Entity\Team;
use Doctrine\ORM\EntityManagerInterface;
/**
@@ -17,14 +19,13 @@ use Doctrine\ORM\EntityManagerInterface;
*/
final class ProjectIdLoader 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,38 +40,63 @@ final class ProjectIdLoader implements LoaderInterface
$em = $this->entityManager;
$qb = $em->createQueryBuilder();
$qb->select('PARTIAL p.{id}', 'customer')
->from(Project::class, 'p')
->leftJoin('p.customer', 'customer')
->andWhere($qb->expr()->in('p.id', $ids))
/** @var Project[] $projects */
$projects = $qb->select('PARTIAL project.{id}', 'customer')
->from(Project::class, 'project')
->leftJoin('project.customer', 'customer')
->andWhere($qb->expr()->in('project.id', $ids))
->getQuery()
->execute();
$qb = $em->createQueryBuilder();
$qb->select('PARTIAL p.{id}', 'meta')
->from(Project::class, 'p')
->leftJoin('p.meta', 'meta')
->andWhere($qb->expr()->in('p.id', $ids))
$qb->select('PARTIAL project.{id}', 'meta')
->from(Project::class, 'project')
->leftJoin('project.meta', 'meta')
->andWhere($qb->expr()->in('project.id', $ids))
->getQuery()
->execute();
$qb = $em->createQueryBuilder();
$qb->select('PARTIAL p.{id}', 'teams', 'teamlead')
->from(Project::class, 'p')
->leftJoin('p.teams', 'teams')
->leftJoin('teams.teamlead', 'teamlead')
->andWhere($qb->expr()->in('p.id', $ids))
$qb->select('PARTIAL project.{id}', 'teams')
->from(Project::class, 'project')
->leftJoin('project.teams', 'teams')
->andWhere($qb->expr()->in('project.id', $ids))
->getQuery()
->execute();
$customerIds = array_unique(array_map(function (Project $project) {
return $project->getCustomer()->getId();
}, $projects));
$qb = $em->createQueryBuilder();
$qb->select('PARTIAL p.{id}', 'PARTIAL customer.{id}', 'teams', 'teamlead')
->from(Project::class, 'p')
->leftJoin('p.customer', 'customer')
$qb->select('PARTIAL customer.{id}', 'teams')
->from(Customer::class, 'customer')
->leftJoin('customer.teams', 'teams')
->leftJoin('teams.teamlead', 'teamlead')
->andWhere($qb->expr()->in('p.id', $ids))
->andWhere($qb->expr()->in('customer.id', $customerIds))
->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 ($projects as $project) {
foreach ($project->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();
}
}
}
}

6
src/Repository/Loader/ProjectLoader.php
View File

@@ -15,10 +15,12 @@ use Doctrine\ORM\EntityManagerInterface;
final class ProjectLoader implements LoaderInterface
{
private $entityManager;
private $fullyHydrated;
public function __construct(EntityManagerInterface $entityManager)
public function __construct(EntityManagerInterface $entityManager, bool $fullyHydrated = false)
{
$this->entityManager = $entityManager;
$this->fullyHydrated = $fullyHydrated;
}
/**
@@ -30,7 +32,7 @@ final class ProjectLoader implements LoaderInterface
return $project->getId();
}, $projects);
$loader = new ProjectIdLoader($this->entityManager);
$loader = new ProjectIdLoader($this->entityManager, $this->fullyHydrated);
$loader->loadResults($ids);
}
}

26
src/Repository/Loader/TeamIdLoader.php
View File

@@ -17,9 +17,6 @@ use Doctrine\ORM\EntityManagerInterface;
*/
final class TeamIdLoader implements LoaderInterface
{
/**
* @var EntityManagerInterface
*/
private $entityManager;
public function __construct(EntityManagerInterface $entityManager)
@@ -28,29 +25,30 @@ final class TeamIdLoader implements LoaderInterface
}
/**
* @param int[] $ids
* @param int[] $teamIds
*/
public function loadResults(array $ids): void
public function loadResults(array $teamIds): void
{
if (empty($ids)) {
if (empty($teamIds)) {
return;
}
$em = $this->entityManager;
$qb = $em->createQueryBuilder();
$qb->select('PARTIAL t.{id}', 'users')
->from(Team::class, 't')
->leftJoin('t.users', 'users')
->andWhere($qb->expr()->in('t.id', $ids))
$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();
$qb = $em->createQueryBuilder();
$qb->select('PARTIAL t.{id}', 'projects')
->from(Team::class, 't')
->leftJoin('t.projects', 'projects')
->andWhere($qb->expr()->in('t.id', $ids))
$qb->select('PARTIAL team.{id}', 'projects')
->from(Team::class, 'team')
->leftJoin('team.projects', 'projects')
->andWhere($qb->expr()->in('team.id', $teamIds))
->getQuery()
->execute();
}

12
src/Repository/Loader/TimesheetIdLoader.php
View File

@@ -20,19 +20,13 @@ use Doctrine\ORM\EntityManagerInterface;
*/
final class TimesheetIdLoader implements LoaderInterface
{
/**
* @var EntityManagerInterface
*/
private $entityManager;
/**
* @var bool
*/
private $fullyHydrated = false;
private $fullyHydrated;
public function __construct(EntityManagerInterface $entityManager, bool $hydrateFullTree = false)
public function __construct(EntityManagerInterface $entityManager, bool $fullyHydrated = false)
{
$this->entityManager = $entityManager;
$this->fullyHydrated = $hydrateFullTree;
$this->fullyHydrated = $fullyHydrated;
}
/**

8
src/Repository/Loader/TimesheetLoader.php
View File

@@ -15,12 +15,12 @@ use Doctrine\ORM\EntityManagerInterface;
final class TimesheetLoader implements LoaderInterface
{
private $entityManager;
private $hydrateFullTree;
private $fullyHydrated;
public function __construct(EntityManagerInterface $entityManager, bool $hydrateFullTree = false)
public function __construct(EntityManagerInterface $entityManager, bool $fullyHydrated = false)
{
$this->entityManager = $entityManager;
$this->hydrateFullTree = $hydrateFullTree;
$this->fullyHydrated = $fullyHydrated;
}
/**
@@ -32,7 +32,7 @@ final class TimesheetLoader implements LoaderInterface
return $timesheet->getId();
}, $timesheets);
$loader = new TimesheetIdLoader($this->entityManager, $this->hydrateFullTree);
$loader = new TimesheetIdLoader($this->entityManager, $this->fullyHydrated);
$loader->loadResults($ids);
}
}

65
src/Repository/Loader/UserIdLoader.php
View File

@@ -18,14 +18,13 @@ use Doctrine\ORM\EntityManagerInterface;
*/
final class UserIdLoader 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;
}
/**
@@ -41,44 +40,44 @@ final class UserIdLoader implements LoaderInterface
$qb = $em->createQueryBuilder();
/** @var User[] $users */
$users = $qb->select('PARTIAL u.{id}', 'teams')
->from(User::class, 'u')
->leftJoin('u.teams', 'teams')
->andWhere($qb->expr()->in('u.id', $ids))
$users = $qb->select('PARTIAL user.{id}', 'memberships', 'team')
->from(User::class, 'user')
->leftJoin('user.memberships', 'memberships')
->leftJoin('memberships.team', 'team')
->andWhere($qb->expr()->in('user.id', $ids))
->getQuery()
->execute();
$qb = $em->createQueryBuilder();
$qb->select('PARTIAL u.{id}', 'preferences')
->from(User::class, 'u')
->leftJoin('u.preferences', 'preferences')
->andWhere($qb->expr()->in('u.id', $ids))
$qb->select('PARTIAL user.{id}', 'preferences')
->from(User::class, 'user')
->leftJoin('user.preferences', 'preferences')
->andWhere($qb->expr()->in('user.id', $ids))
->getQuery()
->execute();
$teamIds = [];
foreach ($users as $user) {
foreach ($user->getTeams() as $team) {
$teamIds[] = $team->getId();
// 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 ($users as $user) {
foreach ($user->getTeams() as $team) {
$teamIds[] = $team->getId();
}
}
}
$teamIds = array_unique($teamIds);
if (\count($teamIds) > 0) {
$qb = $em->createQueryBuilder();
$qb->select('PARTIAL t.{id}', 'teamlead')
->from(Team::class, 't')
->leftJoin('t.teamlead', 'teamlead')
->andWhere($qb->expr()->in('t.id', $teamIds))
->getQuery()
->execute();
$qb = $em->createQueryBuilder();
$qb->select('PARTIAL t.{id}', 'users')
->from(Team::class, 't')
->leftJoin('t.users', 'users')
->andWhere($qb->expr()->in('t.id', $teamIds))
->getQuery()
->execute();
if (\count($teamIds) > 0) {
$qb = $em->createQueryBuilder();
/** @var Team[] $teams */
$teams = $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();
}
}
}
}

6
src/Repository/Loader/UserLoader.php
View File

@@ -15,10 +15,12 @@ use Doctrine\ORM\EntityManagerInterface;
final class UserLoader implements LoaderInterface
{
private $entityManager;
private $fullyHydrated;
public function __construct(EntityManagerInterface $entityManager)
public function __construct(EntityManagerInterface $entityManager, bool $fullyHydrated = false)
{
$this->entityManager = $entityManager;
$this->fullyHydrated = $fullyHydrated;
}
/**
@@ -30,7 +32,7 @@ final class UserLoader implements LoaderInterface
return $user->getId();
}, $users);
$loader = new UserIdLoader($this->entityManager);
$loader = new UserIdLoader($this->entityManager, $this->fullyHydrated);
$loader->loadResults($ids);
}
}

6
src/Repository/ProjectRepository.php
View File

@@ -48,7 +48,7 @@ class ProjectRepository extends EntityRepository
return null;
}
$loader = new ProjectLoader($this->getEntityManager());
$loader = new ProjectLoader($this->getEntityManager(), true);
$loader->loadResults([$project]);
return $project;
@@ -68,7 +68,7 @@ class ProjectRepository extends EntityRepository
$projects = $qb->getQuery()->getResult();
$loader = new ProjectLoader($qb->getEntityManager());
$loader = new ProjectLoader($qb->getEntityManager(), true);
$loader->loadResults($projects);
return $projects;
@@ -195,7 +195,7 @@ class ProjectRepository extends EntityRepository
}
if (null !== $user) {
$teams = array_merge($teams, $user->getTeams()->toArray());
$teams = array_merge($teams, $user->getTeams());
}
if (empty($teams)) {

2
src/Repository/Query/TeamQuery.php
View File

@@ -13,7 +13,7 @@ use App\Entity\User;
class TeamQuery extends BaseQuery
{
public const TEAM_ORDER_ALLOWED = ['id', 'name', 'teamlead'];
public const TEAM_ORDER_ALLOWED = ['id', 'name'];
/**
* @var User[]

19
src/Repository/Query/UserQuery.php
View File

@@ -9,6 +9,8 @@
namespace App\Repository\Query;
use App\Entity\Team;
/**
* Can be used for advanced queries with the: UserRepository
*/
@@ -22,6 +24,7 @@ class UserQuery extends BaseQuery implements VisibilityInterface
* @var string|null
*/
private $role;
private $searchTeams = [];
public function __construct()
{
@@ -30,6 +33,22 @@ class UserQuery extends BaseQuery implements VisibilityInterface
]);
}
/**
* @return Team[]
*/
public function getSearchTeams(): array
{
return $this->searchTeams;
}
/**
* @param Team[] $searchTeams
*/
public function setSearchTeams(array $searchTeams): void
{
$this->searchTeams = $searchTeams;
}
public function getRole(): ?string
{
return $this->role;

52
src/Repository/TeamRepository.php
View File

@@ -10,6 +10,7 @@
namespace App\Repository;
use App\Entity\Team;
use App\Entity\TeamMember;
use App\Entity\Timesheet;
use App\Entity\User;
use App\Repository\Loader\TeamLoader;
@@ -26,6 +27,19 @@ use Pagerfanta\Pagerfanta;
*/
class TeamRepository extends EntityRepository
{
/**
* @return Team[]
*/
public function findAll(): array
{
$result = parent::findAll();
$loader = new TeamLoader($this->getEntityManager());
$loader->loadResults($result);
return $result;
}
public function find($id, $lockMode = null, $lockVersion = null)
{
/** @var Team|null $team */
@@ -52,6 +66,16 @@ class TeamRepository extends EntityRepository
$entityManager->flush();
}
/**
* @param TeamMember $member
* @throws ORMException
*/
public function removeTeamMember(TeamMember $member)
{
$entityManager = $this->getEntityManager();
$entityManager->remove($member);
}
/**
* @param Team $team
* @throws ORMException
@@ -131,21 +155,17 @@ class TeamRepository extends EntityRepository
$orderBy = $query->getOrderBy();
switch ($orderBy) {
case 'teamlead':
$qb->leftJoin('t.teamlead', 'lead');
$orderBy = 'lead.username';
break;
default:
$orderBy = 't.' . $orderBy;
break;
}
if ($query->hasUsers()) {
$qb->leftJoin('t.members', 'qMembers');
$qb->orWhere(
$qb->expr()->in('t.teamlead', ':user'),
$qb->expr()->isMemberOf(':user', 't.users')
)
->setParameter('user', $query->getUsers());
$qb->expr()->in('qMembers.user', ':user')
);
$qb->setParameter('user', $query->getUsers());
}
$qb->addOrderBy($orderBy, $query->getOrder());
@@ -181,19 +201,31 @@ class TeamRepository extends EntityRepository
return;
}
// this is an OR on purpose because we either query only for teams where the user is teamlead
// OR we query for all teams where the user is a member - in later case $teams is not empty
$or = $qb->expr()->orX();
// this query should limit to teams where the user is a teamlead (eg. in dropdowns or listing page)
if (null !== $user) {
$or->add($qb->expr()->eq('t.teamlead', ':id'));
$qb->leftJoin('t.members', 'members');
$or->add(
$qb->expr()->andX(
$qb->expr()->eq('members.user', ':id'),
$qb->expr()->eq('members.teamlead', true),
)
);
$qb->setParameter('id', $user);
}
// this is primarily used, if we want to query for teams of the current user
// and not 'teamlead_only' as used in the teams form type
if (!empty($teams)) {
$ids = [];
foreach ($teams as $team) {
$ids[] = $team->getId();
}
$or->add($qb->expr()->in('t.id', $ids));
$or->add($qb->expr()->in('t.id', ':teamIds'));
$qb->setParameter('teamIds', array_unique($ids));
}
$qb->andWhere($or);

2
src/Repository/TimesheetRepository.php
View File

@@ -765,7 +765,7 @@ class TimesheetRepository extends EntityRepository
}
if (null !== $user) {
$teams = array_merge($teams, $user->getTeams()->toArray());
$teams = array_merge($teams, $user->getTeams());
}
if (empty($teams)) {

67
src/Repository/UserRepository.php
View File

@@ -11,9 +11,9 @@ namespace App\Repository;
use App\Entity\Invoice;
use App\Entity\Role;
use App\Entity\Team;
use App\Entity\Timesheet;
use App\Entity\User;
use App\Repository\Loader\UserIdLoader;
use App\Repository\Loader\UserLoader;
use App\Repository\Paginator\LoaderPaginator;
use App\Repository\Paginator\PaginatorInterface;
@@ -59,11 +59,11 @@ class UserRepository extends EntityRepository implements UserLoaderInterface
public function getUserById($id): ?User
{
/** @var User|null $user */
$user = $this->findOneBy(['id' => $id]);
$user = $this->find($id);
if ($user !== null) {
$loader = new UserIdLoader($this->getEntityManager());
$loader->loadResults([$user->getId()]);
$loader = new UserLoader($this->getEntityManager(), true);
$loader->loadResults([$user]);
}
return $user;
@@ -82,11 +82,7 @@ class UserRepository extends EntityRepository implements UserLoaderInterface
return parent::findOneBy($criteria, $orderBy);
}
/**
* @param null|bool $enabled
* @return int
*/
public function countUser($enabled = null)
public function countUser(?bool $enabled = null): int
{
if (null !== $enabled) {
return $this->count(['enabled' => (bool) $enabled]);
@@ -135,8 +131,8 @@ class UserRepository extends EntityRepository implements UserLoaderInterface
->getOneOrNullResult();
if ($user !== null) {
$loader = new UserIdLoader($this->getEntityManager());
$loader->loadResults([$user->getId()]);
$loader = new UserLoader($this->getEntityManager(), true);
$loader->loadResults([$user]);
}
return $user;
@@ -178,6 +174,11 @@ class UserRepository extends EntityRepository implements UserLoaderInterface
return $qb;
}
/**
* @param QueryBuilder $qb
* @param User|null $user
* @param Team[] $teams
*/
private function addPermissionCriteria(QueryBuilder $qb, ?User $user = null, array $teams = [])
{
// make sure that all queries without a user see all user
@@ -193,23 +194,38 @@ class UserRepository extends EntityRepository implements UserLoaderInterface
$or = $qb->expr()->orX();
// if no explicit team was requested and the user is part of some teams
// then find all members of teams where he is teamlead
if (null !== $user && $user->hasTeamAssignment()) {
$qb->leftJoin('u.teams', 't');
$or->add($qb->expr()->eq('t.teamlead', ':teamlead'));
$qb->setParameter('teamlead', $user);
// then find all members of his teams (where he is teamlead)
if (null !== $user && $user->isTeamlead()) {
$userIds = [];
foreach ($user->getTeams() as $team) {
if ($team->isTeamlead($user)) {
foreach ($team->getUsers() as $teamMember) {
$userIds[] = $teamMember->getId();
}
}
}
$userIds = array_unique($userIds);
$qb->setParameter('teamMember', $userIds);
$or->add($qb->expr()->in('u.id', ':teamMember'));
}
// if teams where requested, then select all team members
if (\count($teams) > 0) {
$or->add($qb->expr()->isMemberOf(':teams', 'u.teams'));
$qb->setParameter('teams', $teams);
$userIds = [];
foreach ($teams as $team) {
foreach ($team->getUsers() as $user) {
$userIds[] = $user->getId();
}
}
$userIds = array_unique($userIds);
$qb->setParameter('userIds', $userIds);
$or->add($qb->expr()->in('u.id', ':userIds'));
}
// and make sure, that the user himself is always returned
if (null !== $user) {
$or->add($qb->expr()->eq('u.id', ':user'));
$qb->setParameter('user', $user);
$or->add($qb->expr()->eq('u.id', ':self'));
$qb->setParameter('self', $user);
}
if ($or->count() > 0) {
@@ -251,6 +267,17 @@ class UserRepository extends EntityRepository implements UserLoaderInterface
$this->addPermissionCriteria($qb, $query->getCurrentUser(), $query->getTeams());
if (\count($query->getSearchTeams()) > 0) {
$userIds = [];
foreach ($query->getSearchTeams() as $team) {
foreach ($team->getUsers() as $user) {
$userIds[] = $user->getId();
}
}
$qb->andWhere($qb->expr()->in('u.id', ':searchTeams'));
$qb->setParameter('searchTeams', array_unique($userIds));
}
if ($query->isShowVisible()) {
$qb->andWhere($qb->expr()->eq('u.enabled', ':enabled'));
$qb->setParameter('enabled', true, \PDO::PARAM_BOOL);