From 9029426d0367a105f2b64a042489ed18eb06f164 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Wed, 8 Feb 2023 15:22:08 +0000 Subject: [PATCH] Feature: [docgen] add center when normalizing person --- .../Serializer/Normalizer/PersonDocGenNormalizer.php | 4 ++++ .../Serializer/Normalizer/PersonDocGenNormalizerTest.php | 2 ++ tests/app | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php index 09fde56e3..74ca55398 100644 --- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php +++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php @@ -14,6 +14,7 @@ namespace Chill\PersonBundle\Serializer\Normalizer; use Chill\BudgetBundle\Service\Summary\SummaryBudgetInterface; use Chill\DocGeneratorBundle\Serializer\Helper\NormalizeNullValueHelper; use Chill\MainBundle\Entity\Address; +use Chill\MainBundle\Entity\Center; use Chill\MainBundle\Entity\Civility; use Chill\MainBundle\Templating\TranslatableStringHelper; use Chill\PersonBundle\Entity\Household\Household; @@ -87,6 +88,7 @@ class PersonDocGenNormalizer implements $dateContext['docgen:expects'] = DateTimeInterface::class; $addressContext = array_merge($context, ['docgen:expects' => Address::class]); $phonenumberContext = array_merge($context, ['docgen:expects' => PhoneNumber::class]); + $centerContext = array_merge($context, ['docgen:expects' => Center::class]); $personResourceContext = array_merge($context, [ 'docgen:expects' => Person\PersonResource::class, // we simplify the list of attributes for the embedded persons @@ -139,6 +141,7 @@ class PersonDocGenNormalizer implements 'numberOfChildren' => (string) $person->getNumberOfChildren(), 'address' => $this->normalizer->normalize($person->getCurrentPersonAddress(), $format, $addressContext), 'resources' => $this->normalizer->normalize($person->getResources(), $format, $personResourceContext), + 'center' => $this->normalizer->normalize($person->getCenter(), $format, $centerContext), ]; if ($context['docgen:person:with-household'] ?? false) { @@ -240,6 +243,7 @@ class PersonDocGenNormalizer implements $attributes = [ 'id', 'firstName', 'lastName', 'age', 'altNames', 'text', + 'center' => Center::class, 'civility' => Civility::class, 'birthdate' => DateTimeInterface::class, 'deathdate' => DateTimeInterface::class, diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php index f87d0d5be..28ae1c89c 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php @@ -40,6 +40,7 @@ final class PersonDocGenNormalizerTest extends KernelTestCase private const BLANK = [ 'id' => '', + 'center' => '', 'firstName' => '', 'lastName' => '', 'altNames' => '', @@ -64,6 +65,7 @@ final class PersonDocGenNormalizerTest extends KernelTestCase 'numberOfChildren' => '', 'age' => '@ignored', 'resources' => [], + 'center' => '@ignored', ]; private NormalizerInterface $normalizer; diff --git a/tests/app b/tests/app index 8694ad7c4..5e478fdfb 160000 --- a/tests/app +++ b/tests/app @@ -1 +1 @@ -Subproject commit 8694ad7c4de306f9d5e35af966d24fb2e3e1c2ff +Subproject commit 5e478fdfbf429baf3ce852ae69eb1f7101b1b416