Merge remote-tracking branch 'origin/master' into issue185_ACCent_createdBy_updatedBy

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,18 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
 
         return $centers ?? null;
     }
+
+    public function getGroupSequence()
+    {
+        if ($this->getStep() == self::STEP_DRAFT)
+        {
+            return [[self::STEP_DRAFT]];
+        } elseif ($this->getStep() == self::STEP_CONFIRMED)
+        {
+            return [[self::STEP_DRAFT, self::STEP_CONFIRMED]];
+        }
+
+        throw new \LogicException("no validation group permitted with this step");
+
+    }
 }

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

@@ -167,7 +167,7 @@ use Symfony\Component\Validator\Constraints as Assert;
       * @ORM\OneToMany(
       *     targetEntity=AccompanyingPeriodWorkEvaluation::class,
       *     mappedBy="accompanyingPeriodWork",
-      *     cascade={"persist"},
+      *     cascade={"remove", "persist"},
       *     orphanRemoval=true
       * )
       * @Serializer\Groups({"read"})

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

@@ -70,7 +70,8 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
 
     /**
     * @ORM\ManyToOne(
-    *     targetEntity=StoredObject::class
+    *     targetEntity=StoredObject::class,
+    *     cascade={"remove"},
     * )
      * @Serializer\Groups({"read"})
     */

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);
+        }
+    }
 }

src/Bundle/ChillPersonBundle/Entity/Person.php

@@ -932,13 +932,19 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * return gender as a Numeric form.
      * This is used for translations
      * @return int
