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-21 07:03: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/ChillThirdPartyBundle/Entity/ThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
@@ -63,7 +63,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
     * @var string
     * @ORM\Column(name="acronym", type="string", length=64, nullable=true)
     * @Assert\Length(min="2")
-     * @Groups({"read", "write"})
+     * @Groups({"read", "write", "docgen:read"})
     */
    private ?string $acronym = '';

@@ -78,7 +78,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
     * @ORM\ManyToOne(targetEntity="\Chill\MainBundle\Entity\Address",
     * cascade={"persist", "remove"})
     * @ORM\JoinColumn(nullable=true, onDelete="SET NULL")
-     * @Groups({"read", "write"})
+     * @Groups({"read", "write", "docgen:read"})
     */
    private ?Address $address = null;

@@ -97,6 +97,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
     * @ORM\JoinTable(name="chill_3party.thirdparty_category",
     *     joinColumns={@ORM\JoinColumn(name="thirdparty_id", referencedColumnName="id")},
     * inverseJoinColumns={@ORM\JoinColumn(name="category_id", referencedColumnName="id")})
+     * @Groups({"docgen:read"})
     */
    private Collection $categories;

@@ -121,6 +122,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
     * @var Civility
     * @ORM\ManyToOne(targetEntity=Civility::class)
     * ORM\JoinColumn(name="civility", referencedColumnName="id", nullable=true)
+     * @Groups({"docgen:read", "read"})
     */
    private ?Civility $civility = null;

@@ -131,7 +133,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface

    /**
     * @ORM\Column(name="contact_data_anonymous", type="boolean", options={"default": false})
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
     */
    private bool $contactDataAnonymous = false;

@@ -149,7 +151,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
    /**
     * @ORM\Column(name="email", type="string", length=255, nullable=true)
     * @Assert\Email(checkMX=false)
-     * @Groups({"read", "write"})
+     * @Groups({"read", "write", "docgen:read"})
     */
    private ?string $email = null;

@@ -158,6 +160,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
     * @ORM\Column(name="id", type="integer")
     * @ORM\Id
     * @ORM\GeneratedValue(strategy="AUTO")
+     * @Groups({"read", "write", "docgen:read"})
     */
    private ?int $id = null;

@@ -171,7 +174,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
     * @var string
     * @ORM\Column(name="name", type="string", length=255)
     * @Assert\Length(min="2")
-     * @Groups({"read", "write"})
+     * @Groups({"read", "write", "docgen:read"})
     */
    private ?string $name = '';

@@ -181,7 +184,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
     * @var string
     * @ORM\Column(name="name_company", type="string", length=255, nullable=true)
     * @Assert\Length(min="3")
-     * @Groups({"read", "write"})
+     * @Groups({"read", "write", "docgen:read"})
     */
    private ?string $nameCompany = '';

@@ -200,6 +203,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
     * @var ThirdPartyProfession
     * @ORM\ManyToOne(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdPartyProfession")
     * ORM\JoinColumn(name="profession", referencedColumnName="id", nullable=true)
+     * @Groups({"docgen:read"})
     */
    private ?ThirdPartyProfession $profession = null;

@@ -209,7 +213,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
     *     message="Invalid phone number: it should begin with the international prefix starting with ""+"", hold only digits and be smaller than 20 characters. Ex: +33123456789"
     * )
     * @PhonenumberConstraint(type="any")
-     * @Groups({"read", "write"})
+     * @Groups({"read", "write", "dogen:read"})
     */
    private ?string $telephone = null;

@@ -495,7 +499,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
    }

    /**
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
     */
    public function isChild(): bool
    {
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyCategory.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyCategory.php
@@ -13,6 +13,7 @@ namespace Chill\ThirdPartyBundle\Entity;

 use Chill\ThirdPartyBundle\Repository\ThirdPartyCategoryRepository;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;

 /**
 * @ORM\Table(name="chill_3party.party_category")
@@ -23,19 +24,21 @@ class ThirdPartyCategory
    /**
     * @ORM\Column(type="boolean")
     */
-    private $active = true;
+    private bool $active = true;

    /**
     * @ORM\Id
     * @ORM\GeneratedValue
     * @ORM\Column(type="integer")
+     * @Serializer\Groups({"docgen:read"})
     */
-    private $id;
+    private ?int $id = null;

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

    public function getActive(): ?bool
    {
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyProfession.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyProfession.php
@@ -13,6 +13,7 @@ namespace Chill\ThirdPartyBundle\Entity;

 use Chill\ThirdPartyBundle\Repository\ThirdPartyProfessionRepository;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;

 /**
 * @ORM\Table(name="chill_3party.party_profession")
@@ -23,19 +24,21 @@ class ThirdPartyProfession
    /**
     * @ORM\Column(type="boolean")
     */
-    private $active = true;
+    private bool $active = true;

    /**
     * @ORM\Id
     * @ORM\GeneratedValue
     * @ORM\Column(type="integer")
+     * @Serializer\Groups({"docgen:read"})
     */
-    private $id;
+    private ?int $id = null;

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

    public function getActive(): ?bool
    {
--- a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
+++ b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
@@ -50,6 +50,6 @@ class ThirdPartyNormalizer implements NormalizerAwareInterface, NormalizerInterf

    public function supportsNormalization($data, ?string $format = null)
    {
-        return $data instanceof ThirdParty;
+        return $data instanceof ThirdParty && 'json' === $format;
    }
 }
--- a/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdpartyDocGenNormalizerTest.php
+++ b/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdpartyDocGenNormalizerTest.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ThirdPartyBundle\Test\Serializer\Normalizer;
+
+use Chill\MainBundle\Entity\Civility;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\ThirdPartyBundle\Entity\ThirdPartyCategory;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ThirdpartyDocGenNormalizerTest extends KernelTestCase
+{
+    private NormalizerInterface $normalizer;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+        $this->normalizer = self::$container->get(NormalizerInterface::class);
+    }
+
+    public function testNormalize()
+    {
+        $thirdparty = new ThirdParty();
+        $thirdparty
+            ->setAcronym('ABCD')
+            ->setName('test')
+            ->setCivility((new Civility())->setName(['fr' => 'Monsieur'])->setAbbreviation(['fr' => 'M.']))
+            ->setEmail('info@cl.coop')
+            ->addTypesAndCategories('kind')
+            ->addTypesAndCategories((new ThirdPartyCategory())->setName(['fr' => 'category']));
+
+        $actual = $this->normalizer->normalize($thirdparty, 'docgen', ['groups' => ['docgen:read']]);
+
+        var_dump($actual);
+
+        $this->assertIsArray($actual);
+    }
+}