Merge remote-tracking branch 'origin/master' into features/activity-form

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php

@@ -369,13 +369,9 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
         return false;
     }
 
-    public function setRemark(string $remark): self
+    public function setRemark(string $remark = null): self
     {
-        if ($remark === null) {
-            $remark = '';
-        }
-
-        $this->remark = $remark;
+        $this->remark = (string) $remark;
 
         return $this;
     }
@@ -447,12 +443,13 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
      */
     public function getParticipationsContainsPerson(Person $person): Collection
     {
-        return $this->getParticipations($person)->filter(
-            function(AccompanyingPeriodParticipation $participation) use ($person) {
-                if ($person === $participation->getPerson()) {
-                    return $participation;
+        return $this
+            ->getParticipations()
+            ->filter(
+                static function(AccompanyingPeriodParticipation $participation) use ($person): bool {
+                    return $person === $participation->getPerson();
                 }
-            });
+            );
     }
 
     /**
@@ -462,12 +459,13 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
      */
     public function getOpenParticipationContainsPerson(Person $person): ?AccompanyingPeriodParticipation
     {
-        $collection = $this->getParticipationsContainsPerson($person)->filter(
-            function(AccompanyingPeriodParticipation $participation) use ($person) {
-                if (NULL === $participation->getEndDate()) {
-                    return $participation;
+        $collection = $this
+            ->getParticipationsContainsPerson($person)
+            ->filter(
+                static function(AccompanyingPeriodParticipation $participation): bool {
+                    return null === $participation->getEndDate();
                 }
-            });
+            );
 
         return $collection->count() > 0 ? $collection->first() : NULL;
     }
@@ -557,15 +555,16 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
             return false;
         }
 
-        $participation = $this->getParticipationsContainsPerson($person);
-        if (!null === $participation)
+        $participation = $this->getOpenParticipationContainsPerson($person);
+
+        if (null === $participation)
         {
-            $person = $participation->getPerson();
-            $periods = $person->getAccompanyingPeriodsOrdered();
-            return end($periods) === $this;
+            return false;
         }
 
-        return false;
+        $periods = $participation->getPerson()->getAccompanyingPeriodsOrdered();
+
+        return end($periods) === $this;
     }
 
     /**
@@ -863,14 +862,18 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * Get a list of all persons which are participating to this course
+     *
+     * @psalm-return Collection<int, Person>
      */
     public function getPersons(): Collection
     {
-        return $this->participations->map(
-            function(AccompanyingPeriodParticipation $participation) {
-                return $participation->getPerson();
-            }
-        );
+        return $this
+            ->participations
+            ->map(
+                static function(AccompanyingPeriodParticipation $participation): Person {
+                    return $participation->getPerson();
+                }
+            );
     }
 
     public function setCreatedAt(\DateTimeInterface $datetime): self

src/Bundle/ChillPersonBundle/Entity/Household/Household.php

@@ -2,12 +2,21 @@
 
 namespace Chill\PersonBundle\Entity\Household;
 
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\Collection;
+use Symfony\Component\Serializer\Annotation as Serializer;
 use Chill\MainBundle\Entity\Address;
