normalization for docgen:read: add groups and so on (wip)

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php

@@ -259,7 +259,7 @@ class AccompanyingPeriod implements
      *     cascade={"persist", "remove"},
      *     orphanRemoval=true
      * )
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
      * @ResourceDuplicateCheck(groups={AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED, "Default", "default"})
      */
     private Collection $resources;
@@ -274,7 +274,7 @@ class AccompanyingPeriod implements
      *     joinColumns={@ORM\JoinColumn(name="accompanying_period_id", referencedColumnName="id")},
      *     inverseJoinColumns={@ORM\JoinColumn(name="scope_id", referencedColumnName="id")}
      * )
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
      * @Assert\Count(min=1, groups={AccompanyingPeriod::STEP_CONFIRMED}, minMessage="A course must be associated to at least one scope")
      */
     private Collection $scopes;
@@ -340,6 +340,7 @@ class AccompanyingPeriod implements
         $this->socialIssues = new ArrayCollection();
         $this->comments = new ArrayCollection();
         $this->works = new ArrayCollection();
+        $this->resources = new ArrayCollection();
     }
 
     /**
@@ -575,6 +576,9 @@ class AccompanyingPeriod implements
         return $this->createdBy;
     }
 
+    /**
+     * @Groups({"docgen:read"})
+     */
     public function getCurrentParticipations(): Collection
     {
         return $this->getOpenParticipations();

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

@@ -41,11 +41,10 @@ class Resource
      * )
      * @ORM\JoinColumn(nullable=false)
      */
-    private $accompanyingPeriod;
+    private ?AccompanyingPeriod $accompanyingPeriod = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=Comment::class)
-     * @ORM\JoinColumn(nullable=true)
      */
     private $comment;
 
@@ -53,21 +52,23 @@ class Resource
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
      */
-    private $id;
+    private ?int $id = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=Person::class)
      * @ORM\JoinColumn(nullable=true)
+     * @Groups({"docgen:read"})
      */
-    private $person;
+    private ?Person $person = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=ThirdParty::class)
      * @ORM\JoinColumn(nullable=true)
+     * @Groups({"docgen:read"})
      */
-    private $thirdParty;
+    private ?ThirdParty $thirdParty = null;
 
     public function getAccompanyingPeriod(): ?AccompanyingPeriod
     {

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriodParticipation.php

@@ -32,38 +32,38 @@ class AccompanyingPeriodParticipation
      * @ORM\ManyToOne(targetEntity=AccompanyingPeriod::class, inversedBy="participations", cascade={"persist"})
      * @ORM\JoinColumn(name="accompanyingperiod_id", referencedColumnName="id", nullable=false)
      */
-    private $accompanyingPeriod;
+    private ?AccompanyingPeriod $accompanyingPeriod = null;
 
     /**
      * @ORM\Column(type="date", nullable=true)
-     * @Groups({"read", "read:docgen"})
+     * @Groups({"read", "docgen:read"})
      */
-    private $endDate;
+    private ?\DateTime $endDate = null;
 
     /**
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
-     * @Groups({"read", "read:docgen"})
+     * @Groups({"read", "docgen:read"})
      */
-    private $id;
+    private ?int $id = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=Person::class, inversedBy="accompanyingPeriodParticipations")
      * @ORM\JoinColumn(name="person_id", referencedColumnName="id", nullable=false)
-     * @Groups({"read", "read:docgen"})
+     * @Groups({"read", "docgen:read"})
      */
-    private $person;
+    private ?Person $person = null;
 
     /**
      * @ORM\Column(type="date", nullable=false)
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
      */
-    private $startDate;
+    private ?\DateTime $startDate = null;
 
     public function __construct(AccompanyingPeriod $accompanyingPeriod, Person $person)
     {
-        $this->startDate = new DateTimeImmutable('now');
+        $this->startDate = new \DateTime('now');
         $this->accompanyingPeriod = $accompanyingPeriod;
         $this->person = $person;
     }
@@ -73,10 +73,6 @@ class AccompanyingPeriodParticipation
         return $this->accompanyingPeriod;
     }
 
