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

SQL and performance improvements (#2017)

Browse Source
This commit is contained in:
Kevin Papst
2020-10-23 00:31:53 +02:00
committed by GitHub
parent 6ed7ee76e7
commit 4533c994a3
14 changed files with 216 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
src/Repository/ActivityRepository.php
View File

@@ -11,6 +11,7 @@ namespace App\Repository;
use App\Entity\Activity;
use App\Entity\Project;
use App\Entity\Team;
use App\Entity\Timesheet;
use App\Entity\User;
use App\Model\ActivityStatistic;
@@ -117,7 +118,7 @@ class ActivityRepository extends EntityRepository
return $stats;
}
private function addPermissionCriteria(QueryBuilder $qb, ?User $user = null, array $teams = [])
private function addPermissionCriteria(QueryBuilder $qb, ?User $user = null, array $teams = [], bool $globalsOnly = false)
{
// make sure that all queries without a user see all projects
if (null === $user && empty($teams)) {
@@ -133,37 +134,41 @@ class ActivityRepository extends EntityRepository
$teams = array_merge($teams, $user->getTeams()->toArray());
}
$qb->leftJoin('a.teams', 'teams')
->leftJoin('p.teams', 'p_teams')
->leftJoin('c.teams', 'c_teams');
if (empty($teams)) {
$qb->andWhere($qb->expr()->isNull('teams'));
$qb->andWhere($qb->expr()->isNull('p_teams'));
$qb->andWhere($qb->expr()->isNull('c_teams'));
$qb->andWhere('SIZE(a.teams) = 0');
if (!$globalsOnly) {
$qb->andWhere('SIZE(p.teams) = 0');
$qb->andWhere('SIZE(c.teams) = 0');
}
return;
}
$orActivity = $qb->expr()->orX(
$qb->expr()->isNull('teams'),
'SIZE(a.teams) = 0',
$qb->expr()->isMemberOf(':teams', 'a.teams')
);
$qb->andWhere($orActivity);
$orProject = $qb->expr()->orX(
$qb->expr()->isNull('p_teams'),
$qb->expr()->isMemberOf(':teams', 'p.teams')
);
$qb->andWhere($orProject);
if (!$globalsOnly) {
$orProject = $qb->expr()->orX(
'SIZE(p.teams) = 0',
$qb->expr()->isMemberOf(':teams', 'p.teams')
);
$qb->andWhere($orProject);
$orCustomer = $qb->expr()->orX(
$qb->expr()->isNull('c_teams'),
$qb->expr()->isMemberOf(':teams', 'c.teams')
);
$qb->andWhere($orCustomer);
$orCustomer = $qb->expr()->orX(
'SIZE(c.teams) = 0',
$qb->expr()->isMemberOf(':teams', 'c.teams')
);
$qb->andWhere($orCustomer);
}
$qb->setParameter('teams', $teams);
$ids = array_values(array_unique(array_map(function (Team $team) {
return $team->getId();
}, $teams)));
$qb->setParameter('teams', $ids);
}
/**
@@ -196,7 +201,7 @@ class ActivityRepository extends EntityRepository
$where = $qb->expr()->andX();
$where->add('a.visible = :visible');
$where->add($qb->expr()->eq('a.visible', ':visible'));
$qb->setParameter('visible', true, \PDO::PARAM_BOOL);
if (!$query->isGlobalsOnly()) {
@@ -208,19 +213,15 @@ class ActivityRepository extends EntityRepository
$where->add(
$qb->expr()->orX(
$qb->expr()->eq('c.visible', ':customer_visible'),
$qb->expr()->isNull('c.visible')
)
);
$where->add(
$qb->expr()->orX(
$qb->expr()->eq('p.visible', ':project_visible'),
$qb->expr()->isNull('p.visible')
$qb->expr()->isNull('a.project'),
$qb->expr()->andX(
$qb->expr()->eq('p.visible', ':is_visible'),
$qb->expr()->eq('c.visible', ':is_visible')
)
)
);
$qb->setParameter('project_visible', true, \PDO::PARAM_BOOL);
$qb->setParameter('customer_visible', true, \PDO::PARAM_BOOL);
$qb->setParameter('is_visible', true, \PDO::PARAM_BOOL);
}
if ($query->isGlobalsOnly()) {
@@ -228,8 +229,8 @@ class ActivityRepository extends EntityRepository
} elseif ($query->hasProjects()) {
$where->add(
$qb->expr()->orX(
$qb->expr()->in('a.project', ':project'),
$qb->expr()->isNull('a.project')
$qb->expr()->isNull('a.project'),
$qb->expr()->in('a.project', ':project')
)
);
$qb->setParameter('project', $query->getProjects());
@@ -240,6 +241,8 @@ class ActivityRepository extends EntityRepository
$qb->setParameter('ignored', $query->getActivityToIgnore());
}
$this->addPermissionCriteria($qb, $query->getUser(), $query->getTeams(), $query->isGlobalsOnly());
$or = $qb->expr()->orX();
// this must always be the last part before the or
@@ -287,21 +290,21 @@ class ActivityRepository extends EntityRepository
$where = $qb->expr()->andX();
if (!$query->isShowBoth()) {
$where->add($qb->expr()->eq('a.visible', ':visible'));
if (!$query->isGlobalsOnly()) {
$where->add(
$qb->expr()->orX(
$qb->expr()->isNull('a.project'),
$qb->expr()->andX(
$qb->expr()->eq('c.visible', ':is_visible'),
$qb->expr()->eq('p.visible', ':is_visible')
$qb->expr()->eq('p.visible', ':is_visible'),
$qb->expr()->eq('c.visible', ':is_visible')
)
)
);
$qb->setParameter('is_visible', true, \PDO::PARAM_BOOL);
}
$where->add($qb->expr()->eq('a.visible', ':visible'));
if ($query->isShowVisible()) {
$qb->setParameter('visible', true, \PDO::PARAM_BOOL);
} elseif ($query->isShowHidden()) {
@@ -322,16 +325,16 @@ class ActivityRepository extends EntityRepository
$where->add($orX);
$qb->setParameter('project', $query->getProjects());
} elseif (null !== $query->getCustomer()) {
$where->add('p.customer = :customer');
$qb->setParameter('customer', $query->getCustomer());
} elseif ($query->hasCustomers()) {
$where->add($qb->expr()->in('p.customer', ':customer'));
$qb->setParameter('customer', $query->getCustomers());
}
if ($where->count() > 0) {
$qb->andWhere($where);
}
$this->addPermissionCriteria($qb, $query->getCurrentUser(), $query->getTeams());
$this->addPermissionCriteria($qb, $query->getCurrentUser(), $query->getTeams(), $query->isGlobalsOnly());
if ($query->hasSearchTerm()) {
$searchAnd = $qb->expr()->andX();
@@ -364,13 +367,6 @@ class ActivityRepository extends EntityRepository
}
}
// this will make sure, that we do not accidentally create results with multiple rows,
// which would result in a wrong LIMIT with paginated results
$qb->addGroupBy('a');
// the second group by is needed to satisfy SQL standard (ONLY_FULL_GROUP_BY)
$qb->addGroupBy($orderBy);
return $qb;
}