Use better namespacing for configuring workflow signature documents

Create entity workflow signature

See merge request Chill-Projet/chill-bundles!705

.changes/unreleased/Feature-20240614-153236.yaml

@@ -0,0 +1,8 @@
+kind: Feature
+body: |-
+  Electronic signature
+
+  Implementation of the electronic signature for documents within chill.
+time: 2024-06-14T15:32:36.875891692+02:00
+custom:
+  Issue: ""

.changes/unreleased/Feature-20240718-151233.yaml

@@ -0,0 +1,5 @@
+kind: Feature
+body: Metadata form added for person signatures
+time: 2024-07-18T15:12:33.8134266+02:00
+custom:
+  Issue: "288"

.changes/v2.22.0.md

@@ -1,6 +0,0 @@
-## v2.22.0 - 2024-06-25
-### Feature
-* ([#216](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/216)) [event bundle] exports  added for the event module
-
-### Traduction francophone
-* Exports sont ajoutés pour la module événement.

.changes/v2.22.1.md

@@ -1,5 +0,0 @@
-## v2.22.1 - 2024-07-01
-### Fixed
-* Remove debug word 
-### DX
-* Add a command for reading official address DB from Luxembourg and update chill addresses 

.changes/v2.22.2.md

@@ -1,3 +0,0 @@
-## v2.22.2 - 2024-07-03
-### Fixed
-* Remove scope required for event participation stats 

CHANGELOG.md

@@ -6,23 +6,6 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
-## v2.22.2 - 2024-07-03
-### Fixed
-* Remove scope required for event participation stats 
-
-## v2.22.1 - 2024-07-01
-### Fixed
-* Remove debug word 
-### DX
-* Add a command for reading official address DB from Luxembourg and update chill addresses 
-
-## v2.22.0 - 2024-06-25
-### Feature
-* ([#216](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/216)) [event bundle] exports  added for the event module
-
-### Traduction francophone
-* Exports sont ajoutés pour la module événement.
-
 ## v2.21.0 - 2024-06-18
 ### Feature
 * Add flash menu buttons in search results, to open directly a new calendar, or a new activity in an accompanying period

composer.json

@@ -31,6 +31,7 @@
         "phpoffice/phpspreadsheet": "^1.16",
         "ramsey/uuid-doctrine": "^1.7",
         "sensio/framework-extra-bundle": "^5.5",
+        "smalot/pdfparser": "^2.10",
         "spomky-labs/base64url": "^2.0",
         "symfony/asset": "^5.4",
         "symfony/browser-kit": "^5.4",

docs/source/installation/index.rst

@@ -56,7 +56,7 @@ We strongly encourage you to initialize a git repository at this step, to track
    cat <<< "$(jq '.extra.symfony += {"endpoint": ["flex://defaults", "https://gitlab.com/api/v4/projects/57371968/repository/files/index.json/raw?ref=main"]}' composer.json)" > composer.json
    # install chill and some dependencies
    # TODO fix the suffix "alpha1" and replace by ^3.0.0 when version 3.0.0 will be released
-   symfony composer require chill-project/chill-bundles v3.0.0-RC3 champs-libres/wopi-lib dev-master@dev champs-libres/wopi-bundle dev-master@dev
+   symfony composer require chill-project/chill-bundles v3.0.0-alpha1 champs-libres/wopi-lib dev-master@dev champs-libres/wopi-bundle dev-master@dev
 
 We encourage you to accept the inclusion of the "Docker configuration from recipes": this is the documented way to run the database.
 You must also accept to configure recipes from the contrib repository, unless you want to configure the bundles manually).
@@ -110,14 +110,15 @@ you can either:
   .. code-block:: env
 
      ADMIN_PASSWORD=\$2y\$13\$iyvJLuT4YEa6iWXyQV4/N.hNHpNG8kXlYDkkt5MkYy4FXcSwYAwmm
-     # note: if you copy-paste the line above, the password will be "admin".
 
 - add the generated password to the secrets manager (**note**: you must add the generated hashed password to the secrets env,
   not the password in clear text).
 
 - set up the jwt authentication bundle
 
-Some environment variables are available for the JWT authentication bundle in the :code:`.env` file. 
+Some environment variables are available for the JWT authentication bundle in the :code:`.env` file. You must also run the command
+:code:`symfony console lexik:jwt:generate-keypair` to generate some keys that will be stored in the paths set up in the :code:`JWT_SECRET_KEY`
+and the :code:`JWT_PUBLIC_KEY` env variables. This is only required for using the stored documents in Chill.
 
 Prepare migrations and other tools
 **********************************
@@ -135,8 +136,6 @@ To continue the installation process, you will have to run migrations:
    symfony console messenger:setup-transports
    # prepare some views
    symfony console chill:db:sync-views
-   # generate jwt token, required for some api features (webdav access, ...)
-   symfony console lexik:jwt:generate-keypair
 
 .. warning::
 

src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig

@@ -87,6 +87,7 @@
                             <li>
                                 {% if bloc.type == 'user' %}
                                     <span class="badge-user">
+                                        hello
                                         {{ item|chill_entity_render_box({'render': 'raw', 'addAltNames': false, 'at_date': entity.date }) }}
                                     </span>
                                 {% else %}

src/Bundle/ChillDocStoreBundle/Controller/SignatureRequestController.php

@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\DocStoreBundle\Controller;
+
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\Service\Signature\Driver\BaseSigner\RequestPdfSignMessage;
+use Chill\DocStoreBundle\Service\Signature\PDFPage;
+use Chill\DocStoreBundle\Service\Signature\PDFSignatureZone;
+use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Messenger\MessageBusInterface;
+use Symfony\Component\Routing\Annotation\Route;
+
+class SignatureRequestController
+{
+    public function __construct(
+        private MessageBusInterface $messageBus,
+        private StoredObjectManagerInterface $storedObjectManager,
+    ) {}
+
+    #[Route('/api/1.0/document/workflow/{id}/signature-request', name: 'chill_docstore_signature_request')]
+    public function processSignature(StoredObject $storedObject): Response
+    {
+        $content = $this->storedObjectManager->read($storedObject);
+
+        $this->messageBus->dispatch(new RequestPdfSignMessage(
+            0,
+            new PDFSignatureZone(10.0, 10.0, 180.0, 180.0, new PDFPage(0, 500.0, 800.0)),
+            0,
+            'test signature',
+            'Mme Caroline Diallo',
+            $content
+        ));
+
+        return new Response('<html><head><title>test</title></head><body><p>ok</p></body></html>');
+    }
+}

src/Bundle/ChillDocStoreBundle/Service/Signature/Driver/BaseSigner/PdfSignedMessage.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\DocStoreBundle\Service\Signature\Driver\BaseSigner;
+
+/**
+ * Message which is received when a pdf is signed.
+ */
+final readonly class PdfSignedMessage
+{
+    public function __construct(
+        public readonly int $signatureId,
+        public readonly string $content
+    ) {}
+}

src/Bundle/ChillDocStoreBundle/Service/Signature/Driver/BaseSigner/PdfSignedMessageHandler.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\DocStoreBundle\Service\Signature\Driver\BaseSigner;
+
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+
+final readonly class PdfSignedMessageHandler implements MessageHandlerInterface
+{
+    /**
+     * log prefix.
+     */
+    private const P = '[pdf signed message] ';
+
+    public function __construct(
+        private LoggerInterface $logger,
+    ) {}
+
+    public function __invoke(PdfSignedMessage $message): void
+    {
+        $this->logger->info(self::P.'a message is received', ['signaturedId' => $message->signatureId]);
+    }
+}

src/Bundle/ChillDocStoreBundle/Service/Signature/Driver/BaseSigner/PdfSignedMessageSerializer.php

@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\DocStoreBundle\Service\Signature\Driver\BaseSigner;
+
+use Symfony\Component\Messenger\Envelope;
+use Symfony\Component\Messenger\Exception\MessageDecodingFailedException;
+use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
+
+/**
+ * Decode (and requeue) @see{PdfSignedMessage}, which comes from an external producer.
+ */
+final readonly class PdfSignedMessageSerializer implements SerializerInterface
+{
+    public function decode(array $encodedEnvelope): Envelope
+    {
+        $body = $encodedEnvelope['body'];
+
+        try {
+            $decoded = json_decode($body, true, 512, JSON_THROW_ON_ERROR);
+        } catch (\JsonException $e) {
+            throw new MessageDecodingFailedException('Could not deserialize message', previous: $e);
+        }
+
+        if (!array_key_exists('signatureId', $decoded) || !array_key_exists('content', $decoded)) {
+            throw new MessageDecodingFailedException('Could not find expected keys: signatureId or content');
+        }
+
+        $content = base64_decode($decoded['content'], true);
+
+        if (false === $content) {
+            throw new MessageDecodingFailedException('Invalid character found in the base64 encoded content');
+        }
+
+        $message = new PdfSignedMessage($decoded['signatureId'], $content);
+
+        return new Envelope($message);
+    }
+
+    public function encode(Envelope $envelope): array
+    {
+        $message = $envelope->getMessage();
+
+        if (!$message instanceof PdfSignedMessage) {
+            throw new MessageDecodingFailedException('Expected a PdfSignedMessage');
+        }
+
+        $data = [
+            'signatureId' => $message->signatureId,
+            'content' => base64_encode($message->content),
+        ];
+
+        return [
+            'body' => json_encode($data, JSON_THROW_ON_ERROR),
+            'headers' => [],
+        ];
+    }
+}

src/Bundle/ChillDocStoreBundle/Service/Signature/Driver/BaseSigner/RequestPdfSignMessage.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\DocStoreBundle\Service\Signature\Driver\BaseSigner;
+
+use Chill\DocStoreBundle\Service\Signature\PDFSignatureZone;
+
+/**
+ * Message which is sent when we request a signature on a pdf.
+ */
+final readonly class RequestPdfSignMessage
+{
+    public function __construct(
+        public int $signatureId,
+        public PDFSignatureZone $PDFSignatureZone,
+        public int $signatureZoneIndex,
+        public string $reason,
+        public string $signerText,
+        public string $content,
+    ) {}
+}

src/Bundle/ChillDocStoreBundle/Service/Signature/Driver/BaseSigner/RequestPdfSignMessageSerializer.php

@@ -0,0 +1,105 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\DocStoreBundle\Service\Signature\Driver\BaseSigner;
+
+use Chill\DocStoreBundle\Service\Signature\PDFSignatureZone;
+use Symfony\Component\Messenger\Envelope;
+use Symfony\Component\Messenger\Exception\MessageDecodingFailedException;
+use Symfony\Component\Messenger\Stamp\NonSendableStampInterface;
+use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+/**
+ * Serialize a RequestPdfSignMessage, for external consumer.
+ */
+final readonly class RequestPdfSignMessageSerializer implements SerializerInterface
+{
+    public function __construct(
+        private NormalizerInterface $normalizer,
+        private DenormalizerInterface $denormalizer,
+    ) {}
+
+    public function decode(array $encodedEnvelope): Envelope
+    {
+        $body = $encodedEnvelope['body'];
+        $headers = $encodedEnvelope['headers'];
+
+        if (RequestPdfSignMessage::class !== ($headers['Message'] ?? null)) {
+            throw new MessageDecodingFailedException('serializer does not support this message');
+        }
+
+        $data = json_decode($body, true);
+
+        $zoneSignature = $this->denormalizer->denormalize($data['signatureZone'], PDFSignatureZone::class, 'json', [
+            AbstractNormalizer::GROUPS => ['write'],
+        ]);
+
+        $content = base64_decode($data['content'], true);
+
+        if (false === $content) {
+            throw new MessageDecodingFailedException('the content could not be converted from base64 encoding');
+        }
+
+        $message = new RequestPdfSignMessage(
+            $data['signatureId'],
+            $zoneSignature,
+            $data['signatureZoneIndex'],
+            $data['reason'],
+            $data['signerText'],
+            $content,
+        );
+
+        // in case of redelivery, unserialize any stamps
+        $stamps = [];
+        if (isset($headers['stamps'])) {
+            $stamps = unserialize($headers['stamps']);
+        }
+
+        return new Envelope($message, $stamps);
+    }
+
+    public function encode(Envelope $envelope): array
+    {
+        $message = $envelope->getMessage();
+
+        if (!$message instanceof RequestPdfSignMessage) {
+            throw new MessageDecodingFailedException('Message is not a RequestPdfSignMessage');
+        }
+
+        $data = [
+            'signatureId' => $message->signatureId,
+            'signatureZoneIndex' => $message->signatureZoneIndex,
+            'signatureZone' => $this->normalizer->normalize($message->PDFSignatureZone, 'json', [AbstractNormalizer::GROUPS => ['read']]),
+            'reason' => $message->reason,
+            'signerText' => $message->signerText,
+            'content' => base64_encode($message->content),
+        ];
+
+        $allStamps = [];
+        foreach ($envelope->all() as $stamp) {
+            if ($stamp instanceof NonSendableStampInterface) {
+                continue;
+            }
+            $allStamps = [...$allStamps, ...$stamp];
+        }
+
+        return [
+            'body' => json_encode($data, JSON_THROW_ON_ERROR, 512),
+            'headers' => [
+                'stamps' => serialize($allStamps),
+                'Message' => RequestPdfSignMessage::class,
+            ],
+        ];
+    }
+}

src/Bundle/ChillDocStoreBundle/Service/Signature/PDFPage.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\DocStoreBundle\Service\Signature;
+
+use Symfony\Component\Serializer\Annotation\Groups;
+
+final readonly class PDFPage
+{
+    public function __construct(
+        #[Groups(['read'])]
+        public int $index,
+        #[Groups(['read'])]
+        public float $width,
+        #[Groups(['read'])]
+        public float $height,
+    ) {}
+
+    public function equals(self $page): bool
+    {
+        return $page->index === $this->index
+            && round($page->width, 2) === round($this->width, 2)
+            && round($page->height, 2) === round($this->height, 2);
+    }
+}

src/Bundle/ChillDocStoreBundle/Service/Signature/PDFSignatureZone.php

@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\DocStoreBundle\Service\Signature;
+
+use Symfony\Component\Serializer\Annotation\Groups;
+
+final readonly class PDFSignatureZone
+{
+    public function __construct(
+        #[Groups(['read'])]
+        public float $x,
+        #[Groups(['read'])]
+        public float $y,
+        #[Groups(['read'])]
+        public float $height,
+        #[Groups(['read'])]
+        public float $width,
+        #[Groups(['read'])]
+        public PDFPage $PDFPage,
+    ) {}
+
+    public function equals(self $other): bool
+    {
+        return
+            $this->x == $other->x
+            && $this->y == $other->y
+            && $this->height == $other->height
+            && $this->width == $other->width
+            && $this->PDFPage->equals($other->PDFPage);
+    }
+}

src/Bundle/ChillDocStoreBundle/Service/Signature/PDFSignatureZoneParser.php

@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\DocStoreBundle\Service\Signature;
+
+use Smalot\PdfParser\Parser;
+
+class PDFSignatureZoneParser
+{
+    public const ZONE_SIGNATURE_START = 'signature_zone';
+
+    private Parser $parser;
+
+    public function __construct(
+        public float $defaultHeight = 180.0,
+        public float $defaultWidth = 180.0,
+    ) {
+        $this->parser = new Parser();
+    }
+
+    /**
+     * @return list<PDFSignatureZone>
+     */
+    public function findSignatureZones(string $fileContent): array
+    {
+        $pdf = $this->parser->parseContent($fileContent);
+        $zones = [];
+
+        $defaults = $pdf->getObjectsByType('Pages');
+        $defaultPage = reset($defaults);
+        $defaultPageDetails = $defaultPage->getDetails();
+
+        foreach ($pdf->getPages() as $index => $page) {
+            $details = $page->getDetails();
+            $pdfPage = new PDFPage(
+                $index,
+                (float) ($details['MediaBox'][2] ?? $defaultPageDetails['MediaBox'][2]),
+                (float) ($details['MediaBox'][3] ?? $defaultPageDetails['MediaBox'][3]),
+            );
+
+            foreach ($page->getDataTm() as $dataTm) {
+                if (str_starts_with($dataTm[1], self::ZONE_SIGNATURE_START)) {
+                    $zones[] = new PDFSignatureZone((float) $dataTm[0][4], (float) $dataTm[0][5], $this->defaultHeight, $this->defaultWidth, $pdfPage);
+                }
+            }
+        }
+
+        return $zones;
+    }
+}

src/Bundle/ChillDocStoreBundle/Tests/Service/Signature/Driver/BaseSigner/PdfSignedMessageSerializerTest.php

@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\DocStoreBundle\Tests\Service\Signature\Driver\BaseSigner;
+
+use Chill\DocStoreBundle\Service\Signature\Driver\BaseSigner\PdfSignedMessage;
+use Chill\DocStoreBundle\Service\Signature\Driver\BaseSigner\PdfSignedMessageSerializer;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Messenger\Envelope;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class PdfSignedMessageSerializerTest extends TestCase
+{
+    public function testDecode(): void
+    {
+        $asString = <<<'JSON'
+            {"signatureId": 0, "content": "dGVzdAo="}
+            JSON;
+
+        $actual = $this->buildSerializer()->decode(['body' => $asString]);
+
+        self::assertInstanceOf(Envelope::class, $actual);
+        $message = $actual->getMessage();
+        self::assertInstanceOf(PdfSignedMessage::class, $message);
+        self::assertEquals("test\n", $message->content);
+        self::assertEquals(0, $message->signatureId);
+    }
+
+    public function testEncode(): void
+    {
+        $envelope = new Envelope(
+            new PdfSignedMessage(0, "test\n")
+        );
+
+        $actual = $this->buildSerializer()->encode($envelope);
+
+        self::assertIsArray($actual);
+        self::assertArrayHasKey('body', $actual);
+        self::assertArrayHasKey('headers', $actual);
+        self::assertEquals([], $actual['headers']);
+
+        self::assertEquals(<<<'JSON'
+                {"signatureId":0,"content":"dGVzdAo="}
+                JSON, $actual['body']);
+    }
+
+    private function buildSerializer(): PdfSignedMessageSerializer
+    {
+        return new PdfSignedMessageSerializer();
+    }
+}

src/Bundle/ChillDocStoreBundle/Tests/Service/Signature/Driver/BaseSigner/RequestPdfSignMessageSerializerTest.php

@@ -0,0 +1,137 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\DocStoreBundle\Tests\Service\Signature\Driver\BaseSigner;
+
+use Chill\DocStoreBundle\Service\Signature\PDFPage;
+use Chill\DocStoreBundle\Service\Signature\PDFSignatureZone;
+use Chill\DocStoreBundle\Service\Signature\Driver\BaseSigner\RequestPdfSignMessage;
+use Chill\DocStoreBundle\Service\Signature\Driver\BaseSigner\RequestPdfSignMessageSerializer;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Messenger\Envelope;
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use Symfony\Component\Serializer\Serializer;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class RequestPdfSignMessageSerializerTest extends TestCase
+{
+    public function testEncode(): void
+    {
+        $serializer = $this->buildSerializer();
+
+        $envelope = new Envelope(
+            $request = new RequestPdfSignMessage(
+                0,
+                new PDFSignatureZone(10.0, 10.0, 180.0, 180.0, new PDFPage(0, 500.0, 800.0)),
+                0,
+                'metadata to add to the signature',
+                'Mme Caroline Diallo',
+                'abc'
+            ),
+        );
+
+        $actual = $serializer->encode($envelope);
+        $expectedBody = json_encode([
+            'signatureId' => $request->signatureId,
+            'signatureZoneIndex' => $request->signatureZoneIndex,
+            'signatureZone' => ['x' => 10.0],
+            'reason' => $request->reason,
+            'signerText' => $request->signerText,
+            'content' => base64_encode($request->content),
+        ]);
+
+        self::assertIsArray($actual);
+        self::assertArrayHasKey('body', $actual);
+        self::assertArrayHasKey('headers', $actual);
+        self::assertEquals($expectedBody, $actual['body']);
+    }
+
+    public function testDecode(): void
+    {
+        $serializer = $this->buildSerializer();
+
+        $request = new RequestPdfSignMessage(
+            0,
+            new PDFSignatureZone(10.0, 10.0, 180.0, 180.0, new PDFPage(0, 500.0, 800.0)),
+            0,
+            'metadata to add to the signature',
+            'Mme Caroline Diallo',
+            'abc'
+        );
+
+        $bodyAsString = json_encode([
+            'signatureId' => $request->signatureId,
+            'signatureZoneIndex' => $request->signatureZoneIndex,
+            'signatureZone' => ['x' => 10.0],
+            'reason' => $request->reason,
+            'signerText' => $request->signerText,
+            'content' => base64_encode($request->content),
+        ], JSON_THROW_ON_ERROR);
+
+        $actual = $serializer->decode([
+            'body' => $bodyAsString,
+            'headers' => [
+                'Message' => RequestPdfSignMessage::class,
+            ],
+        ]);
+
+        self::assertInstanceOf(RequestPdfSignMessage::class, $actual->getMessage());
+        self::assertEquals($request->signatureId, $actual->getMessage()->signatureId);
+        self::assertEquals($request->signatureZoneIndex, $actual->getMessage()->signatureZoneIndex);
+        self::assertEquals($request->reason, $actual->getMessage()->reason);
+        self::assertEquals($request->signerText, $actual->getMessage()->signerText);
+        self::assertEquals($request->content, $actual->getMessage()->content);
+        self::assertNotNull($actual->getMessage()->PDFSignatureZone);
+    }
+
+    private function buildSerializer(): RequestPdfSignMessageSerializer
+    {
+        $normalizer =
+            new class () implements NormalizerInterface {
+                public function normalize($object, ?string $format = null, array $context = []): array
+                {
+                    if (!$object instanceof PDFSignatureZone) {
+                        throw new UnexpectedValueException('expected RequestPdfSignMessage');
+                    }
+
+                    return [
+                        'x' => $object->x,
+                    ];
+                }
+
+                public function supportsNormalization($data, ?string $format = null): bool
+                {
+                    return $data instanceof PDFSignatureZone;
+                }
+            };
+        $denormalizer = new class () implements DenormalizerInterface {
+            public function denormalize($data, string $type, ?string $format = null, array $context = [])
+            {
+                return new PDFSignatureZone(10.0, 10.0, 180.0, 180.0, new PDFPage(0, 500.0, 800.0));
+            }
+
+            public function supportsDenormalization($data, string $type, ?string $format = null)
+            {
+                return PDFSignatureZone::class === $type;
+            }
+        };
+
+        $serializer = new Serializer([$normalizer, $denormalizer]);
+
+        return new RequestPdfSignMessageSerializer($serializer, $serializer);
+    }
+}

src/Bundle/ChillDocStoreBundle/Tests/Service/Signature/PDFSignatureZoneParserTest.php

@@ -0,0 +1,77 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Service\Signature;
+
+use Chill\DocStoreBundle\Service\Signature\PDFPage;
+use PHPUnit\Framework\TestCase;
+use Chill\DocStoreBundle\Service\Signature\PDFSignatureZone;
+use Chill\DocStoreBundle\Service\Signature\PDFSignatureZoneParser;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class PDFSignatureZoneParserTest extends TestCase
+{
+    private static PDFSignatureZoneParser $parser;
+
+    public static function setUpBeforeClass(): void
+    {
+        self::$parser = new PDFSignatureZoneParser();
+    }
+
+    /**
+     * @dataProvider provideFiles
+     *
+     * @param list<PDFSignatureZone> $expected
+     */
+    public function testFindSignatureZones(string $filePath, array $expected): void
+    {
+        $content = file_get_contents($filePath);
+
+        if (false === $content) {
+            throw new \LogicException("Unable to read file {$filePath}");
+        }
+
+        $actual = self::$parser->findSignatureZones($content);
+
+        self::assertEquals(count($expected), count($actual));
+
+        foreach ($actual as $index => $signatureZone) {
+            self::assertObjectEquals($expected[$index], $signatureZone);
+        }
+    }
+
+    public static function provideFiles(): iterable
+    {
+        yield [
+            __DIR__.'/data/signature_2_signature_page_1.pdf',
+            [
+                new PDFSignatureZone(
+                    127.7,
+                    95.289,
+                    180.0,
+                    180.0,
+                    $page = new PDFPage(0, 595.30393, 841.8897)
+                ),
+                new PDFSignatureZone(
+                    269.5,
+                    95.289,
+                    180.0,
+                    180.0,
+                    $page,
+                ),
+            ],
+        ];
+    }
+}

src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php

@@ -121,9 +121,4 @@ class AccompanyingCourseDocumentWorkflowHandler implements EntityWorkflowHandler
     {
         return AccompanyingCourseDocument::class === $entityWorkflow->getRelatedEntityClass();
     }
-
-    public function supportsFreeze(EntityWorkflow $entityWorkflow, array $options = []): bool
-    {
-        return false;
-    }
 }

src/Bundle/ChillEventBundle/Controller/EventController.php

@@ -15,7 +15,7 @@ use Chill\EventBundle\Entity\Event;
 use Chill\EventBundle\Entity\Participation;
 use Chill\EventBundle\Form\EventType;
 use Chill\EventBundle\Form\Type\PickEventType;
-use Chill\EventBundle\Security\EventVoter;
+use Chill\EventBundle\Security\Authorization\EventVoter;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Pagination\PaginatorFactory;
@@ -418,6 +418,7 @@ final class EventController extends AbstractController
         $builder->add('event_id', HiddenType::class, [
             'data' => $event->getId(),
         ]);
+        dump($event->getId());
 
         return $builder->getForm();
     }

src/Bundle/ChillEventBundle/Controller/ParticipationController.php

@@ -15,7 +15,7 @@ use Chill\EventBundle\Entity\Event;
 use Chill\EventBundle\Entity\Participation;
 use Chill\EventBundle\Form\ParticipationType;
 use Chill\EventBundle\Repository\EventRepository;
-use Chill\EventBundle\Security\ParticipationVoter;
+use Chill\EventBundle\Security\Authorization\ParticipationVoter;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Doctrine\Common\Collections\Collection;

src/Bundle/ChillEventBundle/DependencyInjection/ChillEventExtension.php

@@ -11,8 +11,8 @@ declare(strict_types=1);
 
 namespace Chill\EventBundle\DependencyInjection;
 
-use Chill\EventBundle\Security\EventVoter;
-use Chill\EventBundle\Security\ParticipationVoter;
+use Chill\EventBundle\Security\Authorization\EventVoter;
+use Chill\EventBundle\Security\Authorization\ParticipationVoter;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
@@ -33,13 +33,12 @@ class ChillEventExtension extends Extension implements PrependExtensionInterface
 
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services.yaml');
-        $loader->load('services/security.yaml');
+        $loader->load('services/authorization.yaml');
         $loader->load('services/fixtures.yaml');
         $loader->load('services/forms.yaml');
         $loader->load('services/repositories.yaml');
         $loader->load('services/search.yaml');
         $loader->load('services/timeline.yaml');
-        $loader->load('services/export.yaml');
     }
 
     /** (non-PHPdoc).

src/Bundle/ChillEventBundle/Export/Aggregator/EventDateAggregator.php

@@ -1,110 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\EventBundle\Export\Aggregator;
-
-use Chill\EventBundle\Export\Declarations;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class EventDateAggregator implements AggregatorInterface
-{
-    private const CHOICES = [
-        'by month' => 'month',
-        'by week' => 'week',
-        'by year' => 'year',
-    ];
-
-    private const DEFAULT_CHOICE = 'year';
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $order = null;
-
-        switch ($data['frequency']) {
-            case 'month':
-                $fmt = 'YYYY-MM';
-
-                break;
-
-            case 'week':
-                $fmt = 'YYYY-IW';
-
-                break;
-
-            case 'year':
-                $fmt = 'YYYY';
-                $order = 'DESC';
-
-                break;
-
-            default:
-                throw new \RuntimeException(sprintf("The frequency data '%s' is invalid.", $data['frequency']));
-        }
-
-        $qb->addSelect(sprintf("TO_CHAR(event.date, '%s') AS date_aggregator", $fmt));
-        $qb->addGroupBy('date_aggregator');
-        $qb->addOrderBy('date_aggregator', $order);
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::EVENT;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('frequency', ChoiceType::class, [
-            'choices' => self::CHOICES,
-            'multiple' => false,
-            'expanded' => true,
-        ]);
-    }
-
-    public function getFormDefaultData(): array
-    {
-        return ['frequency' => self::DEFAULT_CHOICE];
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        return static function ($value) use ($data): string {
-            if ('_header' === $value) {
-                return 'by '.$data['frequency'];
-            }
-
-            if (null === $value) {
-                return '';
-            }
-
-            return match ($data['frequency']) {
-                default => $value,
-            };
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['date_aggregator'];
-    }
-
-    public function getTitle(): string
-    {
-        return 'Group event by date';
-    }
-}

src/Bundle/ChillEventBundle/Export/Aggregator/EventTypeAggregator.php

@@ -1,81 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\EventBundle\Export\Aggregator;
-
-use Chill\EventBundle\Export\Declarations;
-use Chill\EventBundle\Repository\EventTypeRepository;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class EventTypeAggregator implements AggregatorInterface
-{
-    final public const KEY = 'event_type_aggregator';
-
-    public function __construct(protected EventTypeRepository $eventTypeRepository, protected TranslatableStringHelperInterface $translatableStringHelper) {}
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!\in_array('eventtype', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('event.type', 'eventtype');
-        }
-
-        $qb->addSelect(sprintf('IDENTITY(event.type) AS %s', self::KEY));
-        $qb->addGroupBy(self::KEY);
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::EVENT;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form required for this aggregator
-    }
-
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }
-
-    public function getLabels($key, array $values, $data): \Closure
-    {
-        return function (int|string|null $value): string {
-            if ('_header' === $value) {
-                return 'Event type';
-            }
-
-            if (null === $value || '' === $value || null === $t = $this->eventTypeRepository->find($value)) {
-                return '';
-            }
-
-            return $this->translatableStringHelper->localize($t->getName());
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return [self::KEY];
-    }
-
-    public function getTitle()
-    {
-        return 'Group by event type';
-    }
-}

src/Bundle/ChillEventBundle/Export/Aggregator/RoleAggregator.php

@@ -1,81 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\EventBundle\Export\Aggregator;
-
-use Chill\EventBundle\Export\Declarations;
-use Chill\EventBundle\Repository\RoleRepository;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class RoleAggregator implements AggregatorInterface
-{
-    final public const KEY = 'part_role_aggregator';
-
-    public function __construct(protected RoleRepository $roleRepository, protected TranslatableStringHelperInterface $translatableStringHelper) {}
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!\in_array('event_part', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('event_part.role', 'role');
-        }
-
-        $qb->addSelect(sprintf('IDENTITY(event_part.role) AS %s', self::KEY));
-        $qb->addGroupBy(self::KEY);
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::EVENT_PARTICIPANTS;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form required for this aggregator
-    }
-
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }
-
-    public function getLabels($key, array $values, $data): \Closure
-    {
-        return function (int|string|null $value): string {
-            if ('_header' === $value) {
-                return 'Participant role';
-            }
-
-            if (null === $value || '' === $value || null === $r = $this->roleRepository->find($value)) {
-                return '';
-            }
-
-            return $this->translatableStringHelper->localize($r->getName());
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return [self::KEY];
-    }
-
-    public function getTitle()
-    {
-        return 'Group by participant role';
-    }
-}

src/Bundle/ChillEventBundle/Export/Declarations.php

@@ -1,22 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\EventBundle\Export;
-
-/**
- * This class declare constants used for the export framework.
- */
-abstract class Declarations
-{
-    final public const EVENT = 'event';
-
-    final public const EVENT_PARTICIPANTS = 'event_participants';
-}

