endpoint for recent accompanying period attributions

This commit is contained in:
2022-01-28 15:39:37 +01:00
parent fcd5fba13e
commit 292c9380ad
6 changed files with 132 additions and 19 deletions

View File

@@ -338,7 +338,8 @@ class AccompanyingPeriod implements
private ?User $user = null;
/**
* @ORM\OneToMany(targetEntity=UserHistory::class, mappedBy="accompanyingPeriod")
* @ORM\OneToMany(targetEntity=UserHistory::class, mappedBy="accompanyingPeriod", orphanRemoval=true,
* cascade={"persist", "remove"})
*
* @var Collection|UserHistory[]
*/
@@ -1226,15 +1227,15 @@ class AccompanyingPeriod implements
if ($this->user !== $user) {
$this->userPrevious = $this->user;
if (null !== $user) {
$this->userHistories->add(new UserHistory($this, $user));
}
foreach ($this->userHistories as $history) {
if (null === $history->getEndDate()) {
$history->setEndDate(new DateTimeImmutable('now'));
}
}
if (null !== $user) {
$this->userHistories->add(new UserHistory($this, $user));
}
}
$this->user = $user;

View File

@@ -11,16 +11,21 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
use Chill\MainBundle\Entity\User;
use Chill\PersonBundle\Entity\AccompanyingPeriod;
use DateTimeImmutable;
use Doctrine\ORM\Mapping as ORM;
/**
* @ORM\Entity
* @ORM\Table("chill_person_accompanying_period_user_history")
*/
class UserHistory
class UserHistory implements TrackCreationInterface
{
use TrackCreationTrait;
/**
* @ORM\ManyToOne(targetEntity=AccompanyingPeriod::class, inversedBy="userHistories")
* @ORM\JoinColumn(nullable=false)
@@ -30,7 +35,7 @@ class UserHistory
/**
* @ORM\Column(type="datetime_immutable", nullable=true, options={"default": null})
*/
private ?\DateTimeImmutable $endDate = null;
private ?DateTimeImmutable $endDate = null;
/**
* @ORM\Id
@@ -42,7 +47,7 @@ class UserHistory
/**
* @ORM\Column(type="datetime_immutable", nullable=false)
*/
private \DateTimeImmutable $startDate;
private DateTimeImmutable $startDate;
/**
* @ORM\ManyToOne(targetEntity=User::class)
@@ -50,9 +55,9 @@ class UserHistory
*/
private User $user;
public function __construct(AccompanyingPeriod $accompanyingPeriod, User $user, ?\DateTimeImmutable $startDate = null)
public function __construct(AccompanyingPeriod $accompanyingPeriod, User $user, ?DateTimeImmutable $startDate = null)
{
$this->startDate = $startDate ?? new \DateTimeImmutable('now');
$this->startDate = $startDate ?? new DateTimeImmutable('now');
$this->accompanyingPeriod = $accompanyingPeriod;
$this->user = $user;
}