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

26
src/API/TeamController.php
View File

@@ -15,6 +15,7 @@ use App\Entity\Activity;
use App\Entity\Customer;
use App\Entity\Project;
use App\Entity\Team;
use App\Entity\TeamMember;
use App\Entity\User;
use App\Form\API\TeamApiEditForm;
use App\Repository\ActivityRepository;
@@ -22,7 +23,6 @@ use App\Repository\CustomerRepository;
use App\Repository\ProjectRepository;
use App\Repository\TeamRepository;
use App\Repository\UserRepository;
use FOS\RestBundle\Request\ParamFetcherInterface;
use FOS\RestBundle\View\View;
use FOS\RestBundle\View\ViewHandlerInterface;
use HandcraftedInTheAlps\RestRoutingBundle\Controller\Annotations\RouteResource;
@@ -77,7 +77,7 @@ final class TeamController extends BaseApiController
* @ApiSecurity(name="apiUser")
* @ApiSecurity(name="apiToken")
*/
public function cgetAction(ParamFetcherInterface $paramFetcher): Response
public function cgetAction(): Response
{
$data = $this->repository->findAll();
@@ -177,16 +177,10 @@ final class TeamController extends BaseApiController
*/
public function postAction(Request $request): Response
{
/** @var User $user */
$user = $this->getUser();
$team = new Team();
$team->setTeamLead($user);
$form = $this->createForm(TeamApiEditForm::class, $team);
$form->submit($request->request->all());
$team->addUser($team->getTeamLead());
if ($form->isValid()) {
$this->repository->saveTeam($team);
@@ -241,11 +235,17 @@ final class TeamController extends BaseApiController
throw new NotFoundException();
}
// cache the current memberlist
/** @var TeamMember[] $originalMembers */
$originalMembers = [];
foreach ($team->getMembers() as $member) {
$originalMembers[] = $member;
}
$form = $this->createForm(TeamApiEditForm::class, $team);
$form->setData($team);
$form->submit($request->request->all(), false);
$team->addUser($team->getTeamLead());
if (false === $form->isValid()) {
$view = new View($form, Response::HTTP_OK);
@@ -254,6 +254,14 @@ final class TeamController extends BaseApiController
return $this->viewHandler->handle($view);
}
// and now remove the ones, which are not in the list any longer
foreach ($originalMembers as $member) {
if (!$team->hasMember($member)) {
$member->getUser()->removeMembership($member);
$this->repository->removeTeamMember($member);
}
}
$this->repository->saveTeam($team);
$view = new View($team, Response::HTTP_OK);

1
src/Calendar/CalendarService.php
View File

@@ -115,6 +115,7 @@ final class CalendarService
'timeframeEnd' => $this->configuration->getCalendarTimeframeEnd(),
'dragDropAmount' => $this->configuration->getCalendarDragAndDropMaxEntries(),
];
$event = new CalendarConfigurationEvent($config);
$this->dispatcher->dispatch($event);

2
src/Command/ImportProjectCommand.php
View File

@@ -195,7 +195,7 @@ class ImportProjectCommand extends Command
$team = new Team();
$team->setName($project->getName());
$team->setTeamLead($teamlead);
$team->addTeamlead($teamlead);
$this->teams->saveTeam($team);

10
src/Command/KimaiImporterCommand.php
View File

@@ -1873,20 +1873,20 @@ final class KimaiImporterCommand extends Command
$team->addUser($user);
// first user in the team will become team lead
if ($team->getTeamLead() == null) {
$team->setTeamLead($user);
if (!$team->hasTeamleads()) {
$team->addTeamlead($user);
}
// any other user with admin role in the team will become team lead
// should be the last added admin of the source group
if ($row['membershipRoleID'] === 1) {
$team->setTeamLead($user);
$team->addTeamlead($user);
}
}
// if team has no users it will not be persisted
foreach ($newTeams as $oldId => $team) {
if ($team->getTeamLead() === null) {
if (!$team->hasUsers()) {
$io->warning(sprintf('Didn\'t import team: %s because it has no users.', $team->getName()));
++$skippedEmpty;
unset($newTeams[$oldId]);
@@ -1998,7 +1998,7 @@ final class KimaiImporterCommand extends Command
$team->setName($name);
$teamlead = $users[array_key_first($users)];
$teamlead = $this->getCachedUser($teamlead['userID']);
$team->setTeamLead($teamlead);
$team->addTeamlead($teamlead);
foreach ($users as $oldUser) {
$team->addUser($this->getCachedUser($oldUser['userID']));
foreach ($activities as $oldActivity) {

2
src/Command/ResetTestCommand.php
View File

@@ -128,7 +128,7 @@ class ResetTestCommand extends AbstractResetCommand
$team = new Team();
$team->setName('Test team');
$team->setTeamLead($userEntities[6]);
$team->addTeamlead($userEntities[6]);
$team->addUser($userEntities[7]);
$this->entityManager->persist($team);

2
src/Controller/ActivityController.php
View File

@@ -265,7 +265,7 @@ final class ActivityController extends AbstractController
$defaultTeam = new Team();
$defaultTeam->setName($activity->getName());
$defaultTeam->setTeamLead($this->getUser());
$defaultTeam->addTeamlead($this->getUser());
$defaultTeam->addActivity($activity);
try {

2
src/Controller/CustomerController.php
View File

@@ -227,7 +227,7 @@ final class CustomerController extends AbstractController
$defaultTeam = new Team();
$defaultTeam->setName($customer->getName());
$defaultTeam->setTeamLead($this->getUser());
$defaultTeam->addTeamlead($this->getUser());
$defaultTeam->addCustomer($customer);
try {

18
src/Controller/ProfileController.php
View File

@@ -9,6 +9,7 @@
namespace App\Controller;
use App\Entity\TeamMember;
use App\Entity\User;
use App\Entity\UserPreference;
use App\Event\PrepareUserEvent;
@@ -21,6 +22,7 @@ use App\Form\UserTeamsType;
use App\Repository\TimesheetRepository;
use App\Timesheet\TimesheetStatisticService;
use App\User\UserService;
use Doctrine\Common\Collections\ArrayCollection;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\Form\FormInterface;
@@ -179,13 +181,27 @@ final class ProfileController extends AbstractController
* @Route(path="/{username}/teams", name="user_profile_teams", methods={"GET", "POST"})
* @Security("is_granted('teams', profile)")
*/
public function teamsAction(User $profile, Request $request): Response
public function teamsAction(User $profile, Request $request, UserService $service): Response
{
$originalMembers = new ArrayCollection();
foreach ($profile->getMemberships() as $member) {
$originalMembers->add($member);
}
$form = $this->createTeamsForm($profile);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
$entityManager = $this->getDoctrine()->getManager();
/** @var TeamMember $member */
foreach ($originalMembers as $member) {
if (!$profile->hasMembership($member)) {
$member->getTeam()->removeMember($member);
$entityManager->remove($profile);
}
}
$entityManager->persist($profile);
$entityManager->flush();

2
src/Controller/ProjectController.php
View File

@@ -249,7 +249,7 @@ final class ProjectController extends AbstractController
$defaultTeam = new Team();
$defaultTeam->setName($project->getName());
$defaultTeam->setTeamLead($this->getUser());
$defaultTeam->addTeamlead($this->getUser());
$defaultTeam->addProject($project);
try {

53
src/Controller/TeamController.php
View File

@@ -86,25 +86,10 @@ final class TeamController extends AbstractController
*/
public function duplicateTeam(Team $team, Request $request)
{
$newTeam = new Team();
$newTeam = clone $team;
$newTeam->setName($team->getName() . ' [COPY]');
$newTeam->setTeamLead($team->getTeamLead());
foreach ($team->getUsers() as $user) {
$newTeam->addUser($user);
}
foreach ($team->getCustomers() as $customer) {
$newTeam->addCustomer($customer);
}
foreach ($team->getProjects() as $project) {
$newTeam->addProject($project);
}
try {
// make sure that the teamlead is always part of the team, otherwise permission checks
// and filtering might not work as expected!
$team->addUser($team->getTeamLead());
$this->repository->saveTeam($newTeam);
$this->flashSuccess('action.update.success');
@@ -140,10 +125,6 @@ final class TeamController extends AbstractController
if ($editForm->isSubmitted() && $editForm->isValid()) {
try {
// make sure that the teamlead is always part of the team, otherwise permission checks
// and filtering might not work as expected!
$team->addUser($team->getTeamLead());
$this->repository->saveTeam($team);
$this->flashSuccess('action.update.success');
@@ -175,22 +156,16 @@ final class TeamController extends AbstractController
'method' => 'POST',
]);
if ($request->isMethod('POST') && (null !== ($editFormValues = $request->get($editForm->getName())))) {
$editForm->submit($editFormValues, true);
$editForm->handleRequest($request);
if ($editForm->isValid()) {
try {
// make sure that the teamlead is always part of the team, otherwise permission checks
// and filtering might not work as expected!
$team->addUser($team->getTeamLead());
if ($editForm->isSubmitted() && $editForm->isValid()) {
try {
$this->repository->saveTeam($team);
$this->flashSuccess('action.update.success');
$this->repository->saveTeam($team);
$this->flashSuccess('action.update.success');
return $this->redirectToRoute('admin_team_edit', ['id' => $team->getId()]);
} catch (\Exception $ex) {
$this->flashUpdateException($ex);
}
return $this->redirectToRoute('admin_team_edit', ['id' => $team->getId()]);
} catch (\Exception $ex) {
$this->flashUpdateException($ex);
}
}
@@ -198,10 +173,9 @@ final class TeamController extends AbstractController
$customerForm = $this->createForm(TeamCustomerForm::class, $team, [
'method' => 'POST',
]);
$customerForm->handleRequest($request);
if ($request->isMethod('POST') && (null !== ($customerFormValues = $request->get($customerForm->getName())))) {
$customerForm->submit($customerFormValues, true);
if ($customerForm->isSubmitted() && $customerForm->isValid()) {
if ($customerForm->isValid()) {
try {
$this->repository->saveTeam($team);
@@ -217,10 +191,9 @@ final class TeamController extends AbstractController
$projectForm = $this->createForm(TeamProjectForm::class, $team, [
'method' => 'POST',
]);
$projectForm->handleRequest($request);
if ($request->isMethod('POST') && (null !== ($projectFormValues = $request->get($projectForm->getName())))) {
$projectForm->submit($projectFormValues, true);
if ($projectForm->isSubmitted() && $projectForm->isValid()) {
if ($projectForm->isValid()) {
try {
$this->repository->saveTeam($team);

8
src/Controller/TimesheetTeamController.php
View File

@@ -12,6 +12,7 @@ namespace App\Controller;
use App\Entity\Tag;
use App\Entity\Team;
use App\Entity\Timesheet;
use App\Entity\User;
use App\Event\TimesheetMetaDisplayEvent;
use App\Form\Model\MultiUserTimesheet;
use App\Form\TimesheetAdminEditForm;
@@ -101,14 +102,15 @@ class TimesheetTeamController extends TimesheetAbstractController
if ($createForm->isSubmitted() && $createForm->isValid()) {
try {
/** @var ArrayCollection $users */
/** @var ArrayCollection<User> $users */
$users = $createForm->get('users')->getData();
/** @var ArrayCollection $teams */
/** @var ArrayCollection<Team> $teams */
$teams = $createForm->get('teams')->getData();
$allUsers = $users->toArray();
/** @var Team $team */
foreach ($teams as $team) {
$allUsers = array_merge($allUsers, $team->getUsers()->toArray());
$allUsers = array_merge($allUsers, $team->getUsers());
}
$allUsers = array_unique($allUsers);

2
src/DataFixtures/TeamFixtures.php
View File

@@ -100,7 +100,7 @@ class TeamFixtures extends Fixture implements DependentFixtureInterface
$team = new Team();
$team
->setName($faker->company . ' ' . $i)
->setTeamLead($allUsers[array_rand($allUsers)])
->addTeamlead($allUsers[array_rand($allUsers)])
;
if ($userCount > 0) {

319
src/Entity/Team.php
View File

@@ -9,6 +9,7 @@
namespace App\Entity;
use App\Validator\Constraints as Constraints;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\Mapping as ORM;
@@ -27,13 +28,12 @@ use Symfony\Component\Validator\Constraints as Assert;
* @UniqueEntity("name")
*
* @Serializer\ExclusionPolicy("all")
* @Constraints\Team
*/
class Team
{
/**
* The internal ID
*
* @var int
* @var int|null
*
* @Serializer\Expose()
* @Serializer\Groups({"Default"})
@@ -57,41 +57,23 @@ class Team
*/
private $name;
/**
* Teamlead
* All team member (including team leads)
*
* The teamlead for this team
*
* @var User
* @var TeamMember[]|Collection<TeamMember>
*
* @Serializer\Expose()
* @Serializer\Groups({"Team_Entity"})
* @SWG\Property(ref="#/definitions/User")
* @SWG\Property(type="array", @SWG\Items(ref="#/definitions/TeamMember"))
*
* @ORM\ManyToOne(targetEntity="App\Entity\User")
* @ORM\JoinColumn(onDelete="CASCADE", nullable=false)
* @Assert\NotNull()
* @ORM\OneToMany(targetEntity="App\Entity\TeamMember", mappedBy="team", fetch="LAZY", cascade={"persist"}, orphanRemoval=true)
* @ORM\JoinColumn(onDelete="CASCADE")
* @Assert\Count(min="1")
*/
private $teamlead;
private $members;
/**
* Team member
* Customers assigned to the team
*
* All team member, including the teamlead
*
* @var User[]|ArrayCollection
*
* @Serializer\Expose()
* @Serializer\Groups({"Team_Entity"})
* @SWG\Property(type="array", @SWG\Items(ref="#/definitions/User"))
*
* @ORM\ManyToMany(targetEntity="User", mappedBy="teams", fetch="EXTRA_LAZY")
*/
private $users;
/**
* Customers
*
* All customers assigned to the team
*
* @var Customer[]|ArrayCollection
* @var Collection<Customer>
*
* @Serializer\Expose()
* @Serializer\Groups({"Team_Entity"})
@@ -101,11 +83,9 @@ class Team
*/
private $customers;
/**
* Projects
* Projects assigned to the team
*
* All projects assigned to the team
*
* @var Project[]|ArrayCollection
* @var Collection<Project>
*
* @Serializer\Expose()
* @Serializer\Groups({"Team_Entity", "Expanded"})
@@ -115,11 +95,9 @@ class Team
*/
private $projects;
/**
* Activities
* Activities assigned to the team
*
* All activities assigned to the team
*
* @var Activity[]|ArrayCollection
* @var Collection<Activity>
*
* @Serializer\Expose()
* @Serializer\Groups({"Team_Entity", "Expanded"})
@@ -133,7 +111,7 @@ class Team
public function __construct()
{
$this->users = new ArrayCollection();
$this->members = new ArrayCollection();
$this->customers = new ArrayCollection();
$this->projects = new ArrayCollection();
$this->activities = new ArrayCollection();
@@ -156,55 +134,237 @@ class Team
return $this->name;
}
public function getTeamLead(): ?User
/**
* Indexed by ID to use it within collection type forms.
*
* @return TeamMember[]
*/
public function getMembers(): iterable
{
return $this->teamlead;
$all = [];
foreach ($this->members as $member) {
if ($member->getId() === null) {
$all[] = $member;
} else {
$all[$member->getId()] = $member;
}
}
return $all;
}
public function addMember(TeamMember $member): void
{
if ($this->members->contains($member)) {
return;
}
if ($member->getTeam() === null) {
$member->setTeam($this);
}
if ($member->getTeam() !== $this) {
throw new \InvalidArgumentException('Cannot set foreign team membership');
}
if (null !== ($existing = $this->findMember($member))) {
$existing->setTeamlead($member->isTeamlead());
return;
}
// when using the API an invalid user id does not trigger the validation first, but after calling this method :-(
if ($member->getUser() !== null) {
$this->members->add($member);
$member->getUser()->addMembership($member);
}
}
public function hasMember(TeamMember $member): bool
{
return $this->members->contains($member);
}
private function findMember(TeamMember $member): ?TeamMember
{
foreach ($this->members as $oldMember) {
if ($oldMember->getUser() === $member->getUser() && $oldMember->getTeam() === $member->getTeam()) {
return $oldMember;
}
}
return null;
}
public function removeMember(TeamMember $member): void
{
$existingMember = $this->findMember($member);
if ($existingMember === null) {
return;
}
$this->members->removeElement($existingMember);
$existingMember->getUser()->removeMembership($existingMember);
}
/**
* BE AWARE: this property is deprecated and will be removed with 2.0 - teams can have multiple teamleads since 1.15!
*
* @Serializer\VirtualProperty
* @Serializer\SerializedName("teamlead"),
* @Serializer\Groups({"Team_Entity"})
* @SWG\Property(ref="#/definitions/User")
*
* @deprecated since 1.15 - will be removed with 2.0
* @return User|null
*/
public function getTeamlead(): ?User
{
foreach ($this->members as $member) {
if ($member->isTeamlead()) {
return $member->getUser();
}
}
return null;
}
/**
* @return User[]
*/
public function getTeamleads(): array
{
$leads = [];
foreach ($this->members as $member) {
if ($member->isTeamlead()) {
$leads[] = $member->getUser();
}
}
return $leads;
}
public function isTeamlead(User $user): bool
{
return $this->teamlead === $user;
foreach ($this->members as $member) {
if ($user === $member->getUser()) {
return $member->isTeamlead();
}
}
return false;
}
public function setTeamLead(User $teamlead): Team
/**
* @deprecated since 1.15 - will be removed with 2.0
* @param User $teamlead
*/
public function setTeamlead(User $teamlead): void
{
$this->teamlead = $teamlead;
$this->addUser($teamlead);
$this->addTeamlead($teamlead);
}
return $this;
public function addTeamlead(User $user): void
{
$this->addUser($user, true);
}
/**
* Will only remove the teamlead flag, not the user from the team.
*
* @param User $user
*/
public function removeTeamlead(User $user): void
{
foreach ($this->members as $member) {
if ($member->getUser() === $user) {
$member->setTeamlead(false);
return;
}
}
}
public function hasUser(User $user): bool
{
return $this->users->contains($user);
foreach ($this->members as $member) {
if ($member->getUser() === $user) {
return true;
}
}
return false;
}
public function addUser(User $user)
public function hasUsers(): bool
{
if ($this->users->contains($user)) {
return !$this->members->isEmpty();
}
public function hasTeamleads(): bool
{
foreach ($this->members as $member) {
if ($member->isTeamlead()) {
return true;
}
}
return false;
}
public function addUser(User $user, bool $teamlead = false): void
{
foreach ($this->members as $member) {
if ($member->getUser() === $user) {
$member->setTeamlead($teamlead);
return;
}
}
$member = new TeamMember();
$member->setTeam($this);
$member->setUser($user);
$member->setTeamlead($teamlead);
$this->addMember($member);
}
public function removeUser(User $user): void
{
$memberToRemove = null;
foreach ($this->members as $member) {
if ($member->getUser() === $user) {
$memberToRemove = $member;
break;
}
}
if ($memberToRemove === null) {
return;
}
$this->users->add($user);
$user->addTeam($this);
}
public function removeUser(User $user)
{
if (!$this->users->contains($user)) {
return;
}
$this->users->removeElement($user);
$user->removeTeam($this);
$this->removeMember($memberToRemove);
}
/**
* @return Collection<User>
* Returns all users in the team, both teamlead and normal member.
*
* @Serializer\VirtualProperty
* @Serializer\SerializedName("users"),
* @Serializer\Groups({"Team_Entity"})
* @SWG\Property(ref="#/definitions/User")
*
* @return array<User>
*/
public function getUsers(): iterable
{
return $this->users;
$users = [];
foreach ($this->members as $member) {
$users[] = $member->getUser();
}
return $users;
}
public function hasCustomer(Customer $customer): bool
@@ -313,4 +473,37 @@ class Team
{
return $this->getName();
}
public function __clone()
{
if ($this->id !== null) {
$this->id = null;
}
$members = $this->members;
$this->members = new ArrayCollection();
foreach ($members as $member) {
$newMember = clone $member;
$newMember->setTeam($this);
$this->addMember($newMember);
}
$customers = $this->customers;
$this->customers = new ArrayCollection();
foreach ($customers as $customer) {
$this->addCustomer($customer);
}
$projects = $this->projects;
$this->projects = new ArrayCollection();
foreach ($projects as $project) {
$this->addProject($project);
}
$activities = $this->activities;
$this->activities = new ArrayCollection();
foreach ($activities as $activity) {
$this->addActivity($activity);
}
}
}

113
src/Entity/TeamMember.php Normal file
View File

@@ -0,0 +1,113 @@
<?php
/*
* This file is part of the Kimai time-tracking app.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace App\Entity;
use Doctrine\ORM\Mapping as ORM;
use JMS\Serializer\Annotation as Serializer;
use Swagger\Annotations as SWG;
use Symfony\Component\Validator\Constraints as Assert;
/**
* @ORM\Table(name="kimai2_users_teams",
* uniqueConstraints={
* @ORM\UniqueConstraint(columns={"user_id", "team_id"})
* }
* )
* @ORM\Entity
*
* @Serializer\ExclusionPolicy("all")
*/
class TeamMember
{
/**
* @var int|null
*
* @ORM\Column(name="id", type="integer")
* @ORM\Id
* @ORM\GeneratedValue(strategy="IDENTITY")
*/
private $id;
/**
* @var User
*
* @Serializer\Expose()
* @Serializer\Groups({"Default", "Entity", "Team_Entity"})
* @SWG\Property(ref="#/definitions/User")
*
* @ORM\ManyToOne(targetEntity="App\Entity\User", inversedBy="memberships")
* @ORM\JoinColumn(onDelete="CASCADE", nullable=false)
* @Assert\NotNull()
*/
private $user;
/**
* @var Team
*
* @Serializer\Expose()
* @Serializer\Groups({"Default", "Entity", "User_Entity"})
* @SWG\Property(ref="#/definitions/TeamEntity")
*
* @ORM\ManyToOne(targetEntity="App\Entity\Team", inversedBy="members")
* @ORM\JoinColumn(onDelete="CASCADE", nullable=false)
* @Assert\NotNull()
*/
private $team;
/**
* @var bool
*
* @Serializer\Expose()
* @Serializer\Groups({"Default", "Entity", "Team_Entity", "User_Entity"})
*
* @ORM\Column(name="teamlead", type="boolean", nullable=false, options={"default": false})
* @Assert\NotNull()
*/
private $teamlead = false;
public function getId(): ?int
{
return $this->id;
}
public function isTeamlead(): bool
{
return $this->teamlead;
}
public function setTeamlead(bool $teamlead): void
{
$this->teamlead = $teamlead;
}
public function getUser(): ?User
{
return $this->user;
}
public function setUser(?User $user): void
{
$this->user = $user;
}
public function getTeam(): ?Team
{
return $this->team;
}
public function setTeam(?Team $team): void
{
$this->team = $team;
}
public function __clone()
{
if ($this->id !== null) {
$id = null;
}
}
}

221
src/Entity/User.php
View File

@@ -19,6 +19,7 @@ use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\Mapping as ORM;
use Exception;
use JMS\Serializer\Annotation as Serializer;
use Swagger\Annotations as SWG;
use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
use Symfony\Component\Security\Core\User\EquatableInterface;
use Symfony\Component\Security\Core\User\UserInterface;
@@ -63,7 +64,7 @@ use Symfony\Component\Validator\Constraints as Assert;
* @Exporter\Expose("language", label="label.language", exp="object.getLanguage()")
* @Exporter\Expose("last_login", label="label.lastLogin", exp="object.getLastLogin()", type="datetime")
* @Exporter\Expose("roles", label="label.roles", exp="object.getRoles()", type="array")
* @ Exporter\Expose("teams", label="label.team", exp="object.getTeams().toArray()", type="array")
* @ Exporter\Expose("teams", label="label.team", exp="object.getTeams()", type="array")
* @Exporter\Expose("active", label="label.active", exp="object.isEnabled()", type="boolean")
*/
class User implements UserInterface, EquatableInterface, \Serializable
@@ -172,25 +173,17 @@ class User implements UserInterface, EquatableInterface, \Serializable
*/
private $preferences;
/**
* All teams of the user
*
* @var Team[]|ArrayCollection
* @var TeamMember[]|ArrayCollection<TeamMember>
*
* @Serializer\Expose()
* @Serializer\Groups({"User_Entity"})
* @SWG\Property(ref="#/definitions/TeamMembership")
*
* @ORM\ManyToMany(targetEntity="Team", inversedBy="users", cascade={"persist"})
* @ORM\JoinTable(
* name="kimai2_users_teams",
* joinColumns={
* @ORM\JoinColumn(name="user_id", referencedColumnName="id", onDelete="CASCADE")
* },
* inverseJoinColumns={
* @ORM\JoinColumn(name="team_id", referencedColumnName="id", onDelete="CASCADE")
* }
* )
* @ORM\OneToMany(targetEntity="App\Entity\TeamMember", mappedBy="user", fetch="LAZY", cascade={"persist"}, orphanRemoval=true)
* @ORM\JoinColumn(onDelete="CASCADE")
* @Assert\NotNull()
*/
private $teams;
private $memberships;
/**
* The type of authentication used by the user (eg. "kimai", "ldap", "saml")
*
@@ -296,7 +289,7 @@ class User implements UserInterface, EquatableInterface, \Serializable
{
$this->registeredAt = new DateTime();
$this->preferences = new ArrayCollection();
$this->teams = new ArrayCollection();
$this->memberships = new ArrayCollection();
}
public function getId(): ?int
@@ -515,37 +508,99 @@ class User implements UserInterface, EquatableInterface, \Serializable
return $this;
}
public function addTeam(Team $team): User
public function addMembership(TeamMember $member): void
{
if ($this->teams->contains($team)) {
return $this;
}
$this->teams->add($team);
$team->addUser($this);
return $this;
}
public function removeTeam(Team $team)
{
if (!$this->teams->contains($team)) {
if ($this->memberships->contains($member)) {
return;
}
$this->teams->removeElement($team);
$team->removeUser($this);
if ($member->getUser() === null) {
$member->setUser($this);
}
if ($member->getUser() !== $this) {
throw new \InvalidArgumentException('Cannot set foreign user membership');
}
if (null !== ($existing = $this->findMember($member))) {
$existing->setTeamlead($member->isTeamlead());
return;
}
// when using the API an invalid team id does not trigger the validation first, but after calling this method :-(
if ($member->getTeam() !== null) {
$this->memberships->add($member);
$member->getTeam()->addMember($member);
}
}
public function removeMembership(TeamMember $member): void
{
$existingMember = $this->findMember($member);
if ($existingMember === null) {
return;
}
$this->memberships->removeElement($existingMember);
$existingMember->getUser()->removeMembership($existingMember);
}
/**
* Indexed by ID to use it within collection type forms.
*
* @return TeamMember[]
*/
public function getMemberships(): iterable
{
$all = [];
foreach ($this->memberships as $member) {
if ($member->getId() === null) {
$all[] = $member;
} else {
$all[$member->getId()] = $member;
}
}
return $all;
}
public function hasMembership(TeamMember $member): bool
{
return $this->memberships->contains($member);
}
private function findMember(TeamMember $member): ?TeamMember
{
foreach ($this->memberships as $oldMember) {
if ($oldMember->getUser() === $member->getUser() && $oldMember->getTeam() === $member->getTeam()) {
return $oldMember;
}
}
return null;
}
/**
* Checks if the user is member of any team.
*
* @return bool
*/
public function hasTeamAssignment(): bool
{
return !$this->getTeams()->isEmpty();
return !$this->memberships->isEmpty();
}
public function hasTeamMember(User $user): bool
/**
* Checks is the user is teamlead in any of the assigned teams.
*
* @see User::hasTeamleadRole()
* @return bool
*/
public function isTeamlead(): bool
{
/** @var Team $team */
foreach ($this->getTeams() as $team) {
if ($team->hasUser($user)) {
foreach ($this->memberships as $membership) {
if ($membership->isTeamlead()) {
return true;
}
}
@@ -554,21 +609,96 @@ class User implements UserInterface, EquatableInterface, \Serializable
}
/**
* @return Collection<Team>
* Checks if the given user is a team member.
*
* @param User $user
* @return bool
*/
public function getTeams(): Collection
public function hasTeamMember(User $user): bool
{
return $this->teams;
foreach ($this->memberships as $membership) {
if ($membership->getTeam()->hasUser($user)) {
return true;
}
}
return false;
}
/**
* @Serializer\VirtualProperty
* @Serializer\SerializedName("teams"),
* @Serializer\Groups({"User_Entity"})
* @SWG\Property(ref="#/definitions/TeamEntity")
*
* @return Team[]
*/
public function getTeams(): iterable
{
$teams = [];
foreach ($this->memberships as $membership) {
$teams[] = $membership->getTeam();
}
return $teams;
}
/**
* Required in the User profile screen to edit his teams.
*
* @param Team $team
*/
public function addTeam(Team $team): void
{
foreach ($this->memberships as $membership) {
if ($membership->getTeam() === $team) {
return;
}
}
$membership = new TeamMember();
$membership->setUser($this);
$membership->setTeam($team);
$this->addMembership($membership);
}
/**
* Required in the User profile screen to edit his teams.
*
* @param Team $team
*/
public function removeTeam(Team $team): void
{
foreach ($this->memberships as $membership) {
if ($membership->getTeam() === $team) {
$this->removeMembership($membership);
return;
}
}
}
public function isInTeam(Team $team): bool
{
return $this->teams->contains($team);
foreach ($this->memberships as $membership) {
if ($membership->getTeam() === $team) {
return true;
}
}
return false;
}
public function isTeamleadOf(Team $team): bool
{
return $team->getTeamLead() === $this;
foreach ($this->memberships as $membership) {
if ($membership->getTeam() === $team) {
return $membership->isTeamlead();
}
}
return false;
}
public function canSeeAllData(): bool
@@ -596,7 +726,7 @@ class User implements UserInterface, EquatableInterface, \Serializable
return true;
}
public function isTeamlead(): bool
public function hasTeamleadRole(): bool
{
return $this->hasRole(static::ROLE_TEAMLEAD);
}
@@ -698,6 +828,11 @@ class User implements UserInterface, EquatableInterface, \Serializable
public function getLastLogin(): ?DateTime
{
if ($this->lastLogin !== null) {
// make sure to use the users own timezone
$this->lastLogin->setTimeZone(new \DateTimeZone($this->getTimezone()));
}
return $this->lastLogin;
}

2
src/Form/API/TeamApiEditForm.php
View File

@@ -18,6 +18,7 @@ class TeamApiEditForm extends TeamEditForm
public function buildForm(FormBuilderInterface $builder, array $options)
{
parent::buildForm($builder, $options);
$builder->remove('users');
}
/**
@@ -28,7 +29,6 @@ class TeamApiEditForm extends TeamEditForm
parent::configureOptions($resolver);
$resolver->setDefaults([
'expand_users' => false,
'csrf_protection' => false,
]);
}

66
src/Form/TeamEditForm.php
View File

@@ -10,8 +10,10 @@
namespace App\Form;
use App\Entity\Team;
use App\Form\Type\TeamMemberType;
use App\Form\Type\UserType;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\CollectionType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -34,38 +36,51 @@ class TeamEditForm extends AbstractType
'attr' => [
'autofocus' => 'autofocus'
],
// documentation is for NelmioApiDocBundle
'documentation' => [
'type' => 'string',
'description' => 'Name of the team',
],
]);
$this->addColor($builder);
$builder
->add('teamlead', UserType::class, [
'label' => 'label.teamlead',
'multiple' => false,
'expanded' => false,
// documentation is for NelmioApiDocBundle
'documentation' => [
'type' => 'integer',
'description' => 'User ID for the teamlead',
$builder->add('members', CollectionType::class, [
'entry_type' => TeamMemberType::class,
'entry_options' => [
'label' => false,
],
'allow_add' => true,
'by_reference' => false,
'allow_delete' => true,
'label' => 'label.user',
'documentation' => [
'type' => 'array',
'items' => [
'type' => 'object',
'properties' => [
'user' => [
'type' => 'integer',
'description' => 'User ID',
],
'teamlead' => [
'type' => 'boolean',
'description' => 'Whether the user is a teamlead',
],
]
],
])
->add('users', UserType::class, [
'multiple' => true,
'expanded' => $options['expand_users'],
'by_reference' => false,
'documentation' => [
'type' => 'array',
'items' => ['type' => 'integer', 'description' => 'User IDs'],
'title' => 'Team member',
'description' => 'Array of team member IDs',
],
// make sure that disabled users show up in the result list
'include_users' => (null !== $team && $team->getUsers()->count() > 0 ? $team->getUsers()->toArray() : [])
])
;
'description' => 'All team members',
],
]);
$builder->add('users', UserType::class, [
'label' => 'add_user.label',
'help' => 'team.add_user.help',
'mapped' => false,
'multiple' => false,
'expanded' => false,
'required' => false,
'ignore_users' => $team !== null ? $team->getUsers() : []
]);
}
/**
@@ -77,7 +92,6 @@ class TeamEditForm extends AbstractType
'data_class' => Team::class,
'csrf_protection' => true,
'csrf_field_name' => '_token',
'expand_users' => true,
'csrf_token_id' => 'admin_team_edit',
'attr' => [
'data-form-event' => 'kimai.teamUpdate'

4
src/Form/TimesheetMultiUserEditForm.php
View File

@@ -9,8 +9,8 @@
namespace App\Form;
use App\Form\Type\TeamMemberType;
use App\Form\Type\TeamType;
use App\Form\Type\UserType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -24,7 +24,7 @@ class TimesheetMultiUserEditForm extends TimesheetAdminEditForm
parent::buildForm($builder, $options);
$builder->add('users', TeamMemberType::class, [
$builder->add('users', UserType::class, [
'multiple' => true,
'required' => false,
]);

4
src/Form/Toolbar/AbstractToolbarForm.php
View File

@@ -85,9 +85,9 @@ abstract class AbstractToolbarForm extends AbstractType
]);
}
protected function addTeamsChoice(FormBuilderInterface $builder)
protected function addTeamsChoice(FormBuilderInterface $builder, string $field = 'teams')
{
$builder->add('teams', TeamType::class, [
$builder->add($field, TeamType::class, [
'documentation' => [
'type' => 'array',
'items' => ['type' => 'integer', 'description' => 'Team ID'],

1
src/Form/Toolbar/UserToolbarForm.php
View File

@@ -25,6 +25,7 @@ class UserToolbarForm extends AbstractToolbarForm
{
$this->addSearchTermInputField($builder);
$this->addUserRoleChoice($builder);
$this->addTeamsChoice($builder, 'searchTeams');
$this->addVisibilityChoice($builder, 'label.active');
$this->addPageSizeChoice($builder);
$this->addHiddenPagination($builder);

62
src/Form/Type/TeamMemberType.php
View File

@@ -9,60 +9,38 @@
namespace App\Form\Type;
use App\Entity\User;
use App\Repository\UserRepository;
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use App\Entity\TeamMember;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\OptionsResolver\Options;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
/**
* Select a user that
*/
class TeamMemberType extends AbstractType
{
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder->add('user', UserType::class, [
'selectpicker' => false,
]);
$builder->add('teamlead', YesNoType::class, [
'label' => 'label.teamlead'
]);
}
public function getBlockPrefix()
{
return 'team_member';
}
/**
* {@inheritdoc}
*/
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults([
'class' => User::class,
'data_class' => TeamMember::class,
'label' => 'label.user',
'choice_label' => function (User $user) {
return $user->getDisplayName();
},
'compound' => true,
]);
$resolver->setDefault('query_builder', function (Options $options) {
return function (UserRepository $repo) use ($options) {
$qb = $repo->createQueryBuilder('u');
$qb
->andWhere($qb->expr()->eq('u.enabled', ':enabled'))
->setParameter('enabled', true, \PDO::PARAM_BOOL)
->orderBy('u.username', 'ASC');
/** @var User $user */
$user = $options['user'];
if (null !== $user && $user->hasTeamAssignment() && !$user->canSeeAllData()) {
$qb
->leftJoin('u.teams', 'teams')
->leftJoin('teams.users', 'users')
->andWhere($qb->expr()->isMemberOf(':teams', 'u.teams'))
->setParameter('teams', $user->getTeams());
}
return $qb;
};
});
}
/**
* {@inheritdoc}
*/
public function getParent()
{
return EntityType::class;
}
}

2
src/Form/Type/TeamType.php
View File

@@ -46,7 +46,7 @@ class TeamType extends AbstractType
$query->setCurrentUser($user);
if (!$options['teamlead_only']) {
$query->setTeams($user->getTeams()->toArray());
$query->setTeams($user->getTeams());
}
return $repo->getQueryBuilderForFormType($query);

6
src/Form/Type/UserType.php
View File

@@ -37,6 +37,8 @@ class UserType extends AbstractType
'choice_translation_domain' => false,
// whether disabled users should be included in the result list
'include_disabled' => false,
// an array of users that should not be included in the result list
'ignore_users' => [],
// an array of users, which will always be included in the result list
// why? if the base entity could include disabled users, which should not be hidden in/removed from the list
// eg. when editing a team that has disabled users, these users would be removed silently
@@ -57,6 +59,10 @@ class UserType extends AbstractType
$query->setVisibility(VisibilityInterface::SHOW_BOTH);
}
foreach ($options['ignore_users'] as $userToIgnore) {
$query->addUserToIgnore($userToIgnore);
}
if (!empty($options['include_users'])) {
$query->setUsersAlwaysIncluded($options['include_users']);
}

46
src/Migrations/Version20210802174318.php Normal file
View File

@@ -0,0 +1,46 @@
<?php
declare(strict_types=1);
/*
* This file is part of the Kimai time-tracking app.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace DoctrineMigrations;
use App\Doctrine\AbstractMigration;
use Doctrine\DBAL\Schema\Schema;
/**
* @version 1.15
*/
final class Version20210802174318 extends AbstractMigration
{
public function getDescription(): string
{
return 'Adds a new column to the team join table to support multiple teamleads';
}
public function up(Schema $schema): void
{
$teamMember = $schema->getTable('kimai2_users_teams');
$teamMember->addColumn('id', 'integer', ['autoincrement' => true, 'notnull' => true]);
$teamMember->addColumn('teamlead', 'boolean', ['notnull' => true, 'default' => false]);
$teamMember->dropPrimaryKey();
$teamMember->setPrimaryKey(['id']);
$teamMember->addUniqueIndex(['user_id', 'team_id'], 'UNIQ_B5E92CF8A76ED395296CD8AE');
}
public function down(Schema $schema): void
{
$teamMember = $schema->getTable('kimai2_users_teams');
$teamMember->dropIndex('UNIQ_B5E92CF8A76ED395296CD8AE');
$teamMember->dropPrimaryKey();
$teamMember->dropColumn('teamlead');
$teamMember->dropColumn('id');
$teamMember->setPrimaryKey(['user_id', 'team_id']);
}
}

52
src/Migrations/Version20210802174319.php Normal file
View File

@@ -0,0 +1,52 @@
<?php
declare(strict_types=1);
/*
* This file is part of the Kimai time-tracking app.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace DoctrineMigrations;
use App\Doctrine\AbstractMigration;
use Doctrine\DBAL\Schema\Schema;
/**
* @version 1.15
*/
final class Version20210802174319 extends AbstractMigration
{
public function getDescription(): string
{
return 'Migrate teamleads to join table';
}
public function up(Schema $schema): void
{
$fetch = $this->connection->prepare('SELECT id, teamlead_id FROM kimai2_teams');
foreach ($fetch->executeQuery()->iterateAssociative() as $row) {
$this->addSql('UPDATE kimai2_users_teams SET teamlead = 1 WHERE user_id = ? AND team_id = ?', [$row['teamlead_id'], $row['id']]);
}
$fetch->free();
}
public function down(Schema $schema): void
{
$fetch = $this->connection->prepare('SELECT user_id, team_id, teamlead FROM kimai2_users_teams WHERE teamlead = 1');
foreach ($fetch->executeQuery()->iterateAssociative() as $row) {
$this->addSql('UPDATE kimai2_teams SET teamlead_id = ? where id = ?', [$row['user_id'], $row['team_id']]);
}
$fetch->free();
$teams = $schema->getTable('kimai2_teams');
$teams->getColumn('teamlead_id')->setNotnull(true);
$teams->addForeignKeyConstraint('kimai2_users', ['teamlead_id'], ['id'], ['onDelete' => 'CASCADE'], 'FK_3BEDDC7F8F7DE5D7');
}
}

39
src/Migrations/Version20210802174320.php Normal file
View File

@@ -0,0 +1,39 @@
<?php
declare(strict_types=1);
/*
* This file is part of the Kimai time-tracking app.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace DoctrineMigrations;
use App\Doctrine\AbstractMigration;
use Doctrine\DBAL\Schema\Schema;
/**
* @version 1.15
*/
final class Version20210802174320 extends AbstractMigration
{
public function getDescription(): string
{
return 'Remove teamlead id from teams table';
}
public function up(Schema $schema): void
{
$teams = $schema->getTable('kimai2_teams');
$teams->removeForeignKey('FK_3BEDDC7F8F7DE5D7');
$teams->dropColumn('teamlead_id');
}
public function down(Schema $schema): void
{
$teams = $schema->getTable('kimai2_teams');
$teams->addColumn('teamlead_id', 'integer', ['length' => 11, 'notnull' => false]);
}
}

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);

33
src/Validator/Constraints/Team.php Normal file
View File

@@ -0,0 +1,33 @@
<?php
/*
* This file is part of the Kimai time-tracking app.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace App\Validator\Constraints;
use Doctrine\Common\Annotations\Annotation\Target;
use Symfony\Component\Validator\Constraint;
/**
* @Annotation
* @Target({"CLASS", "PROPERTY", "METHOD", "ANNOTATION"})
*/
class Team extends Constraint
{
public const MISSING_TEAMLEAD = 'kimai-team-001';
protected static $errorNames = [
self::MISSING_TEAMLEAD => 'At least one team leader must be assigned to the team.',
];
public $message = 'The team has invalid settings.';
public function getTargets()
{
return self::CLASS_CONSTRAINT;
}
}

41
src/Validator/Constraints/TeamValidator.php Normal file
View File

@@ -0,0 +1,41 @@
<?php
/*
* This file is part of the Kimai time-tracking app.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace App\Validator\Constraints;
use App\Entity\Team as TeamEntity;
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\ConstraintValidator;
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
class TeamValidator extends ConstraintValidator
{
/**
* @param TeamEntity $value
* @param Constraint $constraint
*/
public function validate($value, Constraint $constraint)
{
if (!($constraint instanceof Team)) {
throw new UnexpectedTypeException($constraint, Team::class);
}
if (!\is_object($value) || !($value instanceof TeamEntity)) {
return;
}
if (!$value->hasTeamleads()) {
$this->context->buildViolation(Team::getErrorName(Team::MISSING_TEAMLEAD))
->atPath('teamleads')
->setTranslationDomain('validators')
->setCode(Team::MISSING_TEAMLEAD)
->addViolation();
}
}
}

9
src/Voter/TeamVoter.php
View File

@@ -65,6 +65,15 @@ final class TeamVoter extends Voter
return false;
}
switch ($attribute) {
case 'edit':
case 'delete':
// changing existing teams should be limited to admins and teamleads
if (!$user->isAdmin() && !$user->isSuperAdmin() && !$user->isTeamleadOf($subject)) {
return false;
}
}
return $this->permissionManager->hasRolePermission($user, $attribute . '_team');
}
}

10
src/Voter/UserVoter.php
View File

@@ -29,6 +29,8 @@ final class UserVoter extends Voter
'preferences',
'api-token',
'hourly-rate',
// teams_own_profile could be merged with view_team_member
'view_team_member',
];
private $permissionManager;
@@ -70,6 +72,14 @@ final class UserVoter extends Voter
return false;
}
if ($attribute === 'view_team_member') {
if ($subject->getId() !== $user->getId()) {
return false;
}
return $this->permissionManager->hasRolePermission($user, 'view_team_member');
}
if ($attribute === 'delete') {
if ($subject->getId() === $user->getId()) {
return false;

2
src/Widget/Type/UserTeamProjects.php
View File

@@ -50,7 +50,7 @@ class UserTeamProjects extends SimpleWidget implements AuthorizedWidget, UserWid
$now = new \DateTime('now', new \DateTimeZone($user->getTimezone()));
$loader = new TeamLoader($this->entityManager);
$loader->loadResults($user->getTeams()->toArray());
$loader->loadResults($user->getTeams());
$teamProjects = [];
$projects = [];