src/Bundle/ChillEventBundle/Export/Export/CountEventParticipations.php

@@ -1,125 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\EventBundle\Export\Export;
-
-use Chill\EventBundle\Export\Declarations;
-use Chill\EventBundle\Repository\ParticipationRepository;
-use Chill\EventBundle\Security\ParticipationVoter;
-use Chill\MainBundle\Export\ExportInterface;
-use Chill\MainBundle\Export\FormatterInterface;
-use Chill\MainBundle\Export\GroupedExportInterface;
-use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
-use Doctrine\ORM\Query;
-use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
-use Symfony\Component\Form\FormBuilderInterface;
-use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
-
-readonly class CountEventParticipations implements ExportInterface, GroupedExportInterface
-{
-    private bool $filterStatsByCenters;
-
-    public function __construct(
-        private ParticipationRepository $participationRepository,
-        ParameterBagInterface $parameterBag,
-    ) {
-        $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
-    }
-
-    public function buildForm(FormBuilderInterface $builder) {}
-
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }
-
-    public function getAllowedFormattersTypes()
-    {
-        return [FormatterInterface::TYPE_TABULAR];
-    }
-
-    public function getDescription()
-    {
-        return 'Count participants to an event by various parameters.';
-    }
-
-    public function getGroup(): string
-    {
-        return 'Exports of events';
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        if ('export_count_event_participants' !== $key) {
-            throw new \LogicException("the key {$key} is not used by this export");
-        }
-
-        return static fn ($value) => '_header' === $value ? 'Count event participants' : $value;
-    }
-
-    public function getQueryKeys($data)
-    {
-        return ['export_count_event_participants'];
-    }
-
-    public function getResult($query, $data)
-    {
-        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
-    }
-
-    public function getTitle()
-    {
-        return 'Count event participants';
-    }
-
-    public function getType(): string
-    {
-        return Declarations::EVENT_PARTICIPANTS;
-    }
-
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
-    {
-        $centers = array_map(static fn ($el) => $el['center'], $acl);
-
-        $qb = $this->participationRepository
-            ->createQueryBuilder('event_part')
-            ->join('event_part.person', 'person');
-
-        $qb->select('COUNT(event_part.id) as export_count_event_participants');
-
-        if ($this->filterStatsByCenters) {
-            $qb
-                ->andWhere(
-                    $qb->expr()->exists(
-                        'SELECT 1 FROM '.PersonCenterHistory::class.' acl_count_person_history WHERE acl_count_person_history.person = person
-                    AND acl_count_person_history.center IN (:authorized_centers)
-                    '
-                    )
-                )
-                ->setParameter('authorized_centers', $centers);
-        }
-
-        return $qb;
-    }
-
-    public function requiredRole(): string
-    {
-        return ParticipationVoter::STATS;
-    }
-
-    public function supportsModifiers()
-    {
-        return [
-            Declarations::EVENT_PARTICIPANTS,
-            PersonDeclarations::PERSON_TYPE,
-        ];
-    }
-}

