Merge branch 'master' into upgrade-sf5

2025-08-21 23:23:51 +00:00 · 2024-06-24 10:46:21 +02:00
parent 102d0dad94 47f4cfddbb
commit 916724c0c5
99 changed files with 1442 additions and 422 deletions
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
@@ -17,6 +17,7 @@ use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher;
+use Chill\MainBundle\Serializer\Normalizer\UserNormalizer;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
@@ -81,6 +82,7 @@ class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterf
    {
        if ($period instanceof AccompanyingPeriod) {
            $scopes = $this->scopeResolverDispatcher->isConcerned($period) ? $this->scopeResolverDispatcher->resolveScope($period) : [];
+            $userHistory = $period->getCurrentUserHistory();

            if (!\is_array($scopes)) {
                $scopes = [$scopes];
@@ -101,7 +103,7 @@ class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterf
                'closingMotive' => $this->normalizer->normalize($period->getClosingMotive(), $format, array_merge($context, ['docgen:expects' => AccompanyingPeriod\ClosingMotive::class])),
                'confidential' => $period->isConfidential(),
                'createdAt' => $this->normalizer->normalize($period->getCreatedAt(), $format, $dateContext),
-                'createdBy' => $this->normalizer->normalize($period->getCreatedBy(), $format, $userContext),
+                'createdBy' => $this->normalizer->normalize($period->getCreatedBy(), $format, [...$userContext, UserNormalizer::AT_DATE => $period->getCreatedAt()]),
                '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])),
@@ -123,7 +125,7 @@ class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterf
                'isClosed' => null !== $period->getClosingDate(),
                'closingMotiveText' => null !== $period->getClosingMotive() ?
                    $this->closingMotiveRender->renderString($period->getClosingMotive(), []) : '',
-                'ref' => $this->normalizer->normalize($period->getUser(), $format, $userContext),
+                'ref' => $this->normalizer->normalize($userHistory?->getUser(), $format, [...$userContext, UserNormalizer::AT_DATE => $userHistory?->getStartDate()]),
                'hasRef' => null !== $period->getUser(),
                'socialIssuesText' => implode(', ', array_map(fn (SocialIssue $s) => $this->socialIssueRender->renderString($s, []), $period->getSocialIssues()->toArray())),
                'scopesText' => implode(', ', array_map(fn (Scope $s) => $this->translatableStringHelper->localize($s->getName()), $scopes)),
@@ -135,7 +137,7 @@ class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterf
                'locationPerson' => $this->normalizer->normalize($period->getPersonLocation(), $format, array_merge($context, ['docgen:expects' => Person::class])),
                'location' => $this->normalizer->normalize($period->getLocation(), $format, $addressContext),
                'administrativeLocation' => $this->normalizer->normalize($period->getAdministrativeLocation(), $format, $administrativeLocationContext),
-                'works' => $this->normalizer->normalize($period->getWorks(), $format, $workContext),
+                'works' => $this->normalizer->normalize($period->getWorks()->getValues(), $format, $workContext),
                'comments' => $this->normalizer->normalize($period->getComments(), $format, array_merge($context, ['docgen:expects' => AccompanyingPeriod\Comment::class])),
                'pinnedComment' => $this->normalizer->normalize($period->getPinnedComment(), $format, array_merge($context, ['docgen:expects' => AccompanyingPeriod\Comment::class])),
            ];
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkNormalizer.php
@@ -11,12 +11,16 @@ declare(strict_types=1);

 namespace Chill\PersonBundle\Serializer\Normalizer;

+use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
+use Chill\MainBundle\Serializer\Normalizer\UserNormalizer;
 use Chill\MainBundle\Workflow\Helper\MetadataExtractor;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
-use Symfony\Component\Serializer\Exception\ExceptionInterface;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
@@ -30,16 +34,48 @@ class AccompanyingPeriodWorkNormalizer implements ContextAwareNormalizerInterfac

    public function __construct(private readonly Registry $registry, private readonly EntityWorkflowRepository $entityWorkflowRepository, private readonly MetadataExtractor $metadataExtractor) {}

-    /**
-     * @param AccompanyingPeriodWork $object
-     *
-     * @throws ExceptionInterface
-     */
    public function normalize($object, ?string $format = null, array $context = []): array|\ArrayObject|bool|float|int|string|null
    {
+        if (!$object instanceof AccompanyingPeriodWork && 'json' === $format) {
+            throw new UnexpectedValueException('Object cannot be null or empty when format is json');
+        }
+        if ('docgen' === $format && !($object instanceof AccompanyingPeriodWork || null === $object)) {
+            throw new UnexpectedValueException(sprintf('Object must be an instanceof AccompanyingPeriodWork or null when format is docgen, %s given', get_debug_type($object)));
+        }
+
+        $cleanContext = array_filter($context, fn (string|int $key) => !in_array($key, ['docgen:expects', self::IGNORE_WORK], true), ARRAY_FILTER_USE_KEY);
+
+        if (null === $object && 'docgen' === $format) {
+            $dateNull = $this->normalizer->normalize(null, $format, [...$context, 'docgen:expects' => \DateTimeImmutable::class]);
+            $userNull = $this->normalizer->normalize(null, $format, [...$context, 'docgen:expects' => User::class]);
+
+            return [
+                'isNull' => true,
+                'type' => 'accompanying_period_work',
+                'accompanyingPeriodWorkEvaluations' => [],
+                'referrers' => [],
+                'createdAt' => $dateNull,
+                'createdAutomatically' => 'false',
+                'createdAutomaticallyReason' => '',
+                'createdBy' => $userNull,
+                'endDate' => $dateNull,
+                'goals' => [],
+                'handlingThierParty' => $this->normalizer->normalize(null, $format, [...$cleanContext, 'docgen:expects' => ThirdParty::class]),
+                'id' => '',
+                'note' => '',
+                'persons' => [],
+                'results' => [],
+                'socialAction' => $this->normalizer->normalize(null, $format, [...$cleanContext, 'docgen:expects' => SocialAction::class]),
+                'startDate' => $dateNull,
+                'thirdParties' => [],
+                'updatedAt' => $dateNull,
+                'updatedBy' => $userNull,
+            ];
+        }
+
        $initial = $this->normalizer->normalize($object, $format, array_merge(
-            $context,
-            [self::IGNORE_WORK => spl_object_hash($object)]
+            $cleanContext,
+            [self::IGNORE_WORK => null === $object ? null : spl_object_hash($object)]
        ));

        // due to bug: https://api-platform.com/docs/core/serialization/#collection-relation
@@ -48,38 +84,57 @@ class AccompanyingPeriodWorkNormalizer implements ContextAwareNormalizerInterfac
        $initial['accompanyingPeriodWorkEvaluations'] = $this->normalizer->normalize(
            $object->getAccompanyingPeriodWorkEvaluations()->getValues(),
            $format,
-            $context
+            [...$cleanContext]
        );

-        // then, we add normalization for things which are not into the entity
+        // add the referrers
+        $initial['referrers'] = [];

-        $initial['workflows_availables'] = $this->metadataExtractor->availableWorkflowFor(
-            AccompanyingPeriodWork::class,
-            $object->getId()
-        );
+        foreach ($object->getReferrersHistory() as $referrerHistory) {
+            if (null !== $referrerHistory->getEndDate()) {
+                continue;
+            }

-        $initial['workflows_availables_evaluation'] = $this->metadataExtractor->availableWorkflowFor(
-            AccompanyingPeriodWorkEvaluation::class
-        );
+            $initial['referrers'][] = $this->normalizer->normalize(
+                $referrerHistory->getUser(),
+                $format,
+                [...$cleanContext, UserNormalizer::AT_DATE => $referrerHistory->getStartDate()]
+            );
+        }

-        $initial['workflows_availables_evaluation_documents'] = $this->metadataExtractor->availableWorkflowFor(
-            AccompanyingPeriodWorkEvaluationDocument::class
-        );
+        if ('json' === $format) {
+            // then, we add normalization for things which are not into the entity
+            $initial['workflows_availables'] = $this->metadataExtractor->availableWorkflowFor(
+                AccompanyingPeriodWork::class,
+                $object->getId()
+            );

-        $workflows = $this->entityWorkflowRepository->findBy([
-            'relatedEntityClass' => AccompanyingPeriodWork::class,
-            'relatedEntityId' => $object->getId(),
-        ]);
+            $initial['workflows_availables_evaluation'] = $this->metadataExtractor->availableWorkflowFor(
+                AccompanyingPeriodWorkEvaluation::class
+            );

-        $initial['workflows'] = $this->normalizer->normalize($workflows, 'json', $context);
+            $initial['workflows_availables_evaluation_documents'] = $this->metadataExtractor->availableWorkflowFor(
+                AccompanyingPeriodWorkEvaluationDocument::class
+            );
+
+            $workflows = $this->entityWorkflowRepository->findBy([
+                'relatedEntityClass' => AccompanyingPeriodWork::class,
+                'relatedEntityId' => $object->getId(),
+            ]);
+
+            $initial['workflows'] = $this->normalizer->normalize($workflows, 'json', $context);
+        }

        return $initial;
    }

    public function supportsNormalization($data, ?string $format = null, array $context = []): bool
    {
-        return 'json' === $format
-            && $data instanceof AccompanyingPeriodWork
-            && !\array_key_exists(self::IGNORE_WORK, $context);
+        return match ($format) {
+            'json' => $data instanceof AccompanyingPeriodWork && ($context[self::IGNORE_WORK] ?? null) !== spl_object_hash($data),
+            'docgen' => ($data instanceof AccompanyingPeriodWork || (null === $data && ($context['docgen:expects'] ?? null) === AccompanyingPeriodWork::class))
+                && !array_key_exists(self::IGNORE_WORK, $context),
+            default => false,
+        };
    }
 }
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialActionNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialActionNormalizer.php
@@ -48,7 +48,7 @@ class SocialActionNormalizer implements NormalizerAwareInterface, NormalizerInte
                    'type' => 'social_work_social_action',
                    'text' => $this->render->renderString($socialAction, []),
                    'title' => $socialAction->getTitle(),
-                    'parent' => $this->normalizer->normalize($socialAction->getParent(), $format, $context),
+                    'parent' => $this->normalizer->normalize($socialAction->getParent(), $format, [...$context, 'docgen:expects' => SocialAction::class]),
                    'issue' => $this->normalizer->normalize($socialAction->getIssue(), $format, $context),
                ];

--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/WorkflowNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/WorkflowNormalizer.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Serializer\Normalizer;

 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
+use Chill\MainBundle\Serializer\Normalizer\UserNormalizer;
 use Chill\MainBundle\Workflow\Helper\MetadataExtractor;
 use Symfony\Component\Serializer\Exception\ExceptionInterface;
 use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
@@ -46,7 +47,7 @@ class WorkflowNormalizer implements ContextAwareNormalizerInterface, NormalizerA
        $data['workflow'] = $this->metadataExtractor->buildArrayPresentationForWorkflow($workflow);
        $data['current_place'] = $this->metadataExtractor->buildArrayPresentationForPlace($object);
        $data['current_place_at'] = $this->normalizer->normalize($object->getCurrentStepCreatedAt(), 'json', ['groups' => ['read']]);
-        $data['current_place_by'] = $this->normalizer->normalize($object->getCurrentStepCreatedBy(), 'json', ['groups' => ['read']]);
+        $data['current_place_by'] = $this->normalizer->normalize($object->getCurrentStepCreatedBy(), 'json', ['groups' => ['read'], UserNormalizer::AT_DATE => $object->getCurrentStepCreatedAt()]);

        return $data;
    }