merge with master

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php

@@ -250,10 +250,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this->accompanyingPeriod;
     }
 
-    /**
-     * @return Collection
-     */
-    public function getAccompanyingPeriodWorkEvaluations()
+    public function getAccompanyingPeriodWorkEvaluations(): Collection
     {
         return $this->accompanyingPeriodWorkEvaluations;
     }

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php

@@ -67,10 +67,15 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
     private ?User $createdBy = null;
 
     /**
+     * **Note on deserialization/denormalization**: denormalization of documents is handled by.
+     *
+     * @see{Chill\PersonBundle\Serializer\Normalizer\AccompanyingPeriodWorkEvaluationDenormalizer}
+     *
      * @ORM\OneToMany(
      *     targetEntity=AccompanyingPeriodWorkEvaluationDocument::class,
      *     mappedBy="accompanyingPeriodWorkEvaluation",
-     *     cascade={"remove"}
+     *     cascade={"remove", "persist"},
+     *     orphanRemoval=true
      * )
      * @Serializer\Groups({"read"})
      */
@@ -261,6 +266,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
     public function removeDocument(AccompanyingPeriodWorkEvaluationDocument $document): self
     {
         $this->documents->removeElement($document);
+        $document->setAccompanyingPeriodWorkEvaluation(null);
 
         return $this;
     }

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php

@@ -41,6 +41,7 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
      * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      */
     private ?\DateTimeImmutable $createdAt = null;
 
@@ -49,6 +50,7 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
      *     targetEntity=User::class
      * )
      * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      */
     private ?User $createdBy = null;
 
@@ -60,15 +62,32 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
      * @internal the default name exceeds 64 characters, we must set manually:
      * @ORM\SequenceGenerator(sequenceName="chill_person_social_work_eval_doc_id_seq", allocationSize=1, initialValue=1000)
      * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      */
-    private ?int $id;
+    private ?int $id = null;
+
+    /**
+     * This is a workaround for client, to allow them to assign arbitrary data
+     * dedicated to their job.
+     *
+     * This data is not persisted into database, but will appears on the data
+     * normalized during the same request (like PUT/PATCH request)
+     *
+     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"write"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
+     *
+     * @var mixed
+     */
+    private $key;
 
     /**
      * @ORM\ManyToOne(
      *     targetEntity=StoredObject::class,
-     *     cascade={"remove"},
      * )
      * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"write"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      */
     private ?StoredObject $storedObject = null;
 
@@ -77,12 +96,22 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
      *     targetEntity=DocGeneratorTemplate::class
      * )
      * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      */
     private ?DocGeneratorTemplate $template = null;
 
+    /**
+     * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"write"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
+     */
+    private ?string $title = '';
+
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
      * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      */
     private ?\DateTimeImmutable $updatedAt = null;
 
@@ -91,6 +120,7 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
      *     targetEntity=User::class
      * )
      * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      */
     private ?User $updatedBy = null;
 
@@ -117,6 +147,14 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
         return $this->id;
     }
 
+    /**
+     * @return mixed
+     */
+    public function getKey()
+    {
+        return $this->key;
+    }
+
     public function getStoredObject(): ?StoredObject
     {
         return $this->storedObject;
@@ -127,6 +165,11 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
         return $this->template;
     }
 
+    public function getTitle(): ?string
+    {
+        return $this->title;
+    }
+
     /**
      * @return DateTimeImmutable|null
      */
@@ -171,6 +214,18 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
         return $this;
     }
 
+    /**
+     * @param mixed $key
+     *
+     * @return AccompanyingPeriodWorkEvaluationDocument
+     */
+    public function setKey($key)
+    {
+        $this->key = $key;
+
+        return $this;
+    }
+
     public function setStoredObject(?StoredObject $storedObject): AccompanyingPeriodWorkEvaluationDocument
     {
         $this->storedObject = $storedObject;
@@ -185,6 +240,13 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
         return $this;
     }
 
+    public function setTitle(?string $title): AccompanyingPeriodWorkEvaluationDocument
+    {
+        $this->title = $title;
+
+        return $this;
+    }
+
     public function setUpdatedAt(DateTimeInterface $datetime): TrackUpdateInterface
     {
         $this->updatedAt = $datetime;

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

@@ -358,7 +358,7 @@ class Household
             $membership->getEndDate()
         )->filter(
             static function (HouseholdMember $m) use ($membership) {
-                return $m !== $membership;
+                return $m->getPerson() !== $membership->getPerson();
             }
         );
     }