src/Bundle/ChillEventBundle/Export/Export/CountEvents.php

@@ -1,126 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\EventBundle\Export\Export;
-
-use Chill\EventBundle\Repository\EventRepository;
-use Chill\EventBundle\Security\EventVoter;
-use Chill\MainBundle\Export\ExportInterface;
-use Chill\MainBundle\Export\FormatterInterface;
-use Chill\MainBundle\Export\GroupedExportInterface;
-use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
-use Doctrine\ORM\Query;
-use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
-use Symfony\Component\Form\FormBuilderInterface;
-use Chill\EventBundle\Export\Declarations;
-use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
-
-readonly class CountEvents implements ExportInterface, GroupedExportInterface
-{
-    private bool $filterStatsByCenters;
-
-    public function __construct(
-        private EventRepository $eventRepository,
-        ParameterBagInterface $parameterBag,
-    ) {
-        $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
-    }
-
-    public function buildForm(FormBuilderInterface $builder) {}
-
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }
-
-    public function getAllowedFormattersTypes()
-    {
-        return [FormatterInterface::TYPE_TABULAR];
-    }
-
-    public function getDescription()
-    {
-        return 'Count events by various parameters.';
-    }
-
-    public function getGroup(): string
-    {
-        return 'Exports of events';
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        if ('export_count_event' !== $key) {
-            throw new \LogicException("the key {$key} is not used by this export");
-        }
-
-        return static fn ($value) => '_header' === $value ? 'Number of events' : $value;
-    }
-
-    public function getQueryKeys($data)
-    {
-        return ['export_count_event'];
-    }
-
-    public function getResult($query, $data)
-    {
-        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
-    }
-
-    public function getTitle()
-    {
-        return 'Count events';
-    }
-
-    public function getType(): string
-    {
-        return Declarations::EVENT;
-    }
-
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
-    {
-        $centers = array_map(static fn ($el) => $el['center'], $acl);
-
-        $qb = $this->eventRepository
-            ->createQueryBuilder('event')
-            ->leftJoin('event.participations', 'epart')
-            ->leftJoin('epart.person', 'person');
-
-        $qb->select('COUNT(event.id) as export_count_event');
-
-        if ($this->filterStatsByCenters) {
-            $qb
-                ->andWhere(
-                    $qb->expr()->exists(
-                        'SELECT 1 FROM '.PersonCenterHistory::class.' acl_count_person_history WHERE acl_count_person_history.person = person
-                    AND acl_count_person_history.center IN (:authorized_centers)
-                    '
-                    )
-                )
-                ->setParameter('authorized_centers', $centers);
-        }
-
-        return $qb;
-    }
-
-    public function requiredRole(): string
-    {
-        return EventVoter::STATS;
-    }
-
-    public function supportsModifiers()
-    {
-        return [
-            Declarations::EVENT,
-            PersonDeclarations::PERSON_TYPE,
-        ];
-    }
-}

src/Bundle/ChillEventBundle/Export/Filter/EventDateFilter.php

@@ -1,95 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\EventBundle\Export\Filter;
-
-use Chill\EventBundle\Export\Declarations;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Form\Type\PickRollingDateType;
-use Chill\MainBundle\Service\RollingDate\RollingDate;
-use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
-use Doctrine\ORM\Query\Expr;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-class EventDateFilter implements FilterInterface
-{
-    public function __construct(protected TranslatorInterface $translator, private readonly RollingDateConverterInterface $rollingDateConverter) {}
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $where = $qb->getDQLPart('where');
-        $clause = $qb->expr()->between(
-            'event.date',
-            ':date_from',
-            ':date_to'
-        );
-
-        if ($where instanceof Expr\Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter(
-            'date_from',
-            $this->rollingDateConverter->convert($data['date_from'])
-        );
-        $qb->setParameter(
-            'date_to',
-            $this->rollingDateConverter->convert($data['date_to'])
-        );
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::EVENT;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder
-            ->add('date_from', PickRollingDateType::class, [
-                'label' => 'Events after this date',
-            ])
-            ->add('date_to', PickRollingDateType::class, [
-                'label' => 'Events before this date',
-            ]);
-    }
-
-    public function getFormDefaultData(): array
-    {
-        return ['date_from' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START), 'date_to' => new RollingDate(RollingDate::T_TODAY)];
-    }
-
-    public function describeAction($data, $format = 'string')
-    {
-        return [
-            'Filtered by date of event: only between %date_from% and %date_to%',
-            [
-                '%date_from%' => $this->rollingDateConverter->convert($data['date_from'])->format('d-m-Y'),
-                '%date_to%' => $this->rollingDateConverter->convert($data['date_to'])->format('d-m-Y'),
-            ],
-        ];
-    }
-
-    public function getTitle()
-    {
-        return 'Filtered by event date';
-    }
-}

src/Bundle/ChillEventBundle/Export/Filter/EventTypeFilter.php

@@ -1,94 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\EventBundle\Export\Filter;
-
-use Chill\EventBundle\Entity\EventType;
-use Chill\EventBundle\Export\Declarations;
-use Chill\EventBundle\Repository\EventTypeRepository;
-use Chill\MainBundle\Export\ExportElementValidatedInterface;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-
-class EventTypeFilter implements ExportElementValidatedInterface, FilterInterface
-{
-    public function __construct(
-        protected TranslatableStringHelperInterface $translatableStringHelper,
-        protected EventTypeRepository $eventTypeRepository
-    ) {}
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $clause = $qb->expr()->in('event.type', ':selected_event_types');
-
-        $qb->andWhere($clause);
-        $qb->setParameter('selected_event_types', $data['types']);
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::EVENT;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('types', EntityType::class, [
-            'choices' => $this->eventTypeRepository->findAllActive(),
-            'class' => EventType::class,
-            'choice_label' => fn (EventType $ety) => $this->translatableStringHelper->localize($ety->getName()),
-            'multiple' => true,
-            'expanded' => false,
-            'attr' => [
-                'class' => 'select2',
-            ],
-        ]);
-    }
-
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }
-
-    public function describeAction($data, $format = 'string')
-    {
-        $typeNames = array_map(
-            fn (EventType $t): string => $this->translatableStringHelper->localize($t->getName()),
-            $this->eventTypeRepository->findBy(['id' => $data['types'] instanceof \Doctrine\Common\Collections\Collection ? $data['types']->toArray() : $data['types']])
-        );
-
-        return ['Filtered by event type: only %list%', [
-            '%list%' => implode(', ', $typeNames),
-        ]];
-    }
-
-    public function getTitle()
-    {
-        return 'Filtered by event type';
-    }
-
-    public function validateForm($data, ExecutionContextInterface $context)
-    {
-        if (null === $data['types'] || 0 === \count($data['types'])) {
-            $context
-                ->buildViolation('At least one type must be chosen')
-                ->addViolation();
-        }
-    }
-}

src/Bundle/ChillEventBundle/Export/Filter/RoleFilter.php

@@ -1,94 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\EventBundle\Export\Filter;
-
-use Chill\EventBundle\Entity\Role;
-use Chill\EventBundle\Export\Declarations;
-use Chill\EventBundle\Repository\RoleRepository;
-use Chill\MainBundle\Export\ExportElementValidatedInterface;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-
-class RoleFilter implements ExportElementValidatedInterface, FilterInterface
-{
-    public function __construct(
-        protected TranslatableStringHelperInterface $translatableStringHelper,
-        protected RoleRepository $roleRepository
-    ) {}
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $clause = $qb->expr()->in('event_part.role', ':selected_part_roles');
-
-        $qb->andWhere($clause);
-        $qb->setParameter('selected_part_roles', $data['part_roles']);
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::EVENT_PARTICIPANTS;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('part_roles', EntityType::class, [
-            'choices' => $this->roleRepository->findAllActive(),
-            'class' => Role::class,
-            'choice_label' => fn (Role $r) => $this->translatableStringHelper->localize($r->getName()),
-            'multiple' => true,
-            'expanded' => false,
-            'attr' => [
-                'class' => 'select2',
-            ],
-        ]);
-    }
-
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }
-
-    public function describeAction($data, $format = 'string')
-    {
-        $roleNames = array_map(
-            fn (Role $r): string => $this->translatableStringHelper->localize($r->getName()),
-            $this->roleRepository->findBy(['id' => $data['part_roles'] instanceof \Doctrine\Common\Collections\Collection ? $data['part_roles']->toArray() : $data['part_roles']])
-        );
-
-        return ['Filtered by participant roles: only %list%', [
-            '%list%' => implode(', ', $roleNames),
-        ]];
-    }
-
-    public function getTitle()
-    {
-        return 'Filter by participant roles';
-    }
-
-    public function validateForm($data, ExecutionContextInterface $context)
-    {
-        if (null === $data['part_roles'] || 0 === \count($data['part_roles'])) {
-            $context
-                ->buildViolation('At least one role must be chosen')
-                ->addViolation();
-        }
-    }
-}

src/Bundle/ChillEventBundle/Menu/PersonMenuBuilder.php

@@ -11,7 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\EventBundle\Menu;
 
-use Chill\EventBundle\Security\EventVoter;
+use Chill\EventBundle\Security\Authorization\EventVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;

src/Bundle/ChillEventBundle/Menu/SectionMenuBuilder.php

@@ -11,7 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\EventBundle\Menu;
 
-use Chill\EventBundle\Security\EventVoter;
+use Chill\EventBundle\Security\Authorization\EventVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Security;

src/Bundle/ChillEventBundle/Repository/EventACLAwareRepository.php

@@ -13,7 +13,7 @@ namespace Chill\EventBundle\Repository;
 
 use Chill\EventBundle\Entity\Event;
 use Chill\EventBundle\Entity\Participation;
-use Chill\EventBundle\Security\EventVoter;
+use Chill\EventBundle\Security\Authorization\EventVoter;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperForCurrentUserInterface;
 use Chill\PersonBundle\Entity\Person;

src/Bundle/ChillEventBundle/Repository/RoleRepository.php

@@ -12,57 +12,13 @@ declare(strict_types=1);
 namespace Chill\EventBundle\Repository;
 
 use Chill\EventBundle\Entity\Role;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\QueryBuilder;
-use Doctrine\Persistence\ObjectRepository;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
 
-readonly class RoleRepository implements ObjectRepository
+class RoleRepository extends ServiceEntityRepository
 {
-    private EntityRepository $repository;
-
-    public function __construct(EntityManagerInterface $entityManager, private TranslatableStringHelper $translatableStringHelper)
+    public function __construct(ManagerRegistry $registry)
     {
-        $this->repository = $entityManager->getRepository(Role::class);
-    }
-
-    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
-    {
-        return $this->repository->createQueryBuilder($alias, $indexBy);
-    }
-
-    public function find($id)
-    {
-        return $this->repository->find($id);
-    }
-
-    public function findAll(): array
-    {
-        return $this->repository->findAll();
-    }
-
-    public function findAllActive(): array
-    {
-        $roles = $this->repository->findBy(['active' => true]);
-
-        usort($roles, fn (Role $a, Role $b) => $this->translatableStringHelper->localize($a->getName()) <=> $this->translatableStringHelper->localize($b->getName()));
-
-        return $roles;
-    }
-
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
-    {
-        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
-    }
-
-    public function findOneBy(array $criteria)
-    {
-        return $this->repository->findOneBy($criteria);
-    }
-
-    public function getClassName(): string
-    {
-        return Role::class;
+        parent::__construct($registry, Role::class);
     }
 }

src/Bundle/ChillEventBundle/Security/Authorization/EventVoter.php

@@ -9,19 +9,18 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\EventBundle\Security;
+namespace Chill\EventBundle\Security\Authorization;
 
 use Chill\EventBundle\Entity\Event;
-use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
-use Chill\MainBundle\Security\Authorization\VoterHelperInterface;
 use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
 
 /**
  * Description of EventVoter.
@@ -43,46 +42,61 @@ class EventVoter extends AbstractChillVoter implements ProvideRoleHierarchyInter
 
     final public const UPDATE = 'CHILL_EVENT_UPDATE';
 
-    final public const STATS = 'CHILL_EVENT_STATS';
+    /**
+     * @var AccessDecisionManagerInterface
+     */
+    protected $accessDecisionManager;
 
-    private readonly VoterHelperInterface $voterHelper;
+    /**
+     * @var AuthorizationHelper
+     */
+    protected $authorizationHelper;
+
+    /**
+     * @var LoggerInterface
+     */
+    protected $logger;
 
     public function __construct(
-        private readonly AuthorizationHelper $authorizationHelper,
-        private readonly LoggerInterface $logger,
-        VoterHelperFactoryInterface $voterHelperFactory
+        AccessDecisionManagerInterface $accessDecisionManager,
+        AuthorizationHelper $authorizationHelper,
+        LoggerInterface $logger
     ) {
-        $this->voterHelper = $voterHelperFactory
-            ->generate(self::class)
-            ->addCheckFor(null, [self::SEE])
-            ->addCheckFor(Event::class, [...self::ROLES])
-            ->addCheckFor(Person::class, [self::SEE, self::CREATE])
-            ->addCheckFor(Center::class, [self::STATS])
-            ->build();
+        $this->accessDecisionManager = $accessDecisionManager;
+        $this->authorizationHelper = $authorizationHelper;
+        $this->logger = $logger;
     }
 
     public function getRoles(): array
     {
-        return [...self::ROLES, self::STATS];
+        return self::ROLES;
     }
 
     public function getRolesWithHierarchy(): array
     {
         return [
-            'Event' => $this->getRoles(),
+            'Event' => self::ROLES,
         ];
     }
 
     public function getRolesWithoutScope(): array
     {
-        return [self::ROLES, self::STATS];
+        return [];
     }
 
     public function supports($attribute, $subject)
     {
-        return $this->voterHelper->supports($attribute, $subject);
+        return ($subject instanceof Event && \in_array($attribute, self::ROLES, true))
+            || ($subject instanceof Person && \in_array($attribute, [self::CREATE, self::SEE], true))
+            || (null === $subject && self::SEE === $attribute);
     }
 
+    /**
+     * @param string $attribute
+     * @param Event  $subject
+     *
+     * @return bool
+     */
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
     {
         $this->logger->debug(sprintf('Voting from %s class', self::class));
@@ -104,5 +118,15 @@ class EventVoter extends AbstractChillVoter implements ProvideRoleHierarchyInter
             ->getReachableCenters($token->getUser(), $attribute);
 
         return \count($centers) > 0;
+
+        if (!$this->accessDecisionManager->decide($token, [PersonVoter::SEE], $person)) {
+            return false;
+        }
+
+        return $this->authorizationHelper->userHasAccess(
+            $token->getUser(),
+            $subject,
+            $attribute
+        );
     }
 }

