From 839fb4a2119b3794aa8dbfb8591f32a16539eb0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sun, 12 Dec 2021 14:46:37 +0100 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 977863c2dd56d5c835f2a710cad7f7d3ba42da68 Merge: 5c37b419d 3eb7ffed1 Author: Julien Fastré Date: Sun Dec 12 14:45:21 2021 +0100 Merge remote-tracking branch 'origin/master' into docgen/improve-normalizer commit 5c37b419ddf0b32b9950c33042396bba1860da84 Author: Julien Fastré Date: Sun Dec 12 14:37:05 2021 +0100 fix normalization for user and type in null value commit 4469d46cdb19051fedec86bbb84e2351e6fcb72e Author: Julien Fastré Date: Sun Dec 12 13:24:23 2021 +0100 add civility to person commit 6cf92fbbde8f4d9f2f4763ec4ee88216257040f7 Author: Julien Fastré Date: Sun Dec 12 13:19:36 2021 +0100 fix person normalization: add a isNull on not null person commit ed6087ff8fd47b80ea5e9526756fe5d032d478e3 Author: Julien Fastré Date: Sun Dec 12 13:08:46 2021 +0100 fix stan and cs issues commit 8429c334c33b3545835cbde034fccaa529c134a7 Author: Julien Fastré Date: Sun Dec 12 13:08:36 2021 +0100 fix id type commit 39ae00d172a9f29320a97abb8518b2ea48d89d9b Author: Julien Fastré 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é Date: Sat Dec 11 03:27:30 2021 +0100 improve normalization wip commit f91a29635827005fc58617dc1c9d210091372be5 Author: Julien Fastré Date: Sat Dec 11 01:15:32 2021 +0100 improve normalization commit 56060e5e6a2191ef441039fdc91a01fb4653a553 Author: Julien Fastré Date: Sat Dec 11 00:41:09 2021 +0100 handle changelog with translatable string commit 9004686a13f816309806cb1231bccd3159a652df Author: Julien Fastré Date: Fri Dec 10 01:10:55 2021 +0100 improve docgen wip commit e266fa0e5dc8c0da446851e5f79f2dc7dab00f70 Author: Julien Fastré Date: Thu Dec 9 21:50:56 2021 +0100 show errors from relatorio driver commit 75ba56fa096917da3b284e3d5a3bb8fe490df2a3 Author: Julien Fastré Date: Thu Dec 9 21:14:12 2021 +0100 add verification tool for admin commit 12d6829b98d73eab232b345f2a611d58ae95874b Author: Julien Fastré Date: Thu Dec 9 14:17:42 2021 +0100 fix type with phonenumber helper commit 7b5e96771f4ca76fc131b9f2f6b5cac70996bec9 Merge: 8a9024de1 8a4748dc2 Author: Julien Fastré Date: Thu Dec 9 14:11:14 2021 +0100 Merge remote-tracking branch 'origin/master' into docgen/improve-normalizer commit 8a9024de13ed702373fffd19c15ca638eb398520 Author: Julien Fastré Date: Thu Dec 9 13:51:36 2021 +0100 add docgen:normalization for relation commit 24a404964b75d1a31108c6b90d82b1592305dccb Author: Julien Fastré Date: Thu Dec 9 12:44:41 2021 +0100 docgen normalization for relation commit 5d24bd4d11db1627527497a8b83dd2bd59726fee Merge: 70ab23214 455b225f4 Author: Julien Fastré Date: Wed Dec 8 21:08:30 2021 +0100 Merge branch 'master' into docgen/improve-normalizer commit 70ab23214906088b9287061ca3d721ba3ea624f3 Author: Julien Fastré Date: Wed Dec 8 13:58:49 2021 +0100 improve docgen, trnslations, admin commit 027c01fc58d679cfcc2e71ca16825a38533bdf79 Author: Julien Fastré Date: Wed Dec 8 12:23:24 2021 +0100 fix css block commit fdc5127c74ff0be3828c4bb0fc989010d28eca6f Author: Julien Fastré Date: Wed Dec 8 11:57:16 2021 +0100 fix some error in test (wip) commit b8d48f04ae2e2c5dfec6a876c2a7d5733f8b8a58 Author: Julien Fastré Date: Wed Dec 8 11:47:50 2021 +0100 fix tests (wip) commit f1b1771d6baf8e585e01859b138f3ad5ad6f8c7a Author: Julien Fastré Date: Wed Dec 8 11:35:00 2021 +0100 fix tests (wip) commit 62dabbe1e76dfead6b5ec94b354f8b4e1b9a7476 Author: Julien Fastré Date: Wed Dec 8 11:14:46 2021 +0100 fix code style commit 4101392190f3e0a3772553235a44268d8144c2e8 Author: Julien Fastré Date: Wed Dec 8 11:13:49 2021 +0100 fix tests and type hinting commit 3f1bed0b1cc4a4248f7041f81e633fedb762f5c9 Author: Julien Fastré Date: Wed Dec 8 11:05:41 2021 +0100 fix tests (wip) commit 79fbdcdee4a1b9e63cf5ab7d33d61b75e638837e Author: Julien Fastré Date: Wed Dec 8 11:05:29 2021 +0100 type hint User class commit 3d8d79323e47c9dd27361a212dbf73f58600ed9a Author: Julien Fastré Date: Wed Dec 8 10:56:30 2021 +0100 remove error messages commit 32178e22feced2256ae58a3c63d4d7d863c555e6 Author: Julien Fastré Date: Wed Dec 8 10:51:30 2021 +0100 fix tests (wip) commit 60a8c20896908d7e434871527910c83eefb8d849 Author: Julien Fastré Date: Wed Dec 8 10:29:54 2021 +0100 update app commit 9d8011da617c83a96451b33b0a0b43054a1f0c7c Author: Julien Fastré Date: Wed Dec 8 10:06:35 2021 +0100 fix loading origin commit 789eeadb404c1950f4b33d201bd78bda915664df Author: Julien Fastré Date: Wed Dec 8 09:52:51 2021 +0100 fix loading fixtures for doc generator template commit f206fdb08ccd85d7d2a460e51578b1acc6dc153c Author: Julien Fastré Date: Wed Dec 8 09:52:35 2021 +0100 fix code style commit 9d5409d8d9e0df8c5f0e53e758dde60817732b9b Author: Julien Fastré Date: Wed Dec 8 09:52:06 2021 +0100 fix casting commit e297d8253344a13f297793e7102ed1f51ff28235 Author: Julien Fastré Date: Wed Dec 8 09:26:13 2021 +0100 fixes on tests [WIP] --- CHANGELOG.md | 3 + .../DocGeneratorTemplateController.php | 225 ++++++++++++++---- .../Exception/TemplateException.php | 35 +++ .../GeneratorDriver/RelatorioDriver.php | 15 +- .../DocGeneratorTemplate/index.html.twig | 17 +- .../Helper/NormalizeNullValueHelper.php | 13 +- .../Normalizer/CollectionDocGenNormalizer.php | 56 +++++ .../Normalizer/DocGenObjectNormalizer.php | 77 +++++- .../config/services.yaml | 3 + .../Normalizer/DocGenObjectNormalizerTest.php | 38 ++- .../Form/AccompanyingCourseDocumentType.php | 7 +- .../AccompanyingCourseDocument/edit.html.twig | 1 + .../AccompanyingCourseDocument/new.html.twig | 1 + .../AccompanyingCourseDocument/show.html.twig | 5 + src/Bundle/ChillMainBundle/Entity/Center.php | 3 +- .../ChillMainBundle/Entity/Civility.php | 10 +- src/Bundle/ChillMainBundle/Entity/Country.php | 15 +- .../ChillMainBundle/Entity/Language.php | 8 +- src/Bundle/ChillMainBundle/Entity/Scope.php | 28 +-- src/Bundle/ChillMainBundle/Entity/User.php | 3 - src/Bundle/ChillMainBundle/Entity/UserJob.php | 4 +- .../Phonenumber/PhonenumberHelper.php | 2 +- .../Normalizer/AddressNormalizer.php | 128 +++++++--- .../Serializer/Normalizer/UserNormalizer.php | 56 ++++- .../Controller/RelationshipApiController.php | 7 +- .../Entity/AccompanyingPeriod.php | 16 ++ .../AccompanyingPeriod/ClosingMotive.php | 24 +- .../Entity/AccompanyingPeriod/Origin.php | 9 +- .../Entity/Household/HouseholdMember.php | 3 +- .../Entity/Household/Position.php | 3 +- .../ChillPersonBundle/Entity/Person.php | 2 - .../Entity/Relationships/Relation.php | 2 + .../Entity/Relationships/Relationship.php | 22 ++ .../Entity/SocialWork/Evaluation.php | 1 + .../Entity/SocialWork/Goal.php | 9 +- .../Entity/SocialWork/Result.php | 16 +- .../Relationships/RelationshipRepository.php | 43 +++- .../components/OriginDemand.vue | 5 +- .../AccompanyingPeriodDocGenNormalizer.php | 134 ++++++----- .../Normalizer/PersonDocGenNormalizer.php | 68 +++++- .../RelationshipDocGenNormalizer.php | 90 +++++++ .../Normalizer/SocialActionNormalizer.php | 4 +- .../AccompanyingPeriodContext.php | 21 +- .../AccompanyingPeriodWorkContext.php | 2 +- ...ccompanyingPeriodWorkEvaluationContext.php | 2 +- .../AccompanyingCourseApiControllerTest.php | 4 +- ...AccompanyingPeriodDocGenNormalizerTest.php | 55 ++++- .../Normalizer/PersonDocGenNormalizerTest.php | 158 +++++++++++- .../RelationshipDocGenNormalizerTest.php | 158 ++++++++++++ .../translations/messages.fr.yml | 4 +- .../Entity/ThirdParty.php | 20 +- .../Entity/ThirdPartyCategory.php | 9 +- .../Entity/ThirdPartyProfession.php | 9 +- .../Normalizer/ThirdPartyNormalizer.php | 2 +- .../ThirdpartyDocGenNormalizerTest.php | 51 ++++ 55 files changed, 1401 insertions(+), 305 deletions(-) create mode 100644 src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/Exception/TemplateException.php create mode 100644 src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php create mode 100644 src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php create mode 100644 src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/RelationshipDocGenNormalizerTest.php create mode 100644 src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdpartyDocGenNormalizerTest.php diff --git a/CHANGELOG.md b/CHANGELOG.md index 4923eb877..c8e0d0f5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,9 @@ and this project adheres to * [person] add validator for accompanying period with a test on social issues (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/76) * [activity] fix visibility for location +* [origin] fix origin: use correctly the translatable strings + + * /!\ everyone must update the origin table. As there is only one row, execute `update chill_person_accompanying_period_origin set label = jsonb_build_object('fr', 'appel téléphonique');` ## Test releases diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php index 21a830bfd..42e6b0e69 100644 --- a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php +++ b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php @@ -18,6 +18,7 @@ use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithPublicFormInterface; use Chill\DocGeneratorBundle\Context\Exception\ContextNotFoundException; use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate; use Chill\DocGeneratorBundle\GeneratorDriver\DriverInterface; +use Chill\DocGeneratorBundle\GeneratorDriver\Exception\TemplateException; use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository; use Chill\DocStoreBundle\Entity\StoredObject; use Chill\MainBundle\Pagination\PaginatorFactory; @@ -28,10 +29,15 @@ use GuzzleHttp\Exception\TransferException; use Psr\Log\LoggerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Symfony\Component\Form\Extension\Core\Type\FileType; +use Symfony\Component\HttpFoundation\File\File; +use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; // TODO à mettre dans services use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\HttpFoundation\StreamedResponse; +use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\HttpKernel\Exception\HttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\KernelInterface; @@ -78,6 +84,27 @@ final class DocGeneratorTemplateController extends AbstractController $this->client = $client; } + /** + * @Route( + * "{_locale}/admin/doc/gen/generate/test/from/{template}/for/{entityClassName}/{entityId}", + * name="chill_docgenerator_test_generate_from_template" + * ) + */ + public function adminTestGenerateDocFromTemplateAction( + DocGeneratorTemplate $template, + string $entityClassName, + int $entityId, + Request $request + ): Response { + return $this->generateDocFromTemplate( + $template, + $entityClassName, + $entityId, + $request, + true + ); + } + /** * @Route( * "{_locale}/doc/gen/generate/from/{template}/for/{entityClassName}/{entityId}", @@ -89,6 +116,81 @@ final class DocGeneratorTemplateController extends AbstractController string $entityClassName, int $entityId, Request $request + ): Response { + return $this->generateDocFromTemplate( + $template, + $entityClassName, + $entityId, + $request, + false + ); + } + + /** + * @Route( + * "/api/1.0/docgen/templates/by-entity/{entityClassName}", + * name="chill_docgenerator_templates_for_entity_api" + * ) + */ + public function listTemplateApiAction(string $entityClassName): Response + { + $nb = $this->docGeneratorTemplateRepository->countByEntity($entityClassName); + $paginator = $this->paginatorFactory->create($nb); + $entities = $this->docGeneratorTemplateRepository->findByEntity( + $entityClassName, + $paginator->getCurrentPageFirstItemNumber(), + $paginator->getItemsPerPage() + ); + + return $this->json( + new Collection($entities, $paginator), + Response::HTTP_OK, + [], + [AbstractNormalizer::GROUPS => ['read']] + ); + } + + /** + * @Route( + * "{_locale}/admin/doc/gen/generate/test/redirect", + * name="chill_docgenerator_test_generate_redirect" + * ) + * + * @return void + */ + public function redirectToTestGenerate(Request $request): RedirectResponse + { + $template = $request->query->getInt('template'); + + if (null === $template) { + throw new BadRequestHttpException('template parameter is missing'); + } + + $entityClassName = $request->query->get('entityClassName'); + + if (null === $entityClassName) { + throw new BadRequestHttpException('entityClassName is missing'); + } + + $entityId = $request->query->get('entityId'); + + if (null === $entityId) { + throw new BadRequestHttpException('entityId is missing'); + } + + return $this->redirectToRoute( + 'chill_docgenerator_test_generate_from_template', + ['template' => $template, 'entityClassName' => $entityClassName, 'entityId' => $entityId, + 'returnPath' => $request->query->get('returnPath', '/'), ] + ); + } + + private function generateDocFromTemplate( + DocGeneratorTemplate $template, + string $entityClassName, + int $entityId, + Request $request, + bool $isTest ): Response { try { $context = $this->contextManager->getContextByDocGeneratorTemplate($template); @@ -105,9 +207,29 @@ final class DocGeneratorTemplateController extends AbstractController $contextGenerationData = []; if ($context instanceof DocGeneratorContextWithPublicFormInterface - && $context->hasPublicForm($template, $entity)) { - $builder = $this->createFormBuilder($context->getFormData($template, $entity)); + && $context->hasPublicForm($template, $entity) || $isTest) { + if ($context instanceof DocGeneratorContextWithPublicFormInterface) { + $builder = $this->createFormBuilder( + array_merge( + $context->getFormData($template, $entity), + $isTest ? ['test_file' => null] : [] + ) + ); + } else { + $builder = $this->createFormBuilder( + ['test_file' => null] + ); + } + $context->buildPublicForm($builder, $template, $entity); + + if ($isTest) { + $builder->add('test_file', FileType::class, [ + 'label' => 'Template file', + 'required' => false, + ]); + } + $form = $builder->getForm()->handleRequest($request); if ($form->isSubmitted() && $form->isValid()) { @@ -121,43 +243,72 @@ final class DocGeneratorTemplateController extends AbstractController } } - $getUrlGen = $this->tempUrlGenerator->generate( - 'GET', - $template->getFile()->getFilename() - ); + if ($isTest && null !== $contextGenerationData['test_file']) { + /** @var File $file */ + $file = $contextGenerationData['test_file']; + $templateResource = fopen($file->getPathname(), 'rb'); + } else { + $getUrlGen = $this->tempUrlGenerator->generate( + 'GET', + $template->getFile()->getFilename() + ); - $data = $this->client->request('GET', $getUrlGen->url); + $data = $this->client->request('GET', $getUrlGen->url); - $iv = $template->getFile()->getIv(); // iv as an Array - $ivGoodFormat = pack('C*', ...$iv); // iv as a String (ok for openssl_decrypt) + $iv = $template->getFile()->getIv(); // iv as an Array + $ivGoodFormat = pack('C*', ...$iv); // iv as a String (ok for openssl_decrypt) - $method = 'AES-256-CBC'; + $method = 'AES-256-CBC'; - $key = $template->getFile()->getKeyInfos()['k']; - $keyGoodFormat = Base64Url::decode($key); + $key = $template->getFile()->getKeyInfos()['k']; + $keyGoodFormat = Base64Url::decode($key); - $dataDecrypted = openssl_decrypt($data->getContent(), $method, $keyGoodFormat, 1, $ivGoodFormat); + $dataDecrypted = openssl_decrypt($data->getContent(), $method, $keyGoodFormat, 1, $ivGoodFormat); - if (false === $dataDecrypted) { - throw new Exception('Error during Decrypt ', 1); + if (false === $dataDecrypted) { + throw new Exception('Error during Decrypt ', 1); + } + + if (false === $templateResource = fopen('php://memory', 'r+b')) { + $this->logger->error('Could not write data to memory'); + + throw new HttpException(500); + } + fwrite($templateResource, $dataDecrypted); + rewind($templateResource); } - if (false === $templateResource = fopen('php://memory', 'r+b')) { - $this->logger->error('Could not write data to memory'); - - throw new HttpException(500); - } - - fwrite($templateResource, $dataDecrypted); - rewind($templateResource); - $datas = $context->getData($template, $entity, $contextGenerationData); dump('datas compiled', $datas); - $generatedResource = $this->driver->generateFromResource($templateResource, $template->getFile()->getType(), $datas, $template->getFile()->getFilename()); + try { + $generatedResource = $this->driver->generateFromResource($templateResource, $template->getFile()->getType(), $datas, $template->getFile()->getFilename()); + } catch (TemplateException $e) { + $msg = implode("\n", $e->getErrors()); + + return new Response($msg, 400, [ + 'Content-Type' => 'text/plain', + ]); + } fclose($templateResource); + if ($isTest) { + return new StreamedResponse( + static function () use ($generatedResource) { + fpassthru($generatedResource); + fclose($generatedResource); + }, + Response::HTTP_OK, + [ + 'Content-Transfer-Encoding', 'binary', + 'Content-Type' => 'application/vnd.oasis.opendocument.text', + 'Content-Disposition' => sprintf('attachment; filename="%s.odt"', 'generated'), + 'Content-Length' => fstat($generatedResource)['size'], + ], + ); + } + $genDocName = 'doc_' . sprintf('%010d', mt_rand()) . 'odt'; $getUrlGen = $this->tempUrlGenerator->generate( @@ -206,28 +357,4 @@ final class DocGeneratorTemplateController extends AbstractController throw new Exception('Unable to generate document.'); } - - /** - * @Route( - * "/api/1.0/docgen/templates/by-entity/{entityClassName}", - * name="chill_docgenerator_templates_for_entity_api" - * ) - */ - public function listTemplateApiAction(string $entityClassName): Response - { - $nb = $this->docGeneratorTemplateRepository->countByEntity($entityClassName); - $paginator = $this->paginatorFactory->create($nb); - $entities = $this->docGeneratorTemplateRepository->findByEntity( - $entityClassName, - $paginator->getCurrentPageFirstItemNumber(), - $paginator->getItemsPerPage() - ); - - return $this->json( - new Collection($entities, $paginator), - Response::HTTP_OK, - [], - [AbstractNormalizer::GROUPS => ['read']] - ); - } } diff --git a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/Exception/TemplateException.php b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/Exception/TemplateException.php new file mode 100644 index 000000000..214c77621 --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/Exception/TemplateException.php @@ -0,0 +1,35 @@ +errors = $errors; + } + + public function getErrors(): array + { + return $this->errors; + } +} diff --git a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php index 8889e72b1..7101e562d 100644 --- a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php +++ b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php @@ -11,6 +11,7 @@ declare(strict_types=1); namespace Chill\DocGeneratorBundle\GeneratorDriver; +use Chill\DocGeneratorBundle\GeneratorDriver\Exception\TemplateException; use Psr\Log\LoggerInterface; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; use Symfony\Component\Mime\Part\DataPart; @@ -45,6 +46,7 @@ class RelatorioDriver implements DriverInterface 'template' => new DataPart($template, $templateName ?? uniqid('template_'), $resourceType), ]; $form = new FormDataPart($formFields); + dump(json_encode($data)); try { $response = $this->relatorioClient->request('POST', $this->url, [ @@ -54,10 +56,21 @@ class RelatorioDriver implements DriverInterface return $response->toStream(); } catch (HttpExceptionInterface $e) { + $content = $e->getResponse()->getContent(false); + + if (400 === $e->getResponse()->getStatusCode()) { + $content = json_decode($content, true); + $this->logger->error('relatorio: template error', [ + 'error' => $content['message'] ?? '_not defined', + ]); + + throw new TemplateException([$content['message']]); + } + $this->logger->error('relatorio: error while generating document', [ 'msg' => $e->getMessage(), 'response' => $e->getResponse()->getStatusCode(), - 'content' => $e->getResponse()->getContent(false), + 'content' => $content, ]); throw $e; diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/index.html.twig b/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/index.html.twig index 1cdad36ff..29050ce02 100644 --- a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/index.html.twig +++ b/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/index.html.twig @@ -6,6 +6,7 @@ {{ 'Title'|trans }} {{ 'docgen.Context'|trans }} + {{ 'docgen.test generate'|trans }} {{ 'Edit'|trans }} {% endblock %} @@ -13,8 +14,22 @@ {% for entity in entities %} {{ entity.id }} - {{ entity.name | localize_translatable_string }} + {{ entity.name|localize_translatable_string}} {{ contextManager.getContextByKey(entity.context).name|trans }} + +
+ + + + + +
    +
  • + +
    • +
