Squashed commit of the following:

commit 977863c2dd56d5c835f2a710cad7f7d3ba42da68 Merge: 5c37b419d 3eb7ffed1 Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Sun Dec 12 14:45:21 2021 +0100 Merge remote-tracking branch 'origin/master' into docgen/improve-normalizer commit 5c37b419ddf0b32b9950c33042396bba1860da84 Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Sun Dec 12 14:37:05 2021 +0100 fix normalization for user and type in null value commit 4469d46cdb19051fedec86bbb84e2351e6fcb72e Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Sun Dec 12 13:24:23 2021 +0100 add civility to person commit 6cf92fbbde8f4d9f2f4763ec4ee88216257040f7 Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Sun Dec 12 13:19:36 2021 +0100 fix person normalization: add a isNull on not null person commit ed6087ff8fd47b80ea5e9526756fe5d032d478e3 Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Sun Dec 12 13:08:46 2021 +0100 fix stan and cs issues commit 8429c334c33b3545835cbde034fccaa529c134a7 Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Sun Dec 12 13:08:36 2021 +0100 fix id type commit 39ae00d172a9f29320a97abb8518b2ea48d89d9b Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Sun Dec 12 12:52:41 2021 +0100 fix test and fix null or not-null value have same keys commit 312fcc44c07affa7aa60f6c5fce58f9d1c564cc3 Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Sat Dec 11 03:27:30 2021 +0100 improve normalization wip commit f91a29635827005fc58617dc1c9d210091372be5 Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Sat Dec 11 01:15:32 2021 +0100 improve normalization commit 56060e5e6a2191ef441039fdc91a01fb4653a553 Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Sat Dec 11 00:41:09 2021 +0100 handle changelog with translatable string commit 9004686a13 Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Fri Dec 10 01:10:55 2021 +0100 improve docgen wip commit e266fa0e5d Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Thu Dec 9 21:50:56 2021 +0100 show errors from relatorio driver commit 75ba56fa09 Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Thu Dec 9 21:14:12 2021 +0100 add verification tool for admin commit 12d6829b98 Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Thu Dec 9 14:17:42 2021 +0100 fix type with phonenumber helper commit 7b5e96771f Merge: 8a9024de1 8a4748dc2 Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Thu Dec 9 14:11:14 2021 +0100 Merge remote-tracking branch 'origin/master' into docgen/improve-normalizer commit 8a9024de13 Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Thu Dec 9 13:51:36 2021 +0100 add docgen:normalization for relation commit 24a404964b Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Thu Dec 9 12:44:41 2021 +0100 docgen normalization for relation commit 5d24bd4d11 Merge: 70ab23214 455b225f4 Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Wed Dec 8 21:08:30 2021 +0100 Merge branch 'master' into docgen/improve-normalizer commit 70ab232149 Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Wed Dec 8 13:58:49 2021 +0100 improve docgen, trnslations, admin commit 027c01fc58 Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Wed Dec 8 12:23:24 2021 +0100 fix css block commit fdc5127c74 Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Wed Dec 8 11:57:16 2021 +0100 fix some error in test (wip) commit b8d48f04ae Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Wed Dec 8 11:47:50 2021 +0100 fix tests (wip) commit f1b1771d6b Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Wed Dec 8 11:35:00 2021 +0100 fix tests (wip) commit 62dabbe1e7 Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Wed Dec 8 11:14:46 2021 +0100 fix code style commit 4101392190 Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Wed Dec 8 11:13:49 2021 +0100 fix tests and type hinting commit 3f1bed0b1c Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Wed Dec 8 11:05:41 2021 +0100 fix tests (wip) commit 79fbdcdee4 Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Wed Dec 8 11:05:29 2021 +0100 type hint User class commit 3d8d79323e Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Wed Dec 8 10:56:30 2021 +0100 remove error messages commit 32178e22fe Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Wed Dec 8 10:51:30 2021 +0100 fix tests (wip) commit 60a8c20896 Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Wed Dec 8 10:29:54 2021 +0100 update app commit 9d8011da61 Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Wed Dec 8 10:06:35 2021 +0100 fix loading origin commit 789eeadb40 Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Wed Dec 8 09:52:51 2021 +0100 fix loading fixtures for doc generator template commit f206fdb08c Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Wed Dec 8 09:52:35 2021 +0100 fix code style commit 9d5409d8d9 Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Wed Dec 8 09:52:06 2021 +0100 fix casting commit e297d82533 Author: Julien Fastré <julien.fastre@champs-libres.coop> Date: Wed Dec 8 09:26:13 2021 +0100 fixes on tests [WIP]
2025-08-20 22:53:49 +00:00 · 2021-12-12 14:46:37 +01:00
parent 3eb7ffed1a
commit 839fb4a211
55 changed files with 1401 additions and 305 deletions
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
@@ -789,6 +789,22 @@ class AccompanyingPeriod implements
        return $this->requestorPerson ?? $this->requestorThirdParty;
    }