-    /*
-     * public function setStartDate(\DateTimeInterface $startDate): self { $this->startDate = $startDate; return $this; }
-     */
-
     public function getEndDate(): ?DateTimeInterface
     {
         return $this->endDate;

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

@@ -59,7 +59,7 @@ class Household
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
@@ -68,17 +68,19 @@ class Household
      *     targetEntity=HouseholdMember::class,
      *     mappedBy="household"
      * )
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      */
     private Collection $members;
 
     /**
      * @ORM\Column(type="boolean", name="waiting_for_birth", options={"default": false})
+     * @Serializer\Groups({"docgen:read"})
      */
     private bool $waitingForBirth = false;
 
     /**
      * @ORM\Column(type="date_immutable", name="waiting_for_birth_date", nullable=true, options={"default": null})
+     * @Serializer\Groups({"docgen:read"})
      */
     private ?DateTimeImmutable $waitingForBirthDate = null;
 
@@ -134,7 +136,7 @@ class Household
     }
 
     /**
-     * @Serializer\Groups({ "read" })
+     * @Serializer\Groups({"read", "docgen:read"})
      * @Serializer\SerializedName("current_address")
      */
     public function getCurrentAddress(?DateTime $at = null): ?Address
@@ -154,6 +156,11 @@ class Household
         return null;
     }
 
+    /**
+     * @param DateTimeImmutable|null $now
+     * @return Collection
+     * @Serializer\Groups({"docgen:read"})
+     */
     public function getCurrentMembers(?DateTimeImmutable $now = null): Collection
     {
         return $this->getMembers()->matching($this->buildCriteriaCurrentMembers($now));

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

@@ -28,13 +28,13 @@ class HouseholdMember
 {
     /**
      * @ORM\Column(type="string", length=255, nullable=true)
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?string $comment = null;
 
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      * @Assert\GreaterThan(
      *     propertyPath="startDate",
      *     message="household_membership.The end date must be after start date",
@@ -45,7 +45,7 @@ class HouseholdMember
 
     /**
      * @ORM\Column(type="boolean", options={"default": false})
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      */
     private bool $holder = false;
 
@@ -63,7 +63,7 @@ class HouseholdMember
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      */
     private $id;
 
@@ -72,7 +72,7 @@ class HouseholdMember
      * @ORM\ManyToOne(
      *     targetEntity="\Chill\PersonBundle\Entity\Person"
      * )
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      * @Assert\Valid(groups={"household_memberships"})
      * @Assert\NotNull(groups={"household_memberships"})
      */
@@ -80,7 +80,7 @@ class HouseholdMember
 
     /**
      * @ORM\ManyToOne(targetEntity=Position::class)
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      * @Assert\NotNull(groups={"household_memberships_created"})
      */
     private ?Position $position = null;
@@ -92,7 +92,7 @@ class HouseholdMember
 
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      * @Assert\NotNull(groups={"household_memberships"})
      */
     private ?DateTimeImmutable $startDate = null;

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

@@ -33,25 +33,25 @@ class Position
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
-     * @Serializer\Groups({ "read" })
+     * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?int $id;
 
     /**
      * @ORM\Column(type="json")
-     * @Serializer\Groups({ "read" })
+     * @Serializer\Groups({"read", "docgen:read"})
      */
     private array $label = [];
 
     /**
      * @ORM\Column(type="float")
-     * @Serializer\Groups({ "read" })
+     * @Serializer\Groups({"read"})
      */
     private float $ordering = 0.00;
 
     /**
      * @ORM\Column(type="boolean")
-     * @Serializer\Groups({ "read" })
+     * @Serializer\Groups({"read"})
      */
     private bool $shareHouseHold = true;
 

src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php

@@ -38,7 +38,7 @@ class Goal
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      */
     private $id;
 
@@ -55,7 +55,7 @@ class Goal
 
     /**
      * @ORM\Column(type="json")
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      */
     private $title = [];
 

src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php

@@ -55,7 +55,7 @@ class Result
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      */
     private $id;
 
@@ -66,7 +66,7 @@ class Result
 
     /**
      * @ORM\Column(type="json")
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      */
     private $title = [];