+
+ {{ 'Edit'|trans }} diff --git a/src/Bundle/ChillDocGeneratorBundle/Serializer/Helper/NormalizeNullValueHelper.php b/src/Bundle/ChillDocGeneratorBundle/Serializer/Helper/NormalizeNullValueHelper.php index 594ae8376..f6be7bd5a 100644 --- a/src/Bundle/ChillDocGeneratorBundle/Serializer/Helper/NormalizeNullValueHelper.php +++ b/src/Bundle/ChillDocGeneratorBundle/Serializer/Helper/NormalizeNullValueHelper.php @@ -16,16 +16,27 @@ use function array_merge; class NormalizeNullValueHelper { + private ?string $discriminatorType = null; + + private ?string $discriminatorValue = null; + private NormalizerInterface $normalizer; - public function __construct(NormalizerInterface $normalizer) + public function __construct(NormalizerInterface $normalizer, $discriminatorType = null, $discriminatorValue = null) { $this->normalizer = $normalizer; + $this->discriminatorType = $discriminatorType; + $this->discriminatorValue = $discriminatorValue; } public function normalize(array $attributes, string $format = 'docgen', ?array $context = []) { $data = []; + $data['isNull'] = true; + + if (null !== $this->discriminatorType) { + $data[$this->discriminatorType] = $this->discriminatorValue; + } foreach ($attributes as $key => $class) { if (is_numeric($key)) { diff --git a/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php new file mode 100644 index 000000000..35c683138 --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php @@ -0,0 +1,56 @@ +count()) { + return $data; + } + + foreach ($object->getIterator() as $item) { + $data[] = $this->normalizer->normalize($item, $format, $context); + } + + return $data; + } + + public function supportsNormalization($data, ?string $format = null, array $context = []) + { + if ('docgen' !== $format) { + return false; + } + + return $data instanceof Collection + || (null === $data && Collection::class === ($context['docgen:expects'] ?? null)); + } +} diff --git a/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php index 0583d981a..35c4729bb 100644 --- a/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php +++ b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php @@ -12,6 +12,7 @@ declare(strict_types=1); namespace Chill\DocGeneratorBundle\Serializer\Normalizer; use Chill\DocGeneratorBundle\Serializer\Helper\NormalizeNullValueHelper; +use Chill\MainBundle\Templating\TranslatableStringHelperInterface; use ReflectionClass; use RuntimeException; use Symfony\Component\PropertyAccess\PropertyAccess; @@ -42,10 +43,15 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte private PropertyAccessor $propertyAccess; - public function __construct(ClassMetadataFactoryInterface $classMetadataFactory) - { + private TranslatableStringHelperInterface $translatableStringHelper; + + public function __construct( + ClassMetadataFactoryInterface $classMetadataFactory, + TranslatableStringHelperInterface $translatableStringHelper + ) { $this->classMetadataFactory = $classMetadataFactory; $this->propertyAccess = PropertyAccess::createPropertyAccessor(); + $this->translatableStringHelper = $translatableStringHelper; } public function normalize($object, ?string $format = null, array $context = []) @@ -57,7 +63,12 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte } if (!$this->classMetadataFactory->hasMetadataFor($classMetadataKey)) { - throw new LogicException(sprintf('This object does not have metadata: %s. Add groups on this entity to allow to serialize with the format %s and groups %s', is_object($object) ? get_class($object) : $context['docgen:expects'], $format, implode(', ', $context['groups']))); + throw new LogicException(sprintf( + 'This object does not have metadata: %s. Add groups on this entity to allow to serialize with the format %s and groups %s', + is_object($object) ? get_class($object) : '(todo' /*$context['docgen:expects'],*/ , + $format, + implode(', ', ($context['groups'] ?? [])) + )); } $metadata = $this->classMetadataFactory->getMetadataFor($classMetadataKey); @@ -98,8 +109,9 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte if ($reflection->hasProperty($attribute->getName())) { if (!$reflection->getProperty($attribute->getName())->hasType()) { throw new \LogicException(sprintf( - 'Could not determine how the content is determined for the attribute %s. Add a type on this property', - $attribute->getName() + 'Could not determine how the content is determined for the attribute %s on class %s. Add a type on this property', + $attribute->getName(), + $reflection->getName() )); } @@ -107,8 +119,9 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte } elseif ($reflection->hasMethod($method = 'get' . ucfirst($attribute->getName()))) { if (!$reflection->getMethod($method)->hasReturnType()) { throw new \LogicException(sprintf( - 'Could not determine how the content is determined for the attribute %s. Add a return type on the method', - $attribute->getName() + 'Could not determine how the content is determined for the attribute %s on class %s. Add a return type on the method', + $attribute->getName(), + $reflection->getName() )); } @@ -116,8 +129,9 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte } elseif ($reflection->hasMethod($method = 'is' . ucfirst($attribute->getName()))) { if (!$reflection->getMethod($method)->hasReturnType()) { throw new \LogicException(sprintf( - 'Could not determine how the content is determined for the attribute %s. Add a return type on the method', - $attribute->getName() + 'Could not determine how the content is determined for the attribute %s on class %s. Add a return type on the method', + $attribute->getName(), + $reflection->getName() )); } @@ -125,8 +139,9 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte } elseif ($reflection->hasMethod($attribute->getName())) { if (!$reflection->getMethod($attribute->getName())->hasReturnType()) { throw new \LogicException(sprintf( - 'Could not determine how the content is determined for the attribute %s. Add a return type on the method', - $attribute->getName() + 'Could not determine how the content is determined for the attribute %s on class %s. Add a return type on the method', + $attribute->getName(), + $reflection->getName() )); } @@ -153,12 +168,32 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte { $keys = []; + // add a discriminator + if (null !== $discriminator = $metadata->getClassDiscriminatorMapping()) { + $typeKey = $discriminator->getTypeProperty(); + $typeValue = null; + + foreach ($discriminator->getTypesMapping() as $type => $typeClass) { + if ($typeClass === $context['docgen:expects']) { + $typeValue = $type; + + break; + } + } + + if (null === $typeValue) { + $typeKey = null; + } + } else { + $typeKey = $typeValue = null; + } + foreach ($attributes as $attribute) { $key = $attribute->getSerializedName() ?? $attribute->getName(); $keys[$key] = $this->getExpectedType($attribute, $metadata->getReflectionClass()); } - $normalizer = new NormalizeNullValueHelper($this->normalizer); + $normalizer = new NormalizeNullValueHelper($this->normalizer, $typeKey, $typeValue); return $normalizer->normalize($keys, $format, $context); } @@ -172,6 +207,10 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte switch ($type) { case 'array': + if (in_array('is-translatable', $attribute->getNormalizationContextForGroups(['docgen:read']), true)) { + return ''; + } + return []; case 'bool': @@ -208,14 +247,26 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte private function normalizeObject($object, $format, array $context, array $expectedGroups, ClassMetadata $metadata, array $attributes) { $data = []; + $data['isNull'] = false; $reflection = $metadata->getReflectionClass(); + // add a discriminator + if (null !== $discriminator = $metadata->getClassDiscriminatorMapping()) { + $data[$discriminator->getTypeProperty()] = $discriminator->getMappedObjectType($object); + } + foreach ($attributes as $attribute) { /** @var AttributeMetadata $attribute */ $value = $this->propertyAccess->getValue($object, $attribute->getName()); $key = $attribute->getSerializedName() ?? $attribute->getName(); + $isTranslatable = $attribute->getNormalizationContextForGroups( + is_array($context['groups']) ? $context['groups'] : [$context['groups']] + )['is-translatable'] ?? false; - if (is_iterable($value)) { + if ($isTranslatable) { + $data[$key] = $this->translatableStringHelper + ->localize($value); + } elseif (is_iterable($value)) { $arr = []; foreach ($value as $k => $v) { diff --git a/src/Bundle/ChillDocGeneratorBundle/config/services.yaml b/src/Bundle/ChillDocGeneratorBundle/config/services.yaml index 10ab6d172..54bf5a697 100644 --- a/src/Bundle/ChillDocGeneratorBundle/config/services.yaml +++ b/src/Bundle/ChillDocGeneratorBundle/config/services.yaml @@ -20,6 +20,9 @@ services: resource: '../Serializer/Normalizer/' tags: - { name: 'serializer.normalizer', priority: -152 } + Chill\DocGeneratorBundle\Serializer\Normalizer\CollectionDocGenNormalizer: + tags: + - { name: 'serializer.normalizer', priority: -126 } Chill\DocGeneratorBundle\Controller\: resource: "../Controller" diff --git a/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php b/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php index 0364f0eb5..8d5213b3d 100644 --- a/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php +++ b/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php @@ -11,7 +11,7 @@ declare(strict_types=1); namespace Chill\DocGeneratorBundle\tests\Serializer\Normalizer; -use Chill\MainBundle\Entity\Center; +use Chill\MainBundle\Entity\Scope; use Chill\MainBundle\Entity\User; use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; @@ -35,25 +35,36 @@ final class DocGenObjectNormalizerTest extends KernelTestCase public function testNormalizationBasic() { - $user = new User(); - $user->setUsername('User Test'); - $user->setMainCenter($center = new Center()); - $center->setName('test'); + $scope = new Scope(); + $scope->setName(['fr' => 'scope']); - $normalized = $this->normalizer->normalize($user, 'docgen', [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => User::class]); + $normalized = $this->normalizer->normalize($scope, 'docgen', [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => Scope::class]); $expected = [ - 'label' => 'User Test', - 'email' => '', - 'mainCenter' => [ - 'name' => 'test', - ], + 'id' => null, + 'name' => 'scope', + 'type' => 'scope', + 'isNull' => false, ]; - $this->assertEquals($expected, $normalized, 'test normalization fo an user'); + $this->assertEquals($expected, $normalized, 'test normalization fo a scope'); + } + + public function testNormalizeNull() + { + $actual = $this->normalizer->normalize(null, 'docgen', [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => Scope::class]); + $expected = [ + 'id' => '', + 'name' => '', + 'type' => 'scope', + 'isNull' => true, + ]; + + $this->assertEquals($expected, $actual, 'test normalization for a null scope'); } public function testNormalizeNullObjectWithObjectEmbedded() { + $this->markTestIncomplete('test to implement'); $normalized = $this->normalizer->normalize(null, 'docgen', [ AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => User::class, @@ -62,7 +73,7 @@ final class DocGenObjectNormalizerTest extends KernelTestCase $expected = [ 'label' => '', 'email' => '', - 'mainCenter' => [ + 'main_center' => [ 'name' => '', ], ]; @@ -72,6 +83,7 @@ final class DocGenObjectNormalizerTest extends KernelTestCase public function testNormalizeWithNullValueEmbedded() { + $this->markTestIncomplete('test to write'); $user = new User(); $user->setUsername('User Test'); diff --git a/src/Bundle/ChillDocStoreBundle/Form/AccompanyingCourseDocumentType.php b/src/Bundle/ChillDocStoreBundle/Form/AccompanyingCourseDocumentType.php index 12797da79..64a81e9c7 100644 --- a/src/Bundle/ChillDocStoreBundle/Form/AccompanyingCourseDocumentType.php +++ b/src/Bundle/ChillDocStoreBundle/Form/AccompanyingCourseDocumentType.php @@ -11,8 +11,9 @@ declare(strict_types=1); namespace Chill\DocStoreBundle\Form; +use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument; use Chill\DocStoreBundle\Entity\Document; -use Chill\DocStoreBundle\Entity\PersonDocument; +use Chill\DocStoreBundle\Entity\DocumentCategory; use Chill\MainBundle\Entity\User; use Chill\MainBundle\Form\Type\ChillDateType; use Chill\MainBundle\Form\Type\ChillTextareaType; @@ -70,11 +71,11 @@ class AccompanyingCourseDocumentType extends AbstractType //TODO : adapt to using AccompanyingCourseDocument categories. Currently there are none... ->add('category', EntityType::class, [ 'placeholder' => 'Choose a document category', - 'class' => 'ChillDocStoreBundle:DocumentCategory', + 'class' => DocumentCategory::class, 'query_builder' => static function (EntityRepository $er) { return $er->createQueryBuilder('c') ->where('c.documentClass = :docClass') - ->setParameter('docClass', PersonDocument::class); + ->setParameter('docClass', AccompanyingCourseDocument::class); }, 'choice_label' => function ($entity = null) { return $entity ? $this->translatableStringHelper->localize($entity->getName()) : ''; diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/edit.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/edit.html.twig index 088a351f3..e28611701 100644 --- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/edit.html.twig +++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/edit.html.twig @@ -41,5 +41,6 @@ {% endblock %} {% block css %} + {{ parent() }} {{ encore_entry_link_tags('mod_async_upload') }} {% endblock %} diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/new.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/new.html.twig index 713654739..d76e5a745 100644 --- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/new.html.twig +++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/new.html.twig @@ -42,5 +42,6 @@ {% endblock %} {% block css %} + {{ parent() }} {{ encore_entry_link_tags('mod_async_upload') }} {% endblock %} diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig index 90bb6289d..97299675a 100644 --- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig +++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig @@ -14,6 +14,11 @@ {{ encore_entry_script_tags('mod_async_upload') }} {% endblock %} +{% block css %} + {{ parent() }} + {{ encore_entry_link_tags('mod_async_upload') }} +{% endblock %} + {% block content %}

{{ 'Document %title%' | trans({ '%title%': document.title }) }}

diff --git a/src/Bundle/ChillMainBundle/Entity/Center.php b/src/Bundle/ChillMainBundle/Entity/Center.php index 10584bea9..5b25ee119 100644 --- a/src/Bundle/ChillMainBundle/Entity/Center.php +++ b/src/Bundle/ChillMainBundle/Entity/Center.php @@ -38,8 +38,9 @@ class Center implements HasCenterInterface * @ORM\Id * @ORM\Column(name="id", type="integer") * @ORM\GeneratedValue(strategy="AUTO") + * @Serializer\Groups({"docgen:read"}) */ - private $id; + private ?int $id = null; /** * @ORM\Column(type="string", length=255) diff --git a/src/Bundle/ChillMainBundle/Entity/Civility.php b/src/Bundle/ChillMainBundle/Entity/Civility.php index 4fcad0db8..48b2a7569 100644 --- a/src/Bundle/ChillMainBundle/Entity/Civility.php +++ b/src/Bundle/ChillMainBundle/Entity/Civility.php @@ -22,7 +22,8 @@ class Civility { /** * @ORM\Column(type="json") - * @Serializer\Groups({"read"}) + * @Serializer\Groups({"read", "docgen:read"}) + * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"}) */ private array $abbreviation = []; @@ -35,13 +36,14 @@ class Civility * @ORM\Id * @ORM\GeneratedValue * @ORM\Column(type="integer") - * @Serializer\Groups({"read"}) + * @Serializer\Groups({"read", "docgen:read"}) */ - private $id; + private ?int $id = null; /** * @ORM\Column(type="json") - * @Serializer\Groups({"read"}) + * @Serializer\Groups({"read", "docgen:read"}) + * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"}) */ private array $name = []; diff --git a/src/Bundle/ChillMainBundle/Entity/Country.php b/src/Bundle/ChillMainBundle/Entity/Country.php index 1bd009689..f1fc18557 100644 --- a/src/Bundle/ChillMainBundle/Entity/Country.php +++ b/src/Bundle/ChillMainBundle/Entity/Country.php @@ -12,6 +12,7 @@ declare(strict_types=1); namespace Chill\MainBundle\Entity; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Serializer\Annotation\Context; use Symfony\Component\Serializer\Annotation\Groups; /** @@ -25,12 +26,11 @@ use Symfony\Component\Serializer\Annotation\Groups; class Country { /** - * @var string - * * @ORM\Column(type="string", length=3) - * @groups({"read"}) + * @groups({"read", "docgen:read"}) + * @Context({"is-translatable": true}, groups={"docgen:read"}) */ - private $countryCode; + private string $countryCode = ''; /** * @var int @@ -38,15 +38,16 @@ class Country * @ORM\Id * @ORM\Column(name="id", type="integer") * @ORM\GeneratedValue(strategy="AUTO") - * @groups({"read"}) + * @groups({"read", "docgen:read"}) */ - private $id; + private ?int $id = null; /** * @var string * * @ORM\Column(type="json") - * @groups({"read"}) + * @groups({"read", "docgen:read"}) + * @Context({"is-translatable": true}, groups={"docgen:read"}) */ private $name; diff --git a/src/Bundle/ChillMainBundle/Entity/Language.php b/src/Bundle/ChillMainBundle/Entity/Language.php index ad47eae1b..b4929b662 100644 --- a/src/Bundle/ChillMainBundle/Entity/Language.php +++ b/src/Bundle/ChillMainBundle/Entity/Language.php @@ -12,6 +12,7 @@ declare(strict_types=1); namespace Chill\MainBundle\Entity; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Serializer\Annotation as Serializer; /** * Language. @@ -28,15 +29,18 @@ class Language * * @ORM\Id * @ORM\Column(type="string") + * @Serializer\Groups({"docgen:read"}) */ - private $id; + private ?string $id = null; /** * @var string array * * @ORM\Column(type="json") + * @Serializer\Groups({"docgen:read"}) + * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"}) */ - private $name; + private array $name = []; /** * Get id. diff --git a/src/Bundle/ChillMainBundle/Entity/Scope.php b/src/Bundle/ChillMainBundle/Entity/Scope.php index fc6084883..72ac0ad01 100644 --- a/src/Bundle/ChillMainBundle/Entity/Scope.php +++ b/src/Bundle/ChillMainBundle/Entity/Scope.php @@ -14,6 +14,7 @@ namespace Chill\MainBundle\Entity; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Serializer\Annotation\Context; use Symfony\Component\Serializer\Annotation\DiscriminatorMap; use Symfony\Component\Serializer\Annotation\Groups; @@ -28,24 +29,21 @@ use Symfony\Component\Serializer\Annotation\Groups; class Scope { /** - * @var int - * * @ORM\Id * @ORM\Column(name="id", type="integer") * @ORM\GeneratedValue(strategy="AUTO") * @Groups({"read", "docgen:read"}) */ - private $id; + private ?int $id = null; /** * translatable names. * - * @var array - * * @ORM\Column(type="json") * @Groups({"read", "docgen:read"}) + * @Context({"is-translatable": true}, groups={"docgen:read"}) */ - private $name = []; + private array $name = []; /** * @var Collection @@ -65,31 +63,27 @@ class Scope $this->roleScopes = new ArrayCollection(); } - public function addRoleScope(RoleScope $roleScope) + public function addRoleScope(RoleScope $roleScope): self { $this->roleScopes->add($roleScope); + + return $this; } /** * @return int */ - public function getId() + public function getId(): ?int { return $this->id; } - /** - * @return array - */ - public function getName() + public function getName(): array { return $this->name; } - /** - * @return Collection - */ - public function getRoleScopes() + public function getRoleScopes(): Collection { return $this->roleScopes; } @@ -99,7 +93,7 @@ class Scope * * @return $this */ - public function setName($name) + public function setName(array $name): self { $this->name = $name; diff --git a/src/Bundle/ChillMainBundle/Entity/User.php b/src/Bundle/ChillMainBundle/Entity/User.php index 2ed451a92..f5be4793a 100644 --- a/src/Bundle/ChillMainBundle/Entity/User.php +++ b/src/Bundle/ChillMainBundle/Entity/User.php @@ -55,7 +55,6 @@ class User implements AdvancedUserInterface * @var string * * @ORM\Column(type="string", length=150, nullable=true) - * @Serializer\Groups({"docgen:read"}) */ private ?string $email = null; @@ -83,7 +82,6 @@ class User implements AdvancedUserInterface /** * @ORM\Column(type="string", length=200) - * @Serializer\Groups({"docgen:read"}) */ private string $label = ''; @@ -95,7 +93,6 @@ class User implements AdvancedUserInterface /** * @ORM\ManyToOne(targetEntity=Center::class) - * @Serializer\Groups({"docgen:read"}) */ private ?Center $mainCenter = null; diff --git a/src/Bundle/ChillMainBundle/Entity/UserJob.php b/src/Bundle/ChillMainBundle/Entity/UserJob.php index bccba10dd..5f0bea45d 100644 --- a/src/Bundle/ChillMainBundle/Entity/UserJob.php +++ b/src/Bundle/ChillMainBundle/Entity/UserJob.php @@ -32,14 +32,14 @@ class UserJob * @ORM\Id * @ORM\Column(name="id", type="integer") * @ORM\GeneratedValue(strategy="AUTO") - * @Serializer\Groups({"read"}) + * @Serializer\Groups({"read", "docgen:read"}) */ protected ?int $id = null; /** * @var array|string[]A * @ORM\Column(name="label", type="json") - * @Serializer\Groups({"read"}) + * @Serializer\Groups({"read", "docgen:read"}) */ protected array $label = []; diff --git a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php index 0bf1cc8f4..08243e560 100644 --- a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php +++ b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php @@ -260,7 +260,7 @@ class PhonenumberHelper return null; } - $validation = json_decode($response->getBody())->carrier->type; + $validation = json_decode($response->getBody()->getContents())->carrier->type; $item ->set($validation) diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php index f9a73cd07..131638b3d 100644 --- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php +++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php @@ -11,55 +11,115 @@ declare(strict_types=1); namespace Chill\MainBundle\Serializer\Normalizer; +use Chill\DocGeneratorBundle\Serializer\Helper\NormalizeNullValueHelper; use Chill\MainBundle\Entity\Address; +use DateTimeInterface; +use Symfony\Component\Serializer\Exception\UnexpectedValueException; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; +use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface; use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface; use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait; -use Symfony\Component\Serializer\Normalizer\NormalizerInterface; -class AddressNormalizer implements NormalizerAwareInterface, NormalizerInterface +class AddressNormalizer implements ContextAwareNormalizerInterface, NormalizerAwareInterface { use NormalizerAwareTrait; + private const NULL_POSTCODE_COUNTRY = [ + 'id', 'name', 'code', + ]; + + private const NULL_VALUE = [ + 'address_id', + 'text', + 'street', + 'streetNumber', + 'postcode', + 'country', + 'floor', + 'corridor', + 'steps', + 'flat', + 'buildingName', + 'distribution', + 'extra', + 'validFrom' => DateTimeInterface::class, + 'validTo' => DateTimeInterface::class, + ]; + /** * @param Address $address */ public function normalize($address, ?string $format = null, array $context = []) { - return [ - 'address_id' => $address->getId(), - 'text' => $address->isNoAddress() ? '' : $address->getStreetNumber() . ', ' . $address->getStreet(), - 'street' => $address->getStreet(), - 'streetNumber' => $address->getStreetNumber(), - 'postcode' => [ - 'id' => $address->getPostCode()->getId(), - 'name' => $address->getPostCode()->getName(), - 'code' => $address->getPostCode()->getCode(), - ], - 'country' => [ - 'id' => $address->getPostCode()->getCountry()->getId(), - 'name' => $address->getPostCode()->getCountry()->getName(), - 'code' => $address->getPostCode()->getCountry()->getCountryCode(), - ], - 'floor' => $address->getFloor(), - 'corridor' => $address->getCorridor(), - 'steps' => $address->getSteps(), - 'flat' => $address->getFlat(), - 'buildingName' => $address->getBuildingName(), - 'distribution' => $address->getDistribution(), - 'extra' => $address->getExtra(), - 'validFrom' => $address->getValidFrom(), - 'validTo' => $address->getValidTo(), - 'addressReference' => $this->normalizer->normalize( - $address->getAddressReference(), - $format, - [AbstractNormalizer::GROUPS => ['read']] - ), - ]; + if ($address instanceof Address) { + $data = [ + 'address_id' => $address->getId(), + 'text' => $address->isNoAddress() ? '' : $address->getStreetNumber() . ', ' . $address->getStreet(), + 'street' => $address->getStreet(), + 'streetNumber' => $address->getStreetNumber(), + 'postcode' => [ + 'id' => $address->getPostCode()->getId(), + 'name' => $address->getPostCode()->getName(), + 'code' => $address->getPostCode()->getCode(), + ], + 'country' => [ + 'id' => $address->getPostCode()->getCountry()->getId(), + 'name' => $address->getPostCode()->getCountry()->getName(), + 'code' => $address->getPostCode()->getCountry()->getCountryCode(), + ], + 'floor' => $address->getFloor(), + 'corridor' => $address->getCorridor(), + 'steps' => $address->getSteps(), + 'flat' => $address->getFlat(), + 'buildingName' => $address->getBuildingName(), + 'distribution' => $address->getDistribution(), + 'extra' => $address->getExtra(), + ]; + + if ('json' === $format) { + $data['addressReference'] = $this->normalizer->normalize( + $address->getAddressReference(), + $format, + [AbstractNormalizer::GROUPS => ['read']] + ); + $data['validFrom'] = $address->getValidFrom(); + $data['validTo'] = $address->getValidTo(); + } elseif ('docgen' === $format) { + $dateContext = array_merge($context, ['docgen:expects' => DateTimeInterface::class]); + $data['validFrom'] = $this->normalizer->normalize($address->getValidFrom(), $format, $dateContext); + $data['validTo'] = $this->normalizer->normalize($address->getValidTo(), $format, $dateContext); + } + + return $data; + } + + if (null === $address) { + $helper = new NormalizeNullValueHelper($this->normalizer); + + return array_merge( + $helper->normalize(self::NULL_VALUE, $format, $context), + [ + 'postcode' => $helper->normalize(self::NULL_POSTCODE_COUNTRY, $format, $context), + 'country' => $helper->normalize(self::NULL_POSTCODE_COUNTRY, $format, $context), + ] + ); + } + + throw new UnexpectedValueException(); } - public function supportsNormalization($data, ?string $format = null) + public function supportsNormalization($data, ?string $format = null, array $context = []): bool { - return $data instanceof Address; + if ('json' === $format) { + return $data instanceof Address; + } + + if ('docgen' === $format) { + return + $data instanceof Address + || (null === $data && Address::class === ($context['docgen:expects'] ?? null)); + } + + return false; } } diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php index 22219b108..d8c616d82 100644 --- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php +++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php @@ -11,16 +11,28 @@ declare(strict_types=1); namespace Chill\MainBundle\Serializer\Normalizer; +use Chill\MainBundle\Entity\Center; +use Chill\MainBundle\Entity\Scope; use Chill\MainBundle\Entity\User; +use Chill\MainBundle\Entity\UserJob; use Chill\MainBundle\Templating\Entity\UserRender; +use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface; use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface; use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait; -use Symfony\Component\Serializer\Normalizer\NormalizerInterface; -class UserNormalizer implements NormalizerAwareInterface, NormalizerInterface +class UserNormalizer implements ContextAwareNormalizerInterface, NormalizerAwareInterface { use NormalizerAwareTrait; + public const NULL_USER = [ + 'type' => 'user', + 'id' => '', + 'username' => '', + 'text' => '', + 'label' => '', + 'email' => '', + ]; + private UserRender $userRender; public function __construct(UserRender $userRender) @@ -31,20 +43,50 @@ class UserNormalizer implements NormalizerAwareInterface, NormalizerInterface public function normalize($user, ?string $format = null, array $context = []) { /** @var User $user */ + $userJobContext = array_merge( + $context, + ['docgen:expects' => UserJob::class, 'groups' => 'docgen:read'] + ); + $scopeContext = array_merge( + $context, + ['docgen:expects' => Scope::class, 'groups' => 'docgen:read'] + ); + $centerContext = array_merge( + $context, + ['docgen:expects' => Center::class, 'groups' => 'docgen:read'] + ); + + if (null === $user && 'docgen' === $format) { + return array_merge(self::NULL_USER, [ + 'user_job' => $this->normalizer->normalize(null, $format, $userJobContext), + 'main_center' => $this->normalizer->normalize(null, $format, $centerContext), + 'main_scope' => $this->normalizer->normalize(null, $format, $scopeContext), + ]); + } + return [ 'type' => 'user', 'id' => $user->getId(), 'username' => $user->getUsername(), 'text' => $this->userRender->renderString($user, []), 'label' => $user->getLabel(), - 'user_job' => $this->normalizer->normalize($user->getUserJob(), $format, $context), - 'main_center' => $this->normalizer->normalize($user->getMainCenter(), $format, $context), - 'main_scope' => $this->normalizer->normalize($user->getMainScope(), $format, $context), + 'email' => (string) $user->getEmail(), + 'user_job' => $this->normalizer->normalize($user->getUserJob(), $format, $userJobContext), + 'main_center' => $this->normalizer->normalize($user->getMainCenter(), $format, $centerContext), + 'main_scope' => $this->normalizer->normalize($user->getMainScope(), $format, $scopeContext), ]; } - public function supportsNormalization($data, ?string $format = null): bool + public function supportsNormalization($data, ?string $format = null, array $context = []): bool { - return $data instanceof User && ('json' === $format || 'docgen' === $format); + if ($data instanceof User && ('json' === $format || 'docgen' === $format)) { + return true; + } + + if (null === $data && 'docgen' === $format && User::class === ($context['docgen:expects'] ?? null)) { + return true; + } + + return false; } } diff --git a/src/Bundle/ChillPersonBundle/Controller/RelationshipApiController.php b/src/Bundle/ChillPersonBundle/Controller/RelationshipApiController.php index 72e92ac92..271b0cff7 100644 --- a/src/Bundle/ChillPersonBundle/Controller/RelationshipApiController.php +++ b/src/Bundle/ChillPersonBundle/Controller/RelationshipApiController.php @@ -14,10 +14,10 @@ namespace Chill\PersonBundle\Controller; use Chill\MainBundle\CRUD\Controller\ApiController; use Chill\PersonBundle\Entity\Person; use Chill\PersonBundle\Repository\Relationships\RelationshipRepository; +use Chill\PersonBundle\Security\Authorization\PersonVoter; use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Validator\Validator\ValidatorInterface; -use function array_values; class RelationshipApiController extends ApiController { @@ -36,9 +36,10 @@ class RelationshipApiController extends ApiController */ public function getRelationshipsByPerson(Person $person) { - //TODO: add permissions? (voter?) + $this->denyAccessUnlessGranted(PersonVoter::SEE, $person); + $relationships = $this->repository->findByPerson($person); - return $this->json(array_values($relationships), Response::HTTP_OK, [], ['groups' => ['read']]); + return $this->json($relationships, Response::HTTP_OK, [], ['groups' => ['read']]); } } diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php index e8a4e5608..5b4293226 100644 --- 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; diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php index b7d4c00b1..aa12f0416 100644 --- 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. diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Origin.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Origin.php index ec22e806e..7a1114b3e 100644 --- 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; } diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php index 829bc3ade..22c33f85f 100644 --- 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"}) */ diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/Position.php b/src/Bundle/ChillPersonBundle/Entity/Household/Position.php index b8f707126..378bc0d9f 100644 --- 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 = []; diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php index f58cee747..fb34a779a 100644 --- 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 diff --git a/src/Bundle/ChillPersonBundle/Entity/Relationships/Relation.php b/src/Bundle/ChillPersonBundle/Entity/Relationships/Relation.php index 3b7c75a06..c78e5df33 100644 --- 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 = []; diff --git a/src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php b/src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php index 45cd546b0..d51881bb2 100644 --- 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; diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php index 4c21cd348..aeb8d0a8d 100644 --- 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 = []; diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php index f3d8f5289..30abaa3ef 100644 --- 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() { diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php index 17d4ddd0a..b4a9b6aa2 100644 --- 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() { diff --git a/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationshipRepository.php b/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationshipRepository.php index ab172e459..9549a4564 100644 --- a/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationshipRepository.php +++ b/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationshipRepository.php @@ -11,18 +11,31 @@ declare(strict_types=1); namespace Chill\PersonBundle\Repository\Relationships; +use Chill\PersonBundle\Entity\Person; use Chill\PersonBundle\Entity\Relationships\Relationship; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityRepository; +use Doctrine\ORM\QueryBuilder; use Doctrine\Persistence\ObjectRepository; class RelationshipRepository implements ObjectRepository { + private EntityManagerInterface $em; + private EntityRepository $repository; public function __construct(EntityManagerInterface $em) { $this->repository = $em->getRepository(Relationship::class); + $this->em = $em; + } + + public function countByPerson(Person $person): int + { + return $this->buildQueryByPerson($person) + ->select('COUNT(p)') + ->getQuery() + ->getSingleScalarResult(); } public function find($id): ?Relationship @@ -40,15 +53,13 @@ class RelationshipRepository implements ObjectRepository return $this->repository->findBy($criteria, $orderBy, $limit, $offset); } - public function findByPerson($personId): array + /** + * @return array|Relationship[] + */ + public function findByPerson(Person $person): array { - // return all relationships of which person is part? or only where person is the fromPerson? - return $this->repository->createQueryBuilder('r') - ->select('r, t') // entity Relationship - ->join('r.relation', 't') - ->where('r.fromPerson = :val') - ->orWhere('r.toPerson = :val') - ->setParameter('val', $personId) + return $this->buildQueryByPerson($person) + ->select('r') ->getQuery() ->getResult(); } @@ -62,4 +73,20 @@ class RelationshipRepository implements ObjectRepository { return Relationship::class; } + + private function buildQueryByPerson(Person $person): QueryBuilder + { + $qb = $this->em->createQueryBuilder(); + $qb + ->from(Relationship::class, 'r') + ->where( + $qb->expr()->orX( + $qb->expr()->eq('r.fromPerson', ':person'), + $qb->expr()->eq('r.toPerson', ':person') + ) + ) + ->setParameter('person', $person); + + return $qb; + } } diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/OriginDemand.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/OriginDemand.vue index ee5ad469a..c3c33e9ef 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/OriginDemand.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/OriginDemand.vue @@ -4,7 +4,7 @@
'', + 'id', 'closingDate' => DateTime::class, - 'confidential' => '', - 'confidentialText' => '', + 'confidential', + 'confidentialText', 'createdAt' => DateTime::class, 'createdBy' => User::class, - 'emergency' => '', - 'emergencyText' => '', + 'emergency', + 'emergencyText', 'openingDate' => DateTime::class, - 'originText' => '', - 'requestorAnonymous' => false, - 'socialIssues' => [], - 'intensity' => '', - 'step' => '', - 'closingMotiveText' => '', - 'socialIssuesText' => '', - 'scopes' => [], - 'scopesText' => '', + 'origin' => AccompanyingPeriod\Origin::class, + 'originText', + 'requestorAnonymous', + 'socialIssues', + 'intensity', + 'step', + 'closingMotiveText', + 'socialIssuesText', + 'scopes' => Collection::class, + 'scopesText', 'ref' => User::class, - 'participations' => [], + 'participations' => Collection::class, + 'currentParticipations' => Collection::class, + 'requestorPerson' => Person::class, + 'requestorThirdParty' => ThirdParty::class, + 'resources' => Collection::class, ]; private ClosingMotiveRender $closingMotiveRender; @@ -89,48 +96,70 @@ class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterf public function normalize($period, ?string $format = null, array $context = []) { if ($period instanceof AccompanyingPeriod) { - $ignored = $context[self::IGNORE_FIRST_PASS_KEY] ?? []; - $ignored[] = spl_object_hash($period); - $initial = - $this->normalizer->normalize($period, $format, array_merge( - $context, - [self::IGNORE_FIRST_PASS_KEY => $ignored, AbstractNormalizer::GROUPS => 'docgen:read'] - )); - - // some transformation - $user = $initial['user']; - unset($initial['user']); - $scopes = $this->scopeResolverDispatcher->isConcerned($period) ? $this->scopeResolverDispatcher->resolveScope($period) : []; if (!is_array($scopes)) { $scopes = [$scopes]; } + $dateContext = array_merge($context, ['docgen:expects' => DateTime::class, 'groups' => 'docgen:read']); + $userContext = array_merge($context, ['docgen:expects' => User::class, 'groups' => 'docgen:read']); + $participationContext = array_merge($context, ['docgen:expects' => AccompanyingPeriodParticipation::class, 'groups' => 'docgen:read']); + + return [ + 'id' => $period->getId(), + 'type' => 'accompanying_period', + 'isNull' => false, + 'closingDate' => $this->normalizer->normalize($period->getClosingDate(), $format, $dateContext), + 'confidential' => $period->isConfidential(), + 'createdAt' => $this->normalizer->normalize($period->getCreatedAt(), $format, $dateContext), + 'createdBy' => $this->normalizer->normalize($period->getCreatedBy(), $format, $userContext), + 'emergency' => $period->isEmergency(), + 'openingDate' => $this->normalizer->normalize($period->getOpeningDate(), $format, $dateContext), + 'origin' => $this->normalizer->normalize($period->getOrigin(), $format, array_merge($context, ['docgen:expects' => AccompanyingPeriod\Origin::class])), + 'participations' => $this->normalizer->normalize($period->getParticipations(), $format, $participationContext), + 'currentParticipations' => $this->normalizer->normalize($period->getCurrentParticipations(), $format, $participationContext), + 'requestorAnonymous' => $period->isRequestorAnonymous(), + 'requestorPerson' => $this->normalizer->normalize($period->getRequestorPerson(), $format, array_merge($context, ['docgen:expects' => Person::class])), + 'hasRequestorPerson' => $period->getRequestorPerson() !== null, + 'requestorThirdParty' => $this->normalizer->normalize($period->getRequestorThirdParty(), $format, array_merge($context, ['docgen:expects' => ThirdParty::class])), + 'hasRequestorThirdParty' => $period->getRequestorThirdParty() !== null, + 'resources' => $this->normalizer->normalize($period->getResources(), $format, $context), + 'scopes' => $this->normalizer->normalize($scopes, $format, array_merge($context, ['docgen:expects' => Scope::class, 'groups' => 'docgen:read'])), + 'socialIssues' => $this->normalizer->normalize($period->getSocialIssues(), $format, $context), + 'intensity' => $this->translator->trans($period->getIntensity()), + 'step' => $this->translator->trans('accompanying_period.' . $period->getStep()), + 'emergencyText' => $period->isEmergency() ? $this->translator->trans('accompanying_period.emergency') : '', + 'confidentialText' => $period->isConfidential() ? $this->translator->trans('confidential') : '', + 'originText' => null !== $period->getOrigin() ? $this->translatableStringHelper->localize($period->getOrigin()->getLabel()) : '', + 'isClosed' => $period->getClosingDate() !== null, + 'closingMotiveText' => null !== $period->getClosingMotive() ? + $this->closingMotiveRender->renderString($period->getClosingMotive(), []) : '', + 'ref' => $this->normalizer->normalize($period->getUser(), $format, $userContext), + 'hasRef' => $period->getUser() !== null, + 'socialIssuesText' => implode(', ', array_map(function (SocialIssue $s) { + return $this->socialIssueRender->renderString($s, []); + }, $period->getSocialIssues()->toArray())), + 'scopesText' => implode(', ', array_map(function (Scope $s) { + return $this->translatableStringHelper->localize($s->getName()); + }, $scopes)), + 'hasRequestor' => $period->getRequestor() !== null, + 'requestorKind' => $period->getRequestorKind(), + ]; + } elseif (null === $period) { return array_merge( - // get a first default data - $initial, - // and add data custom + (new NormalizeNullValueHelper($this->normalizer, 'type', 'accompanying_period')) + ->normalize(self::PERIOD_NULL, $format, $context), [ - 'intensity' => $this->translator->trans($period->getIntensity()), - 'step' => $this->translator->trans('accompanying_period.' . $period->getStep()), - 'emergencyText' => $period->isEmergency() ? $this->translator->trans('accompanying_period.emergency') : '', - 'confidentialText' => $period->isConfidential() ? $this->translator->trans('confidential') : '', - //'originText' => null !== $period->getOrigin() ? $this->translatableStringHelper->localize($period->getOrigin()->getLabel()) : '', - 'closingMotiveText' => null !== $period->getClosingMotive() ? - $this->closingMotiveRender->renderString($period->getClosingMotive(), []) : '', - 'ref' => $user, - 'socialIssuesText' => implode(', ', array_map(function (SocialIssue $s) { - return $this->socialIssueRender->renderString($s, []); - }, $period->getSocialIssues()->toArray())), - 'scopesText' => implode(', ', array_map(function (Scope $s) { - return $this->translatableStringHelper->localize($s->getName()); - }, $scopes)), - 'scopes' => $scopes, + 'hasRef' => false, + 'requestorKind' => 'none', + 'hasRequestor' => false, + 'hasRequestorPerson' => false, + 'hasRequestorThirdParty' => false, + 'isClosed' => false, + 'confidential' => false, ] ); - } elseif (null === $period) { - return self::PERIOD_NULL; } throw new InvalidArgumentException('this neither an accompanying period or null'); @@ -143,11 +172,6 @@ class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterf } if ($data instanceof AccompanyingPeriod) { - if (array_key_exists(self::IGNORE_FIRST_PASS_KEY, $context) - && in_array(spl_object_hash($data), $context[self::IGNORE_FIRST_PASS_KEY], true)) { - return false; - } - return true; } diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php index c12f6f6a7..a1f8b1f83 100644 --- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php +++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php @@ -12,16 +12,21 @@ declare(strict_types=1); namespace Chill\PersonBundle\Serializer\Normalizer; use Chill\DocGeneratorBundle\Serializer\Helper\NormalizeNullValueHelper; +use Chill\MainBundle\Entity\Address; +use Chill\MainBundle\Entity\Civility; use Chill\MainBundle\Templating\TranslatableStringHelper; +use Chill\PersonBundle\Entity\Household\Household; use Chill\PersonBundle\Entity\Person; use Chill\PersonBundle\Entity\PersonAltName; +use Chill\PersonBundle\Repository\Relationships\RelationshipRepository; use Chill\PersonBundle\Templating\Entity\PersonRender; use DateTimeInterface; +use Doctrine\Common\Collections\ArrayCollection; +use Symfony\Component\Serializer\Exception\UnexpectedValueException; use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface; use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface; use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait; use Symfony\Contracts\Translation\TranslatorInterface; -use function array_key_exists; use function array_map; use function implode; @@ -33,16 +38,20 @@ class PersonDocGenNormalizer implements private PersonRender $personRender; + private RelationshipRepository $relationshipRepository; + private TranslatableStringHelper $translatableStringHelper; private TranslatorInterface $translator; public function __construct( PersonRender $personRender, + RelationshipRepository $relationshipRepository, TranslatorInterface $translator, TranslatableStringHelper $translatableStringHelper ) { $this->personRender = $personRender; + $this->relationshipRepository = $relationshipRepository; $this->translator = $translator; $this->translatableStringHelper = $translatableStringHelper; } @@ -52,12 +61,20 @@ class PersonDocGenNormalizer implements /** @var Person $person */ $dateContext = $context; $dateContext['docgen:expects'] = DateTimeInterface::class; + $addressContext = array_merge($context, ['docgen:expects' => Address::class]); if (null === $person) { return $this->normalizeNullValue($format, $context); } - return [ + if (!$person instanceof Person) { + throw new UnexpectedValueException(); + } + + $data = [ + 'type' => 'person', + 'isNull' => false, + 'civility' => $this->normalizer->normalize($person->getCivility(), $format, array_merge($context, ['docgen:expect' => Civility::class])), 'firstname' => $person->getFirstName(), 'lastname' => $person->getLastName(), 'altNames' => implode( @@ -83,7 +100,34 @@ class PersonDocGenNormalizer implements 'placeOfBirth' => $person->getPlaceOfBirth(), 'memo' => $person->getMemo(), 'numberOfChildren' => (string) $person->getNumberOfChildren(), + 'address' => $this->normalizer->normalize($person->getCurrentPersonAddress(), $format, $addressContext), ]; + + if ($context['docgen:person:with-household'] ?? false) { + $data['household'] = $this->normalizer->normalize( + $person->getCurrentHousehold(), + $format, + array_merge($context, [ + 'docgen:expects' => Household::class, + 'docgen:person:with-household' => false, + 'docgen:person:with-relations' => false, + ]) + ); + } + + if ($context['docgen:person:with-relations'] ?? false) { + $data['relations'] = $this->normalizer->normalize( + new ArrayCollection($this->relationshipRepository->findByPerson($person)), + $format, + array_merge($context, [ + 'docgen:person:with-household' => false, + 'docgen:person:with-relation' => false, + 'docgen:relationship:counterpart' => $person, + ]) + ); + } + + return $data; } public function supportsNormalization($data, ?string $format = null, array $context = []) @@ -95,25 +139,37 @@ class PersonDocGenNormalizer implements return $data instanceof Person || ( - array_key_exists('docgen:expects', $context) - && Person::class === $context['docgen:expects'] + null === $data + && Person::class === ($context['docgen:expects'] ?? null) ); } private function normalizeNullValue(string $format, array $context) { - $normalizer = new NormalizeNullValueHelper($this->normalizer); + $normalizer = new NormalizeNullValueHelper($this->normalizer, 'type', 'person'); $attributes = [ 'firstname', 'lastname', 'altNames', 'text', + 'civility' => Civility::class, 'birthdate' => DateTimeInterface::class, 'deathdate' => DateTimeInterface::class, 'gender', 'maritalStatus', 'maritalStatusDate' => DateTimeInterface::class, 'email', 'firstPhoneNumber', 'fixPhoneNumber', 'mobilePhoneNumber', 'nationality', 'placeOfBirth', 'memo', 'numberOfChildren', + 'address' => Address::class, ]; - return $normalizer->normalize($attributes, $format, $context); + if ($context['docgen:person:with-household'] ?? false) { + $attributes['household'] = Household::class; + } + + $data = $normalizer->normalize($attributes, $format, $context); + + if ($context['docgen:person:with-relations'] ?? false) { + $data['relations'] = []; + } + + return $data; } } diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php new file mode 100644 index 000000000..7d90e40e2 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php @@ -0,0 +1,90 @@ +translatableStringHelper = $translatableStringHelper; + } + + /** + * @param Relationship $relation + */ + public function normalize($relation, ?string $format = null, array $context = []) + { + $counterpart = $context['docgen:relationship:counterpart'] ?? null; + $contextPerson = array_merge($context, [ + 'docgen:person:with-relations' => false, + 'docgen:relationship:counterpart' => null, + 'docgen:expects' => Person::class, + ]); + + if (null !== $counterpart) { + $opposite = $relation->getOpposite($counterpart); + } else { + $opposite = null; + } + + if (null === $relation) { + return [ + 'id' => '', + 'fromPerson' => $nullPerson = $this->normalizer->normalize(null, $format, $contextPerson), + 'toPerson' => $nullPerson, + 'opposite' => $nullPerson, + 'text' => '', + 'relationId' => '', + ]; + } + + return [ + 'id' => $relation->getId(), + 'fromPerson' => $this->normalizer->normalize( + $relation->getFromPerson(), + $format, + $contextPerson + ), + 'toPerson' => $this->normalizer->normalize( + $relation->getToPerson(), + $format, + $contextPerson + ), + 'text' => $relation->getReverse() ? + $this->translatableStringHelper->localize($relation->getRelation()->getReverseTitle()) : + $this->translatableStringHelper->localize($relation->getRelation()->getTitle()), + 'opposite' => $this->normalizer->normalize($opposite, $format, $contextPerson), + 'relationId' => $relation->getRelation()->getId(), + ]; + } + + public function supportsNormalization($data, ?string $format = null, array $context = []) + { + if ('docgen' !== $format) { + return false; + } + + return $data instanceof Relationship || (null === $data + && Relationship::class === ($context['docgen:expects'] ?? null)); + } +} diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialActionNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialActionNormalizer.php index 5fa12f741..1274b46b9 100644 --- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialActionNormalizer.php +++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialActionNormalizer.php @@ -36,8 +36,8 @@ class SocialActionNormalizer implements NormalizerAwareInterface, NormalizerInte 'id' => $socialAction->getId(), 'type' => 'social_work_social_action', 'text' => $this->render->renderString($socialAction, []), - 'parent' => $this->normalizer->normalize($socialAction->getParent()), - 'desactivationDate' => $this->normalizer->normalize($socialAction->getDesactivationDate()), + 'parent' => $this->normalizer->normalize($socialAction->getParent(), $format, $context), + 'desactivationDate' => $this->normalizer->normalize($socialAction->getDesactivationDate(), $format, $context), 'title' => $socialAction->getTitle(), ]; diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php index 10431d7aa..345fa2556 100644 --- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php +++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php @@ -68,6 +68,8 @@ class AccompanyingPeriodContext implements public function adminFormReverseTransform(array $data): array { + dump($data); + if (array_key_exists('category', $data)) { $data['category'] = [ 'idInsideBundle' => $data['category']->getIdInsideBundle(), @@ -80,7 +82,7 @@ class AccompanyingPeriodContext implements public function adminFormTransform(array $data): array { - $data = [ + $r = [ 'mainPerson' => $data['mainPerson'] ?? false, 'mainPersonLabel' => $data['mainPersonLabel'] ?? $this->translator->trans('docgen.Main person'), 'person1' => $data['person1'] ?? false, @@ -90,11 +92,11 @@ class AccompanyingPeriodContext implements ]; if (array_key_exists('category', $data)) { - $data['category'] = array_key_exists('category', $data) ? + $r['category'] = array_key_exists('category', $data) ? $this->documentCategoryRepository->find($data['category']) : null; } - return $data; + return $r; } public function buildAdminForm(FormBuilderInterface $builder): void @@ -169,11 +171,16 @@ class AccompanyingPeriodContext implements $options = $template->getOptions(); $data = []; - $data['course'] = $this->normalizer->normalize($entity, 'docgen', ['docgen:expects' => AccompanyingPeriod::class]); + $data['course'] = $this->normalizer->normalize($entity, 'docgen', ['docgen:expects' => AccompanyingPeriod::class, 'groups' => 'docgen:read']); foreach (['mainPerson', 'person1', 'person2'] as $k) { if ($options[$k]) { - $data[$k] = $this->normalizer->normalize($contextGenerationData[$k], 'docgen', ['docgen:expects' => Person::class]); + $data[$k] = $this->normalizer->normalize($contextGenerationData[$k], 'docgen', [ + 'docgen:expects' => Person::class, + 'groups' => 'docgen:read', + 'docgen:person:with-household' => true, + 'docgen:person:with-relations' => true, + ]); } } @@ -204,7 +211,7 @@ class AccompanyingPeriodContext implements public function getName(): string { - return 'Accompanying Period basic'; + return 'docgen.Accompanying Period basic'; } public function hasAdminForm(): bool @@ -231,7 +238,7 @@ class AccompanyingPeriodContext implements ->setCourse($entity) ->setObject($storedObject); - if (array_key_exists('category', $template->getOptions()['category'])) { + if (array_key_exists('category', $template->getOptions())) { $doc ->setCategory( $this->documentCategoryRepository->find( diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php index 09d154900..b47c46b00 100644 --- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php +++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php @@ -102,7 +102,7 @@ class AccompanyingPeriodWorkContext implements public function getName(): string { - return 'Accompanying period work'; + return 'docgen.Accompanying period work'; } public function hasAdminForm(): bool diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php index 9c8d6172a..26004eee3 100644 --- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php +++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php @@ -153,7 +153,7 @@ class AccompanyingPeriodWorkEvaluationContext implements public function getName(): string { - return 'Accompanying period work context'; + return 'docgen.Accompanying period work context'; } public function hasAdminForm(): bool diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php index bcee2941a..cfd126ad2 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php @@ -388,7 +388,7 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase $this->assertTrue(in_array($this->client->getResponse()->getStatusCode(), [200, 422], true)); - if ($response->getStatusCode() === 422) { + if ($this->client->getResponse()->getStatusCode() === 422) { $this->markTestSkipped('the next tests should appears only on valid accompanying period'); } @@ -522,7 +522,7 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase $this->assertTrue(in_array($this->client->getResponse()->getStatusCode(), [200, 422], true)); - if ($response->getStatusCode() === 422) { + if ($this->client->getResponse()->getStatusCode() === 422) { $this->markTestSkipped('the next tests should appears only on valid accompanying period'); } diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizerTest.php index d268edbfe..1ad289b60 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizerTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizerTest.php @@ -32,6 +32,19 @@ final class AccompanyingPeriodDocGenNormalizerTest extends KernelTestCase $this->normalizer = self::$container->get(NormalizerInterface::class); } + public function testNormalizationNullOrNotNullHaveSameKeys() + { + $period = new AccompanyingPeriod(); + $notNullData = $this->normalizer->normalize($period, 'docgen', ['docgen:expects' => AccompanyingPeriod::class]); + $nullData = $this->normalizer->normalize(null, 'docgen', ['docgen:expects' => AccompanyingPeriod::class]); + + $this->assertEqualsCanonicalizing( + array_keys($notNullData), + array_keys($nullData), + 'test that the data returned by null value and an accompanying period have the same keys' + ); + } + public function testNormalize() { $period = new AccompanyingPeriod(); @@ -43,10 +56,14 @@ final class AccompanyingPeriodDocGenNormalizerTest extends KernelTestCase $period->addScope((new Scope())->setName(['fr' => 'scope2'])); $period->addSocialIssue((new SocialIssue())->setTitle(['fr' => 'issue1'])); $period->addSocialIssue((new SocialIssue())->setTitle(['fr' => 'issue2'])); + $period->addPerson(new Person()); + $period->addPerson(new Person()); $data = $this->normalizer->normalize($period, 'docgen', ['docgen:expects' => AccompanyingPeriod::class]); $expected = [ 'id' => null, + 'type' => 'accompanying_period', + 'isNull' => false, 'closingDate' => '@ignored', 'confidential' => true, 'confidentialText' => 'confidentiel', @@ -56,7 +73,9 @@ final class AccompanyingPeriodDocGenNormalizerTest extends KernelTestCase 'emergencyText' => 'Urgent', 'openingDate' => '@ignored', 'originText' => 'origin', + 'origin' => '@ignored', 'requestorAnonymous' => false, + 'resources' => [], 'socialIssues' => '@ignored', 'intensity' => 'ponctuel', 'step' => 'Brouillon', @@ -66,10 +85,18 @@ final class AccompanyingPeriodDocGenNormalizerTest extends KernelTestCase 'scopesText' => 'scope1, scope2', 'ref' => '@ignored', 'participations' => '@ignored', + 'currentParticipations' => '@ignored', + 'isClosed' => false, + 'hasRef' => false, + 'hasRequestor' => false, + 'requestorKind' => 'none', + 'hasRequestorPerson' => false, + 'hasRequestorThirdParty' => false, + 'requestorPerson' => '@ignored', + 'requestorThirdParty' => '@ignored', ]; $this->assertIsArray($data); - $this->markTestSkipped('still in specification'); $this->assertEqualsCanonicalizing(array_keys($expected), array_keys($data)); foreach ($expected as $key => $item) { @@ -77,8 +104,10 @@ final class AccompanyingPeriodDocGenNormalizerTest extends KernelTestCase continue; } - $this->assertEquals($item, $data[$key]); + $this->assertEquals($item, $data[$key], "test key {$key}"); } + + $this->assertCount(2, $data['participations']); } public function testNormalizeNull() @@ -87,16 +116,19 @@ final class AccompanyingPeriodDocGenNormalizerTest extends KernelTestCase $expected = [ 'id' => '', + 'type' => 'accompanying_period', 'closingDate' => '@ignored', - 'confidential' => '', + 'confidential' => false, 'confidentialText' => '', 'createdAt' => '@ignored', 'createdBy' => '@ignored', - 'emergency' => '', + 'emergency' => false, 'emergencyText' => '', 'openingDate' => '@ignored', 'originText' => '', - 'requestorAnonymous' => '', + 'origin' => '@ignored', + 'requestorAnonymous' => false, + 'resources' => [], 'socialIssues' => '@ignored', 'intensity' => '', 'step' => '', @@ -106,10 +138,19 @@ final class AccompanyingPeriodDocGenNormalizerTest extends KernelTestCase 'scopesText' => '', 'ref' => '@ignored', 'participations' => '@ignored', + 'currentParticipations' => '@ignored', + 'isClosed' => false, + 'hasRef' => false, + 'hasRequestor' => false, + 'requestorKind' => 'none', + 'hasRequestorPerson' => false, + 'hasRequestorThirdParty' => false, + 'requestorPerson' => '@ignored', + 'requestorThirdParty' => '@ignored', + 'isNull' => true, ]; $this->assertIsArray($data); - $this->markTestSkipped('still in specification'); $this->assertEqualsCanonicalizing(array_keys($expected), array_keys($data)); foreach ($expected as $key => $item) { @@ -117,7 +158,7 @@ final class AccompanyingPeriodDocGenNormalizerTest extends KernelTestCase continue; } - $this->assertEquals($item, $data[$key]); + $this->assertEquals($item, $data[$key], "test the key {$key}"); } } diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php index 64c7c5c5a..6c9d8de5c 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php @@ -11,9 +11,21 @@ declare(strict_types=1); namespace Serializer\Normalizer; +use Chill\MainBundle\Templating\TranslatableStringHelper; +use Chill\MainBundle\Templating\TranslatableStringHelperInterface; +use Chill\PersonBundle\Entity\Household\Household; +use Chill\PersonBundle\Entity\Household\HouseholdMember; +use Chill\PersonBundle\Entity\Household\Position; use Chill\PersonBundle\Entity\Person; +use Chill\PersonBundle\Entity\Relationships\Relation; +use Chill\PersonBundle\Entity\Relationships\Relationship; +use Chill\PersonBundle\Repository\Relationships\RelationshipRepository; +use Chill\PersonBundle\Serializer\Normalizer\PersonDocGenNormalizer; +use Chill\PersonBundle\Templating\Entity\PersonRender; +use Prophecy\Argument; use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase; use Symfony\Component\Serializer\Normalizer\NormalizerInterface; +use Symfony\Contracts\Translation\TranslatorInterface; use function array_merge; /** @@ -27,9 +39,13 @@ final class PersonDocGenNormalizerTest extends KernelTestCase 'lastname' => '', 'altNames' => '', 'text' => '', + 'isNull' => true, + 'type' => 'person', 'birthdate' => ['short' => '', 'long' => ''], 'deathdate' => ['short' => '', 'long' => ''], 'gender' => '', + 'civility' => '@ignored', + 'address' => '@ignored', 'maritalStatus' => '', 'maritalStatusDate' => ['short' => '', 'long' => ''], 'email' => '', @@ -69,6 +85,19 @@ final class PersonDocGenNormalizerTest extends KernelTestCase yield [null, self::BLANK, 'normalization for a null person']; } + public function testNormalizationNullOrNotNullHaveSameKeys() + { + $period = new Person(); + $notNullData = $this->buildPersonNormalizer()->normalize($period, 'docgen', ['docgen:expects' => Person::class]); + $nullData = $this->buildPersonNormalizer()->normalize(null, 'docgen', ['docgen:expects' => Person::class]); + + $this->assertEqualsCanonicalizing( + array_keys($notNullData), + array_keys($nullData), + 'test that the data returned by null value and a Person have the same keys' + ); + } + /** * @dataProvider generateData * @@ -77,8 +106,133 @@ final class PersonDocGenNormalizerTest extends KernelTestCase */ public function testNormalize(?Person $person, $expected, $msg) { - $normalized = $this->normalizer->normalize($person, 'docgen', ['docgen:expects' => Person::class]); + $normalized = $this->normalizer->normalize($person, 'docgen', [ + 'docgen:expects' => Person::class, + 'groups' => 'docgen:read', + ]); - $this->assertEquals($expected, $normalized, $msg); + $this->assertIsArray($normalized); + + foreach ($normalized as $key => $value) { + if ('@ignored' === $value) { + continue; + } + + $this->assertEquals($value, $normalized[$key]); + } + $this->assertEqualsCanonicalizing(array_keys($expected), array_keys($normalized), $msg); + } + + public function testNormalizePersonWithHousehold() + { + $household = new Household(); + $person = new Person(); + $person + ->setFirstName('Renaud') + ->setLastName('Mégane'); + $householdMember = new HouseholdMember(); + $householdMember + ->setPosition((new Position())->setAllowHolder(true)->setLabel(['fr' => 'position']) + ->setShareHousehold(true)) + ->setHolder(true); + $person->addHouseholdParticipation($householdMember); + $household->addMember($householdMember); + + $person = new Person(); + $person + ->setFirstName('Citroen') + ->setLastName('Xsara'); + $householdMember = new HouseholdMember(); + $householdMember + ->setPosition((new Position())->setAllowHolder(true)->setLabel(['fr' => 'position2']) + ->setShareHousehold(true)) + ->setHolder(false); + $person->addHouseholdParticipation($householdMember); + $household->addMember($householdMember); + + $actual = $this->normalizer->normalize($person, 'docgen', [ + 'groups' => 'docgen:read', + 'docgen:expects' => Person::class, + 'docgen:person:with-household' => true, + ]); + + $this->assertCount(2, $household->getMembers()); + $this->assertIsArray($actual); + $this->assertArrayHasKey('household', $actual); + $this->assertCount(2, $actual['household']['currentMembers']); + $this->assertCount(2, $actual['household']['members']); + } + + public function testNormalizePersonWithRelationships() + { + $person = (new Person())->setFirstName('Renaud')->setLastName('megane'); + $father = (new Person())->setFirstName('Clément')->setLastName('megane'); + $mother = (new Person())->setFirstName('Mireille')->setLastName('Mathieu'); + $sister = (new Person())->setFirstName('Callie')->setLastName('megane'); + + $relations = [ + (new Relationship())->setFromPerson($person)->setToPerson($father) + ->setReverse(false)->setRelation((new Relation())->setTitle(['fr' => 'Père']) + ->setReverseTitle(['fr' => 'Fils'])), + (new Relationship())->setFromPerson($person)->setToPerson($mother) + ->setReverse(false)->setRelation((new Relation())->setTitle(['fr' => 'Mère']) + ->setReverseTitle(['fr' => 'Fils'])), + (new Relationship())->setFromPerson($person)->setToPerson($sister) + ->setReverse(true)->setRelation((new Relation())->setTitle(['fr' => 'Frère']) + ->setReverseTitle(['fr' => 'Soeur'])), + ]; + + $repository = $this->prophesize(RelationshipRepository::class); + $repository->findByPerson($person)->willReturn($relations); + + $normalizer = $this->buildPersonNormalizer(null, $repository->reveal(), null, null); + + $actual = $normalizer->normalize($person, 'docgen', [ + 'groups' => 'docgen:read', + 'docgen:expects' => Person::class, + 'docgen:person:with-relations' => true, + ]); + + $this->assertIsArray($actual); + $this->assertArrayHasKey('relations', $actual); + $this->assertCount(3, $actual['relations']); + } + + private function buildPersonNormalizer( + ?PersonRender $personRender = null, + ?RelationshipRepository $relationshipRepository = null, + ?TranslatorInterface $translator = null, + ?TranslatableStringHelper $translatableStringHelper = null + ): PersonDocGenNormalizer { + $normalizer = new PersonDocGenNormalizer( + $personRender ?? self::$container->get(PersonRender::class), + $relationshipRepository ?? self::$container->get(RelationshipRepository::class), + $translator ?? self::$container->get(TranslatorInterface::class), + $translatableStringHelper ?? self::$container->get(TranslatableStringHelperInterface::class) + ); + $normalizerManager = $this->prophesize(NormalizerInterface::class); + $normalizerManager->supportsNormalization(Argument::any(), 'docgen', Argument::any())->willReturn(true); + $normalizerManager->normalize(Argument::type(Person::class), 'docgen', Argument::any()) + ->will(static function ($args) use ($normalizer) { + return $normalizer->normalize($args[0], $args[1], $args[2]); + }); + $normalizerManager->normalize(Argument::any(), 'docgen', Argument::any())->will( + static function ($args) { + if (is_iterable($args[0])) { + $r = []; + + foreach ($args[0] as $i) { + $r[] = ['fake' => true, 'hash' => spl_object_hash($i)]; + } + + return $r; + } + + return ['fake' => true, 'hash' => null !== $args[0] ? spl_object_hash($args[0]) : null]; + } + ); + $normalizer->setNormalizer($normalizerManager->reveal()); + + return $normalizer; } } diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/RelationshipDocGenNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/RelationshipDocGenNormalizerTest.php new file mode 100644 index 000000000..a8b7502d9 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/RelationshipDocGenNormalizerTest.php @@ -0,0 +1,158 @@ +buildNormalizer(); + + $this->assertTrue($normalizer->supportsNormalization($relationship, 'docgen', [ + 'docgen:expects' => Relationship::class, + ])); + $this->assertFalse($normalizer->supportsNormalization($relationship, 'docgen', [ + 'docgen:expects' => Person::class, + ])); + + $actual = $normalizer->normalize($relationship, 'docgen', [ + 'docgen:expects' => Relationship::class, + ]); + $this->assertIsArray($actual); + $this->assertEqualsCanonicalizing( + ['fromPerson', 'toPerson', 'id', 'relationId', 'text', 'opposite'], + array_keys($actual), + 'check that the expected keys are present' + ); + } + + public function testNormalizeRelationshipWithCounterPart() + { + $relationship = new Relationship(); + $relationship + ->setFromPerson($person1 = new Person()) + ->setToPerson($person2 = new Person()) + ->setRelation( + (new Relation())->setTitle(['fr' => 'title']) + ->setReverseTitle(['fr' => 'reverse title']) + ) + ->setReverse(false); + + $normalizer = $this->buildNormalizer(); + + $this->assertTrue($normalizer->supportsNormalization($relationship, 'docgen', [])); + $this->assertFalse($normalizer->supportsNormalization($person1, 'docgen', [])); + + $actual = $normalizer->normalize($relationship, 'docgen', [ + 'docgen:expects' => Relationship::class, + 'docgen:relationship:counterpart' => $person1, + ]); + + $this->assertIsArray($actual); + $this->assertEqualsCanonicalizing( + ['fromPerson', 'toPerson', 'id', 'relationId', 'text', 'opposite'], + array_keys($actual), + 'check that the expected keys are present' + ); + $this->assertEquals(spl_object_hash($person2), $actual['opposite']['hash']); + } + + public function testNormalizeRelationshipWithoutCounterPart() + { + $relationship = new Relationship(); + $relationship + ->setFromPerson($person1 = new Person()) + ->setToPerson($person2 = new Person()) + ->setRelation( + (new Relation())->setTitle(['fr' => 'title']) + ->setReverseTitle(['fr' => 'reverse title']) + ) + ->setReverse(false); + + $normalizer = $this->buildNormalizer(); + + $this->assertTrue($normalizer->supportsNormalization($relationship, 'docgen', [])); + $this->assertFalse($normalizer->supportsNormalization($person1, 'docgen', [])); + + $actual = $normalizer->normalize($relationship, 'docgen', [ + 'docgen:expects' => Relationship::class, + ]); + $this->assertIsArray($actual); + $this->assertEqualsCanonicalizing( + ['fromPerson', 'toPerson', 'id', 'relationId', 'text', 'opposite'], + array_keys($actual), + 'check that the expected keys are present' + ); + $this->assertEquals(null, $actual['opposite']); + } + + private function buildNormalizer(): RelationshipDocGenNormalizer + { + $translatableStringHelper = $this->prophesize(TranslatableStringHelperInterface::class); + $translatableStringHelper->localize(Argument::type('array'))->will( + static function ($args) { return $args[0][array_keys($args[0])[0]]; } + ); + + $normalizer = new RelationshipDocGenNormalizer( + $translatableStringHelper->reveal() + ); + + $normalizerManager = $this->prophesize(NormalizerInterface::class); + $normalizerManager->supportsNormalization(Argument::any(), 'docgen', Argument::any())->willReturn(true); + $normalizerManager->normalize(Argument::type(Relationship::class), 'docgen', Argument::any()) + ->will(static function ($args) use ($normalizer) { + return $normalizer->normalize($args[0], $args[1], $args[2]); + }); + $normalizerManager->normalize(Argument::any(), 'docgen', Argument::any())->will( + static function ($args) { + if (null === $args[0]) { + return null; + } + + if (is_iterable($args[0])) { + $r = []; + + foreach ($args[0] as $i) { + $r[] = ['fake' => true, 'hash' => spl_object_hash($i)]; + } + + return $r; + } + + if (is_object($args[0])) { + return ['fake' => true, 'hash' => null !== $args[0] ? spl_object_hash($args[0]) : null]; + } + + return $args[0]; + } + ); + $normalizer->setNormalizer($normalizerManager->reveal()); + + return $normalizer; + } +} diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml index 0ca5ce19d..a37ee0f4e 100644 --- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml @@ -455,13 +455,15 @@ see social issues: Voir les problématiques sociales see persons associated: Voir les usagers concernés docgen: + Accompanying Period basic: "Parcours d'accompagnement (basique)" + Accompanying period work: "Action d'accompagnement" + Accompanying period work context: "Evaluation des actions d'accompagnement" Main person: Personne principale person 1: Première personne person 2: Seconde personne Ask for main person: Demander à l'utilisateur de préciser la personne principale Ask for person 1: Demander à l'utilisateur de préciser la première personne Ask for person 2: Demander à l'utilisateur de préciser la seconde personne - Accompanying period work: Actions A basic context for accompanying period: Contexte pour les parcours A context for accompanying period work: Contexte pour les actions d'accompagnement A context for accompanying period work evaluation: Contexte pour les évaluations dans les actions d'accompagnement diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php index 19f2062ee..fd6f013df 100644 --- 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 { diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyCategory.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyCategory.php index 14cebcb84..7ce362360 100644 --- 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 { diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyProfession.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyProfession.php index e51111624..1963b34a7 100644 --- 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 { diff --git a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php index 50ecefb18..b6e98b6f0 100644 --- 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; } } diff --git a/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdpartyDocGenNormalizerTest.php b/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdpartyDocGenNormalizerTest.php new file mode 100644 index 000000000..0b8169d69 --- /dev/null +++ b/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdpartyDocGenNormalizerTest.php @@ -0,0 +1,51 @@ +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); + } +}