src/Bundle/ChillEventBundle/Security/Authorization/ParticipationVoter.php

@@ -9,19 +9,18 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\EventBundle\Security;
+namespace Chill\EventBundle\Security\Authorization;
 
 use Chill\EventBundle\Entity\Participation;
-use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
-use Chill\MainBundle\Security\Authorization\VoterHelperInterface;
 use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
 
 class ParticipationVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
@@ -40,48 +39,58 @@ class ParticipationVoter extends AbstractChillVoter implements ProvideRoleHierar
 
     final public const UPDATE = 'CHILL_EVENT_PARTICIPATION_UPDATE';
 
-    final public const STATS = 'CHILL_EVENT_PARTICIPATION_STATS';
+    /**
+     * @var AccessDecisionManagerInterface
+     */
+    protected $accessDecisionManager;
 
-    private readonly VoterHelperInterface $voterHelper;
+    /**
+     * @var AuthorizationHelper
+     */
+    protected $authorizationHelper;
+
+    /**
+     * @var LoggerInterface
+     */
+    protected $logger;
 
     public function __construct(
-        private readonly AuthorizationHelper $authorizationHelper,
-        private readonly LoggerInterface $logger,
-        VoterHelperFactoryInterface $voterHelperFactory
+        AccessDecisionManagerInterface $accessDecisionManager,
+        AuthorizationHelper $authorizationHelper,
+        LoggerInterface $logger
     ) {
-        $this->voterHelper = $voterHelperFactory
-            ->generate(self::class)
-            ->addCheckFor(null, [self::SEE])
-            ->addCheckFor(Participation::class, [...self::ROLES])
-            ->addCheckFor(Person::class, [self::SEE, self::CREATE])
-            ->addCheckFor(Center::class, [self::STATS])
-            ->build();
+        $this->accessDecisionManager = $accessDecisionManager;
+        $this->authorizationHelper = $authorizationHelper;
+        $this->logger = $logger;
     }
 
     public function getRoles(): array
     {
-        return [...self::ROLES, self::STATS];
+        return self::ROLES;
     }
 
     public function getRolesWithHierarchy(): array
     {
         return [
-            'Participation' => $this->getRoles(),
+            'Event' => self::ROLES,
         ];
     }
 
     public function getRolesWithoutScope(): array
     {
-        return [self::ROLES, self::STATS];
+        return [];
     }
 
     public function supports($attribute, $subject)
     {
-        return $this->voterHelper->supports($attribute, $subject);
+        return ($subject instanceof Participation && \in_array($attribute, self::ROLES, true))
+            || ($subject instanceof Person && \in_array($attribute, [self::CREATE, self::SEE], true))
+            || (null === $subject && self::SEE === $attribute);
     }
 
     /**
-     * @param string $attribute
+     * @param string        $attribute
+     * @param Participation $subject
      *
      * @return bool
      */
@@ -106,5 +115,15 @@ class ParticipationVoter extends AbstractChillVoter implements ProvideRoleHierar
             ->getReachableCenters($token->getUser(), $attribute);
 
         return \count($centers) > 0;
+
+        if (!$this->accessDecisionManager->decide($token, [PersonVoter::SEE], $person)) {
+            return false;
+        }
+
+        return $this->authorizationHelper->userHasAccess(
+            $token->getUser(),
+            $subject,
+            $attribute
+        );
     }
 }

src/Bundle/ChillEventBundle/Tests/Export/CountEventParticipationsTest.php

@@ -1,43 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\EventBundle\Tests\Export;
-
-use Chill\EventBundle\Export\Export\CountEventParticipations;
-use Doctrine\ORM\AbstractQuery;
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-class CountEventParticipationsTest extends KernelTestCase
-{
-    private CountEventParticipations $countEventParticipations;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-        self::bootKernel();
-        $this->countEventParticipations = self::getContainer()->get(CountEventParticipations::class);
-    }
-
-    public function testExecuteQuery(): void
-    {
-        $qb = $this->countEventParticipations->initiateQuery([], [], [])
-            ->setMaxResults(1);
-
-        $results = $qb->getQuery()->getResult(AbstractQuery::HYDRATE_ARRAY);
-
-        self::assertIsArray($results, 'smoke test: test that the result is an array');
-    }
-}

src/Bundle/ChillEventBundle/Tests/Export/CountEventTest.php

@@ -1,43 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\EventBundle\Tests\Export;
-
-use Chill\EventBundle\Export\Export\CountEvents;
-use Doctrine\ORM\AbstractQuery;
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-class CountEventTest extends KernelTestCase
-{
-    private CountEvents $countEvents;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-        self::bootKernel();
-        $this->countEvents = self::getContainer()->get(CountEvents::class);
-    }
-
-    public function testExecuteQuery(): void
-    {
-        $qb = $this->countEvents->initiateQuery([], [], [])
-            ->setMaxResults(1);
-
-        $results = $qb->getQuery()->getResult(AbstractQuery::HYDRATE_ARRAY);
-
-        self::assertIsArray($results, 'smoke test: test that the result is an array');
-    }
-}

src/Bundle/ChillEventBundle/Tests/Export/aggregators/EventDateAggregatorTest.php

@@ -1,59 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Export\aggregators;
-
-use Chill\EventBundle\Entity\Event;
-use Chill\EventBundle\Export\Aggregator\EventDateAggregator;
-use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
-use Doctrine\ORM\EntityManagerInterface;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-class EventDateAggregatorTest extends AbstractAggregatorTest
-{
-    private $aggregator;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        $this->aggregator = self::getContainer()->get(EventDateAggregator::class);
-    }
-
-    public function getAggregator()
-    {
-        return $this->aggregator;
-    }
-
-    public function getFormData(): array|\Generator
-    {
-        yield ['frequency' => 'YYYY'];
-        yield ['frequency' => 'YYYY-MM'];
-        yield ['frequency' => 'YYYY-IV'];
-    }
-
-    public function getQueryBuilders(): array
-    {
-        self::bootKernel();
-
-        $em = self::getContainer()->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('event.id')
-                ->from(Event::class, 'event'),
-        ];
-    }
-}

src/Bundle/ChillEventBundle/Tests/Export/aggregators/EventTypeAggregatorTest.php

@@ -1,59 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Export\aggregators;
-
-use Chill\EventBundle\Entity\Event;
-use Chill\EventBundle\Export\Aggregator\EventTypeAggregator;
-use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
-use Doctrine\ORM\EntityManagerInterface;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-class EventTypeAggregatorTest extends AbstractAggregatorTest
-{
-    private $aggregator;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        $this->aggregator = self::getContainer()->get(EventTypeAggregator::class);
-    }
-
-    public function getAggregator()
-    {
-        return $this->aggregator;
-    }
-
-    public function getFormData(): array
-    {
-        return [
-            [],
-        ];
-    }
-
-    public function getQueryBuilders(): array
-    {
-        self::bootKernel();
-
-        $em = self::getContainer()->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('event.id')
-                ->from(Event::class, 'event'),
-        ];
-    }
-}

src/Bundle/ChillEventBundle/Tests/Export/aggregators/RoleAggregatorTest.php

@@ -1,63 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Export\aggregators;
-
-use Chill\EventBundle\Entity\Event;
-use Chill\EventBundle\Entity\Participation;
-use Chill\EventBundle\Export\Aggregator\RoleAggregator;
-use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
-use Doctrine\ORM\EntityManagerInterface;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-class RoleAggregatorTest extends AbstractAggregatorTest
-{
-    private $aggregator;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        $this->aggregator = self::getContainer()->get(RoleAggregator::class);
-    }
-
-    public function getAggregator()
-    {
-        return $this->aggregator;
-    }
-
-    public function getFormData(): array
-    {
-        return [
-            [],
-        ];
-    }
-
-    public function getQueryBuilders(): array
-    {
-        self::bootKernel();
-
-        $em = self::getContainer()->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('event.id')
-                ->from(Event::class, 'event'),
-            $em->createQueryBuilder()
-                ->select('event_part')
-                ->from(Participation::class, 'event_part'),
-        ];
-    }
-}

src/Bundle/ChillEventBundle/Tests/Export/filters/EventDateFilterTest.php

@@ -1,65 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Export\filters;
-
-use Chill\EventBundle\Entity\Event;
-use Chill\EventBundle\Export\Filter\EventDateFilter;
-use Chill\MainBundle\Service\RollingDate\RollingDate;
-use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
-use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use Doctrine\ORM\EntityManagerInterface;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-class EventDateFilterTest extends AbstractFilterTest
-{
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-        self::bootKernel();
-
-        $this->rollingDateConverter = self::getContainer()->get(RollingDateConverterInterface::class);
-    }
-
-    public function getFilter()
-    {
-        return new EventDateFilter($this->rollingDateConverter);
-    }
-
-    public function getFormData()
-    {
-        return [
-            [
-                'date_from' => new RollingDate(RollingDate::T_YEAR_CURRENT_START),
-                'date_to' => new RollingDate(RollingDate::T_TODAY),
-            ],
-        ];
-    }
-
-    public function getQueryBuilders(): array
-    {
-        self::bootKernel();
-
-        $em = self::getContainer()->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('event.id')
-                ->from(Event::class, 'event'),
-        ];
-    }
-}

src/Bundle/ChillEventBundle/Tests/Export/filters/EventTypeFilterTest.php

@@ -1,76 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Export\filters;
-
-use Chill\EventBundle\Entity\Event;
-use Chill\EventBundle\Entity\EventType;
-use Chill\EventBundle\Export\Filter\EventTypeFilter;
-use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\ORM\EntityManagerInterface;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-class EventTypeFilterTest extends AbstractFilterTest
-{
-    private EventTypeFilter $filter;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-        $this->filter = self::getContainer()->get(EventTypeFilter::class);
-    }
-
-    public function getFilter(): EventTypeFilter|\Chill\MainBundle\Export\FilterInterface
-    {
-        return $this->filter;
-    }
-
-    public function getFormData()
-    {
-        self::bootKernel();
-
-        $em = self::getContainer()->get(EntityManagerInterface::class);
-
-        $array = $em->createQueryBuilder()
-            ->from(EventType::class, 'et')
-            ->select('et')
-            ->getQuery()
-            ->getResult();
-
-        $data = [];
-
-        foreach ($array as $a) {
-            $data[] = [
-                'types' => new ArrayCollection([$a]),
-            ];
-        }
-
-        return $data;
-    }
-
-    public function getQueryBuilders()
-    {
-        self::bootKernel();
-
-        $em = self::getContainer()->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('event.id')
-                ->from(Event::class, 'event'),
-        ];
-    }
-}

src/Bundle/ChillEventBundle/Tests/Export/filters/RoleFilterTest.php

@@ -1,81 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Export\filters;
-
-use Chill\EventBundle\Entity\Event;
-use Chill\EventBundle\Entity\Participation;
-use Chill\EventBundle\Entity\Role;
-use Chill\EventBundle\Export\Filter\RoleFilter;
-use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\ORM\EntityManagerInterface;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-class RoleFilterTest extends AbstractFilterTest
-{
-    private RoleFilter $filter;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        $this->filter = self::getContainer()->get(RoleFilter::class);
-    }
-
-    public function getFilter()
-    {
-        return $this->filter;
-    }
-
-    public function getFormData(): array
-    {
-        self::bootKernel();
-        $em = self::getContainer()->get(EntityManagerInterface::class);
-
-        $array = $em->createQueryBuilder()
-            ->from(Role::class, 'r')
-            ->select('r')
-            ->getQuery()
-            ->setMaxResults(1)
-            ->getResult();
-
-        $data = [];
-
-        foreach ($array as $a) {
-            $data[] = [
-                'roles' => new ArrayCollection([$a]),
-            ];
-        }
-
-        return $data;
-    }
-
-    public function getQueryBuilders()
-    {
-        self::bootKernel();
-
-        $em = self::getContainer()->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('event.id')
-                ->from(Event::class, 'event'),
-            $em->createQueryBuilder()
-                ->select('event_part')
-                ->from(Participation::class, 'event_part'),
-        ];
-    }
-}

src/Bundle/ChillEventBundle/Tests/Repository/EventACLAwareRepositoryTest.php

@@ -12,7 +12,7 @@ declare(strict_types=1);
 namespace Chill\EventBundle\Tests\Repository;
 
 use Chill\EventBundle\Repository\EventACLAwareRepository;
-use Chill\EventBundle\Security\EventVoter;
+use Chill\EventBundle\Security\Authorization\EventVoter;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;

src/Bundle/ChillEventBundle/config/services/authorization.yaml

@@ -0,0 +1,18 @@
+services:
+    chill_event.event_voter:
+        class: Chill\EventBundle\Security\Authorization\EventVoter
+        arguments:
+            - "@security.access.decision_manager"
+            - "@chill.main.security.authorization.helper"
+            - "@logger"
+        tags:
+            - { name: security.voter }
+
+    chill_event.event_participation:
+        class: Chill\EventBundle\Security\Authorization\ParticipationVoter
+        arguments:
+            - "@security.access.decision_manager"
+            - "@chill.main.security.authorization.helper"
+            - "@logger"
+        tags:
+            - { name: security.voter }

src/Bundle/ChillEventBundle/config/services/export.yaml

@@ -1,41 +0,0 @@
-services:
-    _defaults:
-        autowire: true
-        autoconfigure: true
-
-    # indicators
-
-    Chill\EventBundle\Export\Export\CountEvents:
-        tags:
-            - { name: chill.export, alias: 'count_events' }
-    Chill\EventBundle\Export\Export\CountEventParticipations:
-        tags:
-            - { name: chill.export, alias: 'count_event_participants' }
-
-    # filters
-
-    Chill\EventBundle\Export\Filter\EventDateFilter:
-        tags:
-            - { name: chill.export_filter, alias: 'event_date_filter' }
-
-    Chill\EventBundle\Export\Filter\EventTypeFilter:
-        tags:
-            - { name: chill.export_filter, alias: 'event_type_filter' }
-
-    Chill\EventBundle\Export\Filter\RoleFilter:
-        tags:
-            - { name: chill.export_filter, alias: 'role_filter' }
-
-    # aggregators
-
-    Chill\EventBundle\Export\Aggregator\EventTypeAggregator:
-        tags:
-            - { name: chill.export_aggregator, alias: event_type_aggregator }
-
-    Chill\EventBundle\Export\Aggregator\EventDateAggregator:
-        tags:
-            - { name: chill.export_aggregator, alias: event_date_aggregator }
-
-    Chill\EventBundle\Export\Aggregator\RoleAggregator:
-        tags:
-            - { name: chill.export_aggregator, alias: role_aggregator }

src/Bundle/ChillEventBundle/config/services/security.yaml

@@ -1,14 +0,0 @@
-services:
-    Chill\EventBundle\Security\EventVoter:
-        autowire: true
-        autoconfigure: true
-        tags:
-            - { name: security.voter }
-            - { name: chill.role }
-
-    Chill\EventBundle\Security\ParticipationVoter:
-        autowire: true
-        autoconfigure: true
-        tags:
-            - { name: security.voter }
-            - { name: chill.role }

src/Bundle/ChillEventBundle/translations/messages.fr.yml

@@ -81,31 +81,9 @@ Pick an event: Choisir un événement
 Pick a type of event: Choisir un type d'événement
 Pick a moderator: Choisir un animateur
 
-# exports
 Select a format: Choisir un format
 Export: Exporter
 
-Count events: Nombre d'événements
-Count events by various parameters.: Compte le nombre d'événements selon divers critères
-Exports of events: Exports d'événements
-
-Filtered by event date: Filtrer par date d'événement
-'Filtered by date of event: only between %date_from% and %date_to%': "Filtré par date d'événement: uniquement entre le %date_from% et le %date_to%"
-Events after this date: Événements après cette date
-Events before this date: Événements avant cette date
-Filtered by event type: Filtrer par type d'événement
-'Filtered by event type: only %list%': "Filtré par type: uniquement %list%"
-Group event by date: Grouper par date d'événement
-Group by event type: Grouper par type d'événement
-
-Count event participants: Nombre de participations
-Count participants to an event by various parameters.: Compte le nombre de participations selon divers critères
-Exports of event participants: Exports de participations
-'Filtered by participant roles: only %list%': "Filtré par rôles de participation: uniquement %list%"
-Filter by participant roles: Filtrer par rôles de participation
-Part roles: Rôles de participation
-Group by participant role: Grouper par rôle de participation
-
 
 Events configuration: Configuration des événements
 Events configuration menu: Menu des événements

src/Bundle/ChillMainBundle/Command/LoadAddressesLUFromBDAddressCommand.php

