Merge branch 'accourse_validation' into 'master'

add validation to accompanying periods

See merge request Chill-Projet/chill-bundles!183

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php

@@ -45,6 +45,9 @@ use Chill\MainBundle\Entity\User;
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Validator\GroupSequenceProviderInterface;
+use Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ParticipationOverlap;
+use Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ResourceDuplicateCheck;
 
 /**
  * AccompanyingPeriod Class
@@ -54,9 +57,10 @@ use Symfony\Component\Validator\Constraints as Assert;
  * @DiscriminatorMap(typeProperty="type", mapping={
  *  "accompanying_period"=AccompanyingPeriod::class
  *  })
+ * @Assert\GroupSequenceProvider
  */
 class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface,
-    HasScopesInterface, HasCentersInterface
+    HasScopesInterface, HasCentersInterface, GroupSequenceProviderInterface
 {
     /**
      * Mark an accompanying period as "occasional"
@@ -132,6 +136,7 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
      *       cascade={"persist", "remove"},
      *       orphanRemoval=true
      *     )
+     * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_DRAFT})
      */
     private $comments;
 
@@ -147,9 +152,10 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
      * @var Collection
      *
      * @ORM\OneToMany(targetEntity=AccompanyingPeriodParticipation::class,
-     *     mappedBy="accompanyingPeriod",
+     *     mappedBy="accompanyingPeriod", orphanRemoval=true,
      *     cascade={"persist", "refresh", "remove", "merge", "detach"})
      * @Groups({"read"})
+     * @ParticipationOverlap(groups={AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED})
      */
     private $participations;
 
@@ -188,6 +194,7 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
      * @ORM\ManyToOne(targetEntity=Origin::class)
      * @ORM\JoinColumn(nullable=true)
      * @Groups({"read", "write"})
+     * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_CONFIRMED})
      */
     private $origin;
 
@@ -195,8 +202,9 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
      * @var string
      * @ORM\Column(type="string", nullable=true)
      * @Groups({"read", "write"})
+     * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_CONFIRMED})
      */
-    private $intensity;
+    private $intensity = self::INTENSITY_OCCASIONAL;
 
     /**
      * @var Collection
@@ -210,6 +218,7 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
      *     inverseJoinColumns={@ORM\JoinColumn(name="scope_id", referencedColumnName="id")}
      * )
      * @Groups({"read"})
+     * @Assert\Count(min=1, groups={AccompanyingPeriod::STEP_CONFIRMED})
      */
     private $scopes;
 
@@ -256,6 +265,7 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
      *     orphanRemoval=true
      * )
      * @Groups({"read"})
+     * @ResourceDuplicateCheck(groups={AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED, "Default", "default"})
      */
     private $resources;
 
@@ -267,6 +277,7 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
      *     name="chill_person_accompanying_period_social_issues"
      *  )
      * @Groups({"read"})
+     * @Assert\Count(min=1, groups={AccompanyingPeriod::STEP_CONFIRMED})
      */
     private Collection $socialIssues;
 
@@ -606,6 +617,14 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
         return $participation;
     }
 
+    /**
+     * Remove Participation
+     */
+
+    public function removeParticipation(AccompanyingPeriodParticipation $participation)
+    {
+        $participation->setAccompanyingPeriod(null);
+    }
 
     /**
      * Remove Person
@@ -1115,4 +1134,17 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
 
         return $centers ?? null;
     }
+
+    public function getGroupSequence()
+    {
+        if($this->getStep() == self::STEP_DRAFT)
+        {
+            return [[self::STEP_DRAFT]];
+        }
+
+        if($this->getStep() == self::STEP_CONFIRMED)
+        {
+            return [[self::STEP_DRAFT, self::STEP_CONFIRMED]];
+        }
+    }
 }

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

@@ -33,7 +33,13 @@ use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
  * @ORM\Entity
- * @ORM\Table(name="chill_person_accompanying_period_resource")
+ * @ORM\Table(
+ *  name="chill_person_accompanying_period_resource",
+ *  uniqueConstraints={
+ *      @ORM\UniqueConstraint(name="person_unique", columns={"person_id", "accompanyingperiod_id"}),
+ *      @ORM\UniqueConstraint(name="thirdparty_unique", columns={"thirdparty_id", "accompanyingperiod_id"})
+ *  }
+ * )
  * @DiscriminatorMap(typeProperty="type", mapping={
  *   "accompanying_period_resource"=Resource::class
  *  })

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriodParticipation.php

@@ -134,4 +134,11 @@ class AccompanyingPeriodParticipation
     {
         return $this->endDate === null;
     }
+
+    private function checkSameStartEnd() 
+    {
+        if($this->endDate == $this->startDate) {
+            $this->accompanyingPeriod->removeParticipation($this);
+        }
+    }
 }