+use Chill\PersonBundle\Entity\Household\HouseholdMember;
 
 /**
  * @ORM\Entity
+ * @ORM\Table(
+ *      name="chill_person_household"
+ *  )
+ * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
+ *    "household"=Household::class
+ * })
  */
 class Household
 {
@@ -15,17 +24,12 @@ class Household
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
+     * @Serializer\Groups({"read"})
      */
-    private $id;
-
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
+    private ?int $id = null;
 
     /**
      * Addresses
-     * @var Collection
      *
      * @ORM\ManyToMany(
      *     targetEntity="Chill\MainBundle\Entity\Address",
@@ -33,8 +37,27 @@ class Household
      * @ORM\JoinTable(name="chill_person_household_to_addresses")
      * @ORM\OrderBy({"validFrom" = "DESC"})
      */
-    private $addresses;
+    private Collection $addresses;
 
+    /**
+     * @ORM\OneToMany(
+     *      targetEntity=HouseholdMember::class,
+     *      mappedBy="household"
+     *  )
+     * @Serializer\Groups({"read"})
+     */
+    private Collection $members;
+
+    public function __construct()
+    {
+        $this->addresses = new ArrayCollection();
+        $this->members = new ArrayCollection();
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
 
     /**
      * @param Address $address
@@ -66,4 +89,34 @@ class Household
         return $this->addresses;
     }
 
+    /**
+     * @return Collection|HouseholdMember[]
+     */
+    public function getMembers(): Collection
+    {
+        return $this->members;
+    }
+
+    public function addMember(HouseholdMember $member): self
+    {
+        if (!$this->members->contains($member)) {
+            $this->members[] = $member;
+            $member->setHousehold($this);
+        }
+
+        return $this;
+    }
+
+    public function removeMember(HouseholdMember $member): self
+    {
+        if ($this->members->removeElement($member)) {
+            // set the owning side to null (unless already changed)
+            if ($member->getHousehold() === $this) {
+                $member->setHousehold(null);
+            }
+        }
+
+        return $this;
+    }
+
 }

src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php

@@ -0,0 +1,197 @@
+<?php
+
+namespace Chill\PersonBundle\Entity\Household;
+
+use Doctrine\ORM\Mapping as ORM;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\Household\Household;
+use Chill\PersonBundle\Entity\Household\Position;
+use Symfony\Component\Serializer\Annotation as Serializer;
+
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(
+ *      name="chill_person_household_members"
+ *  )
+ */
+class HouseholdMember
+{
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     * @Serializer\Groups({"read"})
+     */
+    private $id;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=Position::class)
+     * @Serializer\Groups({"read"})
+     */
+    private ?Position $position = null;
+
+    /**
+     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     * @Serializer\Groups({"read"})
+     */
+    private ?\DateTimeImmutable $startDate = null;
+
+    /**
+     * @ORM\Column(type="date_immutable", nullable= true, options={"default": null})
+     * @Serializer\Groups({"read"})
+     */
+    private ?\DateTimeImmutable $endDate = null;
+
+    /**
+     * @ORM\Column(type="string", length=255, nullable=true)
+     * @Serializer\Groups({"read"})
+     */
+    private ?string $comment = NULL;
+
+    /**
+     * @ORM\Column(type="boolean")
+     */
+    private bool $sharedHousehold = false;
+
+    /**
+     * @ORM\Column(type="boolean", options={"default": false})
+     * @Serializer\Groups({"read"})
+     */
+    private bool $holder = false;
+
+    /**
+     *
+     * @var Person
+     * @ORM\ManyToOne(
+     *  targetEntity="\Chill\PersonBundle\Entity\Person"
+     * )
+     * @Serializer\Groups({"read"})
+     */
+    private ?Person $person = null;
+
+    /**
+     *
+     * @var Household
+     * @ORM\ManyToOne(
+     *  targetEntity="\Chill\PersonBundle\Entity\Household\Household"
+     * )
+     */
+    private ?Household $household = null;
+
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getPosition(): ?Position
+    {
+        return $this->position;
+    }
+
+    public function setPosition(Position $position): self
+    {
+        if ($this->position instanceof Position) {
+            throw new \LogicException("The position is already set. You cannot change ".
+                "a position of a membership");
+        }
+
+        $this->position = $position;
+        $this->sharedHousehold = $position->getShareHousehold();
+
+        return $this;
+    }
+
+    public function getStartDate(): ?\DateTimeImmutable
+    {
+        return $this->startDate;
+    }
+
+    public function setStartDate(\DateTimeImmutable $startDate): self
+    {
+        $this->startDate = $startDate;
+
+        return $this;
+    }
+
+    public function getEndDate(): ?\DateTimeImmutable
+    {
+        return $this->endDate;
+    }
+
+    public function setEndDate(\DateTimeImmutable $endDate): self
+    {
+        $this->endDate = $endDate;
+
+        return $this;
+    }
+
+    public function getComment(): ?string
+    {
+        return $this->comment;
+    }
+
+    public function setComment(?string $comment): self
+    {
+        $this->comment = $comment;
+
+        return $this;
+    }
+
+    /**
+     * @Serializer\Groups({"read"})
+     */
+    public function getShareHousehold(): ?bool
+    {
+        return $this->sharedHousehold;
+    }
+
+
+    public function getPerson(): ?Person
+    {
+        return $this->person;
+    }
+
+    public function setPerson(?Person $person): self
+    {
+        if ($this->person instanceof Person) {
+            throw new \LogicException("You cannot change person ".
+                "on a membership");
+        }
+
+        $this->person = $person;
+        $this->person->addHouseholdParticipation($this);
+
+        return $this;
+    }
+
+    public function getHousehold(): ?Household
+    {
+        return $this->household;
+    }
+
+    public function setHousehold(?Household $household): self
+    {
+        if ($this->household instanceof Household) {
+            throw new \LogicException("You cannot change household ".
+                "on a membership");
+        }
+
+        $this->household = $household;
+
+        return $this;
+    }
+
+    public function setHolder(bool $holder): self
+    {
+        $this->holder = $holder;
+
+        return $this;
+    }
+
+    public function isHolder(): bool
+    {
+        return $this->holder;
+    }
+}