@@ -1,40 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\MainBundle\Command;
-
-use Chill\MainBundle\Service\Import\AddressReferenceLU;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-
-class LoadAddressesLUFromBDAddressCommand extends Command
-{
-    protected static $defaultDescription = 'Import LUX addresses from BD addresses (see https://data.public.lu/fr/datasets/adresses-georeferencees-bd-adresses/)';
-
-    public function __construct(
-        private readonly AddressReferenceLU $addressImporter,
-    ) {
-        parent::__construct();
-    }
-
-    protected function configure()
-    {
-        $this->setName('chill:main:address-ref-lux');
-    }
-
-    protected function execute(InputInterface $input, OutputInterface $output): int
-    {
-        $this->addressImporter->import();
-
-        return Command::SUCCESS;
-    }
-}

src/Bundle/ChillMainBundle/Controller/WorkflowController.php

@@ -13,15 +13,16 @@ namespace Chill\MainBundle\Controller;
 
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
-use Chill\MainBundle\Entity\Workflow\EntityWorkflowComment;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflowStep;
-use Chill\MainBundle\Form\EntityWorkflowCommentType;
+use Chill\MainBundle\Entity\Workflow\EntityWorkflowStepSignature;
+use Chill\MainBundle\Form\WorkflowSignatureMetadataType;
 use Chill\MainBundle\Form\WorkflowStepType;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
 use Chill\MainBundle\Security\Authorization\EntityWorkflowVoter;
 use Chill\MainBundle\Security\ChillSecurity;
 use Chill\MainBundle\Workflow\EntityWorkflowManager;
+use Chill\MainBundle\Workflow\WorkflowTransitionContextDTO;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
@@ -276,10 +277,11 @@ class WorkflowController extends AbstractController
         $handler = $this->entityWorkflowManager->getHandler($entityWorkflow);
         $workflow = $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName());
         $errors = [];
+        $signatures = $entityWorkflow->getCurrentStep()->getSignatures();
 
         if (\count($workflow->getEnabledTransitions($entityWorkflow)) > 0) {
             // possible transition
-
+            $stepDTO = new WorkflowTransitionContextDTO($entityWorkflow);
             $usersInvolved = $entityWorkflow->getUsersInvolved();
             $currentUserFound = array_search($this->security->getUser(), $usersInvolved, true);
 
@@ -289,9 +291,8 @@ class WorkflowController extends AbstractController
 
             $transitionForm = $this->createForm(
                 WorkflowStepType::class,
-                $entityWorkflow->getCurrentStep(),
+                $stepDTO,
                 [
-                    'transition' => true,
                     'entity_workflow' => $entityWorkflow,
                     'suggested_users' => $usersInvolved,
                 ]
@@ -310,12 +311,7 @@ class WorkflowController extends AbstractController
                     throw $this->createAccessDeniedException(sprintf("not allowed to apply transition {$transition}: %s", implode(', ', $msgs)));
                 }
 
-                // TODO symfony 5: add those "future" on context ($workflow->apply($entityWorkflow, $transition, $context)
-                $entityWorkflow->futureCcUsers = $transitionForm['future_cc_users']->getData() ?? [];
-                $entityWorkflow->futureDestUsers = $transitionForm['future_dest_users']->getData() ?? [];
-                $entityWorkflow->futureDestEmails = $transitionForm['future_dest_emails']->getData() ?? [];
-
-                $workflow->apply($entityWorkflow, $transition);
+                $workflow->apply($entityWorkflow, $transition, ['context' => $stepDTO]);
 
                 $this->entityManager->flush();
 
@@ -327,22 +323,6 @@ class WorkflowController extends AbstractController
             }
         }
 
-        /*
-        $commentForm = $this->createForm(EntityWorkflowCommentType::class, $newComment = new EntityWorkflowComment());
-        $commentForm->handleRequest($request);
-
-        if ($commentForm->isSubmitted() && $commentForm->isValid()) {
-            $this->entityManager->persist($newComment);
-            $this->entityManager->flush();
-
-            $this->addFlash('success', $this->translator->trans('workflow.Comment added'));
-
-            return $this->redirectToRoute('chill_main_workflow_show', ['id' => $entityWorkflow->getId()]);
-        } elseif ($commentForm->isSubmitted() && !$commentForm->isValid()) {
-            $this->addFlash('error', $this->translator->trans('This form contains errors'));
-        }
-         */
-
         return $this->render(
             '@ChillMain/Workflow/index.html.twig',
             [
@@ -352,7 +332,7 @@ class WorkflowController extends AbstractController
                 'transition_form' => isset($transitionForm) ? $transitionForm->createView() : null,
                 'entity_workflow' => $entityWorkflow,
                 'transition_form_errors' => $errors,
-                // 'comment_form' => $commentForm->createView(),
+                'signatures' => $signatures,
             ]
         );
     }
@@ -371,4 +351,47 @@ class WorkflowController extends AbstractController
 
         return $lines;
     }
+
+    #[Route(path: '/{_locale}/main/workflow/signature/{signature_id}/metadata', name: 'chill_main_workflow_signature_metadata')]
+    public function addSignatureMetadata(int $signature_id, Request $request): Response
+    {
+        $signature = $this->entityManager->getRepository(EntityWorkflowStepSignature::class)->find($signature_id);
+
+        if ($signature->getSigner() instanceof User) {
+            return $this->redirectToRoute('signature_route_user');
+        }
+
+        $metadataForm = $this->createForm(WorkflowSignatureMetadataType::class);
+        $metadataForm->add('submit', SubmitType::class, ['label' => $this->translator->trans('Save')]);
+
+        $metadataForm->handleRequest($request);
+
+        if ($metadataForm->isSubmitted() && $metadataForm->isValid()) {
+            $data = $metadataForm->getData();
+
+            $signature->setSignatureMetadata(
+                [
+                    'base_signer' => [
+                        'document_type' => $data['documentType'],
+                        'document_number' => $data['documentNumber'],
+                        'expiration_date' => $data['expirationDate'],
+                    ],
+                ]
+            );
+
+            $this->entityManager->persist($signature);
+            $this->entityManager->flush();
+
+            // Todo should redirect to document for actual signing? To be adjusted still
+            return $this->redirectToRoute('chill_main_workflow_show', ['id' => $signature->getStep()->getEntityWorkflow()->getId()]);
+        }
+
+        return $this->render(
+            '@ChillMain/Workflow/_signature_metadata.html.twig',
+            [
+                'metadata_form' => $metadataForm->createView(),
+                'person' => $signature->getSigner(),
+            ]
+        );
+    }
 }

src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php

@@ -193,6 +193,11 @@ class ChillMainExtension extends Extension implements
                 []
         );
 
+        $container->setParameter(
+            'chill_main.workflow_signatures.base_signer.document_kinds',
+            $config['workflow_signature']['base_signer']['document_kinds']
+        );
+
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services.yaml');
         $loader->load('services/doctrine.yaml');

src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php

@@ -277,6 +277,32 @@ class Configuration implements ConfigurationInterface
             ->end() // end of root
         ;
 
+        $rootNode->children()
+            ->arrayNode('workflow_signature')
+            ->children()
+            ->arrayNode('base_signer')
+            ->children()
+            ->arrayNode('document_kinds')
+            ->arrayPrototype()
+            ->children()
+            ->scalarNode('key')->cannotBeEmpty()->end()
+            ->arrayNode('labels')
+            ->arrayPrototype()
+            ->children()
+            ->scalarNode('lang')->cannotBeEmpty()->end()
+            ->scalarNode('label')->cannotBeEmpty()->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end();
+
         $rootNode->children()
             ->arrayNode('add_address')->addDefaultsIfNotSet()->children()
             ->scalarNode('default_country')->cannotBeEmpty()->defaultValue('BE')->end()

src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php

@@ -17,9 +17,9 @@ use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Workflow\Validator\EntityWorkflowCreation;
+use Chill\MainBundle\Workflow\WorkflowTransitionContextDTO;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
-use Doctrine\Common\Collections\Order;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Validator\Constraints as Assert;
@@ -34,35 +34,6 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
 
     use TrackUpdateTrait;
 
-    /**
-     * a list of future cc users for the next steps.
-     *
-     * @var array|User[]
-     */
-    public array $futureCcUsers = [];
-
-    /**
-     * a list of future dest emails for the next steps.
-     *
-     * This is in used in order to let controller inform who will be the future emails which will validate
-     * the next step. This is necessary to perform some computation about the next emails, before they are
-     * associated to the entity EntityWorkflowStep.
-     *
-     * @var array|string[]
-     */
-    public array $futureDestEmails = [];
-
-    /**
-     * a list of future dest users for the next steps.
-     *
-     * This is in used in order to let controller inform who will be the future users which will validate
-     * the next step. This is necessary to perform some computation about the next users, before they are
-     * associated to the entity EntityWorkflowStep.
-     *
-     * @var array|User[]
-     */
-    public array $futureDestUsers = [];
-
     /**
      * @var Collection<EntityWorkflowComment>
      */
@@ -442,11 +413,23 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
      *
      * @return $this
      */
-    public function setStep(string $step): self
+    public function setStep(string $step, WorkflowTransitionContextDTO $transitionContextDTO): self
     {
         $newStep = new EntityWorkflowStep();
         $newStep->setCurrentStep($step);
 
+        foreach ($transitionContextDTO->futureCcUsers as $user) {
+            $newStep->addCcUser($user);
+        }
+
+        foreach ($transitionContextDTO->futureDestUsers as $user) {
+            $newStep->addDestUser($user);
+        }
+
+        foreach ($transitionContextDTO->futureDestEmails as $email) {
+            $newStep->addDestEmail($email);
+        }
+
         // copy the freeze
         if ($this->isFreeze()) {
             $newStep->setFreezeAfter(true);

src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowSignatureStateEnum.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Entity\Workflow;
+
+enum EntityWorkflowSignatureStateEnum: string
+{
+    case PENDING = 'pending';
+    case SIGNED = 'signed';
+    case REJECTED = 'rejected';
+    case CANCELED = 'canceled';
+}

src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php

@@ -42,19 +42,25 @@ class EntityWorkflowStep
     private array $destEmail = [];
 
     /**
-     * @var Collection<User>
+     * @var Collection<int, User>
      */
     #[ORM\ManyToMany(targetEntity: User::class)]
     #[ORM\JoinTable(name: 'chill_main_workflow_entity_step_user')]
     private Collection $destUser;
 
     /**
-     * @var Collection<User>
+     * @var Collection<int, User>
      */
     #[ORM\ManyToMany(targetEntity: User::class)]
     #[ORM\JoinTable(name: 'chill_main_workflow_entity_step_user_by_accesskey')]
     private Collection $destUserByAccessKey;
 
+    /**
+     * @var Collection <int, EntityWorkflowStepSignature>
+     */
+    #[ORM\OneToMany(mappedBy: 'step', targetEntity: EntityWorkflowStepSignature::class, cascade: ['persist'], orphanRemoval: true)]
+    private Collection $signatures;
+
     #[ORM\ManyToOne(targetEntity: EntityWorkflow::class, inversedBy: 'steps')]
     private ?EntityWorkflow $entityWorkflow = null;
 
@@ -97,6 +103,7 @@ class EntityWorkflowStep
         $this->ccUser = new ArrayCollection();
         $this->destUser = new ArrayCollection();
         $this->destUserByAccessKey = new ArrayCollection();
+        $this->signatures = new ArrayCollection();
         $this->accessKey = bin2hex(openssl_random_pseudo_bytes(32));
     }
 
@@ -136,6 +143,29 @@ class EntityWorkflowStep
         return $this;
     }
 
+    /**
+     * @internal use @see{EntityWorkflowStepSignature}'s constructor instead
+     */
+    public function addSignature(EntityWorkflowStepSignature $signature): self
+    {
+        if (!$this->signatures->contains($signature)) {
+            $this->signatures[] = $signature;
+        }
+
+        return $this;
+    }
+
+    public function removeSignature(EntityWorkflowStepSignature $signature): self
+    {
+        if ($this->signatures->contains($signature)) {
+            $this->signatures->removeElement($signature);
+        }
+
+        $signature->detachEntityWorkflowStep();
+
+        return $this;
+    }
+
     public function getAccessKey(): string
     {
         return $this->accessKey;
@@ -198,6 +228,14 @@ class EntityWorkflowStep
         return $this->entityWorkflow;
     }
 
+    /**
+     * @return Collection<int, EntityWorkflowStepSignature>
+     */
+    public function getSignatures(): Collection
+    {
+        return $this->signatures;
+    }
+
     public function getId(): ?int
     {
         return $this->id;

src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStepSignature.php

@@ -0,0 +1,156 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Entity\Workflow;
+
+use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
+use Chill\MainBundle\Entity\User;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\Mapping as ORM;
+
+#[ORM\Entity]
+#[ORM\Table(name: 'chill_main_workflow_entity_step_signature')]
+class EntityWorkflowStepSignature implements TrackCreationInterface, TrackUpdateInterface
+{
+    use TrackCreationTrait;
+    use TrackUpdateTrait;
+
+    #[ORM\Id]
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER, unique: true)]
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
+    private ?int $id = null;
+
+    #[ORM\ManyToOne(targetEntity: User::class)]
+    #[ORM\JoinColumn(nullable: true)]
+    private ?User $userSigner = null;
+
+    #[ORM\ManyToOne(targetEntity: Person::class)]
+    #[ORM\JoinColumn(nullable: true)]
+    private ?Person $personSigner = null;
+
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, length: 50, nullable: false, enumType: EntityWorkflowSignatureStateEnum::class)]
+    private EntityWorkflowSignatureStateEnum $state = EntityWorkflowSignatureStateEnum::PENDING;
+
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIMETZ_IMMUTABLE, nullable: true, options: ['default' => null])]
+    private ?\DateTimeImmutable $stateDate = null;
+
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON, nullable: false, options: ['default' => '[]'])]
+    private array $signatureMetadata = [];
+
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER, nullable: true, options: ['default' => null])]
+    private ?int $zoneSignatureIndex = null;
+
+    #[ORM\ManyToOne(targetEntity: EntityWorkflowStep::class, inversedBy: 'signatures')]
+    #[ORM\JoinColumn(nullable: false)]
+    private ?EntityWorkflowStep $step = null;
+
+    public function __construct(
+        EntityWorkflowStep $step,
+        User|Person $signer,
+    ) {
+        $this->step = $step;
+        $step->addSignature($this);
+        $this->setSigner($signer);
+    }
+
+    private function setSigner(User|Person $signer): void
+    {
+        if ($signer instanceof User) {
+            $this->userSigner = $signer;
+        } else {
+            $this->personSigner = $signer;
+        }
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getStep(): EntityWorkflowStep
+    {
+        return $this->step;
+    }
+
+    public function getSigner(): User|Person
+    {
+        if (null !== $this->userSigner) {
+            return $this->userSigner;
+        }
+
+        return $this->personSigner;
+    }
+
+    public function getSignatureMetadata(): array
+    {
+        return $this->signatureMetadata;
+    }
+
+    public function setSignatureMetadata(array $signatureMetadata): EntityWorkflowStepSignature
+    {
+        $this->signatureMetadata = $signatureMetadata;
+
+        return $this;
+    }
+
+    public function getState(): EntityWorkflowSignatureStateEnum
+    {
+        return $this->state;
+    }
+
+    public function setState(EntityWorkflowSignatureStateEnum $state): EntityWorkflowStepSignature
+    {
+        $this->state = $state;
+
+        return $this;
+    }
+
+    public function getStateDate(): ?\DateTimeImmutable
+    {
+        return $this->stateDate;
+    }
+
+    public function setStateDate(?\DateTimeImmutable $stateDate): EntityWorkflowStepSignature
+    {
+        $this->stateDate = $stateDate;
+
+        return $this;
+    }
+
+    public function getZoneSignatureIndex(): ?int
+    {
+        return $this->zoneSignatureIndex;
+    }
+
+    public function setZoneSignatureIndex(?int $zoneSignatureIndex): EntityWorkflowStepSignature
+    {
+        $this->zoneSignatureIndex = $zoneSignatureIndex;
+
+        return $this;
+    }
+
+    /**
+     * Detach from the @see{EntityWorkflowStep}.
+     *
+     * @internal used internally to remove the current signature
+     *
+     * @return $this
+     */
+    public function detachEntityWorkflowStep(): self
+    {
+        $this->step = null;
+
+        return $this;
+    }
+}

src/Bundle/ChillMainBundle/Form/WorkflowSignatureMetadataType.php