+    /**
+     * @return string 'person' if requestor is an instanceof @see{Person::class}, 'thirdparty' if this is an instanceof @see{ThirdParty::class}, or 'none'
+     */
+    public function getRequestorKind(): string
+    {
+        if ($this->getRequestor() instanceof ThirdParty) {
+            return 'thirdparty';
+        }
+
+        if ($this->getRequestor() instanceof Person) {
+            return 'person';
+        }
+
+        return 'none';
+    }
+
    public function getRequestorPerson(): ?Person
    {
        return $this->requestorPerson;
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php
@@ -14,6 +14,7 @@ namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;

 /**
 * ClosingMotive give an explanation why we closed the Accompanying period.
@@ -24,22 +25,18 @@ use Doctrine\ORM\Mapping as ORM;
 class ClosingMotive
 {
    /**
-     * @var bool
-     *
     * @ORM\Column(type="boolean")
     */
-    private $active = true;
+    private bool $active = true;

    /**
     * Child Accompanying periods.
     *
-     * @var Collection
-     *
     * @ORM\OneToMany(
     *     targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive",
     * mappedBy="parent")
     */
-    private $children;
+    private Collection $children;

    /**
     * @var int
@@ -47,22 +44,21 @@ class ClosingMotive
     * @ORM\Id
     * @ORM\Column(name="id", type="integer")
     * @ORM\GeneratedValue(strategy="AUTO")
+     * @Serializer\Groups({"docgen:read"})
     */
-    private $id;
+    private ?int $id = null;

    /**
-     * @var array
-     *
     * @ORM\Column(type="json")
+     * @Serializer\Groups({"docgen:read"})
+     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
     */
-    private $name;
+    private array $name = [];

    /**
-     * @var float
-     *
     * @ORM\Column(type="float")
     */
-    private $ordering = 0.0;
+    private float $ordering = 0.0;

    /**
     * @var self
@@ -71,7 +67,7 @@ class ClosingMotive
     *     targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive",
     * inversedBy="children")
     */
-    private $parent;
+    private ?ClosingMotive $parent = null;

    /**
     * ClosingMotive constructor.
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Origin.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Origin.php
@@ -31,15 +31,16 @@ class Origin
     * @ORM\Id
     * @ORM\GeneratedValue
     * @ORM\Column(type="integer")
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
     */
    private ?int $id = null;

    /**
     * @ORM\Column(type="json")
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
+     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
     */
-    private $label;
+    private array $label = [];

    /**
     * @ORM\Column(type="date_immutable", nullable=true)
@@ -52,7 +53,7 @@ class Origin
        return $this->id;
    }

-    public function getLabel()
+    public function getLabel(): array
    {
        return $this->label;
    }
--- a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
@@ -65,7 +65,7 @@ class HouseholdMember
     * @ORM\Column(type="integer")
     * @Serializer\Groups({"read", "docgen:read"})
     */
-    private $id;
+    private ?int $id = null;

    /**
     * @var Person
@@ -73,6 +73,7 @@ class HouseholdMember
     *     targetEntity="\Chill\PersonBundle\Entity\Person"
     * )
     * @Serializer\Groups({"read", "docgen:read"})
+     * @Serializer\Context({"docgen:person:with-household": false})
     * @Assert\Valid(groups={"household_memberships"})
     * @Assert\NotNull(groups={"household_memberships"})
     */
--- a/src/Bundle/ChillPersonBundle/Entity/Household/Position.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/Position.php
@@ -35,11 +35,12 @@ class Position
     * @ORM\Column(type="integer")
     * @Serializer\Groups({"read", "docgen:read"})
     */
-    private ?int $id;
+    private ?int $id = null;

    /**
     * @ORM\Column(type="json")
     * @Serializer\Groups({"read", "docgen:read"})
+     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
     */
    private array $label = [];

--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -588,8 +588,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
        return $this;
    }