src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMembers.php

@@ -1,152 +0,0 @@
-<?php
-
-namespace Chill\PersonBundle\Entity\Household;
-
-use Doctrine\ORM\Mapping as ORM;
-use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Entity\Household\Household;
-
-/**
- * @ORM\Entity
- */
-class HouseholdMembers
-{
-    /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
-     */
-    private $id;
-
-    /**
-     * @ORM\Column(type="string", length=255, nullable=true)
-     */
-    private $position;
-
-    /**
-     * @ORM\Column(type="date")
-     */
-    private $startDate;
-
-    /**
-     * @ORM\Column(type="date")
-     */
-    private $endDate;
-
-    /**
-     * @ORM\Column(type="string", length=255, nullable=true)
-     */
-    private $comment;
-
-    /**
-     * @ORM\Column(type="boolean")
-     */
-    private $sharedHousehold;
-
-    /**
-     *
-     * @var Person
-     * @ORM\ManyToOne(
-     *  targetEntity="\Chill\PersonBundle\Entity\Person"
-     * )
-     */
-    private $person;
-
-    /**
-     *
-     * @var Household
-     * @ORM\ManyToOne(
-     *  targetEntity="\Chill\PersonBundle\Entity\Household\Household"
-     * )
-     */
-    private $household;
-
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function getPosition(): ?string
-    {
-        return $this->position;
-    }
-
-    public function setPosition(?string $position): self
-    {
-        $this->position = $position;
-
-        return $this;
-    }
-
-    public function getStartDate(): ?\DateTimeInterface
-    {
-        return $this->startDate;
-    }
-
-    public function setStartDate(\DateTimeInterface $startDate): self
-    {
-        $this->startDate = $startDate;
-
-        return $this;
-    }
-
-    public function getEndDate(): ?\DateTimeInterface
-    {
-        return $this->endDate;
-    }
-
-    public function setEndDate(\DateTimeInterface $endDate): self
-    {
-        $this->endDate = $endDate;
-
-        return $this;
-    }
-
-    public function getComment(): ?string
-    {
-        return $this->comment;
-    }
-
-    public function setComment(?string $comment): self
-    {
-        $this->comment = $comment;
-
-        return $this;
-    }
-
-    public function getSharedHousehold(): ?bool
-    {
-        return $this->sharedHousehold;
-    }
-
-    public function setSharedHousehold(bool $sharedHousehold): self
-    {
-        $this->sharedHousehold = $sharedHousehold;
-
-        return $this;
-    }
-
-    public function getPerson(): ?Person
-    {
-        return $this->person;
-    }
-
-    public function setPerson(?Person $person): self
-    {
-        $this->person = $person;
-
-        return $this;
-    }
-
-    public function getHousehold(): ?Household
-    {
-        return $this->household;
-    }
-
-    public function setHousehold(?Household $household): self
-    {
-        $this->household = $household;
-
-        return $this;
-    }
-}