@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Form;
+
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class WorkflowSignatureMetadataType extends AbstractType
+{
+    public function __construct(private readonly ParameterBagInterface $parameterBag, private readonly TranslatableStringHelperInterface $translatableStringHelper) {}
+
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $documentTypeChoices = $this->parameterBag->get('chill_main.id_document_kinds');
+
+        $choices = [];
+
+        foreach ($documentTypeChoices as $documentType) {
+            $labels = [];
+
+            foreach ($documentType['labels'] as $label) {
+                $labels[$label['lang']] = $label['label'];
+            }
+
+            $localizedLabel = $this->translatableStringHelper->localize($labels);
+            if (null !== $localizedLabel) {
+                $choices[$localizedLabel] = $documentType['key'];
+            }
+        }
+
+        $builder
+            ->add('documentType', ChoiceType::class, [
+                'label' => 'workflow.signature_zone.metadata.docType',
+                'expanded' => false,
+                'required' => true,
+                'choices' => $choices,
+            ])
+            ->add('documentNumber', TextType::class, [
+                'required' => true,
+                'label' => 'workflow.signature_zone.metadata.docNumber',
+            ])
+            ->add('expirationDate', ChillDateType::class, [
+                'required' => true,
+                'input' => 'datetime_immutable',
+                'label' => 'workflow.signature_zone.metadata.docExpiration',
+            ]);
+    }
+}

src/Bundle/ChillMainBundle/Form/WorkflowStepType.php

@@ -12,14 +12,12 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Form;
 
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
-use Chill\MainBundle\Entity\Workflow\EntityWorkflowStep;
 use Chill\MainBundle\Form\Type\ChillCollectionType;
 use Chill\MainBundle\Form\Type\ChillTextareaType;
 use Chill\MainBundle\Form\Type\PickUserDynamicType;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Chill\MainBundle\Workflow\EntityWorkflowManager;
+use Chill\MainBundle\Workflow\WorkflowTransitionContextDTO;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -34,169 +32,151 @@ use Symfony\Component\Workflow\Transition;
 
 class WorkflowStepType extends AbstractType
 {
-    public function __construct(private readonly EntityWorkflowManager $entityWorkflowManager, private readonly Registry $registry, private readonly TranslatableStringHelperInterface $translatableStringHelper) {}
+    public function __construct(
+        private readonly Registry $registry,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper
+    ) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         /** @var EntityWorkflow $entityWorkflow */
         $entityWorkflow = $options['entity_workflow'];
-        $handler = $this->entityWorkflowManager->getHandler($entityWorkflow);
         $workflow = $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName());
         $place = $workflow->getMarking($entityWorkflow);
         $placeMetadata = $workflow->getMetadataStore()->getPlaceMetadata(array_keys($place->getPlaces())[0]);
 
-        if (true === $options['transition']) {
-            if (null === $options['entity_workflow']) {
-                throw new \LogicException('if transition is true, entity_workflow should be defined');
-            }
+        if (null === $options['entity_workflow']) {
+            throw new \LogicException('if transition is true, entity_workflow should be defined');
+        }
 
-            $transitions = $this->registry
-                ->get($options['entity_workflow'], $entityWorkflow->getWorkflowName())
-                ->getEnabledTransitions($entityWorkflow);
+        $transitions = $this->registry
+            ->get($options['entity_workflow'], $entityWorkflow->getWorkflowName())
+            ->getEnabledTransitions($entityWorkflow);
 
-            $choices = array_combine(
-                array_map(
-                    static fn (Transition $transition) => $transition->getName(),
-                    $transitions
-                ),
+        $choices = array_combine(
+            array_map(
+                static fn (Transition $transition) => $transition->getName(),
                 $transitions
-            );
+            ),
+            $transitions
+        );
 
-            if (\array_key_exists('validationFilterInputLabels', $placeMetadata)) {
-                $inputLabels = $placeMetadata['validationFilterInputLabels'];
+        if (\array_key_exists('validationFilterInputLabels', $placeMetadata)) {
+            $inputLabels = $placeMetadata['validationFilterInputLabels'];
 
-                $builder->add('transitionFilter', ChoiceType::class, [
-                    'multiple' => false,
-                    'label' => 'workflow.My decision',
-                    'choices' => [
-                        'forward' => 'forward',
-                        'backward' => 'backward',
-                        'neutral' => 'neutral',
-                    ],
-                    'choice_label' => fn (string $key) => $this->translatableStringHelper->localize($inputLabels[$key]),
-                    'choice_attr' => static fn (string $key) => [
-                        $key => $key,
-                    ],
-                    'mapped' => false,
-                    'expanded' => true,
-                    'data' => 'forward',
-                ]);
-            }
-
-            $builder
-                ->add('transition', ChoiceType::class, [
-                    'label' => 'workflow.Next step',
-                    'mapped' => false,
-                    'multiple' => false,
-                    'expanded' => true,
-                    'choices' => $choices,
-                    'constraints' => [new NotNull()],
-                    'choice_label' => function (Transition $transition) use ($workflow) {
-                        $meta = $workflow->getMetadataStore()->getTransitionMetadata($transition);
-
-                        if (\array_key_exists('label', $meta)) {
-                            return $this->translatableStringHelper->localize($meta['label']);
-                        }
-
-                        return $transition->getName();
-                    },
-                    'choice_attr' => static function (Transition $transition) use ($workflow) {
-                        $toFinal = true;
-                        $isForward = 'neutral';
-
-                        $metadata = $workflow->getMetadataStore()->getTransitionMetadata($transition);
-
-                        if (\array_key_exists('isForward', $metadata)) {
-                            if ($metadata['isForward']) {
-                                $isForward = 'forward';
-                            } else {
-                                $isForward = 'backward';
-                            }
-                        }
-
-                        foreach ($transition->getTos() as $to) {
-                            $meta = $workflow->getMetadataStore()->getPlaceMetadata($to);
-
-                            if (
-                                !\array_key_exists('isFinal', $meta) || false === $meta['isFinal']
-                            ) {
-                                $toFinal = false;
-                            }
-                        }
-
-                        return [
-                            'data-is-transition' => 'data-is-transition',
-                            'data-to-final' => $toFinal ? '1' : '0',
-                            'data-is-forward' => $isForward,
-                        ];
-                    },
-                ])
-                ->add('future_dest_users', PickUserDynamicType::class, [
-                    'label' => 'workflow.dest for next steps',
-                    'multiple' => true,
-                    'mapped' => false,
-                    'suggested' => $options['suggested_users'],
-                ])
-                ->add('future_cc_users', PickUserDynamicType::class, [
-                    'label' => 'workflow.cc for next steps',
-                    'multiple' => true,
-                    'mapped' => false,
-                    'required' => false,
-                    'suggested' => $options['suggested_users'],
-                ])
-                ->add('future_dest_emails', ChillCollectionType::class, [
-                    'label' => 'workflow.dest by email',
-                    'help' => 'workflow.dest by email help',
-                    'mapped' => false,
-                    'allow_add' => true,
-                    'entry_type' => EmailType::class,
-                    'button_add_label' => 'workflow.Add an email',
-                    'button_remove_label' => 'workflow.Remove an email',
-                    'empty_collection_explain' => 'workflow.Any email',
-                    'entry_options' => [
-                        'constraints' => [
-                            new NotNull(), new NotBlank(), new Email(),
-                        ],
-                        'label' => 'Email',
-                    ],
-                ]);
+            $builder->add('transitionFilter', ChoiceType::class, [
+                'multiple' => false,
+                'label' => 'workflow.My decision',
+                'choices' => [
+                    'forward' => 'forward',
+                    'backward' => 'backward',
+                    'neutral' => 'neutral',
+                ],
+                'choice_label' => fn (string $key) => $this->translatableStringHelper->localize($inputLabels[$key]),
+                'choice_attr' => static fn (string $key) => [
+                    $key => $key,
+                ],
+                'mapped' => false,
+                'expanded' => true,
+                'data' => 'forward',
+            ]);
         }
 
-        if (
-            $handler->supportsFreeze($entityWorkflow)
-            && !$entityWorkflow->isFreeze()
-        ) {
-            $builder
-                ->add('freezeAfter', CheckboxType::class, [
-                    'required' => false,
-                    'label' => 'workflow.Freeze',
-                    'help' => 'workflow.The associated element will be freezed',
-                ]);
-        }
+        $builder
+            ->add('transition', ChoiceType::class, [
+                'label' => 'workflow.Next step',
+                'mapped' => false,
+                'multiple' => false,
+                'expanded' => true,
+                'choices' => $choices,
+                'constraints' => [new NotNull()],
+                'choice_label' => function (Transition $transition) use ($workflow) {
+                    $meta = $workflow->getMetadataStore()->getTransitionMetadata($transition);
+
+                    if (\array_key_exists('label', $meta)) {
+                        return $this->translatableStringHelper->localize($meta['label']);
+                    }
+
+                    return $transition->getName();
+                },
+                'choice_attr' => static function (Transition $transition) use ($workflow) {
+                    $toFinal = true;
+                    $isForward = 'neutral';
+
+                    $metadata = $workflow->getMetadataStore()->getTransitionMetadata($transition);
+
+                    if (\array_key_exists('isForward', $metadata)) {
+                        if ($metadata['isForward']) {
+                            $isForward = 'forward';
+                        } else {
+                            $isForward = 'backward';
+                        }
+                    }
+
+                    foreach ($transition->getTos() as $to) {
+                        $meta = $workflow->getMetadataStore()->getPlaceMetadata($to);
+
+                        if (
+                            !\array_key_exists('isFinal', $meta) || false === $meta['isFinal']
+                        ) {
+                            $toFinal = false;
+                        }
+                    }
+
+                    return [
+                        'data-is-transition' => 'data-is-transition',
+                        'data-to-final' => $toFinal ? '1' : '0',
+                        'data-is-forward' => $isForward,
+                    ];
+                },
+            ])
+            ->add('futureDestUsers', PickUserDynamicType::class, [
+                'label' => 'workflow.dest for next steps',
+                'multiple' => true,
+                'suggested' => $options['suggested_users'],
+            ])
+            ->add('futureCcUsers', PickUserDynamicType::class, [
+                'label' => 'workflow.cc for next steps',
+                'multiple' => true,
+                'required' => false,
+                'suggested' => $options['suggested_users'],
+            ])
+            ->add('futureDestEmails', ChillCollectionType::class, [
+                'label' => 'workflow.dest by email',
+                'help' => 'workflow.dest by email help',
+                'allow_add' => true,
+                'entry_type' => EmailType::class,
+                'button_add_label' => 'workflow.Add an email',
+                'button_remove_label' => 'workflow.Remove an email',
+                'empty_collection_explain' => 'workflow.Any email',
+                'entry_options' => [
+                    'constraints' => [
+                        new NotNull(), new NotBlank(), new Email(),
+                    ],
+                    'label' => 'Email',
+                ],
+            ]);
 
         $builder
             ->add('comment', ChillTextareaType::class, [
                 'required' => false,
                 'label' => 'Comment',
+                'empty_data' => '',
             ]);
     }
 
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
-            ->setDefined('class')
-            ->setRequired('transition')
-            ->setAllowedTypes('transition', 'bool')
+            ->setDefault('data_class', WorkflowTransitionContextDTO::class)
             ->setRequired('entity_workflow')
             ->setAllowedTypes('entity_workflow', EntityWorkflow::class)
             ->setDefault('suggested_users', [])
             ->setDefault('constraints', [
                 new Callback(
-                    function ($step, ExecutionContextInterface $context, $payload) {
-                        /** @var EntityWorkflowStep $step */
-                        $form = $context->getObject();
-                        $workflow = $this->registry->get($step->getEntityWorkflow(), $step->getEntityWorkflow()->getWorkflowName());
-                        $transition = $form['transition']->getData();
+                    function (WorkflowTransitionContextDTO $step, ExecutionContextInterface $context, $payload) {
+                        $workflow = $this->registry->get($step->entityWorkflow, $step->entityWorkflow->getWorkflowName());
+                        $transition = $step->transition;
                         $toFinal = true;
 
                         if (null === $transition) {
@@ -212,8 +192,8 @@ class WorkflowStepType extends AbstractType
                                     $toFinal = false;
                                 }
                             }
-                            $destUsers = $form['future_dest_users']->getData();
-                            $destEmails = $form['future_dest_emails']->getData();
+                            $destUsers = $step->futureDestUsers;
+                            $destEmails = $step->futureDestEmails;
 
                             if (!$toFinal && [] === $destUsers && [] === $destEmails) {
                                 $context
@@ -224,20 +204,6 @@ class WorkflowStepType extends AbstractType
                         }
                     }
                 ),
-                new Callback(
-                    function ($step, ExecutionContextInterface $context, $payload) {
-                        $form = $context->getObject();
-
-                        foreach ($form->get('future_dest_users')->getData() as $u) {
-                            if (in_array($u, $form->get('future_cc_users')->getData(), true)) {
-                                $context
-                                    ->buildViolation('workflow.The user in cc cannot be a dest user in the same workflow step')
-                                    ->atPath('ccUsers')
-                                    ->addViolation();
-                            }
-                        }
-                    }
-                ),
             ]);
     }
 }

src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowStepSignatureRepository.php

@@ -0,0 +1,54 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Repository\Workflow;
+
+use Chill\MainBundle\Entity\Workflow\EntityWorkflowStepSignature;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\Persistence\ObjectRepository;
+
+/**
+ * @template-implements ObjectRepository<EntityWorkflowStepSignature>
+ */
+class EntityWorkflowStepSignatureRepository implements ObjectRepository
+{
+    private \Doctrine\ORM\EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $entityManager)
+    {
+        $this->repository = $entityManager->getRepository(EntityWorkflowStepSignature::class);
+    }
+
+    public function find($id): ?EntityWorkflowStepSignature
+    {
+        return $this->repository->find($id);
+    }
+
+    public function findAll(): array
+    {
+        return $this->repository->findAll();
+    }
+
+    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    {
+        return $this->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria): ?EntityWorkflowStepSignature
+    {
+        return $this->findOneBy($criteria);
+    }
+
+    public function getClassName(): string
+    {
+        return EntityWorkflowStepSignature::class;
+    }
+}

src/Bundle/ChillMainBundle/Resources/views/Workflow/_decision.html.twig

@@ -58,17 +58,15 @@
         {{ form_row(transition_form.transition) }}
     </div>
 
-    {% if transition_form.freezeAfter is defined %}
-        {{ form_row(transition_form.freezeAfter) }}
-    {% endif %}
-
     <div id="futureDests">
-        {{ form_row(transition_form.future_dest_users) }}
+        {{ form_row(transition_form.futureDestUsers) }}
+        {{ form_errors(transition_form.futureDestUsers) }}
 
-        {{ form_row(transition_form.future_cc_users) }}
+        {{ form_row(transition_form.futureCcUsers) }}
+        {{ form_errors(transition_form.futureCcUsers) }}
 
-        {{ form_row(transition_form.future_dest_emails) }}
-        {{ form_errors(transition_form.future_dest_users) }}
+        {{ form_row(transition_form.futureDestEmails) }}
+        {{ form_errors(transition_form.futureDestEmails) }}
     </div>
 
     <p>{{ form_label(transition_form.comment) }}</p>

src/Bundle/ChillMainBundle/Resources/views/Workflow/_signature.html.twig

@@ -0,0 +1,19 @@
+<h2>{{ 'workflow.signature_zone.title'|trans }}</h2>
+
+<div class="flex-table justify-content-center">
+    <div class="item-bloc">
+        {% for s in signatures %}
+            <div class="item-row mb-2">
+                    <div class="col-sm-6"><span>{{ s.signer|chill_entity_render_box }}</span></div>
+            <div class="col-sm-6">
+                <a class="btn btn-show" href="{{ chill_path_add_return_path('chill_main_workflow_signature_metadata', { 'signature_id': s.id}) }}">{{ 'workflow.signature_zone.button_sign'|trans }}</a>
+                {% if s.state is same as('signed') %}
+                    <p class="updatedBy">{{ s.stateDate }}</p>
+                {% endif %}
+                </div>
+            </div>
+        {% endfor %}
+    </div>
+</div>
+
+

src/Bundle/ChillMainBundle/Resources/views/Workflow/_signature_metadata.html.twig