+     * @deprecated Keep for legacy. Used in Chill 1.5 for feminize before icu translations
      */
     public function getGenderNumeric()
     {
-        if ($this->getGender() == self::FEMALE_GENDER) {
-            return 1;
-        } else {
-            return 0;
+        switch ($this->getGender()) {
+            case self::FEMALE_GENDER:
+                return 1;
+            case self::MALE_GENDER:
+                return 0;
+            case self::BOTH_GENDER:
+                return 2;
+            default:
+                return -1;
         }
     }
 
@@ -1177,9 +1183,9 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @param string $phonenumber
      * @return Person
      */
-    public function setPhonenumber($phonenumber = '')
+    public function setPhonenumber(?string $phonenumber = '')
     {
-        $this->phonenumber = $phonenumber;
+        $this->phonenumber = (string) $phonenumber;
 
         return $this;
     }
@@ -1200,9 +1206,9 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @param string $mobilenumber
      * @return Person
      */
-    public function setMobilenumber($mobilenumber = '')
+    public function setMobilenumber(?string $mobilenumber = '')
     {
-        $this->mobilenumber = $mobilenumber;
+        $this->mobilenumber = (string) $mobilenumber;
 
         return $this;
     }

src/Bundle/ChillPersonBundle/Entity/Relationships/Relation.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace Chill\PersonBundle\Entity\Relationships;
+
+use Doctrine\ORM\Mapping as ORM;
+use Doctrine\ORM\Mapping\DiscriminatorColumn;
+use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
+use Symfony\Component\Serializer\Annotation as Serializer;
+
+/**
+ * @ORM\Entity()
+ * @ORM\Table(name="chill_person_relations")
+ * @DiscriminatorMap(typeProperty="type", mapping={
+ *  "relation"=Relation::class
+ * })
+ */
+class Relation
+{
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     * @Serializer\Groups({"read"})
+     */
+    private ?int $id = null;
+
+    /**
+     * @ORM\Column(type="json", nullable=true)
+     * @Serializer\Groups({"read"})
+     */
+    private array $title = [];
+
+    /**
+     * @ORM\Column(type="json", nullable=true)
+     * @Serializer\Groups({"read"})
+     */
+    private array $reverseTitle = [];
+
+    /**
+     * @ORM\Column(type="boolean", nullable=true)
+     * @Serializer\Groups({"read"})
+     */
+    private bool $isActive = true;
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getTitle(): ?array
+    {
+        return $this->title;
+    }
+
+    public function setTitle(?array $title): self
+    {
+        $this->title = $title;
+
+        return $this;
+    }
+
+    public function getReverseTitle(): ?array
+    {
+        return $this->reverseTitle;
+    }
+
+    public function setReverseTitle(?array $reverseTitle): self
+    {
+        $this->reverseTitle = $reverseTitle;
+
+        return $this;
+    }
+
+    public function getIsActive(): bool
+    {
+        return $this->isActive;
+    }
+
+    public function setIsActive(?bool $isActive): self
+    {
+        $this->isActive = $isActive;
+
+        return $this;
+    }
+}

src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php

@@ -0,0 +1,192 @@
+<?php
+
+namespace Chill\PersonBundle\Entity\Relationships;
+
+use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
+use Chill\MainBundle\Entity\User;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\Relationships\Relation;
+use DateTimeImmutable;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
+use Doctrine\ORM\Mapping\DiscriminatorColumn;
+use Symfony\Component\Serializer\Annotation as Serializer;
+
+/**
+ * @ORM\Entity()
+ * @ORM\Table(name="chill_person_relationships")
+ * @DiscriminatorColumn(name="relation_id", type="integer")
+ * @DiscriminatorMap(typeProperty="type", mapping={
+ *  "relationship"=Relationship::class
+ * })
+ * 
+ */
+class Relationship implements TrackCreationInterface, TrackUpdateInterface
+{
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     * @Serializer\Groups({"read"})
+     */
+    private ?int $id = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=Person::class)
+     * @ORM\JoinColumn(nullable=false)
+     * @Assert\NotNull()
+     * @Serializer\Groups({"read", "write"})
+     */
+    private ?Person $fromPerson = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=Person::class)
+     * @ORM\JoinColumn(nullable=false)
+     * @Assert\NotNull()
+     * @Serializer\Groups({"read", "write"})
+     */
+    private ?Person $toPerson = null;
+    
+    /**
+     * @ORM\ManyToOne(targetEntity=Relation::class)
+     * @ORM\JoinColumn(nullable=false, name="relation_id", referencedColumnName="id")
+     * @Assert\NotNull()
+     * @Serializer\Groups({"read", "write"})
+     */
+    private ?Relation $relation = null;
+    
+    /**
+     * @ORM\Column(type="boolean")
+     * @Assert\Type(
+     *  type="bool",
+     *  message="This must be of type boolean"
+     * )
+     * @Serializer\Groups({"read", "write"})
+     */
+    private bool $reverse;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=User::class)
+     * @ORM\JoinColumn(nullable=false)
+     */
+    private ?User $createdBy = null;
+
+    /**
+     * @ORM\Column(type="datetime_immutable")
+     */
+    private ?DateTimeImmutable $createdAt = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=User::class)
+     */
+    private ?User $updatedBy = null;
+
+    /**
+     * @ORM\Column(type="datetime_immutable", nullable=true)
+     */
+    private ?DateTimeImmutable $updatedAt = null;
+
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getFromPerson(): ?Person
+    {
+        return $this->fromPerson;
+    }
+
+    public function setFromPerson(?Person $fromPerson): self
+    {
+        $this->fromPerson = $fromPerson;
+
+        return $this;
+    }
+
+    public function getToPerson(): ?Person
+    {
+        return $this->toPerson;
+    }
+
+    public function setToPerson(?Person $toPerson): self
+    {
+        $this->toPerson = $toPerson;
+
+        return $this;
+    }
+
+    public function getReverse(): ?bool
+    {
+        return $this->reverse;
+    }
+
+    public function setReverse(bool $reverse): self
+    {
+        $this->reverse = $reverse;
+
+        return $this;
+    }
+
+    public function getCreatedBy(): ?User
+    {
+        return $this->createdBy;
+    }
+
+    public function setCreatedBy(?User $user): self
+    {
+        $this->createdBy = $user;
+
+        return $this;
+    }
+
+    public function getCreatedAt(): ?\DateTimeImmutable
+    {
+        return $this->createdAt;
+    }
+
+    public function setCreatedAt(\DateTimeInterface $createdAt): self
+    {
+        $this->createdAt = $createdAt;
+
+        return $this;
+    }
+
+    public function getUpdatedBy(): ?User
+    {
+        return $this->updatedBy;
+    }
+
+    public function setUpdatedBy(?User $updatedBy): self
+    {
+        $this->updatedBy = $updatedBy;
+
+        return $this;
+    }
+
+    public function getUpdatedAt(): ?\DateTimeImmutable
+    {
+        return $this->updatedAt;
+    }
+
+    public function setUpdatedAt(?\DateTimeInterface $updatedAt): self
+    {
+        $this->updatedAt = $updatedAt;
+
+        return $this;
+    }
+
+    public function getRelation(): ?Relation
+    {
+        return $this->relation;
+    }
+
+    public function setRelation(?Relation $relation): self
+    {
+        $this->relation = $relation;
+
+        return $this;
+    }
+}