-    // a period opened and another one after it
-
    /**
     * Function used for validation that check if the accompanying periods of
     * the person are not collapsing (i.e. have not shared days) or having
--- a/src/Bundle/ChillPersonBundle/Entity/Relationships/Relation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Relationships/Relation.php
@@ -41,12 +41,14 @@ class Relation
    /**
     * @ORM\Column(type="json", nullable=true)
     * @Serializer\Groups({"read"})
+     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
     */
    private array $reverseTitle = [];

    /**
     * @ORM\Column(type="json", nullable=true)
     * @Serializer\Groups({"read"})
+     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
     */
    private array $title = [];

--- a/src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php
@@ -19,6 +19,7 @@ use DateTimeImmutable;
 use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\ORM\Mapping\DiscriminatorColumn;
+use RuntimeException;
 use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Symfony\Component\Validator\Constraints as Assert;
@@ -116,6 +117,27 @@ class Relationship implements TrackCreationInterface, TrackUpdateInterface
        return $this->id;
    }

+    /**
+     * Return the opposite person of the @see{counterpart} person.
+     *
+     * this is the from person if the given is associated to the To,
+     * or the To person otherwise.
+     *
+     * @throw RuntimeException if the counterpart is neither in the from or to person
+     */
+    public function getOpposite(Person $counterpart): Person
+    {
+        if ($this->fromPerson !== $counterpart && $this->toPerson !== $counterpart) {
+            throw new RuntimeException('the counterpart is neither the from nor to person for this relationship');
+        }
+
+        if ($this->fromPerson === $counterpart) {
+            return $this->toPerson;
+        }
+
+        return $this->fromPerson;
+    }
+
    public function getRelation(): ?Relation
    {
        return $this->relation;
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
@@ -55,6 +55,7 @@ class Evaluation
    /**
     * @ORM\Column(type="json")
     * @Serializer\Groups({"read", "docgen:read"})
+     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
     */
    private array $title = [];

--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php
@@ -40,24 +40,25 @@ class Goal
     * @ORM\Column(type="integer")
     * @Serializer\Groups({"read", "docgen:read"})
     */
-    private $id;
+    private ?int $id = null;

    /**
     * @ORM\ManyToMany(targetEntity=Result::class, inversedBy="goals")
     * @ORM\JoinTable(name="chill_person_social_work_goal_result")
     */
-    private $results;
+    private Collection $results;

    /**
     * @ORM\ManyToMany(targetEntity=SocialAction::class, mappedBy="goals")
     */
-    private $socialActions;
+    private Collection $socialActions;

    /**
     * @ORM\Column(type="json")
     * @Serializer\Groups({"read", "docgen:read"})
+     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
     */
-    private $title = [];
+    private array $title = [];

    public function __construct()
    {
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php
@@ -13,6 +13,7 @@ namespace Chill\PersonBundle\Entity\SocialWork;

 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkGoal;
+use DateTime;
 use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
@@ -34,22 +35,22 @@ class Result
    /**
     * @ORM\ManyToMany(targetEntity=AccompanyingPeriodWorkGoal::class, mappedBy="results")
     */
-    private $accompanyingPeriodWorkGoals;
+    private Collection $accompanyingPeriodWorkGoals;

    /**
     * @ORM\ManyToMany(targetEntity=AccompanyingPeriodWork::class, mappedBy="results")
     */
-    private $accompanyingPeriodWorks;
+    private Collection $accompanyingPeriodWorks;

    /**
     * @ORM\Column(type="datetime", nullable=true)
     */
-    private $desactivationDate;
+    private DateTime $desactivationDate;

    /**
     * @ORM\ManyToMany(targetEntity=Goal::class, mappedBy="results")
     */
-    private $goals;
+    private Collection $goals;

    /**
     * @ORM\Id
@@ -57,18 +58,19 @@ class Result
     * @ORM\Column(type="integer")
     * @Serializer\Groups({"read", "docgen:read"})
     */
-    private $id;
+    private ?int $id = null;

    /**
     * @ORM\ManyToMany(targetEntity=SocialAction::class, mappedBy="results")
     */
-    private $socialActions;
+    private Collection $socialActions;

    /**
     * @ORM\Column(type="json")
     * @Serializer\Groups({"read", "docgen:read"})
+     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
     */
-    private $title = [];
+    private array $title = [];

    public function __construct()
    {