@@ -0,0 +1,24 @@
+{% extends '@ChillMain/layout.html.twig' %}
+
+{% block title %}
+    {{ 'Signature'|trans }}
+{% endblock %}
+
+{% block content %}
+<div class="col-10 workflow">
+    <h1 class="mb-5">{{ 'workflow.signature_zone.metadata.sign_by'|trans({ '%name%' : person.firstname ~ ' ' ~ person.lastname}) }}</h1>
+
+    {% if metadata_form is not null %}
+        {{ form_start(metadata_form) }}
+        {{ form_row(metadata_form.documentType) }}
+        {{ form_row(metadata_form.documentNumber) }}
+        {{ form_row(metadata_form.expirationDate) }}
+        <ul class="record_actions">
+            <li>
+            {{ form_widget(metadata_form.submit, { 'attr' : { 'class' : 'btn btn-submit' }} ) }}
+            </li>
+        </ul>
+        {{ form_end(metadata_form) }}
+    {% endif %}
+</div>
+{% endblock %}

src/Bundle/ChillMainBundle/Resources/views/Workflow/index.html.twig

@@ -57,6 +57,9 @@
     </section>
 
     <section class="step my-4">{% include '@ChillMain/Workflow/_follow.html.twig' %}</section>
+    {% if signatures|length > 0 %}
+        <section class="step my-4">{% include '@ChillMain/Workflow/_signature.html.twig' %}</section>
+    {% endif %}
     <section class="step my-4">{% include '@ChillMain/Workflow/_decision.html.twig' %}</section>{#
     <section class="step my-4">{% include '@ChillMain/Workflow/_comment.html.twig' %}</section> #}
     <section class="step my-4">{% include '@ChillMain/Workflow/_history.html.twig' %}</section>

src/Bundle/ChillMainBundle/Service/Import/AddressReferenceLU.php

@@ -1,95 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\MainBundle\Service\Import;
-
-use League\Csv\Reader;
-use League\Csv\Statement;
-use Symfony\Contracts\HttpClient\HttpClientInterface;
-
-class AddressReferenceLU
-{
-    private const RELEASE = 'https://data.public.lu/fr/datasets/r/5cadc5b8-6a7d-4283-87bc-f9e58dd771f7';
-
-    public function __construct(private readonly HttpClientInterface $client, private readonly AddressReferenceBaseImporter $addressBaseImporter, private readonly PostalCodeBaseImporter $postalCodeBaseImporter, private readonly AddressToReferenceMatcher $addressToReferenceMatcher) {}
-
-    public function import(): void
-    {
-        $downloadUrl = self::RELEASE;
-
-        $response = $this->client->request('GET', $downloadUrl);
-
-        if (200 !== $response->getStatusCode()) {
-            throw new \Exception('Could not download CSV: '.$response->getStatusCode());
-        }
-
-        $file = tmpfile();
-
-        foreach ($this->client->stream($response) as $chunk) {
-            fwrite($file, $chunk->getContent());
-        }
-
-        fseek($file, 0);
-
-        $csv = Reader::createFromStream($file);
-        $csv->setDelimiter(';');
-        $csv->setHeaderOffset(0);
-
-        $this->process_postal_code($csv);
-
-        $this->process_address($csv);
-
-        $this->addressToReferenceMatcher->checkAddressesMatchingReferences();
-
-        fclose($file);
-    }
-
-    private function process_address(Reader $csv): void
-    {
-        $stmt = Statement::create()->process($csv);
-        foreach ($stmt as $record) {
-            $this->addressBaseImporter->importAddress(
-                $record['id_geoportail'],
-                $record['code_postal'],
-                $record['code_postal'],
-                $record['rue'],
-                $record['numero'],
-                'bd-addresses.lux',
-                (float) $record['lat_wgs84'],
-                (float) $record['lon_wgs84'],
-                4326
-            );
-        }
-
-        $this->addressBaseImporter->finalize();
-    }
-
-    private function process_postal_code(Reader $csv): void
-    {
-        $stmt = Statement::create()->process($csv);
-        $arr_postal_codes = [];
-        foreach ($stmt as $record) {
-            if (false === \array_key_exists($record['code_postal'], $arr_postal_codes)) {
-                $this->postalCodeBaseImporter->importCode(
-                    'LU',
-                    trim((string) $record['localite']),
-                    trim((string) $record['code_postal']),
-                    trim((string) $record['code_postal']),
-                    'bd-addresses.lux',
-                    (float) $record['lat_wgs84'],
-                    (float) $record['lon_wgs84'],
-                    4326
-                );
-                $arr_postal_codes[$record['code_postal']] = 1;
-            }
-        }
-    }
-}

src/Bundle/ChillMainBundle/Tests/Entity/Workflow/EntityWorkflowStepSignatureTest.php

@@ -0,0 +1,69 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Tests\Entity\Workflow;
+
+use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
+use Chill\MainBundle\Entity\Workflow\EntityWorkflowStepSignature;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class EntityWorkflowStepSignatureTest extends KernelTestCase
+{
+    private EntityManagerInterface $entityManager;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+        $this->entityManager = self::getContainer()->get(EntityManagerInterface::class);
+    }
+
+    public function testConstruct()
+    {
+        $workflow = new EntityWorkflow();
+        $workflow->setWorkflowName('vendee_internal')
+            ->setRelatedEntityId(0)
+            ->setRelatedEntityClass(AccompanyingPeriodWorkEvaluationDocument::class);
+
+        $step = $workflow->getCurrentStep();
+
+        $person = $this->entityManager->createQuery('SELECT p FROM '.Person::class.' p')
+            ->setMaxResults(1)
+            ->getSingleResult();
+
+        $signature = new EntityWorkflowStepSignature($step, $person);
+
+        self::assertCount(1, $step->getSignatures());
+        self::assertSame($signature, $step->getSignatures()->first());
+
+        $this->entityManager->getConnection()->beginTransaction();
+        $this->entityManager->persist($workflow);
+        $this->entityManager->persist($step);
+        $this->entityManager->persist($signature);
+
+        $this->entityManager->flush();
+        $this->entityManager->getConnection()->commit();
+
+        $this->entityManager->clear();
+
+        $signatureBis = $this->entityManager->find(EntityWorkflowStepSignature::class, $signature->getId());
+
+        self::assertEquals($signature->getId(), $signatureBis->getId());
+        self::assertEquals($step->getId(), $signatureBis->getStep()->getId());
+    }
+}

src/Bundle/ChillMainBundle/Tests/Entity/Workflow/EntityWorkflowTest.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Tests\Entity\Workflow;
 
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
+use Chill\MainBundle\Workflow\WorkflowTransitionContextDTO;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -25,7 +26,7 @@ final class EntityWorkflowTest extends TestCase
     {
         $entityWorkflow = new EntityWorkflow();
 
-        $entityWorkflow->setStep('final');
+        $entityWorkflow->setStep('final', new WorkflowTransitionContextDTO($entityWorkflow));
         $entityWorkflow->getCurrentStep()->setIsFinal(true);
 
         $this->assertTrue($entityWorkflow->isFinal());
@@ -37,16 +38,16 @@ final class EntityWorkflowTest extends TestCase
 
         $this->assertFalse($entityWorkflow->isFinal());
 
-        $entityWorkflow->setStep('two');
+        $entityWorkflow->setStep('two', new WorkflowTransitionContextDTO($entityWorkflow));
 
         $this->assertFalse($entityWorkflow->isFinal());
 
-        $entityWorkflow->setStep('previous_final');
+        $entityWorkflow->setStep('previous_final', new WorkflowTransitionContextDTO($entityWorkflow));
 
         $this->assertFalse($entityWorkflow->isFinal());
 
         $entityWorkflow->getCurrentStep()->setIsFinal(true);
-        $entityWorkflow->setStep('final');
+        $entityWorkflow->setStep('final', new WorkflowTransitionContextDTO($entityWorkflow));
 
         $this->assertTrue($entityWorkflow->isFinal());
     }
@@ -57,20 +58,20 @@ final class EntityWorkflowTest extends TestCase
 
         $this->assertFalse($entityWorkflow->isFreeze());
 
-        $entityWorkflow->setStep('step_one');
+        $entityWorkflow->setStep('step_one', new WorkflowTransitionContextDTO($entityWorkflow));
 
         $this->assertFalse($entityWorkflow->isFreeze());
 
-        $entityWorkflow->setStep('step_three');
+        $entityWorkflow->setStep('step_three', new WorkflowTransitionContextDTO($entityWorkflow));
 
         $this->assertFalse($entityWorkflow->isFreeze());
 
-        $entityWorkflow->setStep('freezed');
+        $entityWorkflow->setStep('freezed', new WorkflowTransitionContextDTO($entityWorkflow));
         $entityWorkflow->getCurrentStep()->setFreezeAfter(true);
 
         $this->assertTrue($entityWorkflow->isFreeze());
 
-        $entityWorkflow->setStep('after_freeze');
+        $entityWorkflow->setStep('after_freeze', new WorkflowTransitionContextDTO($entityWorkflow));
 
         $this->assertTrue($entityWorkflow->isFreeze());
 

src/Bundle/ChillMainBundle/Tests/Workflow/EntityWorkflowMarkingStoreTest.php

@@ -0,0 +1,61 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Tests\Workflow;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
+use Chill\MainBundle\Workflow\EntityWorkflowMarkingStore;
+use Chill\MainBundle\Workflow\WorkflowTransitionContextDTO;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Workflow\Marking;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class EntityWorkflowMarkingStoreTest extends TestCase
+{
+    public function testGetMarking(): void
+    {
+        $markingStore = $this->buildMarkingStore();
+        $workflow = new EntityWorkflow();
+
+        $marking = $markingStore->getMarking($workflow);
+
+        self::assertEquals(['initial' => 1], $marking->getPlaces());
+    }
+
+    public function testSetMarking(): void
+    {
+        $markingStore = $this->buildMarkingStore();
+        $workflow = new EntityWorkflow();
+
+        $dto = new WorkflowTransitionContextDTO($workflow);
+        $dto->futureCcUsers[] = $user1 = new User();
+        $dto->futureDestUsers[] = $user2 = new User();
+        $dto->futureDestEmails[] = $email = 'test@example.com';
+
+        $markingStore->setMarking($workflow, new Marking(['foo' => 1]), ['context' => $dto]);
+
+        $currentStep = $workflow->getCurrentStep();
+        self::assertEquals('foo', $currentStep->getCurrentStep());
+        self::assertContains($email, $currentStep->getDestEmail());
+        self::assertContains($user1, $currentStep->getCcUser());
+        self::assertContains($user2, $currentStep->getDestUser());
+    }
+
+    private function buildMarkingStore(): EntityWorkflowMarkingStore
+    {
+        return new EntityWorkflowMarkingStore();
+    }
+}

src/Bundle/ChillMainBundle/Workflow/EntityWorkflowHandlerInterface.php

@@ -49,6 +49,4 @@ interface EntityWorkflowHandlerInterface
     public function isObjectSupported(object $object): bool;
 
     public function supports(EntityWorkflow $entityWorkflow, array $options = []): bool;
-
-    public function supportsFreeze(EntityWorkflow $entityWorkflow, array $options = []): bool;
 }

src/Bundle/ChillMainBundle/Workflow/EntityWorkflowMarkingStore.php

@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Workflow;
+
+use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
+use Symfony\Component\Workflow\Marking;
+use Symfony\Component\Workflow\MarkingStore\MarkingStoreInterface;
+
+final readonly class EntityWorkflowMarkingStore implements MarkingStoreInterface
+{
+    public function getMarking(object $subject): Marking
+    {
+        if (!$subject instanceof EntityWorkflow) {
+            throw new \UnexpectedValueException('Expected instance of EntityWorkflow');
+        }
+        $step = $subject->getCurrentStep();
+
+        return new Marking([$step->getCurrentStep() => 1]);
+    }
+
+    public function setMarking(object $subject, Marking $marking, array $context = []): void
+    {
+        if (!$subject instanceof EntityWorkflow) {
+            throw new \UnexpectedValueException('Expected instance of EntityWorkflow');
+        }
+
+        $places = $marking->getPlaces();
+        if (1 < count($places)) {
+            throw new \LogicException('Expected maximum one place');
+        }
+        $next = array_keys($places)[0];
+
+        $transitionDTO = $context['context'] ?? null;
+        if (!$transitionDTO instanceof WorkflowTransitionContextDTO) {
+            throw new \UnexpectedValueException(sprintf('Expected instance of %s', WorkflowTransitionContextDTO::class));
+        }
+
+        $subject->setStep($next, $transitionDTO);
+    }
+}

src/Bundle/ChillMainBundle/Workflow/EventSubscriber/EntityWorkflowTransitionEventSubscriber.php

@@ -21,31 +21,13 @@ use Symfony\Component\Workflow\Event\Event;
 use Symfony\Component\Workflow\Event\GuardEvent;
 use Symfony\Component\Workflow\TransitionBlocker;
 