src/Bundle/ChillPersonBundle/Entity/Household/Position.php

@@ -0,0 +1,98 @@
+<?php
+
+namespace Chill\PersonBundle\Entity\Household;
+
+use Chill\PersonBundle\Repository\Household\PositionRepository;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
+
+/**
+ * @ORM\Entity(repositoryClass=PositionRepository::class)
+ * @ORM\Table(name="chill_person_household_position")
+ * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
+ *   "household_position"=Position::class
+ *   })
+ */
+class Position
+{
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     * @Serializer\Groups({ "read" })
+     */
+    private $id;
+
+    /**
+     * @ORM\Column(type="json")
+     */
+    private $label = [];
+
+    /**
+     * @ORM\Column(type="boolean")
+     */
+    private $shareHouseHold;
+
+    /**
+     * @ORM\Column(type="boolean")
+     */
+    private $allowHolder;
+
+    /**
+     * @ORM\Column(type="float")
+     */
+    private $ordering;
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getLabel(): ?array
+    {
+        return $this->label;
+    }
+
+    public function setLabel(array $label): self
+    {
+        $this->label = $label;
+
+        return $this;
+    }
+
+    public function getShareHousehold(): ?bool
+    {
+        return $this->shareHouseHold;
+    }
+
+    public function setShareHousehold(bool $shareHouseHold): self
+    {
+        $this->shareHouseHold = $shareHouseHold;
+
+        return $this;
+    }
+
+    public function getAllowHolder(): ?bool
+    {
+        return $this->allowHolder;
+    }
+
+    public function setAllowHolder(bool $allowHolder): self
+    {
+        $this->allowHolder = $allowHolder;
+
+        return $this;
+    }
+
+    public function getOrdering(): ?float
+    {
+        return $this->ordering;
+    }
+
+    public function setOrdering(float $ordering): self
+    {
+        $this->ordering = $ordering;
+
+        return $this;
+    }
+}

src/Bundle/ChillPersonBundle/Entity/Person.php

@@ -26,6 +26,7 @@ use ArrayIterator;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Country;
 use Chill\PersonBundle\Entity\MaritalStatus;
+use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use Chill\MainBundle\Entity\Address;
 use DateTime;
@@ -272,6 +273,14 @@ class Person implements HasCenterInterface
      */
     private $fullnameCanonical;
 
+    /**
+     * @ORM\OneToMany(
+     *  targetEntity=HouseholdMember::class,
+     *  mappedBy="person"
+     * )
+     */
+    private Collection $householdParticipations;
+
     /**
      * Person constructor.
      *
@@ -284,6 +293,7 @@ class Person implements HasCenterInterface
         $this->addresses = new ArrayCollection();
         $this->altNames = new ArrayCollection();
         $this->otherPhoneNumbers = new ArrayCollection();
+        $this->householdParticipations = new ArrayCollection();
 
         if ($opening === null) {
             $opening = new \DateTime();
@@ -1180,4 +1190,16 @@ class Person implements HasCenterInterface
         $this->fullnameCanonical = $fullnameCanonical;
         return $this;
     }
+
+    public function addHouseholdParticipation(HouseholdMember $member): self
+    {
+        $this->householdParticipations[] = $member;
+
+        return $this;
+    }
+
+    public function getHouseholdParticipations(): Collection
+    {
+        return $this->householdParticipations;
+    }
 }