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

fix Entity/UserTest and phpstan error

Browse Source
This commit is contained in:
Mathieu Jaumotte 2023-09-26 11:27:36 +02:00
parent 6665a443b9
commit baeccf0970
2 changed files with 30 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ use DateTimeImmutable;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use Doctrine\Common\Collections\Criteria;
use Doctrine\Common\Collections\Selectable;
use Doctrine\ORM\Mapping as ORM;
use Iterator;
use RuntimeException;
@ -117,11 +118,11 @@ class User implements UserInterface, \Stringable
private ?Location $mainLocation = null;
/**
* @var Collection<UserScopeHistory>
* @var Collection&Selectable<int, UserScopeHistory>
* @ORM\OneToMany(targetEntity=UserScopeHistory::class,
* mappedBy="user", cascade={"persist", "remove"}, orphanRemoval=true)
*/
private Collection $scopeHistories;
private Collection&Selectable $scopeHistories;
/**
* @ORM\Column(type="string", length=255)
@ -136,11 +137,11 @@ class User implements UserInterface, \Stringable
private ?string $salt = null;
/**
* @var Collection<UserJobHistory>
* @var Collection&Selectable<int, UserJobHistory>
* @ORM\OneToMany(targetEntity=UserJobHistory::class,
* mappedBy="user", cascade={"persist", "remove"}, orphanRemoval=true)
*/
private Collection $jobHistories;
private Collection&Selectable $jobHistories;
/**
* @ORM\Column(type="string", length=80)
@ -266,23 +267,12 @@ class User implements UserInterface, \Stringable
{
$at ??= new DateTimeImmutable('now');
$criteria = new Criteria();
$expr = Criteria::expr();
$criteria->where(
$expr->andX(
$expr->orX(
$expr->isNull('endDate'),
$expr->gt('endDate', $at)
),
$expr->lte('startDate', $at)
)
);
$scopes = $this->scopeHistories->matching($criteria)->getIterator();
if ($scopes->count() > 0) {
return $scopes->first()->getScope();
foreach ($this->scopeHistories as $scopeHistory) {
if ($at >= $scopeHistory->getStartDate() && (
null === $scopeHistory->getEndDate() || $at < $scopeHistory->getEndDate()
)) {
return $scopeHistory->getScope();
}
}
return null;
@ -315,23 +305,12 @@ class User implements UserInterface, \Stringable
{
$at ??= new DateTimeImmutable('now');
$criteria = new Criteria();
$expr = Criteria::expr();
$criteria->where(
$expr->andX(
$expr->orX(
$expr->isNull('endDate'),
$expr->gt('endDate', $at)
),
$expr->lte('startDate', $at)
)
);
$jobs = $this->jobHistories->matching($criteria)->getIterator();
if ($jobs->count() > 0) {
return $jobs->first()->getJob();
foreach ($this->jobHistories as $jobHistory) {
if ($at >= $jobHistory->getStartDate() && (
null === $jobHistory->getEndDate() || $at < $jobHistory->getEndDate()
)) {
return $jobHistory->getJob();
}
}
return null;

31
src/Bundle/ChillMainBundle/Tests/Entity/UserTest.php
View File

@ -38,15 +38,13 @@ class UserTest extends TestCase
self::assertSame($scopeB, $user->getMainScope());
// 2. get scopeA history, check endDate is not null
$histories = $user->getMainScopeHistories();
$scopeHistoryA = null;
foreach ($histories as $row) {
/** @var User\UserScopeHistory $row */
if ($scopeA === $row->getScope()) {
$scopeHistoryA = $row;
}
}
self::assertNotNull($scopeHistoryA->getEndDate());
self::assertNotNull(
$user
->getMainScopeHistories()
->filter(fn (User\UserScopeHistory $userScopeHistory) => $userScopeHistory->getScope() === $scopeA )
->first()->getEndDate()
);
}
public function testUserJobHistory()
@ -62,15 +60,12 @@ class UserTest extends TestCase
self::assertSame($jobB, $user->getUserJob());
// 2. get jobA history, check endDate is not null
$histories = $user->getUserJobHistories();
$jobHistoryA = null;
foreach ($histories as $row) {
/** @var User\UserJobHistory $row */
if ($jobA === $row->getJob()) {
$jobHistoryA = $row;
}
}
self::assertNotNull($jobHistoryA->getEndDate());
self::assertNotNull(
$user
->getUserJobHistories()
->filter(fn(User\UserJobHistory $userJobHistory) => $userJobHistory->getJob() === $jobA )
->first()->getEndDate()
);
}
}