-class EntityWorkflowTransitionEventSubscriber implements EventSubscriberInterface
+final readonly class EntityWorkflowTransitionEventSubscriber implements EventSubscriberInterface
 {
-    public function __construct(private readonly LoggerInterface $chillLogger, private readonly Security $security, private readonly UserRender $userRender) {}
-
-    public function addDests(Event $event): void
-    {
-        if (!$event->getSubject() instanceof EntityWorkflow) {
-            return;
-        }
-
-        /** @var EntityWorkflow $entityWorkflow */
-        $entityWorkflow = $event->getSubject();
-
-        foreach ($entityWorkflow->futureCcUsers as $user) {
-            $entityWorkflow->getCurrentStep()->addCcUser($user);
-        }
-
-        foreach ($entityWorkflow->futureDestUsers as $user) {
-            $entityWorkflow->getCurrentStep()->addDestUser($user);
-        }
-
-        foreach ($entityWorkflow->futureDestEmails as $email) {
-            $entityWorkflow->getCurrentStep()->addDestEmail($email);
-        }
-    }
+    public function __construct(
+        private LoggerInterface $chillLogger,
+        private Security $security,
+        private UserRender $userRender
+    ) {}
 
     public static function getSubscribedEvents(): array
     {
@@ -53,7 +35,6 @@ class EntityWorkflowTransitionEventSubscriber implements EventSubscriberInterfac
             'workflow.transition' => 'onTransition',
             'workflow.completed' => [
                 ['markAsFinal', 2048],
-                ['addDests', 2048],
             ],
             'workflow.guard' => [
                 ['guardEntityWorkflow', 0],
@@ -99,6 +80,10 @@ class EntityWorkflowTransitionEventSubscriber implements EventSubscriberInterfac
 
     public function markAsFinal(Event $event): void
     {
+        // NOTE: it is not possible to move this method to the marking store, because
+        // there is dependency between the Workflow definition and the MarkingStoreInterface (the workflow
+        // constructor need a MarkingStoreInterface)
+
         if (!$event->getSubject() instanceof EntityWorkflow) {
             return;
         }

src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php

@@ -23,7 +23,13 @@ use Symfony\Component\Workflow\Registry;
 
 class NotificationOnTransition implements EventSubscriberInterface
 {
-    public function __construct(private readonly EntityManagerInterface $entityManager, private readonly \Twig\Environment $engine, private readonly MetadataExtractor $metadataExtractor, private readonly Security $security, private readonly Registry $registry) {}
+    public function __construct(
+        private readonly EntityManagerInterface $entityManager,
+        private readonly \Twig\Environment $engine,
+        private readonly MetadataExtractor $metadataExtractor,
+        private readonly Security $security,
+        private readonly Registry $registry
+    ) {}
 
     public static function getSubscribedEvents(): array
     {
@@ -85,7 +91,10 @@ class NotificationOnTransition implements EventSubscriberInterface
                 'dest' => $subscriber,
                 'place' => $place,
                 'workflow' => $workflow,
-                'is_dest' => \in_array($subscriber->getId(), array_map(static fn (User $u) => $u->getId(), $entityWorkflow->futureDestUsers), true),
+                'is_dest' => \in_array($subscriber->getId(), array_map(
+                    static fn (User $u) => $u->getId(),
+                    $entityWorkflow->getCurrentStep()->getDestUser()->toArray()
+                ), true),
             ];
 
             $notification = new Notification();

src/Bundle/ChillMainBundle/Workflow/EventSubscriber/SendAccessKeyEventSubscriber.php

@@ -20,7 +20,13 @@ use Symfony\Component\Workflow\Registry;
 
 class SendAccessKeyEventSubscriber
 {
-    public function __construct(private readonly \Twig\Environment $engine, private readonly MetadataExtractor $metadataExtractor, private readonly Registry $registry, private readonly EntityWorkflowManager $entityWorkflowManager, private readonly MailerInterface $mailer) {}
+    public function __construct(
+        private readonly \Twig\Environment $engine,
+        private readonly MetadataExtractor $metadataExtractor,
+        private readonly Registry $registry,
+        private readonly EntityWorkflowManager $entityWorkflowManager,
+        private readonly MailerInterface $mailer
+    ) {}
 
     public function postPersist(EntityWorkflowStep $step): void
     {
@@ -32,7 +38,7 @@ class SendAccessKeyEventSubscriber
         );
         $handler = $this->entityWorkflowManager->getHandler($entityWorkflow);
 
-        foreach ($entityWorkflow->futureDestEmails as $emailAddress) {
+        foreach ($step->getDestEmail() as $emailAddress) {
             $context = [
                 'entity_workflow' => $entityWorkflow,
                 'dest' => $emailAddress,

src/Bundle/ChillMainBundle/Workflow/WorkflowTransitionContextDTO.php

@@ -0,0 +1,74 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Workflow;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
+use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use Symfony\Component\Workflow\Transition;
+
+/**
+ * Context for a transition on an workflow entity.
+ */
+class WorkflowTransitionContextDTO
+{
+    /**
+     * a list of future dest users for the next steps.
+     *
+     * This is in used in order to let controller inform who will be the future users which will validate
+     * the next step. This is necessary to perform some computation about the next users, before they are
+     * associated to the entity EntityWorkflowStep.
+     *
+     * @var array|User[]
+     */
+    public array $futureDestUsers = [];
+
+    /**
+     * a list of future cc users for the next steps.
+     *
+     * @var array|User[]
+     */
+    public array $futureCcUsers = [];
+
+    /**
+     * a list of future dest emails for the next steps.
+     *
+     * This is in used in order to let controller inform who will be the future emails which will validate
+     * the next step. This is necessary to perform some computation about the next emails, before they are
+     * associated to the entity EntityWorkflowStep.
+     *
+     * @var array|string[]
+     */
+    public array $futureDestEmails = [];
+
+    public ?Transition $transition = null;
+
+    public string $comment = '';
+
+    public function __construct(
+        public EntityWorkflow $entityWorkflow
+    ) {}
+
+    #[Assert\Callback()]
+    public function validateCCUserIsNotInDest(ExecutionContextInterface $context, $payload): void
+    {
+        foreach ($this->futureDestUsers as $u) {
+            if (in_array($u, $this->futureCcUsers, true)) {
+                $context
+                    ->buildViolation('workflow.The user in cc cannot be a dest user in the same workflow step')
+                    ->atPath('ccUsers')
+                    ->addViolation();
+            }
+        }
+    }
+}

src/Bundle/ChillMainBundle/config/services/command.yaml

@@ -59,12 +59,6 @@ services:
         tags:
             - { name: console.command }
 
-    Chill\MainBundle\Command\LoadAddressesLUFromBDAddressCommand:
-        autoconfigure: true
-        autowire: true
-        tags:
-            - { name: console.command }
-
     Chill\MainBundle\Command\ExecuteCronJobCommand:
         autoconfigure: true
         autowire: true

src/Bundle/ChillMainBundle/config/services/form.yaml

@@ -133,6 +133,8 @@ services:
 
     Chill\MainBundle\Form\WorkflowStepType: ~
 
+    Chill\MainBundle\Form\WorkflowSignatureMetadataType: ~
+
     Chill\MainBundle\Form\DataMapper\PrivateCommentDataMapper:
         autowire: true
         autoconfigure: true

src/Bundle/ChillMainBundle/migrations/Version20240628095159.php

@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20240628095159 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add signatures to workflow';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE SEQUENCE chill_main_workflow_entity_step_signature_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE TABLE chill_main_workflow_entity_step_signature (id INT NOT NULL, step_id INT NOT NULL, '.
+            'state VARCHAR(50) NOT NULL, stateDate TIMESTAMP(0) WITH TIME ZONE DEFAULT NULL, signatureMetadata JSON DEFAULT \'[]\' NOT NULL,'.
+            ' zoneSignatureIndex INT DEFAULT NULL, createdAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, updatedAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL,'.
+            ' userSigner_id INT DEFAULT NULL, personSigner_id INT DEFAULT NULL, createdBy_id INT DEFAULT NULL, updatedBy_id INT DEFAULT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE INDEX IDX_C47D4BA3D934E3A4 ON chill_main_workflow_entity_step_signature (userSigner_id)');
+        $this->addSql('CREATE INDEX IDX_C47D4BA3ADFFA293 ON chill_main_workflow_entity_step_signature (personSigner_id)');
+        $this->addSql('CREATE INDEX IDX_C47D4BA373B21E9C ON chill_main_workflow_entity_step_signature (step_id)');
+        $this->addSql('CREATE INDEX IDX_C47D4BA33174800F ON chill_main_workflow_entity_step_signature (createdBy_id)');
+        $this->addSql('CREATE INDEX IDX_C47D4BA365FF1AEC ON chill_main_workflow_entity_step_signature (updatedBy_id)');
+        $this->addSql('COMMENT ON COLUMN chill_main_workflow_entity_step_signature.stateDate IS \'(DC2Type:datetimetz_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_main_workflow_entity_step_signature.createdAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_main_workflow_entity_step_signature.updatedAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('ALTER TABLE chill_main_workflow_entity_step_signature ADD CONSTRAINT FK_C47D4BA3D934E3A4 FOREIGN KEY (userSigner_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_main_workflow_entity_step_signature ADD CONSTRAINT FK_C47D4BA3ADFFA293 FOREIGN KEY (personSigner_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_main_workflow_entity_step_signature ADD CONSTRAINT FK_C47D4BA373B21E9C FOREIGN KEY (step_id) REFERENCES chill_main_workflow_entity_step (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_main_workflow_entity_step_signature ADD CONSTRAINT FK_C47D4BA33174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_main_workflow_entity_step_signature ADD CONSTRAINT FK_C47D4BA365FF1AEC FOREIGN KEY (updatedBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP SEQUENCE chill_main_workflow_entity_step_signature_id_seq CASCADE');
+        $this->addSql('DROP TABLE chill_main_workflow_entity_step_signature');
+    }
+}

src/Bundle/ChillMainBundle/translations/messages.fr.yml

@@ -528,6 +528,15 @@ workflow:
     This link grant any user to apply a transition: Le lien d'accès suivant permet d'appliquer une transition
     The workflow may be accssed through this link: Une transition peut être appliquée sur ce workflow grâce au lien d'accès suivant
 
+    signature_zone:
+        title: Appliquer les signatures électroniques
+        button_sign: Signer
+        metadata:
+            sign_by: 'Signature pour %name%'
+            docType: Type de document
+            docNumber: Numéro de document
+            docExpiration: Date d'expiration
+
 
 Subscribe final: Recevoir une notification à l'étape finale
 Subscribe all steps: Recevoir une notification à chaque étape

src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php

@@ -123,9 +123,4 @@ class AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler implements EntityW
     {
         return AccompanyingPeriodWorkEvaluationDocument::class === $entityWorkflow->getRelatedEntityClass();
     }
-
-    public function supportsFreeze(EntityWorkflow $entityWorkflow, array $options = []): bool
-    {
-        return false;
-    }
 }

src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php

@@ -109,9 +109,4 @@ class AccompanyingPeriodWorkEvaluationWorkflowHandler implements EntityWorkflowH
     {
         return AccompanyingPeriodWorkEvaluation::class === $entityWorkflow->getRelatedEntityClass();
     }
-
-    public function supportsFreeze(EntityWorkflow $entityWorkflow, array $options = []): bool
-    {
-        return false;
-    }
 }

src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php

@@ -116,9 +116,4 @@ class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInte
     {
         return AccompanyingPeriodWork::class === $entityWorkflow->getRelatedEntityClass();
     }
-
-    public function supportsFreeze(EntityWorkflow $entityWorkflow, array $options = []): bool
-    {
-        return false;
-    }
 }

tests/app/config/packages/workflow_chill.yaml

@@ -0,0 +1,294 @@
+framework:
+    workflows:
+        vendee_internal:
+            type: state_machine
+            metadata:
+                related_entity:
+                        - Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument
+                        - Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork
+                        - Chill\DocStoreBundle\Entity\AccompanyingCourseDocument
+                label:
+                    fr: 'Suivi'
+            support_strategy: Chill\MainBundle\Workflow\RelatedEntityWorkflowSupportsStrategy
+            initial_marking: 'initial'
+            marking_store:
+                property: step
+                type: method
+            places:
+                initial:
+                    metadata:
+                        label:
+                            fr: Étape initiale
+                attenteModification:
+                    metadata:
+                        label:
+                            fr: En attente de modification du document
+                        validationFilterInputLabels:
+                            forward: {fr: Modification effectuée}
+                            backward: {fr: Pas de modification effectuée}
+                            neutral: {fr: Autre}
+                attenteMiseEnForme:
+                    metadata:
+                        label:
+                            fr: En attente de mise en forme
+                        validationFilterInputLabels:
+                            forward: {fr: Mise en forme terminée}
+                            backward: {fr: Pas de mise en forme effectuée}
+                            neutral: {fr: Autre}
+                attenteVisa:
+                    metadata:
+                        label:
+                            fr: En attente de visa
+                        validationFilterInputLabels:
+                            forward: {fr: Visa accordé}
+                            backward: {fr: Visa refusé}
+                            neutral: {fr: Autre}
+                attenteSignature:
+                    metadata:
+                        label:
+                            fr: En attente de signature
+                        validationFilterInputLabels:
+                            forward: {fr: Signature accordée}
+                            backward: {fr: Signature refusée}
+                            neutral: {fr: Autre}
+                attenteTraitement:
+                    metadata:
+                        label:
+                            fr: En attente de traitement
+                        validationFilterInputLabels:
+                            forward: {fr: Traitement terminé favorablement}
+                            backward: {fr: Traitement terminé défavorablement}
+                            neutral: {fr: Autre}
+                attenteEnvoi:
+                    metadata:
+                        label:
+                            fr: En attente d'envoi
+                        validationFilterInputLabels:
+                            forward: {fr: Document envoyé}
+                            backward: {fr: Document non envoyé}
+                            neutral: {fr: Autre}
+                attenteValidationMiseEnForme:
+                    metadata:
+                        label:
+                            fr: En attente de validation de la mise en forme
+                        validationFilterInputLabels:
+                            forward: {fr: Validation de la mise en forme}
+                            backward: {fr: Refus de validation de la mise en forme}
+                            neutral: {fr: Autre}
+                annule:
+                    metadata:
+                        isFinal: true
+                        isFinalPositive: false
+                        label:
+                            fr: Annulé
+                final:
+                    metadata:
+                        isFinal: true
+                        isFinalPositive: true
+                        label:
+                            fr: Finalisé
+            transitions:
+                # transition qui avancent
+                demandeModificationDocument:
+                    from:
+                        - initial
+                    to: attenteModification
+                    metadata:
+                        label:
+                            fr: Demande de modification du document
+                        isForward: true
+                demandeMiseEnForme:
+                    from:
+                        - initial
+                        - attenteModification
+                    to: attenteMiseEnForme
+                    metadata:
+                        label:
+                            fr: Demande de mise en forme
+                        isForward: true
+                demandeValidationMiseEnForme:
+                    from:
+                        - attenteMiseEnForme
+                    to: attenteValidationMiseEnForme
+                    metadata:
+                        label:
+                            fr: Demande de validation de la mise en forme
+                        isForward: true
+                demandeVisa:
+                    from:
+                        - initial
+                        - attenteModification
+                        - attenteMiseEnForme
+                        - attenteValidationMiseEnForme
+                    to: attenteVisa
+                    metadata:
+                        label:
+                            fr: Demande de visa
+                        isForward: true
+                demandeSignature:
+                    from:
+                        - initial
+                        - attenteModification
+                        - attenteMiseEnForme
+                        - attenteValidationMiseEnForme
+                        - attenteVisa
+                    to: attenteSignature
+                    metadata:
+                        label: {fr: Demande de signature}
+                        isForward: true
+                demandeTraitement:
+                    from:
+                        - initial
+                        - attenteModification
+                        - attenteMiseEnForme
+                        - attenteValidationMiseEnForme
+                        - attenteVisa
+                        - attenteSignature
+                    to: attenteTraitement
+                    metadata:
+                        label: {fr: Demande de traitement}
+                        isForward: true
+                demandeEnvoi:
+                    from:
+                        - initial
+                        - attenteModification
+                        - attenteMiseEnForme
+                        - attenteValidationMiseEnForme
+                        - attenteVisa
+                        - attenteSignature
+                        - attenteTraitement
+                    to: attenteEnvoi
+                    metadata:
+                        label: {fr: Demande d'envoi}
+                        isForward: true
+                annulation:
+                    from:
+                        - initial
+                        - attenteModification
+                        - attenteMiseEnForme
+                        - attenteValidationMiseEnForme
+                        - attenteVisa
+                        - attenteSignature
+                        - attenteTraitement
+                        - attenteEnvoi
+                    to: annule
+                    metadata:
+                        label: {fr: Annulation}
+                        isForward: false
+                # transitions qui répètent l'étape
+                demandeMiseEnFormeSupplementaire:
+                    from:
+                        - attenteMiseEnForme
+                        - attenteValidationMiseEnForme
+                    to: attenteMiseEnForme
+                    metadata:
+                        label: {fr: Demande de mise en forme supplémentaire}
+                demandeVisaSupplementaire:
+                    from:
+                        - attenteVisa
+                    to: attenteVisa
+                    metadata:
+                        label: {fr: Demande de visa supplémentaire}
+                        isForward: true
+                demandeSignatureSupplementaire:
+                    from:
+                        - attenteSignature
+                    to: attenteSignature
+                    metadata:
+                        label: {fr: Demande de signature supplémentaire}
+                demandeTraitementSupplementaire:
+                    from:
+                        - attenteTraitement
+                    to: attenteTraitement
+                    metadata:
+                        label: {fr: Demande de traitement supplémentaire}
+                # transitions qui renvoient vers une étape précédente
+                refusEtModificationDocument:
+                    from:
+                        - attenteVisa
+                        - attenteSignature
+                        - attenteTraitement
+                        - attenteEnvoi
+                    to: attenteModification
+                    metadata:
+                        label:
+                            fr: Refus et demande de modification du document
+                        isForward: false
+                refusEtDemandeMiseEnForme:
+                    from:
+                        - attenteVisa
+                        - attenteSignature
+                        - attenteTraitement
+                        - attenteEnvoi
+                    to: attenteMiseEnForme
+                    metadata:
+                        label: {fr: Refus et demande de mise en forme}
+                        isForward: false
+                refusEtDemandeVisa:
+                    from:
+                        - attenteSignature
+                        - attenteTraitement
+                        - attenteEnvoi
+                    to: attenteVisa
+                    metadata:
+                        label: {fr: Refus et demande de visa}
+                        isForward: false
+                refusEtDemandeSignature:
+                    from:
+                        - attenteTraitement
+                        - attenteEnvoi
+                    to: attenteSignature
+                    metadata:
+                        label: {fr: Refus et demande de signature}
+                        isForward: false
+                refusEtDemandeTraitement:
+                    from:
+                        - attenteEnvoi
+                    to: attenteTraitement
+                    metadata:
+                        label: {fr: Refus et demande de traitement}
+                        isForward: false
+                # transition vers final
+                initialToFinal:
+                    from:
+                        - initial
+                    to: final
+                    metadata:
+                        label: {fr: Clotûre immédiate et cloture positive}
+                        isForward: true
+                attenteMiseEnFormeToFinal:
+                    from:
+                        - attenteMiseEnForme
+                        - attenteValidationMiseEnForme
+                    to: final
+                    metadata:
+                        label: {fr: Mise en forme terminée et cloture positive}
+                        isForward: true
+                attenteVisaToFinal:
+                    from:
+                        - attenteVisa
+                    to: final
+                    metadata:
+                        label: {fr: Accorde le visa et cloture positive}
+                        isForward: true
+                attenteSignatureToFinal:
+                    from:
+                        - attenteSignature
+                    to: final
+                    metadata:
+                        label: {fr: Accorde la signature et cloture positive}
+                        isForward: true
+                attenteTraitementToFinal:
+                    from:
+                        - attenteTraitement
+                    to: final
+                    metadata:
+                        label: {fr: Traitement terminé et cloture postive}
+                        isForward: true
+                attenteEnvoiToFinal:
+                    from:
+                        - attenteEnvoi
+                    to: final
+                    metadata:
+                        label: {fr: Envoyé et cloture postive}
+                        isForward: true