Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

improve check in setters and add types in repositories

Browse Source
This commit is contained in:
Mathieu Jaumotte 2023-09-22 13:48:37 +02:00
parent e6e42777d7
commit 949c5424f0
3 changed files with 8 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Bundle/ChillMainBundle/Entity/User.php
View File

@ -507,12 +507,7 @@ class User implements UserInterface, \Stringable
public function setMainScope(?Scope $mainScope): User public function setMainScope(?Scope $mainScope): User
{ {
$currentScopeUnchanged = array_filter( if ($mainScope === $this->getMainScope()) {
$this->scopeHistories->toArray(),
fn($row) => $row->getEndDate() === null && $row->getScope() === $mainScope
);
if (count($currentScopeUnchanged) > 0) {
return $this; return $this;
} }
@ -572,12 +567,7 @@ class User implements UserInterface, \Stringable
public function setUserJob(?UserJob $userJob): User public function setUserJob(?UserJob $userJob): User
{ {
$currentJobUnchanged = array_filter( if ($userJob === $this->getUserJob()) {
$this->jobHistories->toArray(),
fn($row) => $row->getEndDate() === null && $row->getJob() === $userJob
);
if (count($currentJobUnchanged) > 0) {
return $this; return $this;
} }

28
src/Bundle/ChillMainBundle/Repository/User/UserJobHistoryRepository.php
View File

@ -17,35 +17,13 @@ use Doctrine\ORM\OptimisticLockException;
use Doctrine\ORM\ORMException; use Doctrine\ORM\ORMException;
use Doctrine\Persistence\ManagerRegistry; use Doctrine\Persistence\ManagerRegistry;
/**
* @extends ServiceEntityRepository<UserJobHistory>
*/
class UserJobHistoryRepository extends ServiceEntityRepository class UserJobHistoryRepository extends ServiceEntityRepository
{ {
public function __construct(ManagerRegistry $registry) public function __construct(ManagerRegistry $registry)
{ {
parent::__construct($registry, UserJobHistory::class); parent::__construct($registry, UserJobHistory::class);
} }
/**
* @throws ORMException
* @throws OptimisticLockException
*/
public function add(UserJobHistory $entity, bool $flush = true): void
{
$this->_em->persist($entity);
if ($flush) {
$this->_em->flush();
}
}
/**
* @throws ORMException
* @throws OptimisticLockException
*/
public function remove(UserJobHistory $entity, bool $flush = true): void
{
$this->_em->remove($entity);
if ($flush) {
$this->_em->flush();
}
}
} }

28
src/Bundle/ChillMainBundle/Repository/User/UserScopeHistoryRepository.php
View File

@ -17,35 +17,13 @@ use Doctrine\ORM\OptimisticLockException;
use Doctrine\ORM\ORMException; use Doctrine\ORM\ORMException;
use Doctrine\Persistence\ManagerRegistry; use Doctrine\Persistence\ManagerRegistry;
/**
* @extends ServiceEntityRepository<UserScopeHistory>
*/
final class UserScopeHistoryRepository extends ServiceEntityRepository final class UserScopeHistoryRepository extends ServiceEntityRepository
{ {
public function __construct(ManagerRegistry $registry) public function __construct(ManagerRegistry $registry)
{ {
parent::__construct($registry, UserScopeHistory::class); parent::__construct($registry, UserScopeHistory::class);
} }
/**
* @throws ORMException
* @throws OptimisticLockException
*/
public function add(UserScopeHistory $entity, bool $flush = true): void
{
$this->_em->persist($entity);
if ($flush) {
$this->_em->flush();
}
}
/**
* @throws ORMException
* @throws OptimisticLockException
*/
public function remove(UserScopeHistory $entity, bool $flush = true): void
{
$this->_em->remove($entity);
if ($flush) {
$this->_em->flush();
}
}
} }