From 6d2c6fb6e13d860cc288a1becc6149a8fb9e39f6 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 10 Feb 2023 10:51:16 +0100
Subject: [PATCH 01/14] FIX [renaming][translation] changing a translation for
 concerned groups in activities

---
 src/Bundle/ChillActivityBundle/translations/messages.fr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
index 461137454..4dd67ceb8 100644
--- a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
@@ -77,7 +77,7 @@ Choose a type: Choisir un type
 4 hours: 4 heures
 4 hours 30: 4 heures 30
 5 hours: 5 heures
-Concerned groups: Parties concernées
+Concerned groups: Parties concernées par l'échange
 Persons in accompanying course: Usagers du parcours
 Third persons: Tiers non-pro.
 Others persons: Usagers

From f653f8fd7a3472942f0facd5b72cc488068b972f Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 10 Feb 2023 11:30:26 +0100
Subject: [PATCH 02/14] FIX [translations][wording] make distinction between
 parties concernees for an activity and an appointment in the translations

---
 .../ChillCalendarBundle/Resources/views/Calendar/edit.html.twig | 2 +-
 .../ChillCalendarBundle/Resources/views/Calendar/new.html.twig  | 2 +-
 .../ChillCalendarBundle/Resources/views/Calendar/show.html.twig | 2 +-
 src/Bundle/ChillCalendarBundle/translations/messages.fr.yml     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig
index df814282a..8978739ea 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig
@@ -7,7 +7,7 @@
 
 <div id="mainUser"></div> {# <=== vue component: mainUser #}
 
-<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
+<h2 class="chill-red">{{ 'Concerned groups calendar'|trans }}</h2>
 
 {%- if form.persons is defined -%}
     {{ form_widget(form.persons) }}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig
index 84eca97a0..9fff55d63 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig
@@ -7,7 +7,7 @@
 
 <div id="mainUser"></div> {# <=== vue component: mainUser #}
 
-<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
+<h2 class="chill-red">{{ 'Concerned groups calendar'|trans }}</h2>
 
 {%- if form.mainUser is defined -%}
     {{ form_row(form.mainUser) }}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
index bff4baa53..d48844f67 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
@@ -14,7 +14,7 @@
     <dd>{{ entity.mainUser }}</dd>
 </dl>
 
-<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
+<h2 class="chill-red">{{ 'Concerned groups calendar'|trans }}</h2>
 {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': 'calendar_' ~ context, 'render': 'bloc' } %}
 
 
diff --git a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
index 623eb02cb..aa933bb63 100644
--- a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
@@ -4,7 +4,7 @@ My calendar list: Mes rendez-vous
 There is no calendar items.: Il n'y a pas de rendez-vous
 Remove calendar item: Supprimer le rendez-vous
 Are you sure you want to remove the calendar item?: Êtes-vous sûr de vouloir supprimer le rendez-vous?
-Concerned groups: Parties concernées
+Concerned groups calendar: Parties concernées
 Calendar data: Données du rendez-vous
 Update calendar: Modifier le rendez-vous
 main user concerned: Utilisateur concerné

From eac3471cbb0b59c5e7dd7bebcd716ac1c5618a9c Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 10 Feb 2023 11:37:32 +0100
Subject: [PATCH 03/14] FIX [person][contactinfo] place the contactinfo fields
 underneath birthdate for easier access

---
 .../Resources/views/Person/edit.html.twig     | 70 +++++++++----------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
index 6ffbe8430..872dc4eab 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
@@ -63,6 +63,41 @@
         {%- endif -%}
     </fieldset>
 
+    {%- if form.email is defined or form.phonenumber is defined or form.mobilenumber is defined or form.contactInfo is defined-%}
+        <fieldset>
+            <legend><h2>{{ 'Contact information'|trans }}</h2></legend>
+            {%- if form.email is defined -%}
+                <div id="personEmail">
+                    {{ form_row(form.email, {'label': 'Email'}) }}
+                </div>
+            {% endif %}
+            {%- if form.acceptEmail is defined -%}
+                <div id="personAcceptEmail">
+                    {{ form_row(form.acceptEmail, {'label' : 'Accept emails ?'}) }}
+                </div>
+            {%- endif -%}
+
+            {%- if form.phonenumber is defined -%}
+                {{ form_row(form.phonenumber, {'label': 'Phonenumber'}) }}
+            {%- endif -%}
+            {%- if form.mobilenumber is defined -%}
+                <div id="personPhoneNumber">
+                    {{ form_row(form.mobilenumber, {'label': 'Mobilenumber'}) }}
+                </div>
+                <div id="personAcceptSMS">
+                    {{ form_row(form.acceptSMS, {'label' : 'Accept short text message ?'}) }}
+                </div>
+            {%- endif -%}
+            {%- if form.otherPhoneNumbers is defined -%}
+                {{ form_widget(form.otherPhoneNumbers) }}
+                {{ form_errors(form.otherPhoneNumbers) }}
+            {%- endif -%}
+            {%- if form.contactInfo is defined -%}
+                {{ form_row(form.contactInfo, {'label': 'Notes on contact information'}) }}
+            {%- endif -%}
+        </fieldset>
+    {%- endif -%}
+
     {%- if form.nationality is defined or form.spokenLanguages is defined -%}
     <fieldset>
         <legend><h2>{{ 'Administrative information'|trans }}</h2></legend>
@@ -93,41 +128,6 @@
     </fieldset>
     {%- endif -%}
 
-    {%- if form.email is defined or form.phonenumber is defined or form.mobilenumber is defined or form.contactInfo is defined-%}
-    <fieldset>
-        <legend><h2>{{ 'Contact information'|trans }}</h2></legend>
-        {%- if form.email is defined -%}
-            <div id="personEmail">
-                {{ form_row(form.email, {'label': 'Email'}) }}
-            </div>
-        {% endif %}
-        {%- if form.acceptEmail is defined -%}
-            <div id="personAcceptEmail">
-                {{ form_row(form.acceptEmail, {'label' : 'Accept emails ?'}) }}
-            </div>
-        {%- endif -%}
-
-        {%- if form.phonenumber is defined -%}
-            {{ form_row(form.phonenumber, {'label': 'Phonenumber'}) }}
-        {%- endif -%}
-        {%- if form.mobilenumber is defined -%}
-            <div id="personPhoneNumber">
-                {{ form_row(form.mobilenumber, {'label': 'Mobilenumber'}) }}
-            </div>
-            <div id="personAcceptSMS">
-                {{ form_row(form.acceptSMS, {'label' : 'Accept short text message ?'}) }}
-            </div>
-        {%- endif -%}
-        {%- if form.otherPhoneNumbers is defined -%}
-            {{ form_widget(form.otherPhoneNumbers) }}
-            {{ form_errors(form.otherPhoneNumbers) }}
-        {%- endif -%}
-        {%- if form.contactInfo is defined -%}
-            {{ form_row(form.contactInfo, {'label': 'Notes on contact information'}) }}
-        {%- endif -%}
-    </fieldset>
-    {%- endif -%}
-
     {{ form_rest(form) }}
 
     <ul class="record_actions sticky-form-buttons">

From bb05ba0f170bb2f3a872c6d4a9c209ec00d0ba48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 14 Feb 2023 19:35:28 +0100
Subject: [PATCH 04/14] Feature: [docgen] create a service to generate a
 document from a template

---
 .../GeneratorDriver/RelatorioDriver.php       |   1 +
 .../Service/Generator/Generator.php           | 132 +++++++++++++++++
 .../Service/Generator/GeneratorException.php  |  18 +++
 .../Generator/ObjectReadyException.php        |  11 ++
 .../RelatedEntityNotFoundException.php        |  14 ++
 .../Messenger/RequestGenerationMessage.php    |  45 ++++++
 .../Context/Generator/GeneratorTest.php       | 134 ++++++++++++++++++
 .../Entity/StoredObject.php                   |  77 +++++++---
 8 files changed, 415 insertions(+), 17 deletions(-)
 create mode 100644 src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php
 create mode 100644 src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorException.php
 create mode 100644 src/Bundle/ChillDocGeneratorBundle/Service/Generator/ObjectReadyException.php
 create mode 100644 src/Bundle/ChillDocGeneratorBundle/Service/Generator/RelatedEntityNotFoundException.php
 create mode 100644 src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php
 create mode 100644 src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/Generator/GeneratorTest.php

diff --git a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php
index 9f879f7ff..0f62931b4 100644
--- a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php
+++ b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php
@@ -53,6 +53,7 @@ final class RelatorioDriver implements DriverInterface
             $response = $this->client->request('POST', $this->url, [
                 'headers' => $form->getPreparedHeaders()->toArray(),
                 'body' => $form->bodyToIterable(),
+                'timeout' => '300',
             ]);
 
             return $response->getContent();
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php
new file mode 100644
index 000000000..755e608ba
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php
@@ -0,0 +1,132 @@
+<?php
+
+namespace Chill\DocGeneratorBundle\Service\Generator;
+
+use Chill\DocGeneratorBundle\Context\ContextManagerInterface;
+use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+use Chill\DocGeneratorBundle\GeneratorDriver\DriverInterface;
+use Chill\DocGeneratorBundle\GeneratorDriver\Exception\TemplateException;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
+use Doctrine\ORM\EntityManagerInterface;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\HttpFoundation\File\File;
+
+class Generator
+{
+    private ContextManagerInterface $contextManager;
+
+    private DriverInterface $driver;
+
+    private EntityManagerInterface $entityManager;
+
+    private LoggerInterface $logger;
+
+    private StoredObjectManagerInterface $storedObjectManager;
+
+    public function __construct(
+        ContextManagerInterface $contextManager,
+        DriverInterface $driver,
+        EntityManagerInterface $entityManager,
+        LoggerInterface $logger,
+        StoredObjectManagerInterface $storedObjectManager
+    ) {
+        $this->contextManager = $contextManager;
+        $this->driver = $driver;
+        $this->entityManager = $entityManager;
+        $this->logger = $logger;
+        $this->storedObjectManager = $storedObjectManager;
+    }
+
+    /**
+     * @template T of File|null
+     * @template B of bool
+     * @param B $isTest
+     * @param (B is true ? T : null) $testFile
+     * @psalm-return (B is true ? string : null)
+     * @throws \Symfony\Component\Serializer\Exception\ExceptionInterface|\Throwable
+     */
+    public function generateDocFromTemplate(
+        DocGeneratorTemplate $template,
+        string               $entityClassName,
+        int                  $entityId,
+        ?StoredObject        $destinationStoredObject = null,
+        bool                 $isTest = false,
+        ?File                $testFile = null
+    ): ?string {
+        if ($destinationStoredObject instanceof StoredObject && StoredObject::STATUS_PENDING !== $destinationStoredObject->getStatus()) {
+            throw new ObjectReadyException();
+        }
+
+        $context = $this->contextManager->getContextByDocGeneratorTemplate($template);
+        $contextGenerationData = ['test_file' => $testFile];
+
+        $entity = $this
+            ->entityManager
+            ->find($context->getEntityClass(), $entityId)
+            ;
+
+        if (null === $entity) {
+            throw new RelatedEntityNotFoundException($entityClassName, $entityId);
+        }
+
+        if ($isTest && ($testFile instanceof File)) {
+            $dataDecrypted = file_get_contents($testFile->getPathname());
+        } else {
+            $dataDecrypted = $this->storedObjectManager->read($template->getFile());
+        }
+
+        try {
+            $generatedResource = $this
+                ->driver
+                ->generateFromString(
+                    $dataDecrypted,
+                    $template->getFile()->getType(),
+                    $context->getData($template, $entity, $contextGenerationData),
+                    $template->getFile()->getFilename()
+                );
+        } catch (TemplateException $e) {
+            throw new GeneratorException($e->getErrors(), $e);
+        }
+
+        if ($isTest) {
+            return $generatedResource;
+        }
+
+        /** @var StoredObject $storedObject */
+        $destinationStoredObject
+            ->setType($template->getFile()->getType())
+            ->setFilename(sprintf('%s_odt', uniqid('doc_', true)))
+            ->setStatus(StoredObject::STATUS_READY)
+            ;
+
+        $this->storedObjectManager->write($destinationStoredObject, $generatedResource);
+
+        try {
+            $context
+                ->storeGenerated(
+                    $template,
+                    $destinationStoredObject,
+                    $entity,
+                    $contextGenerationData
+                );
+        } catch (\Exception $e) {
+            $this
+                ->logger
+                ->error(
+                    'Unable to store the associated document to entity',
+                    [
+                        'entityClassName' => $entityClassName,
+                        'entityId' => $entityId,
+                        'contextKey' => $context->getName(),
+                    ]
+                );
+
+            throw $e;
+        }
+
+        $this->entityManager->flush();
+
+        return null;
+    }
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorException.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorException.php
new file mode 100644
index 000000000..423d59dd4
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorException.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Chill\DocGeneratorBundle\Service\Generator;
+
+class GeneratorException extends \RuntimeException
+{
+    /**
+     * @var list<string>
+     */
+    private array $errors;
+
+    public function __construct(array $errors = [], \Throwable $previous = null)
+    {
+        $this->errors = $errors;
+        parent::__construct("Could not generate the document", 15252,
+            $previous);
+    }
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/ObjectReadyException.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/ObjectReadyException.php
new file mode 100644
index 000000000..85c82cf95
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/ObjectReadyException.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Chill\DocGeneratorBundle\Service\Generator;
+
+class ObjectReadyException extends \RuntimeException
+{
+    public function __construct()
+    {
+        parent::__construct("object is already ready", 6698856);
+    }
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/RelatedEntityNotFoundException.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/RelatedEntityNotFoundException.php
new file mode 100644
index 000000000..b451b0ca5
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/RelatedEntityNotFoundException.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Chill\DocGeneratorBundle\Service\Generator;
+
+class RelatedEntityNotFoundException extends \RuntimeException
+{
+    public function __construct(string $relatedEntityClass, int $relatedEntityId, Throwable $previous = null)
+    {
+        parent::__construct(
+            sprintf("Related entity not found: %s, %s", $relatedEntityClass, $relatedEntityId),
+            99876652,
+            $previous);
+    }
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php
new file mode 100644
index 000000000..1489e2686
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Chill\DocGeneratorBundle\Service\Messenger;
+
+use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+use Chill\MainBundle\Entity\User;
+
+class RequestGenerationMessage
+{
+   private int $creatorId;
+
+   private int $templateId;
+
+   private int $entityId;
+
+   private string $entityClassName;
+
+    public function __construct(User $creator, DocGeneratorTemplate $template, int $entityId, string $entityClassName)
+    {
+        $this->creatorId = $creator->getId();
+        $this->templateId = $template->getId();
+        $this->entityId = $entityId;
+        $this->entityClassName = $entityClassName;
+    }
+
+    public function getCreatorId(): int
+    {
+        return $this->creatorId;
+    }
+
+    public function getTemplateId(): int
+    {
+        return $this->templateId;
+    }
+
+    public function getEntityId(): int
+    {
+        return $this->entityId;
+    }
+
+    public function getEntityClassName(): string
+    {
+        return $this->entityClassName;
+    }
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/Generator/GeneratorTest.php b/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/Generator/GeneratorTest.php
new file mode 100644
index 000000000..2e68b443c
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/Generator/GeneratorTest.php
@@ -0,0 +1,134 @@
+<?php
+
+namespace Chill\DocGeneratorBundle\tests\Service\Context\Generator;
+
+use Chill\DocGeneratorBundle\Context\ContextManagerInterface;
+use Chill\DocGeneratorBundle\Context\DocGeneratorContextInterface;
+use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+use Chill\DocGeneratorBundle\GeneratorDriver\DriverInterface;
+use Chill\DocGeneratorBundle\Service\Generator\Generator;
+use Chill\DocGeneratorBundle\Service\Generator\ObjectReadyException;
+use Chill\DocGeneratorBundle\Service\Generator\RelatedEntityNotFoundException;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
+use Doctrine\ORM\EntityManagerInterface;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Psr\Log\NullLogger;
+
+class GeneratorTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testSuccessfulGeneration(): void
+    {
+        $template = (new DocGeneratorTemplate())->setFile($templateStoredObject = (new StoredObject())
+            ->setType('application/test'));
+        $destinationStoredObject = (new StoredObject())->setStatus(StoredObject::STATUS_PENDING);
+        $entity = new class {};
+        $data = [];
+
+        $context = $this->prophesize(DocGeneratorContextInterface::class);
+        $context->getData($template, $entity, Argument::type('array'))->willReturn($data);
+        $context->storeGenerated($template, $destinationStoredObject, $entity, Argument::type('array'))
+            ->shouldBeCalled();
+        $context->getName()->willReturn('dummy_context');
+        $context->getEntityClass()->willReturn('DummyClass');
+        $context = $context->reveal();
+
+        $contextManagerInterface = $this->prophesize(ContextManagerInterface::class);
+        $contextManagerInterface->getContextByDocGeneratorTemplate($template)
+            ->willReturn($context);
+
+        $driver = $this->prophesize(DriverInterface::class);
+        $driver->generateFromString('template', 'application/test', $data, Argument::any())
+            ->willReturn('generated');
+
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $entityManager->find(Argument::type('string'), Argument::type('int'))
+            ->willReturn($entity);
+        $entityManager->flush()->shouldBeCalled();
+
+        $storedObjectManager = $this->prophesize(StoredObjectManagerInterface::class);
+        $storedObjectManager->read($templateStoredObject)->willReturn('template');
+        $storedObjectManager->write($destinationStoredObject, 'generated')->shouldBeCalled();
+
+
+        $generator = new Generator(
+            $contextManagerInterface->reveal(),
+            $driver->reveal(),
+            $entityManager->reveal(),
+            new NullLogger(),
+            $storedObjectManager->reveal()
+        );
+
+        $generator->generateDocFromTemplate(
+            $template,
+            'DummyEntity',
+            1,
+            $destinationStoredObject
+        );
+    }
+
+    public function testPreventRegenerateDocument(): void
+    {
+        $this->expectException(ObjectReadyException::class);
+
+        $generator = new Generator(
+            $this->prophesize(ContextManagerInterface::class)->reveal(),
+            $this->prophesize(DriverInterface::class)->reveal(),
+            $this->prophesize(EntityManagerInterface::class)->reveal(),
+            new NullLogger(),
+            $this->prophesize(StoredObjectManagerInterface::class)->reveal()
+        );
+
+        $template = (new DocGeneratorTemplate())->setFile($templateStoredObject = (new StoredObject())
+            ->setType('application/test'));
+        $destinationStoredObject = (new StoredObject())->setStatus(StoredObject::STATUS_READY);
+
+        $generator->generateDocFromTemplate(
+            $template,
+            'DummyEntity',
+            1,
+            $destinationStoredObject
+        );
+    }
+
+    public function testRelatedEntityNotFound(): void
+    {
+        $this->expectException(RelatedEntityNotFoundException::class);
+
+        $template = (new DocGeneratorTemplate())->setFile($templateStoredObject = (new StoredObject())
+            ->setType('application/test'));
+        $destinationStoredObject = (new StoredObject())->setStatus(StoredObject::STATUS_PENDING);
+
+        $context = $this->prophesize(DocGeneratorContextInterface::class);
+        $context->getName()->willReturn('dummy_context');
+        $context->getEntityClass()->willReturn('DummyClass');
+        $context = $context->reveal();
+
+        $contextManagerInterface = $this->prophesize(ContextManagerInterface::class);
+        $contextManagerInterface->getContextByDocGeneratorTemplate($template)
+            ->willReturn($context);
+
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $entityManager->find(Argument::type('string'), Argument::type('int'))
+            ->willReturn(null);
+
+        $generator = new Generator(
+            $contextManagerInterface->reveal(),
+            $this->prophesize(DriverInterface::class)->reveal(),
+            $entityManager->reveal(),
+            new NullLogger(),
+            $this->prophesize(StoredObjectManagerInterface::class)->reveal()
+        );
+
+        $generator->generateDocFromTemplate(
+            $template,
+            'DummyEntity',
+            1,
+            $destinationStoredObject
+        );
+    }
+}
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
index ec2b67cf2..21abc1f56 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
@@ -14,6 +14,9 @@ namespace Chill\DocStoreBundle\Entity;
 use ChampsLibres\AsyncUploaderBundle\Model\AsyncFileInterface;
 use ChampsLibres\AsyncUploaderBundle\Validator\Constraints\AsyncFileExists;
 use ChampsLibres\WopiLib\Contract\Entity\Document;
+use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
 use DateTime;
 use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
@@ -30,8 +33,14 @@ use Symfony\Component\Serializer\Annotation as Serializer;
  *     message="The file is not stored properly"
  * )
  */
-class StoredObject implements AsyncFileInterface, Document
+class StoredObject implements AsyncFileInterface, Document, TrackCreationInterface
 {
+    public const STATUS_READY = "ready";
+    public const STATUS_PENDING = "pending";
+    public const STATUS_FAILURE = "failure";
+
+    use TrackCreationTrait;
+
     /**
      * @ORM\Column(type="datetime", name="creation_date")
      * @Serializer\Groups({"read", "write"})
@@ -48,7 +57,7 @@ class StoredObject implements AsyncFileInterface, Document
      * @ORM\Column(type="text")
      * @Serializer\Groups({"read", "write"})
      */
-    private $filename;
+    private string $filename = '';
 
     /**
      * @ORM\Id
@@ -56,7 +65,7 @@ class StoredObject implements AsyncFileInterface, Document
      * @ORM\Column(type="integer")
      * @Serializer\Groups({"read", "write"})
      */
-    private $id;
+    private ?int $id;
 
     /**
      * @var int[]
@@ -89,28 +98,44 @@ class StoredObject implements AsyncFileInterface, Document
      */
     private UuidInterface $uuid;
 
-    public function __construct()
+    /**
+     * @ORM\ManyToOne(targetEntity=DocGeneratorTemplate::class)
+     */
+    private ?DocGeneratorTemplate $template;
+
+    /**
+     * @ORM\Column(type="text", options={"default": "ready"})
+     */
+    private string $status;
+
+    /**
+     * @param StoredObject::STATUS_* $status
+     */
+    public function __construct(string $status = "ready")
     {
-        $this->creationDate = new DateTime();
         $this->uuid = Uuid::uuid4();
+        $this->status = $status;
     }
 
+    /**
+     * @Serializer\Groups({"read", "write"})
+     */
     public function getCreationDate(): DateTime
     {
-        return $this->creationDate;
+        return DateTime::createFromImmutable($this->createdAt);
     }
 
-    public function getDatas()
+    public function getDatas(): array
     {
         return $this->datas;
     }
 
-    public function getFilename()
+    public function getFilename(): string
     {
         return $this->filename;
     }
 
-    public function getId()
+    public function getId(): ?int
     {
         return $this->id;
     }
@@ -133,6 +158,11 @@ class StoredObject implements AsyncFileInterface, Document
         return $this->getFilename();
     }
 
+    public function getStatus(): string
+    {
+        return $this->status;
+    }
+
     public function getTitle()
     {
         return $this->title;
@@ -153,49 +183,62 @@ class StoredObject implements AsyncFileInterface, Document
         return (string) $this->uuid;
     }
 
-    public function setCreationDate(DateTime $creationDate)
+    /**
+     * @Serializer\Groups({"write"})
+     */
+    public function setCreationDate(DateTime $creationDate): self
     {
-        $this->creationDate = $creationDate;
+        $this->createdAt = \DateTimeImmutable::createFromMutable($creationDate);
 
         return $this;
     }
 
-    public function setDatas(?array $datas)
+    public function setDatas(?array $datas): self
     {
         $this->datas = (array) $datas;
 
         return $this;
     }
 
-    public function setFilename(?string $filename)
+    public function setFilename(?string $filename): self
     {
         $this->filename = (string) $filename;
 
         return $this;
     }
 
-    public function setIv(?array $iv)
+    public function setIv(?array $iv): self
     {
         $this->iv = (array) $iv;
 
         return $this;
     }
 
-    public function setKeyInfos(?array $keyInfos)
+    public function setKeyInfos(?array $keyInfos): self
     {
         $this->keyInfos = (array) $keyInfos;
 
         return $this;
     }
 
-    public function setTitle(?string $title)
+    /**
+     * @param StoredObject::STATUS_* $status
+     */
+    public function setStatus(string $status): self
+    {
+        $this->status = $status;
+
+        return $this;
+    }
+
+    public function setTitle(?string $title): self
     {
         $this->title = (string) $title;
 
         return $this;
     }
 
-    public function setType(?string $type)
+    public function setType(?string $type): self
     {
         $this->type = (string) $type;
 

From 55918bcafb9b958e83696a9eaa4f6f17e90a9602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 14 Feb 2023 20:57:34 +0100
Subject: [PATCH 05/14] Feature: [docgen][stored object] update model to store
 status, template_id and fix defaults

---
 .../migrations/Version20230214192558.php      | 47 +++++++++++++++++++
 .../Entity/StoredObject.php                   | 10 ++--
 2 files changed, 50 insertions(+), 7 deletions(-)
 create mode 100644 src/Bundle/ChillDocGeneratorBundle/migrations/Version20230214192558.php

diff --git a/src/Bundle/ChillDocGeneratorBundle/migrations/Version20230214192558.php b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20230214192558.php
new file mode 100644
index 000000000..de536ca84
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20230214192558.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\DocGenerator;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20230214192558 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add status, template_id and fix defaults on chill_doc.stored_object';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_doc.stored_object ADD template_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ADD status TEXT DEFAULT \'ready\' NOT NULL');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ADD createdAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('UPDATE chill_doc.stored_object SET createdAt = creation_date');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ADD createdBy_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_doc.stored_object DROP creation_date;');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ALTER type SET DEFAULT \'\'');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ALTER title DROP DEFAULT');
+        $this->addSql('COMMENT ON COLUMN chill_doc.stored_object.createdAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ADD CONSTRAINT FK_49604E365DA0FB8 FOREIGN KEY (template_id) REFERENCES chill_docgen_template (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ADD CONSTRAINT FK_49604E363174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_49604E365DA0FB8 ON chill_doc.stored_object (template_id)');
+        $this->addSql('CREATE INDEX IDX_49604E363174800F ON chill_doc.stored_object (createdBy_id)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_doc.stored_object DROP CONSTRAINT FK_49604E365DA0FB8');
+        $this->addSql('ALTER TABLE chill_doc.stored_object DROP CONSTRAINT FK_49604E363174800F');
+        $this->addSql('ALTER TABLE chill_doc.stored_object DROP template_id');
+        $this->addSql('ALTER TABLE chill_doc.stored_object DROP status');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ADD creation_date TIMESTAMP(0) DEFAULT NOW()');
+        $this->addSql('UPDATE chill_doc.stored_object SET creation_date = createdAt');
+        $this->addSql('ALTER TABLE chill_doc.stored_object DROP createdAt');
+        $this->addSql('ALTER TABLE chill_doc.stored_object DROP createdBy_id');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ALTER title SET DEFAULT \'\'');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ALTER type DROP DEFAULT');
+    }
+}
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
index 21abc1f56..ab09f870f 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
@@ -41,12 +41,6 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
 
     use TrackCreationTrait;
 
-    /**
-     * @ORM\Column(type="datetime", name="creation_date")
-     * @Serializer\Groups({"read", "write"})
-     */
-    private DateTimeInterface $creationDate;
-
     /**
      * @ORM\Column(type="json", name="datas")
      * @Serializer\Groups({"read", "write"})
@@ -87,7 +81,7 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
     private string $title = '';
 
     /**
-     * @ORM\Column(type="text", name="type")
+     * @ORM\Column(type="text", name="type", options={"default": ""})
      * @Serializer\Groups({"read", "write"})
      */
     private string $type = '';
@@ -119,6 +113,7 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
 
     /**
      * @Serializer\Groups({"read", "write"})
+     * @deprecated
      */
     public function getCreationDate(): DateTime
     {
@@ -185,6 +180,7 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
 
     /**
      * @Serializer\Groups({"write"})
+     * @deprecated
      */
     public function setCreationDate(DateTime $creationDate): self
     {

From 91d21ba939e39af504888be3cced98d0b95a92bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 14 Feb 2023 23:26:00 +0100
Subject: [PATCH 06/14] Feature: [docgen][stored object] handler for request
 generator and required fixes

---
 .../Service/DocGenerator/ActivityContext.php  |  10 ++
 ...tActivitiesByAccompanyingPeriodContext.php |  10 ++
 .../Service/DocGenerator/CalendarContext.php  |  10 ++
 .../DocGenerator/CalendarContextInterface.php |   4 +
 ...eneratorContextWithPublicFormInterface.php |  13 ++
 .../DocGeneratorTemplateController.php        | 130 ++++++++----------
 .../Service/Generator/Generator.php           |  35 ++---
 .../Service/Generator/GeneratorInterface.php  |  28 ++++
 .../Messenger/RequestGenerationHandler.php    |  50 +++++++
 .../Messenger/RequestGenerationMessage.php    |  27 +++-
 .../config/services.yaml                      |  16 ++-
 .../Phonenumber/PhonenumberHelper.php         |  10 +-
 .../AccompanyingPeriodContext.php             |  10 ++
 .../AccompanyingPeriodWorkContext.php         |   2 +
 ...ccompanyingPeriodWorkEvaluationContext.php |  10 ++
 .../Service/DocGenerator/PersonContext.php    |  38 +++++
 .../DocGenerator/PersonContextInterface.php   |   4 +
 .../PersonContextWithThirdParty.php           |  10 ++
 18 files changed, 307 insertions(+), 110 deletions(-)
 create mode 100644 src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorInterface.php
 create mode 100644 src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php

diff --git a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
index 4e2970138..f7f30713b 100644
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
@@ -206,6 +206,16 @@ class ActivityContext implements
         return $options['mainPerson'] || $options['person1'] || $options['person2'];
     }
 
+    public function publicFormTransform(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        // TODO: Implement publicFormTransform() method.
+    }
+
+    public function publicFormReverseTransform(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        // TODO: Implement publicFormReverseTransform() method.
+    }
+
     /**
      * @param Activity $entity
      */
diff --git a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
index 3189307f9..3621ed80b 100644
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
@@ -146,6 +146,16 @@ class ListActivitiesByAccompanyingPeriodContext implements
         return $this->accompanyingPeriodContext->hasPublicForm($template, $entity);
     }
 
+    public function publicFormTransform(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        // TODO: Implement publicFormTransform() method.
+    }
+
+    public function publicFormReverseTransform(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        // TODO: Implement publicFormReverseTransform() method.
+    }
+
     public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
     {
         $this->accompanyingPeriodContext->storeGenerated($template, $storedObject, $entity, $contextGenerationData);
diff --git a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
index 9ba9e36b4..e7be965a5 100644
--- a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
+++ b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
@@ -226,6 +226,16 @@ final class CalendarContext implements CalendarContextInterface
         return true;
     }
 
+    public function publicFormTransform(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        // TODO: Implement publicFormTransform() method.
+    }
+
+    public function publicFormReverseTransform(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        // TODO: Implement publicFormReverseTransform() method.
+    }
+
     /**
      * @param array{mainPerson?: Person, thirdParty?: ThirdParty, title: string} $contextGenerationData
      */
diff --git a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php
index d02cdc2c2..692d6991e 100644
--- a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php
+++ b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php
@@ -56,6 +56,10 @@ interface CalendarContextInterface extends DocGeneratorContextWithPublicFormInte
      */
     public function hasPublicForm(DocGeneratorTemplate $template, $entity): bool;
 
+    public function publicFormTransform(DocGeneratorTemplate $template, $entity, array $data): array;
+
+    public function publicFormReverseTransform(DocGeneratorTemplate $template, $entity, array $data): array;
+
     /**
      * @param Calendar $entity
      */
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php
index f013c8435..1ad3dfa51 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php
@@ -23,6 +23,9 @@ interface DocGeneratorContextWithPublicFormInterface extends DocGeneratorContext
      */
     public function buildPublicForm(FormBuilderInterface $builder, DocGeneratorTemplate $template, $entity): void;
 
+    /**
+     * Fill the form with initial data
+     */
     public function getFormData(DocGeneratorTemplate $template, $entity): array;
 
     /**
@@ -31,4 +34,14 @@ interface DocGeneratorContextWithPublicFormInterface extends DocGeneratorContext
      * @param mixed $entity
      */
     public function hasPublicForm(DocGeneratorTemplate $template, $entity): bool;
+
+    /**
+     * Transform the data from the form into serializable data, storable into messenger's message
+     */
+    public function publicFormTransform(DocGeneratorTemplate $template, $entity, array $data): array;
+
+    /**
+     * Reverse the data from the messenger's message into data usable for doc's generation
+     */
+    public function publicFormReverseTransform(DocGeneratorTemplate $template, $entity, array $data): array;
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
index d618f758a..ecb27c455 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
@@ -16,30 +16,28 @@ use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithPublicFormInterface;
 use Chill\DocGeneratorBundle\Context\Exception\ContextNotFoundException;
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\DocGeneratorBundle\GeneratorDriver\DriverInterface;
-use Chill\DocGeneratorBundle\GeneratorDriver\Exception\TemplateException;
 use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
+use Chill\DocGeneratorBundle\Service\Generator\GeneratorInterface;
+use Chill\DocGeneratorBundle\Service\Messenger\RequestGenerationMessage;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Doctrine\ORM\EntityManagerInterface;
-use Exception;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\FileType;
-use Symfony\Component\HttpFoundation\File\File;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 // TODO à mettre dans services
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
-use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
-use Throwable;
 use function strlen;
 
 final class DocGeneratorTemplateController extends AbstractController
@@ -54,17 +52,24 @@ final class DocGeneratorTemplateController extends AbstractController
 
     private EntityManagerInterface $entityManager;
 
+    private GeneratorInterface $generator;
+
     private LoggerInterface $logger;
 
+    private MessageBusInterface $messageBus;
+
     private PaginatorFactory $paginatorFactory;
 
     private StoredObjectManagerInterface $storedObjectManager;
 
+
     public function __construct(
         ContextManager $contextManager,
         DocGeneratorTemplateRepository $docGeneratorTemplateRepository,
         DriverInterface $driver,
+        GeneratorInterface $generator,
         LoggerInterface $logger,
+        MessageBusInterface $messageBus,
         PaginatorFactory $paginatorFactory,
         HttpClientInterface $client,
         StoredObjectManagerInterface $storedObjectManager,
@@ -73,7 +78,9 @@ final class DocGeneratorTemplateController extends AbstractController
         $this->contextManager = $contextManager;
         $this->docGeneratorTemplateRepository = $docGeneratorTemplateRepository;
         $this->driver = $driver;
+        $this->generator = $generator;
         $this->logger = $logger;
+        $this->messageBus = $messageBus;
         $this->paginatorFactory = $paginatorFactory;
         $this->client = $client;
         $this->storedObjectManager = $storedObjectManager;
@@ -259,99 +266,72 @@ final class DocGeneratorTemplateController extends AbstractController
             }
         }
 
-        $document = $template->getFile();
-
-        if ($isTest && ($contextGenerationData['test_file'] instanceof File)) {
-            $dataDecrypted = file_get_contents($contextGenerationData['test_file']->getPathname());
-        } else {
-            try {
-                $dataDecrypted = $this->storedObjectManager->read($document);
-            } catch (Throwable $exception) {
-                throw $exception;
-            }
-        }
+        // transform context generation data
+        $contextGenerationDataSanitized = array_merge(
+            $contextGenerationData,
+            $context instanceof DocGeneratorContextWithPublicFormInterface ?
+                $context->publicFormTransform($template, $entity, $contextGenerationData)
+                : []
+        );
 
+        // if is test, render the data or generate the doc
         if ($isTest && isset($form) && $form['show_data']->getData()) {
             return $this->render('@ChillDocGenerator/Generator/debug_value.html.twig', [
                 'datas' => json_encode($context->getData($template, $entity, $contextGenerationData), JSON_PRETTY_PRINT)
             ]);
-        }
-
-        try {
-            $generatedResource = $this
-                ->driver
-                ->generateFromString(
-                    $dataDecrypted,
-                    $template->getFile()->getType(),
-                    $context->getData($template, $entity, $contextGenerationData),
-                    $template->getFile()->getFilename()
-                );
-        } catch (TemplateException $e) {
-            return new Response(
-                implode("\n", $e->getErrors()),
-                400,
-                [
-                    'Content-Type' => 'text/plain',
-                ]
+        } elseif ($isTest) {
+            $generated = $this->generator->generateDocFromTemplate(
+                $template,
+                $entityClassName,
+                $entityId,
+                $contextGenerationDataSanitized,
+                null,
+                true,
+                isset($form) ? $form['test_file']->getData() : null
             );
-        }
 
-        if ($isTest) {
             return new Response(
-                $generatedResource,
+                $generated,
                 Response::HTTP_OK,
                 [
                     'Content-Transfer-Encoding', 'binary',
                     'Content-Type' => 'application/vnd.oasis.opendocument.text',
                     'Content-Disposition' => 'attachment; filename="generated.odt"',
-                    'Content-Length' => strlen($generatedResource),
+                    'Content-Length' => strlen($generated),
                 ],
             );
         }
 
-        /** @var StoredObject $storedObject */
-        $storedObject = (new ObjectNormalizer())
-            ->denormalize(
-                [
-                    'type' => $template->getFile()->getType(),
-                    'filename' => sprintf('%s_odt', uniqid('doc_', true)),
-                ],
-                StoredObject::class
-            );
-
-        try {
-            $this->storedObjectManager->write($storedObject, $generatedResource);
-        } catch (Throwable $exception) {
-            throw $exception;
-        }
+        // this is not a test
+        // we prepare the object to store the document
+        $storedObject = (new StoredObject())
+            ->setStatus(StoredObject::STATUS_PENDING)
+            ;
 
         $this->entityManager->persist($storedObject);
 
-        try {
-            $context
-                ->storeGenerated(
-                    $template,
-                    $storedObject,
-                    $entity,
-                    $contextGenerationData
-                );
-        } catch (Exception $e) {
-            $this
-                ->logger
-                ->error(
-                    'Unable to store the associated document to entity',
-                    [
-                        'entityClassName' => $entityClassName,
-                        'entityId' => $entityId,
-                        'contextKey' => $context->getName(),
-                    ]
-                );
-
-            throw $e;
-        }
+        // we store the generated document
+        $context
+            ->storeGenerated(
+                $template,
+                $storedObject,
+                $entity,
+                $contextGenerationData
+            );
 
         $this->entityManager->flush();
 
+        $this->messageBus->dispatch(
+            new RequestGenerationMessage(
+                $this->getUser(),
+                $template,
+                $entityId,
+                $entityClassName,
+                $storedObject,
+                $contextGenerationDataSanitized,
+            )
+        );
+
         return $this
             ->redirectToRoute(
                 'chill_wopi_file_edit',
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php
index 755e608ba..376cfc268 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php
@@ -3,6 +3,7 @@
 namespace Chill\DocGeneratorBundle\Service\Generator;
 
 use Chill\DocGeneratorBundle\Context\ContextManagerInterface;
+use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithPublicFormInterface;
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\DocGeneratorBundle\GeneratorDriver\DriverInterface;
 use Chill\DocGeneratorBundle\GeneratorDriver\Exception\TemplateException;
@@ -12,7 +13,7 @@ use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpFoundation\File\File;
 
-class Generator
+class Generator implements GeneratorInterface
 {
     private ContextManagerInterface $contextManager;
 
@@ -50,6 +51,7 @@ class Generator
         DocGeneratorTemplate $template,
         string               $entityClassName,
         int                  $entityId,
+        array $contextGenerationData,
         ?StoredObject        $destinationStoredObject = null,
         bool                 $isTest = false,
         ?File                $testFile = null
@@ -59,7 +61,6 @@ class Generator
         }
 
         $context = $this->contextManager->getContextByDocGeneratorTemplate($template);
-        $contextGenerationData = ['test_file' => $testFile];
 
         $entity = $this
             ->entityManager
@@ -70,6 +71,13 @@ class Generator
             throw new RelatedEntityNotFoundException($entityClassName, $entityId);
         }
 
+        $contextGenerationData = array_merge(
+            $contextGenerationData,
+                $context instanceof DocGeneratorContextWithPublicFormInterface ?
+                    $context->publicFormReverseTransform($template, $entity, $contextGenerationData)
+                    : []
+        );
+
         if ($isTest && ($testFile instanceof File)) {
             $dataDecrypted = file_get_contents($testFile->getPathname());
         } else {
@@ -102,29 +110,6 @@ class Generator
 
         $this->storedObjectManager->write($destinationStoredObject, $generatedResource);
 
-        try {
-            $context
-                ->storeGenerated(
-                    $template,
-                    $destinationStoredObject,
-                    $entity,
-                    $contextGenerationData
-                );
-        } catch (\Exception $e) {
-            $this
-                ->logger
-                ->error(
-                    'Unable to store the associated document to entity',
-                    [
-                        'entityClassName' => $entityClassName,
-                        'entityId' => $entityId,
-                        'contextKey' => $context->getName(),
-                    ]
-                );
-
-            throw $e;
-        }
-
         $this->entityManager->flush();
 
         return null;
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorInterface.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorInterface.php
new file mode 100644
index 000000000..c18dc3bc2
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorInterface.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Chill\DocGeneratorBundle\Service\Generator;
+
+use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Symfony\Component\HttpFoundation\File\File;
+
+interface GeneratorInterface
+{
+    /**
+     * @template T of File|null
+     * @template B of bool
+     * @param B $isTest
+     * @param (B is true ? T : null) $testFile
+     * @psalm-return (B is true ? string : null)
+     * @throws \Symfony\Component\Serializer\Exception\ExceptionInterface|\Throwable
+     */
+    public function generateDocFromTemplate(
+        DocGeneratorTemplate $template,
+        string $entityClassName,
+        int $entityId,
+        array $contextGenerationData,
+        ?StoredObject $destinationStoredObject = null,
+        bool $isTest = false,
+        ?File $testFile = null
+    ): ?string;
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php
new file mode 100644
index 000000000..f0346778b
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Chill\DocGeneratorBundle\Service\Messenger;
+
+use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
+use Chill\DocGeneratorBundle\Service\Generator\Generator;
+use Chill\DocStoreBundle\Repository\StoredObjectRepository;
+use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+
+/**
+ * Handle the request of document generation
+ */
+class RequestGenerationHandler implements MessageHandlerInterface
+{
+    private StoredObjectRepository $storedObjectRepository;
+
+    private DocGeneratorTemplateRepository $docGeneratorTemplateRepository;
+
+    private Generator $generator;
+
+    public function __construct(
+        StoredObjectRepository $storedObjectRepository,
+        DocGeneratorTemplateRepository $docGeneratorTemplateRepository,
+        Generator $generator
+    ) {
+        $this->storedObjectRepository = $storedObjectRepository;
+        $this->docGeneratorTemplateRepository = $docGeneratorTemplateRepository;
+        $this->generator = $generator;
+    }
+
+    public function __invoke(RequestGenerationMessage $message)
+    {
+        if (null === $template = $this->docGeneratorTemplateRepository->find($message->getTemplateId())) {
+            throw new \RuntimeException('template not found: ' . $message->getTemplateId());
+        }
+
+        if (null === $destinationStoredObject = $this->storedObjectRepository->find($message->getDestinationStoredObjectId())) {
+            throw new \RuntimeException('destination stored object not found : ' . $message->getDestinationStoredObjectId());
+        }
+
+        $this->generator->generateDocFromTemplate(
+            $template,
+            $message->getEntityClassName(),
+            $message->getEntityId(),
+            $message->getContextGenerationData(),
+            $destinationStoredObject
+        );
+    }
+
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php
index 1489e2686..535e569d7 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php
@@ -3,6 +3,7 @@
 namespace Chill\DocGeneratorBundle\Service\Messenger;
 
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\MainBundle\Entity\User;
 
 class RequestGenerationMessage
@@ -15,12 +16,24 @@ class RequestGenerationMessage
 
    private string $entityClassName;
 
-    public function __construct(User $creator, DocGeneratorTemplate $template, int $entityId, string $entityClassName)
-    {
+   private int $destinationStoredObjectId;
+
+   private array $contextGenerationData;
+
+    public function __construct(
+        User $creator,
+        DocGeneratorTemplate $template,
+        int $entityId,
+        string $entityClassName,
+        StoredObject $destinationStoredObject,
+        array $contextGenerationData
+    ) {
         $this->creatorId = $creator->getId();
         $this->templateId = $template->getId();
         $this->entityId = $entityId;
         $this->entityClassName = $entityClassName;
+        $this->destinationStoredObjectId = $destinationStoredObject->getId();
+        $this->contextGenerationData = $contextGenerationData;
     }
 
     public function getCreatorId(): int
@@ -28,6 +41,11 @@ class RequestGenerationMessage
         return $this->creatorId;
     }
 
+    public function getDestinationStoredObjectId(): int
+    {
+        return $this->destinationStoredObjectId;
+    }
+
     public function getTemplateId(): int
     {
         return $this->templateId;
@@ -42,4 +60,9 @@ class RequestGenerationMessage
     {
         return $this->entityClassName;
     }
+
+    public function getContextGenerationData(): array
+    {
+        return $this->contextGenerationData;
+    }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/config/services.yaml b/src/Bundle/ChillDocGeneratorBundle/config/services.yaml
index 5bdfe2a11..5fef6fb22 100644
--- a/src/Bundle/ChillDocGeneratorBundle/config/services.yaml
+++ b/src/Bundle/ChillDocGeneratorBundle/config/services.yaml
@@ -20,10 +20,14 @@ services:
         resource: '../Serializer/Normalizer/'
         tags:
             - { name: 'serializer.normalizer', priority: -152 }
+
     Chill\DocGeneratorBundle\Serializer\Normalizer\CollectionDocGenNormalizer:
         tags:
             - { name: 'serializer.normalizer', priority: -126 }
 
+    Chill\DocGeneratorBundle\Service\Context\:
+        resource: "../Service/Context"
+
     Chill\DocGeneratorBundle\Controller\:
         resource: "../Controller"
         autowire: true
@@ -34,18 +38,20 @@ services:
         autowire: true
         autoconfigure: true
 
-    Chill\DocGeneratorBundle\Service\Context\:
-        resource: "../Service/Context/"
-        autowire: true
-        autoconfigure: true
-
     Chill\DocGeneratorBundle\GeneratorDriver\:
         resource: "../GeneratorDriver/"
         autowire: true
         autoconfigure: true
 
+    Chill\DocGeneratorBundle\Service\Messenger\:
+        resource: "../Service/Messenger/"
+
+    Chill\DocGeneratorBundle\Service\Generator\Generator: ~
+    Chill\DocGeneratorBundle\Service\Generator\GeneratorInterface: '@Chill\DocGeneratorBundle\Service\Generator\Generator'
+
     Chill\DocGeneratorBundle\Driver\RelatorioDriver: '@Chill\DocGeneratorBundle\Driver\DriverInterface'
 
     Chill\DocGeneratorBundle\Context\ContextManager:
         arguments:
             $contexts: !tagged_iterator { tag: chill_docgen.context, default_index_method: getKey }
+    Chill\DocGeneratorBundle\Context\ContextManagerInterface: '@Chill\DocGeneratorBundle\Context\ContextManager'
diff --git a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
index 5b52f6819..94a09cafb 100644
--- a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
+++ b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
@@ -118,7 +118,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
      * Return true if the phonenumber is a landline or voip phone.  Return always true
      * if the validation is not configured.
      *
-     * @param string $phonenumber
+     * @param string|PhoneNumber $phonenumber
      */
     public function isValidPhonenumberAny($phonenumber): bool
     {
@@ -138,7 +138,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
      * Return true if the phonenumber is a landline or voip phone.  Return always true
      * if the validation is not configured.
      *
-     * @param string $phonenumber
+     * @param string|PhoneNumber $phonenumber
      */
     public function isValidPhonenumberLandOrVoip($phonenumber): bool
     {
@@ -159,7 +159,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
      * REturn true if the phonenumber is a mobile phone. Return always true
      * if the validation is not configured.
      *
-     * @param string $phonenumber
+     * @param string|PhoneNumber $phonenumber
      */
     public function isValidPhonenumberMobile($phonenumber): bool
     {
@@ -182,6 +182,10 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
             return null;
         }
 
+        if ($phonenumber instanceof PhoneNumber) {
+            $phonenumber = (string) $phonenumber;
+        }
+
         // filter only number
         $filtered = preg_replace('/[^0-9]/', '', $phonenumber);
 
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
index 23bfac56f..dac850446 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
@@ -256,6 +256,16 @@ class AccompanyingPeriodContext implements
         return $options['mainPerson'] || $options['person1'] || $options['person2'];
     }
 
+    public function publicFormTransform(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        // TODO: Implement publicFormTransform() method.
+    }
+
+    public function publicFormReverseTransform(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        // TODO: Implement publicFormReverseTransform() method.
+    }
+
     /**
      * @param AccompanyingPeriod $entity
      */
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php
index 7e9280e5d..d73d1aa7b 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php
@@ -109,6 +109,8 @@ class AccompanyingPeriodWorkContext
         return $this->periodContext->hasPublicForm($template, $entity);
     }
 
+
+
     public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
     {
         // TODO: Implement storeGenerated() method.
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
index 4dd14faab..3b9d958cb 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
@@ -174,6 +174,16 @@ class AccompanyingPeriodWorkEvaluationContext implements
             ->hasPublicForm($template, $entity->getAccompanyingPeriodWork());
     }
 
+    public function publicFormTransform(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        // TODO: Implement publicFormTransform() method.
+    }
+
+    public function publicFormReverseTransform(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        // TODO: Implement publicFormReverseTransform() method.
+    }
+
     public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
     {
         $doc = new AccompanyingPeriodWorkEvaluationDocument();
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
index af6c6e114..5f98f7798 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
@@ -21,11 +21,13 @@ use Chill\DocStoreBundle\Repository\DocumentCategoryRepository;
 use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Form\Type\ScopePickerType;
+use Chill\MainBundle\Repository\ScopeRepositoryInterface;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\PersonRepository;
 use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
@@ -55,6 +57,8 @@ final class PersonContext implements PersonContextInterface
 
     private NormalizerInterface $normalizer;
 
+    private ScopeRepositoryInterface $scopeRepository;
+
     private Security $security;
 
     private bool $showScopes;
@@ -71,6 +75,7 @@ final class PersonContext implements PersonContextInterface
         EntityManagerInterface $em,
         NormalizerInterface $normalizer,
         ParameterBagInterface $parameterBag,
+        ScopeRepositoryInterface $scopeRepository,
         Security $security,
         TranslatorInterface $translator,
         TranslatableStringHelperInterface $translatableStringHelper
@@ -81,6 +86,7 @@ final class PersonContext implements PersonContextInterface
         $this->documentCategoryRepository = $documentCategoryRepository;
         $this->em = $em;
         $this->normalizer = $normalizer;
+        $this->scopeRepository = $scopeRepository;
         $this->security = $security;
         $this->showScopes = $parameterBag->get('chill_main')['acl']['form_show_scopes'];
         $this->translator = $translator;
@@ -211,6 +217,38 @@ final class PersonContext implements PersonContextInterface
         return true;
     }
 
+    /**
+     * @param Person $entity
+     */
+    public function publicFormTransform(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        $scope = $data['scope'] ?? null;
+
+        return [
+            'title' => $data['title'] ?? '',
+            'scope_id' => $scope instanceof Scope ? $scope->getId() : null,
+        ];
+    }
+
+    /**
+     * @param Person $entity
+     */
+    public function publicFormReverseTransform(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        if (!isset($data['scope'])) {
+            $scope = null;
+        } else {
+            if (null === $scope = $this->scopeRepository->find($data['scope'])) {
+                throw new \UnexpectedValueException('scope not found');
+            }
+        }
+
+        return [
+            'title' => $data['title'] ?? '',
+            'scope' => $scope,
+        ];
+    }
+
     /**
      * @param Person $entity
      */
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextInterface.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextInterface.php
index 58a6b5863..782ed13db 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextInterface.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextInterface.php
@@ -48,6 +48,10 @@ interface PersonContextInterface extends DocGeneratorContextWithAdminFormInterfa
      */
     public function hasPublicForm(DocGeneratorTemplate $template, $entity): bool;
 
+    public function publicFormTransform(DocGeneratorTemplate $template, $entity, array $data): array;
+
+    public function publicFormReverseTransform(DocGeneratorTemplate $template, $entity, array $data): array;
+
     /**
      * @param Person $entity
      */
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextWithThirdParty.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextWithThirdParty.php
index 23d57c431..b4fa6fb26 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextWithThirdParty.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextWithThirdParty.php
@@ -123,6 +123,16 @@ class PersonContextWithThirdParty implements DocGeneratorContextWithAdminFormInt
         return true;
     }
 
+    public function publicFormTransform(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        // TODO: Implement publicFormTransform() method.
+    }
+
+    public function publicFormReverseTransform(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        // TODO: Implement publicFormReverseTransform() method.
+    }
+
     public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
     {
         $this->personContext->storeGenerated($template, $storedObject, $entity, $contextGenerationData);

From 55a845fcd63f2fe45f0bf84da79ee75d7207db64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 14 Feb 2023 23:34:21 +0100
Subject: [PATCH 07/14] Sanitize DocGeneratorTemplateController constructor

---
 .../DocGeneratorTemplateController.php          | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
index ecb27c455..934933286 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
@@ -42,48 +42,31 @@ use function strlen;
 
 final class DocGeneratorTemplateController extends AbstractController
 {
-    private HttpClientInterface $client;
-
     private ContextManager $contextManager;
 
     private DocGeneratorTemplateRepository $docGeneratorTemplateRepository;
 
-    private DriverInterface $driver;
-
     private EntityManagerInterface $entityManager;
 
     private GeneratorInterface $generator;
 
-    private LoggerInterface $logger;
-
     private MessageBusInterface $messageBus;
 
     private PaginatorFactory $paginatorFactory;
 
-    private StoredObjectManagerInterface $storedObjectManager;
-
-
     public function __construct(
         ContextManager $contextManager,
         DocGeneratorTemplateRepository $docGeneratorTemplateRepository,
-        DriverInterface $driver,
         GeneratorInterface $generator,
-        LoggerInterface $logger,
         MessageBusInterface $messageBus,
         PaginatorFactory $paginatorFactory,
-        HttpClientInterface $client,
-        StoredObjectManagerInterface $storedObjectManager,
         EntityManagerInterface $entityManager
     ) {
         $this->contextManager = $contextManager;
         $this->docGeneratorTemplateRepository = $docGeneratorTemplateRepository;
-        $this->driver = $driver;
         $this->generator = $generator;
-        $this->logger = $logger;
         $this->messageBus = $messageBus;
         $this->paginatorFactory = $paginatorFactory;
-        $this->client = $client;
-        $this->storedObjectManager = $storedObjectManager;
         $this->entityManager = $entityManager;
     }
 

From 7c4bc8f46a9f29a0124bab32b4cf3aaa6305eebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 16 Feb 2023 14:07:47 +0100
Subject: [PATCH 08/14] Revert commits linked to decoupling of docgen (changes
 not reviewed)

This reverts commit 55a845fcd63f2fe45f0bf84da79ee75d7207db64.
---
 .../DocGeneratorTemplateController.php          | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
index 934933286..ecb27c455 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
@@ -42,31 +42,48 @@ use function strlen;
 
 final class DocGeneratorTemplateController extends AbstractController
 {
+    private HttpClientInterface $client;
+
     private ContextManager $contextManager;
 
     private DocGeneratorTemplateRepository $docGeneratorTemplateRepository;
 
+    private DriverInterface $driver;
+
     private EntityManagerInterface $entityManager;
 
     private GeneratorInterface $generator;
 
+    private LoggerInterface $logger;
+
     private MessageBusInterface $messageBus;
 
     private PaginatorFactory $paginatorFactory;
 
+    private StoredObjectManagerInterface $storedObjectManager;
+
+
     public function __construct(
         ContextManager $contextManager,
         DocGeneratorTemplateRepository $docGeneratorTemplateRepository,
+        DriverInterface $driver,
         GeneratorInterface $generator,
+        LoggerInterface $logger,
         MessageBusInterface $messageBus,
         PaginatorFactory $paginatorFactory,
+        HttpClientInterface $client,
+        StoredObjectManagerInterface $storedObjectManager,
         EntityManagerInterface $entityManager
     ) {
         $this->contextManager = $contextManager;
         $this->docGeneratorTemplateRepository = $docGeneratorTemplateRepository;
+        $this->driver = $driver;
         $this->generator = $generator;
+        $this->logger = $logger;
         $this->messageBus = $messageBus;
         $this->paginatorFactory = $paginatorFactory;
+        $this->client = $client;
+        $this->storedObjectManager = $storedObjectManager;
         $this->entityManager = $entityManager;
     }
 

From 9676975cd8e5b5c4a948c3c24f4fbd52dc9c5235 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 16 Feb 2023 14:08:11 +0100
Subject: [PATCH 09/14] Revert "Feature: [docgen][stored object] handler for
 request generator and required fixes"

This reverts commit 91d21ba939e39af504888be3cced98d0b95a92bb.
---
 .../Service/DocGenerator/ActivityContext.php  |  10 --
 ...tActivitiesByAccompanyingPeriodContext.php |  10 --
 .../Service/DocGenerator/CalendarContext.php  |  10 --
 .../DocGenerator/CalendarContextInterface.php |   4 -
 ...eneratorContextWithPublicFormInterface.php |  13 --
 .../DocGeneratorTemplateController.php        | 132 ++++++++++--------
 .../Service/Generator/Generator.php           |  35 +++--
 .../Service/Generator/GeneratorInterface.php  |  28 ----
 .../Messenger/RequestGenerationHandler.php    |  50 -------
 .../Messenger/RequestGenerationMessage.php    |  27 +---
 .../config/services.yaml                      |  16 +--
 .../Phonenumber/PhonenumberHelper.php         |  10 +-
 .../AccompanyingPeriodContext.php             |  10 --
 .../AccompanyingPeriodWorkContext.php         |   2 -
 ...ccompanyingPeriodWorkEvaluationContext.php |  10 --
 .../Service/DocGenerator/PersonContext.php    |  38 -----
 .../DocGenerator/PersonContextInterface.php   |   4 -
 .../PersonContextWithThirdParty.php           |  10 --
 18 files changed, 111 insertions(+), 308 deletions(-)
 delete mode 100644 src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorInterface.php
 delete mode 100644 src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php

diff --git a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
index f7f30713b..4e2970138 100644
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
@@ -206,16 +206,6 @@ class ActivityContext implements
         return $options['mainPerson'] || $options['person1'] || $options['person2'];
     }
 
-    public function publicFormTransform(DocGeneratorTemplate $template, $entity, array $data): array
-    {
-        // TODO: Implement publicFormTransform() method.
-    }
-
-    public function publicFormReverseTransform(DocGeneratorTemplate $template, $entity, array $data): array
-    {
-        // TODO: Implement publicFormReverseTransform() method.
-    }
-
     /**
      * @param Activity $entity
      */
diff --git a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
index 3621ed80b..3189307f9 100644
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
@@ -146,16 +146,6 @@ class ListActivitiesByAccompanyingPeriodContext implements
         return $this->accompanyingPeriodContext->hasPublicForm($template, $entity);
     }
 
-    public function publicFormTransform(DocGeneratorTemplate $template, $entity, array $data): array
-    {
-        // TODO: Implement publicFormTransform() method.
-    }
-
-    public function publicFormReverseTransform(DocGeneratorTemplate $template, $entity, array $data): array
-    {
-        // TODO: Implement publicFormReverseTransform() method.
-    }
-
     public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
     {
         $this->accompanyingPeriodContext->storeGenerated($template, $storedObject, $entity, $contextGenerationData);
diff --git a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
index e7be965a5..9ba9e36b4 100644
--- a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
+++ b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
@@ -226,16 +226,6 @@ final class CalendarContext implements CalendarContextInterface
         return true;
     }
 
-    public function publicFormTransform(DocGeneratorTemplate $template, $entity, array $data): array
-    {
-        // TODO: Implement publicFormTransform() method.
-    }
-
-    public function publicFormReverseTransform(DocGeneratorTemplate $template, $entity, array $data): array
-    {
-        // TODO: Implement publicFormReverseTransform() method.
-    }
-
     /**
      * @param array{mainPerson?: Person, thirdParty?: ThirdParty, title: string} $contextGenerationData
      */
diff --git a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php
index 692d6991e..d02cdc2c2 100644
--- a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php
+++ b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php
@@ -56,10 +56,6 @@ interface CalendarContextInterface extends DocGeneratorContextWithPublicFormInte
      */
     public function hasPublicForm(DocGeneratorTemplate $template, $entity): bool;
 
-    public function publicFormTransform(DocGeneratorTemplate $template, $entity, array $data): array;
-
-    public function publicFormReverseTransform(DocGeneratorTemplate $template, $entity, array $data): array;
-
     /**
      * @param Calendar $entity
      */
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php
index 1ad3dfa51..f013c8435 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php
@@ -23,9 +23,6 @@ interface DocGeneratorContextWithPublicFormInterface extends DocGeneratorContext
      */
     public function buildPublicForm(FormBuilderInterface $builder, DocGeneratorTemplate $template, $entity): void;
 
-    /**
-     * Fill the form with initial data
-     */
     public function getFormData(DocGeneratorTemplate $template, $entity): array;
 
     /**
@@ -34,14 +31,4 @@ interface DocGeneratorContextWithPublicFormInterface extends DocGeneratorContext
      * @param mixed $entity
      */
     public function hasPublicForm(DocGeneratorTemplate $template, $entity): bool;
-
-    /**
-     * Transform the data from the form into serializable data, storable into messenger's message
-     */
-    public function publicFormTransform(DocGeneratorTemplate $template, $entity, array $data): array;
-
-    /**
-     * Reverse the data from the messenger's message into data usable for doc's generation
-     */
-    public function publicFormReverseTransform(DocGeneratorTemplate $template, $entity, array $data): array;
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
index ecb27c455..d618f758a 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
@@ -16,28 +16,30 @@ use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithPublicFormInterface;
 use Chill\DocGeneratorBundle\Context\Exception\ContextNotFoundException;
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\DocGeneratorBundle\GeneratorDriver\DriverInterface;
+use Chill\DocGeneratorBundle\GeneratorDriver\Exception\TemplateException;
 use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
-use Chill\DocGeneratorBundle\Service\Generator\GeneratorInterface;
-use Chill\DocGeneratorBundle\Service\Messenger\RequestGenerationMessage;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Doctrine\ORM\EntityManagerInterface;
+use Exception;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\FileType;
+use Symfony\Component\HttpFoundation\File\File;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 // TODO à mettre dans services
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
+use Throwable;
 use function strlen;
 
 final class DocGeneratorTemplateController extends AbstractController
@@ -52,24 +54,17 @@ final class DocGeneratorTemplateController extends AbstractController
 
     private EntityManagerInterface $entityManager;
 
-    private GeneratorInterface $generator;
-
     private LoggerInterface $logger;
 
-    private MessageBusInterface $messageBus;
-
     private PaginatorFactory $paginatorFactory;
 
     private StoredObjectManagerInterface $storedObjectManager;
 
-
     public function __construct(
         ContextManager $contextManager,
         DocGeneratorTemplateRepository $docGeneratorTemplateRepository,
         DriverInterface $driver,
-        GeneratorInterface $generator,
         LoggerInterface $logger,
-        MessageBusInterface $messageBus,
         PaginatorFactory $paginatorFactory,
         HttpClientInterface $client,
         StoredObjectManagerInterface $storedObjectManager,
@@ -78,9 +73,7 @@ final class DocGeneratorTemplateController extends AbstractController
         $this->contextManager = $contextManager;
         $this->docGeneratorTemplateRepository = $docGeneratorTemplateRepository;
         $this->driver = $driver;
-        $this->generator = $generator;
         $this->logger = $logger;
-        $this->messageBus = $messageBus;
         $this->paginatorFactory = $paginatorFactory;
         $this->client = $client;
         $this->storedObjectManager = $storedObjectManager;
@@ -266,72 +259,99 @@ final class DocGeneratorTemplateController extends AbstractController
             }
         }
 
-        // transform context generation data
-        $contextGenerationDataSanitized = array_merge(
-            $contextGenerationData,
-            $context instanceof DocGeneratorContextWithPublicFormInterface ?
-                $context->publicFormTransform($template, $entity, $contextGenerationData)
-                : []
-        );
+        $document = $template->getFile();
+
+        if ($isTest && ($contextGenerationData['test_file'] instanceof File)) {
+            $dataDecrypted = file_get_contents($contextGenerationData['test_file']->getPathname());
+        } else {
+            try {
+                $dataDecrypted = $this->storedObjectManager->read($document);
+            } catch (Throwable $exception) {
+                throw $exception;
+            }
+        }
 
-        // if is test, render the data or generate the doc
         if ($isTest && isset($form) && $form['show_data']->getData()) {
             return $this->render('@ChillDocGenerator/Generator/debug_value.html.twig', [
                 'datas' => json_encode($context->getData($template, $entity, $contextGenerationData), JSON_PRETTY_PRINT)
             ]);
-        } elseif ($isTest) {
-            $generated = $this->generator->generateDocFromTemplate(
-                $template,
-                $entityClassName,
-                $entityId,
-                $contextGenerationDataSanitized,
-                null,
-                true,
-                isset($form) ? $form['test_file']->getData() : null
-            );
+        }
 
+        try {
+            $generatedResource = $this
+                ->driver
+                ->generateFromString(
+                    $dataDecrypted,
+                    $template->getFile()->getType(),
+                    $context->getData($template, $entity, $contextGenerationData),
+                    $template->getFile()->getFilename()
+                );
+        } catch (TemplateException $e) {
             return new Response(
-                $generated,
+                implode("\n", $e->getErrors()),
+                400,
+                [
+                    'Content-Type' => 'text/plain',
+                ]
+            );
+        }
+
+        if ($isTest) {
+            return new Response(
+                $generatedResource,
                 Response::HTTP_OK,
                 [
                     'Content-Transfer-Encoding', 'binary',
                     'Content-Type' => 'application/vnd.oasis.opendocument.text',
                     'Content-Disposition' => 'attachment; filename="generated.odt"',
-                    'Content-Length' => strlen($generated),
+                    'Content-Length' => strlen($generatedResource),
                 ],
             );
         }
 
-        // this is not a test
-        // we prepare the object to store the document
-        $storedObject = (new StoredObject())
-            ->setStatus(StoredObject::STATUS_PENDING)
-            ;
+        /** @var StoredObject $storedObject */
+        $storedObject = (new ObjectNormalizer())
+            ->denormalize(
+                [
+                    'type' => $template->getFile()->getType(),
+                    'filename' => sprintf('%s_odt', uniqid('doc_', true)),
+                ],
+                StoredObject::class
+            );
+
+        try {
+            $this->storedObjectManager->write($storedObject, $generatedResource);
+        } catch (Throwable $exception) {
+            throw $exception;
+        }
 
         $this->entityManager->persist($storedObject);
 
-        // we store the generated document
-        $context
-            ->storeGenerated(
-                $template,
-                $storedObject,
-                $entity,
-                $contextGenerationData
-            );
+        try {
+            $context
+                ->storeGenerated(
+                    $template,
+                    $storedObject,
+                    $entity,
+                    $contextGenerationData
+                );
+        } catch (Exception $e) {
+            $this
+                ->logger
+                ->error(
+                    'Unable to store the associated document to entity',
+                    [
+                        'entityClassName' => $entityClassName,
+                        'entityId' => $entityId,
+                        'contextKey' => $context->getName(),
+                    ]
+                );
+
+            throw $e;
+        }
 
         $this->entityManager->flush();
 
-        $this->messageBus->dispatch(
-            new RequestGenerationMessage(
-                $this->getUser(),
-                $template,
-                $entityId,
-                $entityClassName,
-                $storedObject,
-                $contextGenerationDataSanitized,
-            )
-        );
-
         return $this
             ->redirectToRoute(
                 'chill_wopi_file_edit',
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php
index 376cfc268..755e608ba 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php
@@ -3,7 +3,6 @@
 namespace Chill\DocGeneratorBundle\Service\Generator;
 
 use Chill\DocGeneratorBundle\Context\ContextManagerInterface;
-use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithPublicFormInterface;
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\DocGeneratorBundle\GeneratorDriver\DriverInterface;
 use Chill\DocGeneratorBundle\GeneratorDriver\Exception\TemplateException;
@@ -13,7 +12,7 @@ use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpFoundation\File\File;
 
-class Generator implements GeneratorInterface
+class Generator
 {
     private ContextManagerInterface $contextManager;
 
@@ -51,7 +50,6 @@ class Generator implements GeneratorInterface
         DocGeneratorTemplate $template,
         string               $entityClassName,
         int                  $entityId,
-        array $contextGenerationData,
         ?StoredObject        $destinationStoredObject = null,
         bool                 $isTest = false,
         ?File                $testFile = null
@@ -61,6 +59,7 @@ class Generator implements GeneratorInterface
         }
 
         $context = $this->contextManager->getContextByDocGeneratorTemplate($template);
+        $contextGenerationData = ['test_file' => $testFile];
 
         $entity = $this
             ->entityManager
@@ -71,13 +70,6 @@ class Generator implements GeneratorInterface
             throw new RelatedEntityNotFoundException($entityClassName, $entityId);
         }
 
-        $contextGenerationData = array_merge(
-            $contextGenerationData,
-                $context instanceof DocGeneratorContextWithPublicFormInterface ?
-                    $context->publicFormReverseTransform($template, $entity, $contextGenerationData)
-                    : []
-        );
-
         if ($isTest && ($testFile instanceof File)) {
             $dataDecrypted = file_get_contents($testFile->getPathname());
         } else {
@@ -110,6 +102,29 @@ class Generator implements GeneratorInterface
 
         $this->storedObjectManager->write($destinationStoredObject, $generatedResource);
 
+        try {
+            $context
+                ->storeGenerated(
+                    $template,
+                    $destinationStoredObject,
+                    $entity,
+                    $contextGenerationData
+                );
+        } catch (\Exception $e) {
+            $this
+                ->logger
+                ->error(
+                    'Unable to store the associated document to entity',
+                    [
+                        'entityClassName' => $entityClassName,
+                        'entityId' => $entityId,
+                        'contextKey' => $context->getName(),
+                    ]
+                );
+
+            throw $e;
+        }
+
         $this->entityManager->flush();
 
         return null;
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorInterface.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorInterface.php
deleted file mode 100644
index c18dc3bc2..000000000
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorInterface.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace Chill\DocGeneratorBundle\Service\Generator;
-
-use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
-use Chill\DocStoreBundle\Entity\StoredObject;
-use Symfony\Component\HttpFoundation\File\File;
-
-interface GeneratorInterface
-{
-    /**
-     * @template T of File|null
-     * @template B of bool
-     * @param B $isTest
-     * @param (B is true ? T : null) $testFile
-     * @psalm-return (B is true ? string : null)
-     * @throws \Symfony\Component\Serializer\Exception\ExceptionInterface|\Throwable
-     */
-    public function generateDocFromTemplate(
-        DocGeneratorTemplate $template,
-        string $entityClassName,
-        int $entityId,
-        array $contextGenerationData,
-        ?StoredObject $destinationStoredObject = null,
-        bool $isTest = false,
-        ?File $testFile = null
-    ): ?string;
-}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php
deleted file mode 100644
index f0346778b..000000000
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-namespace Chill\DocGeneratorBundle\Service\Messenger;
-
-use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
-use Chill\DocGeneratorBundle\Service\Generator\Generator;
-use Chill\DocStoreBundle\Repository\StoredObjectRepository;
-use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
-
-/**
- * Handle the request of document generation
- */
-class RequestGenerationHandler implements MessageHandlerInterface
-{
-    private StoredObjectRepository $storedObjectRepository;
-
-    private DocGeneratorTemplateRepository $docGeneratorTemplateRepository;
-
-    private Generator $generator;
-
-    public function __construct(
-        StoredObjectRepository $storedObjectRepository,
-        DocGeneratorTemplateRepository $docGeneratorTemplateRepository,
-        Generator $generator
-    ) {
-        $this->storedObjectRepository = $storedObjectRepository;
-        $this->docGeneratorTemplateRepository = $docGeneratorTemplateRepository;
-        $this->generator = $generator;
-    }
-
-    public function __invoke(RequestGenerationMessage $message)
-    {
-        if (null === $template = $this->docGeneratorTemplateRepository->find($message->getTemplateId())) {
-            throw new \RuntimeException('template not found: ' . $message->getTemplateId());
-        }
-
-        if (null === $destinationStoredObject = $this->storedObjectRepository->find($message->getDestinationStoredObjectId())) {
-            throw new \RuntimeException('destination stored object not found : ' . $message->getDestinationStoredObjectId());
-        }
-
-        $this->generator->generateDocFromTemplate(
-            $template,
-            $message->getEntityClassName(),
-            $message->getEntityId(),
-            $message->getContextGenerationData(),
-            $destinationStoredObject
-        );
-    }
-
-}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php
index 535e569d7..1489e2686 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php
@@ -3,7 +3,6 @@
 namespace Chill\DocGeneratorBundle\Service\Messenger;
 
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
-use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\MainBundle\Entity\User;
 
 class RequestGenerationMessage
@@ -16,24 +15,12 @@ class RequestGenerationMessage
 
    private string $entityClassName;
 
-   private int $destinationStoredObjectId;
-
-   private array $contextGenerationData;
-
-    public function __construct(
-        User $creator,
-        DocGeneratorTemplate $template,
-        int $entityId,
-        string $entityClassName,
-        StoredObject $destinationStoredObject,
-        array $contextGenerationData
-    ) {
+    public function __construct(User $creator, DocGeneratorTemplate $template, int $entityId, string $entityClassName)
+    {
         $this->creatorId = $creator->getId();
         $this->templateId = $template->getId();
         $this->entityId = $entityId;
         $this->entityClassName = $entityClassName;
-        $this->destinationStoredObjectId = $destinationStoredObject->getId();
-        $this->contextGenerationData = $contextGenerationData;
     }
 
     public function getCreatorId(): int
@@ -41,11 +28,6 @@ class RequestGenerationMessage
         return $this->creatorId;
     }
 
-    public function getDestinationStoredObjectId(): int
-    {
-        return $this->destinationStoredObjectId;
-    }
-
     public function getTemplateId(): int
     {
         return $this->templateId;
@@ -60,9 +42,4 @@ class RequestGenerationMessage
     {
         return $this->entityClassName;
     }
-
-    public function getContextGenerationData(): array
-    {
-        return $this->contextGenerationData;
-    }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/config/services.yaml b/src/Bundle/ChillDocGeneratorBundle/config/services.yaml
index 5fef6fb22..5bdfe2a11 100644
--- a/src/Bundle/ChillDocGeneratorBundle/config/services.yaml
+++ b/src/Bundle/ChillDocGeneratorBundle/config/services.yaml
@@ -20,14 +20,10 @@ services:
         resource: '../Serializer/Normalizer/'
         tags:
             - { name: 'serializer.normalizer', priority: -152 }
-
     Chill\DocGeneratorBundle\Serializer\Normalizer\CollectionDocGenNormalizer:
         tags:
             - { name: 'serializer.normalizer', priority: -126 }
 
-    Chill\DocGeneratorBundle\Service\Context\:
-        resource: "../Service/Context"
-
     Chill\DocGeneratorBundle\Controller\:
         resource: "../Controller"
         autowire: true
@@ -38,20 +34,18 @@ services:
         autowire: true
         autoconfigure: true
 
+    Chill\DocGeneratorBundle\Service\Context\:
+        resource: "../Service/Context/"
+        autowire: true
+        autoconfigure: true
+
     Chill\DocGeneratorBundle\GeneratorDriver\:
         resource: "../GeneratorDriver/"
         autowire: true
         autoconfigure: true
 
-    Chill\DocGeneratorBundle\Service\Messenger\:
-        resource: "../Service/Messenger/"
-
-    Chill\DocGeneratorBundle\Service\Generator\Generator: ~
-    Chill\DocGeneratorBundle\Service\Generator\GeneratorInterface: '@Chill\DocGeneratorBundle\Service\Generator\Generator'
-
     Chill\DocGeneratorBundle\Driver\RelatorioDriver: '@Chill\DocGeneratorBundle\Driver\DriverInterface'
 
     Chill\DocGeneratorBundle\Context\ContextManager:
         arguments:
             $contexts: !tagged_iterator { tag: chill_docgen.context, default_index_method: getKey }
-    Chill\DocGeneratorBundle\Context\ContextManagerInterface: '@Chill\DocGeneratorBundle\Context\ContextManager'
diff --git a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
index 94a09cafb..5b52f6819 100644
--- a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
+++ b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
@@ -118,7 +118,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
      * Return true if the phonenumber is a landline or voip phone.  Return always true
      * if the validation is not configured.
      *
-     * @param string|PhoneNumber $phonenumber
+     * @param string $phonenumber
      */
     public function isValidPhonenumberAny($phonenumber): bool
     {
@@ -138,7 +138,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
      * Return true if the phonenumber is a landline or voip phone.  Return always true
      * if the validation is not configured.
      *
-     * @param string|PhoneNumber $phonenumber
+     * @param string $phonenumber
      */
     public function isValidPhonenumberLandOrVoip($phonenumber): bool
     {
@@ -159,7 +159,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
      * REturn true if the phonenumber is a mobile phone. Return always true
      * if the validation is not configured.
      *
-     * @param string|PhoneNumber $phonenumber
+     * @param string $phonenumber
      */
     public function isValidPhonenumberMobile($phonenumber): bool
     {
@@ -182,10 +182,6 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
             return null;
         }
 
-        if ($phonenumber instanceof PhoneNumber) {
-            $phonenumber = (string) $phonenumber;
-        }
-
         // filter only number
         $filtered = preg_replace('/[^0-9]/', '', $phonenumber);
 
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
index dac850446..23bfac56f 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
@@ -256,16 +256,6 @@ class AccompanyingPeriodContext implements
         return $options['mainPerson'] || $options['person1'] || $options['person2'];
     }
 
-    public function publicFormTransform(DocGeneratorTemplate $template, $entity, array $data): array
-    {
-        // TODO: Implement publicFormTransform() method.
-    }
-
-    public function publicFormReverseTransform(DocGeneratorTemplate $template, $entity, array $data): array
-    {
-        // TODO: Implement publicFormReverseTransform() method.
-    }
-
     /**
      * @param AccompanyingPeriod $entity
      */
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php
index d73d1aa7b..7e9280e5d 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php
@@ -109,8 +109,6 @@ class AccompanyingPeriodWorkContext
         return $this->periodContext->hasPublicForm($template, $entity);
     }
 
-
-
     public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
     {
         // TODO: Implement storeGenerated() method.
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
index 3b9d958cb..4dd14faab 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
@@ -174,16 +174,6 @@ class AccompanyingPeriodWorkEvaluationContext implements
             ->hasPublicForm($template, $entity->getAccompanyingPeriodWork());
     }
 
-    public function publicFormTransform(DocGeneratorTemplate $template, $entity, array $data): array
-    {
-        // TODO: Implement publicFormTransform() method.
-    }
-
-    public function publicFormReverseTransform(DocGeneratorTemplate $template, $entity, array $data): array
-    {
-        // TODO: Implement publicFormReverseTransform() method.
-    }
-
     public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
     {
         $doc = new AccompanyingPeriodWorkEvaluationDocument();
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
index 5f98f7798..af6c6e114 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
@@ -21,13 +21,11 @@ use Chill\DocStoreBundle\Repository\DocumentCategoryRepository;
 use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Form\Type\ScopePickerType;
-use Chill\MainBundle\Repository\ScopeRepositoryInterface;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Repository\PersonRepository;
 use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
@@ -57,8 +55,6 @@ final class PersonContext implements PersonContextInterface
 
     private NormalizerInterface $normalizer;
 
-    private ScopeRepositoryInterface $scopeRepository;
-
     private Security $security;
 
     private bool $showScopes;
@@ -75,7 +71,6 @@ final class PersonContext implements PersonContextInterface
         EntityManagerInterface $em,
         NormalizerInterface $normalizer,
         ParameterBagInterface $parameterBag,
-        ScopeRepositoryInterface $scopeRepository,
         Security $security,
         TranslatorInterface $translator,
         TranslatableStringHelperInterface $translatableStringHelper
@@ -86,7 +81,6 @@ final class PersonContext implements PersonContextInterface
         $this->documentCategoryRepository = $documentCategoryRepository;
         $this->em = $em;
         $this->normalizer = $normalizer;
-        $this->scopeRepository = $scopeRepository;
         $this->security = $security;
         $this->showScopes = $parameterBag->get('chill_main')['acl']['form_show_scopes'];
         $this->translator = $translator;
@@ -217,38 +211,6 @@ final class PersonContext implements PersonContextInterface
         return true;
     }
 
-    /**
-     * @param Person $entity
-     */
-    public function publicFormTransform(DocGeneratorTemplate $template, $entity, array $data): array
-    {
-        $scope = $data['scope'] ?? null;
-
-        return [
-            'title' => $data['title'] ?? '',
-            'scope_id' => $scope instanceof Scope ? $scope->getId() : null,
-        ];
-    }
-
-    /**
-     * @param Person $entity
-     */
-    public function publicFormReverseTransform(DocGeneratorTemplate $template, $entity, array $data): array
-    {
-        if (!isset($data['scope'])) {
-            $scope = null;
-        } else {
-            if (null === $scope = $this->scopeRepository->find($data['scope'])) {
-                throw new \UnexpectedValueException('scope not found');
-            }
-        }
-
-        return [
-            'title' => $data['title'] ?? '',
-            'scope' => $scope,
-        ];
-    }
-
     /**
      * @param Person $entity
      */
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextInterface.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextInterface.php
index 782ed13db..58a6b5863 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextInterface.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextInterface.php
@@ -48,10 +48,6 @@ interface PersonContextInterface extends DocGeneratorContextWithAdminFormInterfa
      */
     public function hasPublicForm(DocGeneratorTemplate $template, $entity): bool;
 
-    public function publicFormTransform(DocGeneratorTemplate $template, $entity, array $data): array;
-
-    public function publicFormReverseTransform(DocGeneratorTemplate $template, $entity, array $data): array;
-
     /**
      * @param Person $entity
      */
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextWithThirdParty.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextWithThirdParty.php
index b4fa6fb26..23d57c431 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextWithThirdParty.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextWithThirdParty.php
@@ -123,16 +123,6 @@ class PersonContextWithThirdParty implements DocGeneratorContextWithAdminFormInt
         return true;
     }
 
-    public function publicFormTransform(DocGeneratorTemplate $template, $entity, array $data): array
-    {
-        // TODO: Implement publicFormTransform() method.
-    }
-
-    public function publicFormReverseTransform(DocGeneratorTemplate $template, $entity, array $data): array
-    {
-        // TODO: Implement publicFormReverseTransform() method.
-    }
-
     public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
     {
         $this->personContext->storeGenerated($template, $storedObject, $entity, $contextGenerationData);

From 6254303392b7d023c4e9c87eeae882197e5e8b76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 16 Feb 2023 14:08:16 +0100
Subject: [PATCH 10/14] Revert "Feature: [docgen][stored object] update model
 to store status, template_id and fix defaults"

This reverts commit 55918bcafb9b958e83696a9eaa4f6f17e90a9602.
---
 .../migrations/Version20230214192558.php      | 47 -------------------
 .../Entity/StoredObject.php                   | 10 ++--
 2 files changed, 7 insertions(+), 50 deletions(-)
 delete mode 100644 src/Bundle/ChillDocGeneratorBundle/migrations/Version20230214192558.php

diff --git a/src/Bundle/ChillDocGeneratorBundle/migrations/Version20230214192558.php b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20230214192558.php
deleted file mode 100644
index de536ca84..000000000
--- a/src/Bundle/ChillDocGeneratorBundle/migrations/Version20230214192558.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\Migrations\DocGenerator;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-final class Version20230214192558 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Add status, template_id and fix defaults on chill_doc.stored_object';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_doc.stored_object ADD template_id INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_doc.stored_object ADD status TEXT DEFAULT \'ready\' NOT NULL');
-        $this->addSql('ALTER TABLE chill_doc.stored_object ADD createdAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
-        $this->addSql('UPDATE chill_doc.stored_object SET createdAt = creation_date');
-        $this->addSql('ALTER TABLE chill_doc.stored_object ADD createdBy_id INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_doc.stored_object DROP creation_date;');
-        $this->addSql('ALTER TABLE chill_doc.stored_object ALTER type SET DEFAULT \'\'');
-        $this->addSql('ALTER TABLE chill_doc.stored_object ALTER title DROP DEFAULT');
-        $this->addSql('COMMENT ON COLUMN chill_doc.stored_object.createdAt IS \'(DC2Type:datetime_immutable)\'');
-        $this->addSql('ALTER TABLE chill_doc.stored_object ADD CONSTRAINT FK_49604E365DA0FB8 FOREIGN KEY (template_id) REFERENCES chill_docgen_template (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_doc.stored_object ADD CONSTRAINT FK_49604E363174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('CREATE INDEX IDX_49604E365DA0FB8 ON chill_doc.stored_object (template_id)');
-        $this->addSql('CREATE INDEX IDX_49604E363174800F ON chill_doc.stored_object (createdBy_id)');
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_doc.stored_object DROP CONSTRAINT FK_49604E365DA0FB8');
-        $this->addSql('ALTER TABLE chill_doc.stored_object DROP CONSTRAINT FK_49604E363174800F');
-        $this->addSql('ALTER TABLE chill_doc.stored_object DROP template_id');
-        $this->addSql('ALTER TABLE chill_doc.stored_object DROP status');
-        $this->addSql('ALTER TABLE chill_doc.stored_object ADD creation_date TIMESTAMP(0) DEFAULT NOW()');
-        $this->addSql('UPDATE chill_doc.stored_object SET creation_date = createdAt');
-        $this->addSql('ALTER TABLE chill_doc.stored_object DROP createdAt');
-        $this->addSql('ALTER TABLE chill_doc.stored_object DROP createdBy_id');
-        $this->addSql('ALTER TABLE chill_doc.stored_object ALTER title SET DEFAULT \'\'');
-        $this->addSql('ALTER TABLE chill_doc.stored_object ALTER type DROP DEFAULT');
-    }
-}
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
index ab09f870f..21abc1f56 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
@@ -41,6 +41,12 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
 
     use TrackCreationTrait;
 
+    /**
+     * @ORM\Column(type="datetime", name="creation_date")
+     * @Serializer\Groups({"read", "write"})
+     */
+    private DateTimeInterface $creationDate;
+
     /**
      * @ORM\Column(type="json", name="datas")
      * @Serializer\Groups({"read", "write"})
@@ -81,7 +87,7 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
     private string $title = '';
 
     /**
-     * @ORM\Column(type="text", name="type", options={"default": ""})
+     * @ORM\Column(type="text", name="type")
      * @Serializer\Groups({"read", "write"})
      */
     private string $type = '';
@@ -113,7 +119,6 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
 
     /**
      * @Serializer\Groups({"read", "write"})
-     * @deprecated
      */
     public function getCreationDate(): DateTime
     {
@@ -180,7 +185,6 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
 
     /**
      * @Serializer\Groups({"write"})
-     * @deprecated
      */
     public function setCreationDate(DateTime $creationDate): self
     {

From 27f13e0dd175aafe7ec0708e899276f23f5c3968 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 24 Feb 2023 13:54:44 +0100
Subject: [PATCH 11/14] FEATURE [menu][counters] show counter icon for person
 resources and residential address if there are any

---
 .../ChillPersonBundle/Menu/PersonMenuBuilder.php      | 11 ++++++++++-
 .../ChillPersonBundle/Resources/views/menu.html.twig  |  4 ++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
index 9185e372f..bf11a6c01 100644
--- a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
@@ -12,11 +12,13 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\PersonBundle\Repository\ResidentialAddressRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Knp\Menu\MenuItem;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
+use function count;
 
 /**
  * Add menu entrie to person menu.
@@ -35,16 +37,20 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
 
     protected TranslatorInterface $translator;
 
+    private ResidentialAddressRepository $residentialAddressRepo;
+
     private Security $security;
 
     public function __construct(
         ParameterBagInterface $parameterBag,
         Security $security,
-        TranslatorInterface $translator
+        TranslatorInterface $translator,
+        ResidentialAddressRepository $residentialAddressRepo
     ) {
         $this->showAccompanyingPeriod = $parameterBag->get('chill_person.accompanying_period');
         $this->security = $security;
         $this->translator = $translator;
+        $this->residentialAddressRepo = $residentialAddressRepo;
     }
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
@@ -67,6 +73,8 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
         ])
             ->setExtras([
                 'order' => 60,
+                'counter' => count($this->residentialAddressRepo->findBy(['person' => $parameters['person']])) > 0 ?
+                    count($this->residentialAddressRepo->findBy(['person' => $parameters['person']])) : null,
             ]);
 
         $menu->addChild($this->translator->trans('person_resources_menu'), [
@@ -77,6 +85,7 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
         ])
             ->setExtras([
                 'order' => 70,
+                'counter' => count($parameters['person']->getResources()) > 0 ? count($parameters['person']->getResources()) : null,
             ]);
 
         $menu->addChild($this->translator->trans('household.person history'), [
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig
index 23dda065e..cf60e31b7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig
@@ -17,8 +17,12 @@
 
 <div class="list-group vertical-menu {{ 'menu-' ~ menus.name }}">
     {% for menu in menus %}
+
         <a class="list-group-item list-group-item-action"
             href="{{ menu.uri }}">
+            {% if menu.extras.counter is defined and menu.extras.counter is not null %}
+                <span class="badge rounded-pill bg-danger notification-counter">{{ menu.extras.counter }}</span>
+            {% endif %}
             {{ menu.label|upper }}
         </a>
     {% endfor %}

From a16244a3f59f1bf9a12c7e823d3bd728d314755e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 28 Feb 2023 15:25:47 +0000
Subject: [PATCH 12/14] Feature: [docgen] generate documents in an async queue

The documents are now generated in a queue, using symfony messenger. This queue should be configured:

```yaml
# app/config/messenger.yaml
framework:
    messenger:
        # reset services after consuming messages
        # reset_on_message: true

        failure_transport: failed

        transports:
            # https://symfony.com/doc/current/messenger.html#transport-configuration
            async: '%env(MESSENGER_TRANSPORT_DSN)%'
            priority:
                dsn: '%env(MESSENGER_TRANSPORT_DSN)%'
            failed: 'doctrine://default?queue_name=failed'

        routing:
            # ... other messages
            'Chill\DocGeneratorBundle\Service\Messenger\RequestGenerationMessage': priority
```

`StoredObject`s now have additionnal properties:

* status (pending, failure, ready (by default) ), which explain if the document is generated;
* a generationTrialCounter, which is incremented on each generation trial, which prevent each generation more than 5 times;

The generator computation is moved from the `DocGenTemplateController` to a `Generator` (implementing `GeneratorInterface`.

There are new methods to `Context` which allow to normalize/denormalize context data to/from a messenger's `Message`.
---
 .../Service/DocGenerator/ActivityContext.php  |  31 ++++
 ...tActivitiesByAccompanyingPeriodContext.php |  10 ++
 .../Service/DocGenerator/CalendarContext.php  |  10 ++
 .../DocGenerator/CalendarContextInterface.php |   4 +
 ...eneratorContextWithPublicFormInterface.php |  13 ++
 .../DocGeneratorTemplateController.php        | 144 ++++++----------
 .../Email/on_generation_failed_email.txt.twig |  16 ++
 .../Service/Generator/Generator.php           |  73 ++++----
 .../Service/Generator/GeneratorException.php  |   8 +
 .../Service/Generator/GeneratorInterface.php  |  27 +++
 .../Service/Messenger/OnGenerationFails.php   | 156 ++++++++++++++++++
 .../Messenger/RequestGenerationHandler.php    |  66 ++++++++
 .../Messenger/RequestGenerationMessage.php    |  26 ++-
 .../config/services.yaml                      |  16 +-
 .../migrations/Version20230214192558.php      |  47 ++++++
 .../Context/Generator/GeneratorTest.php       |  19 ++-
 .../translations/messages.fr.yml              |  12 +-
 .../Controller/StoredObjectApiController.php  |  39 +++++
 .../Entity/StoredObject.php                   |  62 ++++++-
 .../document_action_buttons_group/index.ts    |  20 ++-
 .../Resources/public/types.ts                 |  12 +-
 .../vuejs/DocumentActionButtonsGroup.vue      |  66 +++++++-
 .../vuejs/StoredObjectButton/helpers.ts       |  14 ++
 .../delete.html.twig                          |   5 -
 .../Resources/views/List/list_item.html.twig  |  17 +-
 .../migrations/Version20230227161327.php      |  26 +++
 .../Phonenumber/PhonenumberHelper.php         |  10 +-
 .../components/FormEvaluation.vue             |   5 +
 .../vuejs/AccompanyingCourseWorkEdit/store.js |  17 +-
 .../AccompanyingPeriodContext.php             |  30 ++++
 .../AccompanyingPeriodWorkContext.php         |  21 ++-
 ...ccompanyingPeriodWorkEvaluationContext.php |  12 ++
 .../Service/DocGenerator/PersonContext.php    |  38 +++++
 .../DocGenerator/PersonContextInterface.php   |   4 +
 .../PersonContextWithThirdParty.php           |  27 ++-
 .../ChillWopiBundle/chill.webpack.config.js   |   5 +-
 .../ChillWopiBundle/src/Controller/Editor.php |  28 ++++
 .../Resources/public/module/pending/index.ts  |  40 +++++
 .../Editor/stored_object_failure.html.twig    |  15 ++
 .../Editor/stored_object_pending.html.twig    |  36 ++++
 40 files changed, 1050 insertions(+), 177 deletions(-)
 create mode 100644 src/Bundle/ChillDocGeneratorBundle/Resources/views/Email/on_generation_failed_email.txt.twig
 create mode 100644 src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorInterface.php
 create mode 100644 src/Bundle/ChillDocGeneratorBundle/Service/Messenger/OnGenerationFails.php
 create mode 100644 src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php
 create mode 100644 src/Bundle/ChillDocGeneratorBundle/migrations/Version20230214192558.php
 create mode 100644 src/Bundle/ChillDocStoreBundle/Controller/StoredObjectApiController.php
 create mode 100644 src/Bundle/ChillDocStoreBundle/migrations/Version20230227161327.php
 create mode 100644 src/Bundle/ChillWopiBundle/src/Resources/public/module/pending/index.ts
 create mode 100644 src/Bundle/ChillWopiBundle/src/Resources/views/Editor/stored_object_failure.html.twig
 create mode 100644 src/Bundle/ChillWopiBundle/src/Resources/views/Editor/stored_object_pending.html.twig

diff --git a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
index 4e2970138..ac832b34b 100644
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
@@ -22,6 +22,7 @@ use Chill\DocStoreBundle\Repository\DocumentCategoryRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
@@ -45,6 +46,8 @@ class ActivityContext implements
 
     private PersonRenderInterface $personRender;
 
+    private PersonRepository $personRepository;
+
     private TranslatableStringHelperInterface $translatableStringHelper;
 
     private TranslatorInterface $translator;
@@ -55,6 +58,7 @@ class ActivityContext implements
         TranslatableStringHelperInterface $translatableStringHelper,
         EntityManagerInterface $em,
         PersonRenderInterface $personRender,
+        PersonRepository $personRepository,
         TranslatorInterface $translator,
         BaseContextData $baseContextData
     ) {
@@ -63,6 +67,7 @@ class ActivityContext implements
         $this->translatableStringHelper = $translatableStringHelper;
         $this->em = $em;
         $this->personRender = $personRender;
+        $this->personRepository = $personRepository;
         $this->translator = $translator;
         $this->baseContextData = $baseContextData;
     }
@@ -206,6 +211,32 @@ class ActivityContext implements
         return $options['mainPerson'] || $options['person1'] || $options['person2'];
     }
 
+    public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        $normalized = [];
+
+        foreach (['mainPerson', 'person1', 'person2'] as $k) {
+            $normalized[$k] = null === $data[$k] ? null : $data[$k]->getId();
+        }
+
+        return $normalized;
+    }
+
+    public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        $denormalized = [];
+
+        foreach (['mainPerson', 'person1', 'person2'] as $k) {
+            if (null !== ($id = ($data[$k] ?? null))) {
+                $denormalized[$k] = $this->personRepository->find($id);
+            } else {
+                $denormalized[$k] = null;
+            }
+        }
+
+        return $denormalized;
+    }
+
     /**
      * @param Activity $entity
      */
diff --git a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
index 3189307f9..7e1873710 100644
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
@@ -146,6 +146,16 @@ class ListActivitiesByAccompanyingPeriodContext implements
         return $this->accompanyingPeriodContext->hasPublicForm($template, $entity);
     }
 
+    public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        return $this->accompanyingPeriodContext->contextGenerationDataNormalize($template, $entity, $data);
+    }
+
+    public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        return $this->accompanyingPeriodContext->contextGenerationDataDenormalize($template, $entity, $data);
+    }
+
     public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
     {
         $this->accompanyingPeriodContext->storeGenerated($template, $storedObject, $entity, $contextGenerationData);
diff --git a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
index 9ba9e36b4..4984c359a 100644
--- a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
+++ b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
@@ -226,6 +226,16 @@ final class CalendarContext implements CalendarContextInterface
         return true;
     }
 
+    public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        // TODO: Implement publicFormTransform() method.
+    }
+
+    public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        // TODO: Implement publicFormReverseTransform() method.
+    }
+
     /**
      * @param array{mainPerson?: Person, thirdParty?: ThirdParty, title: string} $contextGenerationData
      */
diff --git a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php
index d02cdc2c2..eeef3b417 100644
--- a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php
+++ b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php
@@ -56,6 +56,10 @@ interface CalendarContextInterface extends DocGeneratorContextWithPublicFormInte
      */
     public function hasPublicForm(DocGeneratorTemplate $template, $entity): bool;
 
+    public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array;
+
+    public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array;
+
     /**
      * @param Calendar $entity
      */
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php
index f013c8435..4f58bd049 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php
@@ -23,6 +23,9 @@ interface DocGeneratorContextWithPublicFormInterface extends DocGeneratorContext
      */
     public function buildPublicForm(FormBuilderInterface $builder, DocGeneratorTemplate $template, $entity): void;
 
+    /**
+     * Fill the form with initial data
+     */
     public function getFormData(DocGeneratorTemplate $template, $entity): array;
 
     /**
@@ -31,4 +34,14 @@ interface DocGeneratorContextWithPublicFormInterface extends DocGeneratorContext
      * @param mixed $entity
      */
     public function hasPublicForm(DocGeneratorTemplate $template, $entity): bool;
+
+    /**
+     * Transform the data from the form into serializable data, storable into messenger's message
+     */
+    public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array;
+
+    /**
+     * Reverse the data from the messenger's message into data usable for doc's generation
+     */
+    public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array;
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
index d618f758a..6f153acd8 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
@@ -16,67 +16,57 @@ use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithPublicFormInterface;
 use Chill\DocGeneratorBundle\Context\Exception\ContextNotFoundException;
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\DocGeneratorBundle\GeneratorDriver\DriverInterface;
-use Chill\DocGeneratorBundle\GeneratorDriver\Exception\TemplateException;
 use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
+use Chill\DocGeneratorBundle\Service\Generator\GeneratorInterface;
+use Chill\DocGeneratorBundle\Service\Messenger\RequestGenerationMessage;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Doctrine\ORM\EntityManagerInterface;
-use Exception;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\FileType;
-use Symfony\Component\HttpFoundation\File\File;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 // TODO à mettre dans services
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
-use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
-use Throwable;
 use function strlen;
 
 final class DocGeneratorTemplateController extends AbstractController
 {
-    private HttpClientInterface $client;
-
     private ContextManager $contextManager;
 
     private DocGeneratorTemplateRepository $docGeneratorTemplateRepository;
 
-    private DriverInterface $driver;
-
     private EntityManagerInterface $entityManager;
 
-    private LoggerInterface $logger;
+    private GeneratorInterface $generator;
+
+    private MessageBusInterface $messageBus;
 
     private PaginatorFactory $paginatorFactory;
 
-    private StoredObjectManagerInterface $storedObjectManager;
-
     public function __construct(
         ContextManager $contextManager,
         DocGeneratorTemplateRepository $docGeneratorTemplateRepository,
-        DriverInterface $driver,
-        LoggerInterface $logger,
+        GeneratorInterface $generator,
+        MessageBusInterface $messageBus,
         PaginatorFactory $paginatorFactory,
-        HttpClientInterface $client,
-        StoredObjectManagerInterface $storedObjectManager,
         EntityManagerInterface $entityManager
     ) {
         $this->contextManager = $contextManager;
         $this->docGeneratorTemplateRepository = $docGeneratorTemplateRepository;
-        $this->driver = $driver;
-        $this->logger = $logger;
+        $this->generator = $generator;
+        $this->messageBus = $messageBus;
         $this->paginatorFactory = $paginatorFactory;
-        $this->client = $client;
-        $this->storedObjectManager = $storedObjectManager;
         $this->entityManager = $entityManager;
     }
 
@@ -94,7 +84,6 @@ final class DocGeneratorTemplateController extends AbstractController
     ): Response {
         return $this->generateDocFromTemplate(
             $template,
-            $entityClassName,
             $entityId,
             $request,
             true
@@ -115,7 +104,6 @@ final class DocGeneratorTemplateController extends AbstractController
     ): Response {
         return $this->generateDocFromTemplate(
             $template,
-            $entityClassName,
             $entityId,
             $request,
             false
@@ -185,7 +173,6 @@ final class DocGeneratorTemplateController extends AbstractController
 
     private function generateDocFromTemplate(
         DocGeneratorTemplate $template,
-        string $entityClassName,
         int $entityId,
         Request $request,
         bool $isTest
@@ -206,7 +193,7 @@ final class DocGeneratorTemplateController extends AbstractController
 
         if (null === $entity) {
             throw new NotFoundHttpException(
-                sprintf('Entity with classname %s and id %s is not found', $entityClassName, $entityId)
+                sprintf('Entity with classname %s and id %s is not found', $context->getEntityClass(), $entityId)
             );
         }
 
@@ -259,99 +246,68 @@ final class DocGeneratorTemplateController extends AbstractController
             }
         }
 
-        $document = $template->getFile();
-
-        if ($isTest && ($contextGenerationData['test_file'] instanceof File)) {
-            $dataDecrypted = file_get_contents($contextGenerationData['test_file']->getPathname());
-        } else {
-            try {
-                $dataDecrypted = $this->storedObjectManager->read($document);
-            } catch (Throwable $exception) {
-                throw $exception;
-            }
-        }
+        // transform context generation data
+        $contextGenerationDataSanitized =
+            $context instanceof DocGeneratorContextWithPublicFormInterface ?
+                $context->contextGenerationDataNormalize($template, $entity, $contextGenerationData)
+                : [];
 
+        // if is test, render the data or generate the doc
         if ($isTest && isset($form) && $form['show_data']->getData()) {
             return $this->render('@ChillDocGenerator/Generator/debug_value.html.twig', [
                 'datas' => json_encode($context->getData($template, $entity, $contextGenerationData), JSON_PRETTY_PRINT)
             ]);
-        }
-
-        try {
-            $generatedResource = $this
-                ->driver
-                ->generateFromString(
-                    $dataDecrypted,
-                    $template->getFile()->getType(),
-                    $context->getData($template, $entity, $contextGenerationData),
-                    $template->getFile()->getFilename()
-                );
-        } catch (TemplateException $e) {
-            return new Response(
-                implode("\n", $e->getErrors()),
-                400,
-                [
-                    'Content-Type' => 'text/plain',
-                ]
+        } elseif ($isTest) {
+            $generated = $this->generator->generateDocFromTemplate(
+                $template,
+                $entityId,
+                $contextGenerationDataSanitized,
+                null,
+                true,
+                isset($form) ? $form['test_file']->getData() : null
             );
-        }
 
-        if ($isTest) {
             return new Response(
-                $generatedResource,
+                $generated,
                 Response::HTTP_OK,
                 [
                     'Content-Transfer-Encoding', 'binary',
                     'Content-Type' => 'application/vnd.oasis.opendocument.text',
                     'Content-Disposition' => 'attachment; filename="generated.odt"',
-                    'Content-Length' => strlen($generatedResource),
+                    'Content-Length' => strlen($generated),
                 ],
             );
         }
 
-        /** @var StoredObject $storedObject */
-        $storedObject = (new ObjectNormalizer())
-            ->denormalize(
-                [
-                    'type' => $template->getFile()->getType(),
-                    'filename' => sprintf('%s_odt', uniqid('doc_', true)),
-                ],
-                StoredObject::class
-            );
-
-        try {
-            $this->storedObjectManager->write($storedObject, $generatedResource);
-        } catch (Throwable $exception) {
-            throw $exception;
-        }
+        // this is not a test
+        // we prepare the object to store the document
+        $storedObject = (new StoredObject())
+            ->setStatus(StoredObject::STATUS_PENDING)
+            ;
 
         $this->entityManager->persist($storedObject);
 
-        try {
-            $context
-                ->storeGenerated(
-                    $template,
-                    $storedObject,
-                    $entity,
-                    $contextGenerationData
-                );
-        } catch (Exception $e) {
-            $this
-                ->logger
-                ->error(
-                    'Unable to store the associated document to entity',
-                    [
-                        'entityClassName' => $entityClassName,
-                        'entityId' => $entityId,
-                        'contextKey' => $context->getName(),
-                    ]
-                );
-
-            throw $e;
-        }
+        // we store the generated document
+        $context
+            ->storeGenerated(
+                $template,
+                $storedObject,
+                $entity,
+                $contextGenerationData
+            );
 
         $this->entityManager->flush();
 
+        $this->messageBus->dispatch(
+            new RequestGenerationMessage(
+                $this->getUser(),
+                $template,
+                $entityId,
+                $storedObject,
+                $contextGenerationDataSanitized,
+            )
+        );
+
         return $this
             ->redirectToRoute(
                 'chill_wopi_file_edit',
diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Email/on_generation_failed_email.txt.twig b/src/Bundle/ChillDocGeneratorBundle/Resources/views/Email/on_generation_failed_email.txt.twig
new file mode 100644
index 000000000..c4ca7079d
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Resources/views/Email/on_generation_failed_email.txt.twig
@@ -0,0 +1,16 @@
+{{ creator.label }},
+
+{{ 'docgen.failure_email.The generation of the document {template_name} failed'|trans({'{template_name}': template.name|localize_translatable_string}) }}
+
+{{ 'docgen.failure_email.Forward this email to your administrator for solving'|trans }}
+
+{{ 'docgen.failure_email.References'|trans }}:
+{% if errors|length > 0 %}
+{{ 'docgen.failure_email.The following errors were encoutered'|trans }}:
+
+{% for error in errors %}
+- {{ error }}
+{% endfor %}
+{% endif %}
+- template_id: {{ template.id }}
+- stored_object_destination_id: {{ stored_object_id }}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php
index 755e608ba..0775cfb49 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php
@@ -3,6 +3,7 @@
 namespace Chill\DocGeneratorBundle\Service\Generator;
 
 use Chill\DocGeneratorBundle\Context\ContextManagerInterface;
+use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithPublicFormInterface;
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\DocGeneratorBundle\GeneratorDriver\DriverInterface;
 use Chill\DocGeneratorBundle\GeneratorDriver\Exception\TemplateException;
@@ -12,7 +13,7 @@ use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpFoundation\File\File;
 
-class Generator
+class Generator implements GeneratorInterface
 {
     private ContextManagerInterface $contextManager;
 
@@ -24,6 +25,8 @@ class Generator
 
     private StoredObjectManagerInterface $storedObjectManager;
 
+    private const LOG_PREFIX = '[docgen generator] ';
+
     public function __construct(
         ContextManagerInterface $contextManager,
         DriverInterface $driver,
@@ -48,18 +51,23 @@ class Generator
      */
     public function generateDocFromTemplate(
         DocGeneratorTemplate $template,
-        string               $entityClassName,
         int                  $entityId,
+        array                $contextGenerationDataNormalized,
         ?StoredObject        $destinationStoredObject = null,
         bool                 $isTest = false,
         ?File                $testFile = null
     ): ?string {
         if ($destinationStoredObject instanceof StoredObject && StoredObject::STATUS_PENDING !== $destinationStoredObject->getStatus()) {
+            $this->logger->info(self::LOG_PREFIX.'Aborting generation of an already generated document');
             throw new ObjectReadyException();
         }
 
+        $this->logger->info(self::LOG_PREFIX.'Starting generation of a document', [
+            'entity_id' => $entityId,
+            'destination_stored_object' => $destinationStoredObject === null ? null : $destinationStoredObject->getId()
+        ]);
+
         $context = $this->contextManager->getContextByDocGeneratorTemplate($template);
-        $contextGenerationData = ['test_file' => $testFile];
 
         $entity = $this
             ->entityManager
@@ -67,22 +75,38 @@ class Generator
             ;
 
         if (null === $entity) {
-            throw new RelatedEntityNotFoundException($entityClassName, $entityId);
+            throw new RelatedEntityNotFoundException($template->getEntity(), $entityId);
+        }
+
+        $contextGenerationDataNormalized = array_merge(
+            $contextGenerationDataNormalized,
+                $context instanceof DocGeneratorContextWithPublicFormInterface ?
+                    $context->contextGenerationDataDenormalize($template, $entity, $contextGenerationDataNormalized)
+                    : []
+        );
+
+        $data = $context->getData($template, $entity, $contextGenerationDataNormalized);
+
+        $destinationStoredObjectId = $destinationStoredObject instanceof StoredObject ? $destinationStoredObject->getId() : null;
+        $this->entityManager->clear();
+        gc_collect_cycles();
+        if (null !== $destinationStoredObjectId) {
+            $destinationStoredObject = $this->entityManager->find(StoredObject::class, $destinationStoredObjectId);
         }
 
         if ($isTest && ($testFile instanceof File)) {
-            $dataDecrypted = file_get_contents($testFile->getPathname());
+            $templateDecrypted = file_get_contents($testFile->getPathname());
         } else {
-            $dataDecrypted = $this->storedObjectManager->read($template->getFile());
+            $templateDecrypted = $this->storedObjectManager->read($template->getFile());
         }
 
         try {
             $generatedResource = $this
                 ->driver
                 ->generateFromString(
-                    $dataDecrypted,
+                    $templateDecrypted,
                     $template->getFile()->getType(),
-                    $context->getData($template, $entity, $contextGenerationData),
+                    $data,
                     $template->getFile()->getFilename()
                 );
         } catch (TemplateException $e) {
@@ -90,6 +114,11 @@ class Generator
         }
 
         if ($isTest) {
+            $this->logger->info(self::LOG_PREFIX.'Finished generation of a document', [
+                'is_test' => true,
+                'entity_id' => $entityId,
+                'destination_stored_object' => $destinationStoredObject === null ? null : $destinationStoredObject->getId()
+            ]);
             return $generatedResource;
         }
 
@@ -102,31 +131,13 @@ class Generator
 
         $this->storedObjectManager->write($destinationStoredObject, $generatedResource);
 
-        try {
-            $context
-                ->storeGenerated(
-                    $template,
-                    $destinationStoredObject,
-                    $entity,
-                    $contextGenerationData
-                );
-        } catch (\Exception $e) {
-            $this
-                ->logger
-                ->error(
-                    'Unable to store the associated document to entity',
-                    [
-                        'entityClassName' => $entityClassName,
-                        'entityId' => $entityId,
-                        'contextKey' => $context->getName(),
-                    ]
-                );
-
-            throw $e;
-        }
-
         $this->entityManager->flush();
 
+        $this->logger->info(self::LOG_PREFIX.'Finished generation of a document', [
+            'entity_id' => $entityId,
+            'destination_stored_object' => $destinationStoredObject->getId(),
+        ]);
+
         return null;
     }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorException.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorException.php
index 423d59dd4..0f3412859 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorException.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorException.php
@@ -15,4 +15,12 @@ class GeneratorException extends \RuntimeException
         parent::__construct("Could not generate the document", 15252,
             $previous);
     }
+
+    /**
+     * @return array
+     */
+    public function getErrors(): array
+    {
+        return $this->errors;
+    }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorInterface.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorInterface.php
new file mode 100644
index 000000000..385e1d010
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorInterface.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Chill\DocGeneratorBundle\Service\Generator;
+
+use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Symfony\Component\HttpFoundation\File\File;
+
+interface GeneratorInterface
+{
+    /**
+     * @template T of File|null
+     * @template B of bool
+     * @param B $isTest
+     * @param (B is true ? T : null) $testFile
+     * @psalm-return (B is true ? string : null)
+     * @throws \Symfony\Component\Serializer\Exception\ExceptionInterface|\Throwable
+     */
+    public function generateDocFromTemplate(
+        DocGeneratorTemplate $template,
+        int                  $entityId,
+        array                $contextGenerationDataNormalized,
+        ?StoredObject        $destinationStoredObject = null,
+        bool                 $isTest = false,
+        ?File                $testFile = null
+    ): ?string;
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/OnGenerationFails.php b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/OnGenerationFails.php
new file mode 100644
index 000000000..e3b91d7e4
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/OnGenerationFails.php
@@ -0,0 +1,156 @@
+<?php
+
+namespace Chill\DocGeneratorBundle\Service\Messenger;
+
+use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
+use Chill\DocGeneratorBundle\Service\Generator\GeneratorException;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\Repository\StoredObjectRepository;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
+use Doctrine\ORM\EntityManagerInterface;
+use Psr\Log\LoggerInterface;
+use Symfony\Bridge\Twig\Mime\TemplatedEmail;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\Mailer\MailerInterface;
+use Symfony\Component\Messenger\Event\WorkerMessageFailedEvent;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+final class OnGenerationFails implements EventSubscriberInterface
+{
+    private DocGeneratorTemplateRepository $docGeneratorTemplateRepository;
+
+    private EntityManagerInterface $entityManager;
+
+    private LoggerInterface $logger;
+
+    private MailerInterface $mailer;
+
+    private StoredObjectRepository $storedObjectRepository;
+
+    private TranslatorInterface $translator;
+
+    private UserRepositoryInterface $userRepository;
+
+    const LOG_PREFIX = '[docgen failed] ';
+
+    /**
+     * @param DocGeneratorTemplateRepository $docGeneratorTemplateRepository
+     * @param EntityManagerInterface $entityManager
+     * @param LoggerInterface $logger
+     * @param MailerInterface $mailer
+     * @param StoredObjectRepository $storedObjectRepository
+     * @param TranslatorInterface $translator
+     * @param UserRepositoryInterface $userRepository
+     */
+    public function __construct(
+        DocGeneratorTemplateRepository $docGeneratorTemplateRepository,
+        EntityManagerInterface $entityManager,
+        LoggerInterface $logger,
+        MailerInterface $mailer,
+        StoredObjectRepository $storedObjectRepository,
+        TranslatorInterface $translator,
+        UserRepositoryInterface $userRepository
+    ) {
+        $this->docGeneratorTemplateRepository = $docGeneratorTemplateRepository;
+        $this->entityManager = $entityManager;
+        $this->logger = $logger;
+        $this->mailer = $mailer;
+        $this->storedObjectRepository = $storedObjectRepository;
+        $this->translator = $translator;
+        $this->userRepository = $userRepository;
+    }
+
+
+    public static function getSubscribedEvents()
+    {
+        return [
+            WorkerMessageFailedEvent::class => 'onMessageFailed'
+        ];
+    }
+
+    public function onMessageFailed(WorkerMessageFailedEvent $event): void
+    {
+        if ($event->willRetry()) {
+            return;
+        }
+
+        if (!$event->getEnvelope()->getMessage() instanceof RequestGenerationMessage) {
+            return;
+        }
+
+        /** @var \Chill\DocGeneratorBundle\Service\Messenger\RequestGenerationMessage $message */
+        $message = $event->getEnvelope()->getMessage();
+
+        $this->logger->error(self::LOG_PREFIX.'Docgen failed', [
+            'stored_object_id' => $message->getDestinationStoredObjectId(),
+            'entity_id' => $message->getEntityId(),
+            'template_id' => $message->getTemplateId(),
+            'creator_id' => $message->getCreatorId(),
+            'throwable_class' => get_class($event->getThrowable()),
+        ]);
+
+        $this->markObjectAsFailed($message);
+        $this->warnCreator($message, $event);
+    }
+
+    private function markObjectAsFailed(RequestGenerationMessage $message): void
+    {
+        $object = $this->storedObjectRepository->find($message->getDestinationStoredObjectId());
+
+        if (null === $object) {
+            $this->logger->error(self::LOG_PREFIX.'Stored object not found', ['stored_object_id', $message->getDestinationStoredObjectId()]);
+        }
+
+        $object->setStatus(StoredObject::STATUS_FAILURE);
+
+        $this->entityManager->flush();
+    }
+
+    private function warnCreator(RequestGenerationMessage $message, WorkerMessageFailedEvent $event): void
+    {
+        if (null === $creatorId = $message->getCreatorId()) {
+            $this->logger->info(self::LOG_PREFIX.'creator id is null');
+            return;
+        }
+
+        if (null === $creator = $this->userRepository->find($creatorId)) {
+            $this->logger->error(self::LOG_PREFIX.'Creator not found with given id', ['creator_id', $creatorId]);
+            return;
+        }
+
+        if (null === $creator->getEmail() || '' === $creator->getEmail()) {
+            $this->logger->info(self::LOG_PREFIX.'Creator does not have any email', ['user' => $creator->getUsernameCanonical()]);
+            return;
+        }
+
+        // if the exception is not a GeneratorException, we try the previous one...
+        $throwable = $event->getThrowable();
+        if (!$throwable instanceof GeneratorException) {
+            $throwable = $throwable->getPrevious();
+        }
+
+        if ($throwable instanceof GeneratorException) {
+            $errors = $throwable->getErrors();
+        } else {
+            $errors = [$throwable->getTraceAsString()];
+        }
+
+        if (null === $template = $this->docGeneratorTemplateRepository->find($message->getTemplateId())) {
+            $this->logger->info(self::LOG_PREFIX.'Template not found', ['template_id' => $message->getTemplateId()]);
+            return;
+        }
+
+        $email = (new TemplatedEmail())
+            ->to($creator->getEmail())
+            ->subject($this->translator->trans('docgen.failure_email.The generation of a document failed'))
+            ->textTemplate('@ChillDocGenerator/Email/on_generation_failed_email.txt.twig')
+            ->context([
+                'errors' => $errors,
+                'template' => $template,
+                'creator' => $creator,
+                'stored_object_id' => $message->getDestinationStoredObjectId(),
+            ]);
+
+        $this->mailer->send($email);
+    }
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php
new file mode 100644
index 000000000..981a3dde7
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Chill\DocGeneratorBundle\Service\Messenger;
+
+use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
+use Chill\DocGeneratorBundle\Service\Generator\Generator;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\Repository\StoredObjectRepository;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
+use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+
+/**
+ * Handle the request of document generation
+ */
+class RequestGenerationHandler implements MessageHandlerInterface
+{
+    private StoredObjectRepository $storedObjectRepository;
+
+    private DocGeneratorTemplateRepository $docGeneratorTemplateRepository;
+
+    private EntityManagerInterface $entityManager;
+
+    private Generator $generator;
+
+    public const AUTHORIZED_TRIALS = 5;
+
+    public function __construct(
+        DocGeneratorTemplateRepository $docGeneratorTemplateRepository,
+        EntityManagerInterface $entityManager,
+        Generator $generator,
+        StoredObjectRepository $storedObjectRepository,
+    ) {
+        $this->docGeneratorTemplateRepository = $docGeneratorTemplateRepository;
+        $this->entityManager = $entityManager;
+        $this->generator = $generator;
+        $this->storedObjectRepository = $storedObjectRepository;
+    }
+
+    public function __invoke(RequestGenerationMessage $message)
+    {
+        if (null === $template = $this->docGeneratorTemplateRepository->find($message->getTemplateId())) {
+            throw new \RuntimeException('template not found: ' . $message->getTemplateId());
+        }
+
+        if (null === $destinationStoredObject = $this->storedObjectRepository->find($message->getDestinationStoredObjectId())) {
+            throw new \RuntimeException('destination stored object not found : ' . $message->getDestinationStoredObjectId());
+        }
+
+        if ($destinationStoredObject->getGenerationTrialsCounter() >= self::AUTHORIZED_TRIALS) {
+            throw new UnrecoverableMessageHandlingException('maximum number of retry reached');
+        }
+
+        $destinationStoredObject->addGenerationTrial();
+        $this->entityManager->createQuery('UPDATE '.StoredObject::class.' s SET s.generationTrialsCounter = s.generationTrialsCounter + 1 WHERE s.id = :id')
+            ->setParameter('id', $destinationStoredObject->getId())
+            ->execute();
+
+        $this->generator->generateDocFromTemplate(
+            $template,
+            $message->getEntityId(),
+            $message->getContextGenerationData(),
+            $destinationStoredObject
+        );
+    }
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php
index 1489e2686..edba90ce4 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php
@@ -3,6 +3,7 @@
 namespace Chill\DocGeneratorBundle\Service\Messenger;
 
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\MainBundle\Entity\User;
 
 class RequestGenerationMessage
@@ -13,14 +14,22 @@ class RequestGenerationMessage
 
    private int $entityId;
 
-   private string $entityClassName;
+   private int $destinationStoredObjectId;
 
-    public function __construct(User $creator, DocGeneratorTemplate $template, int $entityId, string $entityClassName)
-    {
+   private array $contextGenerationData;
+
+    public function __construct(
+        User $creator,
+        DocGeneratorTemplate $template,
+        int $entityId,
+        StoredObject $destinationStoredObject,
+        array $contextGenerationData
+    ) {
         $this->creatorId = $creator->getId();
         $this->templateId = $template->getId();
         $this->entityId = $entityId;
-        $this->entityClassName = $entityClassName;
+        $this->destinationStoredObjectId = $destinationStoredObject->getId();
+        $this->contextGenerationData = $contextGenerationData;
     }
 
     public function getCreatorId(): int
@@ -28,6 +37,11 @@ class RequestGenerationMessage
         return $this->creatorId;
     }
 
+    public function getDestinationStoredObjectId(): int
+    {
+        return $this->destinationStoredObjectId;
+    }
+
     public function getTemplateId(): int
     {
         return $this->templateId;
@@ -38,8 +52,8 @@ class RequestGenerationMessage
         return $this->entityId;
     }
 
-    public function getEntityClassName(): string
+    public function getContextGenerationData(): array
     {
-        return $this->entityClassName;
+        return $this->contextGenerationData;
     }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/config/services.yaml b/src/Bundle/ChillDocGeneratorBundle/config/services.yaml
index 5bdfe2a11..5fef6fb22 100644
--- a/src/Bundle/ChillDocGeneratorBundle/config/services.yaml
+++ b/src/Bundle/ChillDocGeneratorBundle/config/services.yaml
@@ -20,10 +20,14 @@ services:
         resource: '../Serializer/Normalizer/'
         tags:
             - { name: 'serializer.normalizer', priority: -152 }
+
     Chill\DocGeneratorBundle\Serializer\Normalizer\CollectionDocGenNormalizer:
         tags:
             - { name: 'serializer.normalizer', priority: -126 }
 
+    Chill\DocGeneratorBundle\Service\Context\:
+        resource: "../Service/Context"
+
     Chill\DocGeneratorBundle\Controller\:
         resource: "../Controller"
         autowire: true
@@ -34,18 +38,20 @@ services:
         autowire: true
         autoconfigure: true
 
-    Chill\DocGeneratorBundle\Service\Context\:
-        resource: "../Service/Context/"
-        autowire: true
-        autoconfigure: true
-
     Chill\DocGeneratorBundle\GeneratorDriver\:
         resource: "../GeneratorDriver/"
         autowire: true
         autoconfigure: true
 
+    Chill\DocGeneratorBundle\Service\Messenger\:
+        resource: "../Service/Messenger/"
+
+    Chill\DocGeneratorBundle\Service\Generator\Generator: ~
+    Chill\DocGeneratorBundle\Service\Generator\GeneratorInterface: '@Chill\DocGeneratorBundle\Service\Generator\Generator'
+
     Chill\DocGeneratorBundle\Driver\RelatorioDriver: '@Chill\DocGeneratorBundle\Driver\DriverInterface'
 
     Chill\DocGeneratorBundle\Context\ContextManager:
         arguments:
             $contexts: !tagged_iterator { tag: chill_docgen.context, default_index_method: getKey }
+    Chill\DocGeneratorBundle\Context\ContextManagerInterface: '@Chill\DocGeneratorBundle\Context\ContextManager'
diff --git a/src/Bundle/ChillDocGeneratorBundle/migrations/Version20230214192558.php b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20230214192558.php
new file mode 100644
index 000000000..de536ca84
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20230214192558.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\DocGenerator;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20230214192558 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add status, template_id and fix defaults on chill_doc.stored_object';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_doc.stored_object ADD template_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ADD status TEXT DEFAULT \'ready\' NOT NULL');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ADD createdAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('UPDATE chill_doc.stored_object SET createdAt = creation_date');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ADD createdBy_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_doc.stored_object DROP creation_date;');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ALTER type SET DEFAULT \'\'');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ALTER title DROP DEFAULT');
+        $this->addSql('COMMENT ON COLUMN chill_doc.stored_object.createdAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ADD CONSTRAINT FK_49604E365DA0FB8 FOREIGN KEY (template_id) REFERENCES chill_docgen_template (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ADD CONSTRAINT FK_49604E363174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_49604E365DA0FB8 ON chill_doc.stored_object (template_id)');
+        $this->addSql('CREATE INDEX IDX_49604E363174800F ON chill_doc.stored_object (createdBy_id)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_doc.stored_object DROP CONSTRAINT FK_49604E365DA0FB8');
+        $this->addSql('ALTER TABLE chill_doc.stored_object DROP CONSTRAINT FK_49604E363174800F');
+        $this->addSql('ALTER TABLE chill_doc.stored_object DROP template_id');
+        $this->addSql('ALTER TABLE chill_doc.stored_object DROP status');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ADD creation_date TIMESTAMP(0) DEFAULT NOW()');
+        $this->addSql('UPDATE chill_doc.stored_object SET creation_date = createdAt');
+        $this->addSql('ALTER TABLE chill_doc.stored_object DROP createdAt');
+        $this->addSql('ALTER TABLE chill_doc.stored_object DROP createdBy_id');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ALTER title SET DEFAULT \'\'');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ALTER type DROP DEFAULT');
+    }
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/Generator/GeneratorTest.php b/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/Generator/GeneratorTest.php
index 2e68b443c..066715b60 100644
--- a/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/Generator/GeneratorTest.php
+++ b/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/Generator/GeneratorTest.php
@@ -26,13 +26,14 @@ class GeneratorTest extends TestCase
         $template = (new DocGeneratorTemplate())->setFile($templateStoredObject = (new StoredObject())
             ->setType('application/test'));
         $destinationStoredObject = (new StoredObject())->setStatus(StoredObject::STATUS_PENDING);
+        $reflection = new \ReflectionClass($destinationStoredObject);
+        $reflection->getProperty('id')->setAccessible(true);
+        $reflection->getProperty('id')->setValue($destinationStoredObject, 1);
         $entity = new class {};
         $data = [];
 
         $context = $this->prophesize(DocGeneratorContextInterface::class);
         $context->getData($template, $entity, Argument::type('array'))->willReturn($data);
-        $context->storeGenerated($template, $destinationStoredObject, $entity, Argument::type('array'))
-            ->shouldBeCalled();
         $context->getName()->willReturn('dummy_context');
         $context->getEntityClass()->willReturn('DummyClass');
         $context = $context->reveal();
@@ -46,8 +47,11 @@ class GeneratorTest extends TestCase
             ->willReturn('generated');
 
         $entityManager = $this->prophesize(EntityManagerInterface::class);
-        $entityManager->find(Argument::type('string'), Argument::type('int'))
+        $entityManager->find(StoredObject::class, 1)
+            ->willReturn($destinationStoredObject);
+        $entityManager->find('DummyClass', Argument::type('int'))
             ->willReturn($entity);
+        $entityManager->clear()->shouldBeCalled();
         $entityManager->flush()->shouldBeCalled();
 
         $storedObjectManager = $this->prophesize(StoredObjectManagerInterface::class);
@@ -65,8 +69,8 @@ class GeneratorTest extends TestCase
 
         $generator->generateDocFromTemplate(
             $template,
-            'DummyEntity',
             1,
+            [],
             $destinationStoredObject
         );
     }
@@ -89,8 +93,8 @@ class GeneratorTest extends TestCase
 
         $generator->generateDocFromTemplate(
             $template,
-            'DummyEntity',
             1,
+            [],
             $destinationStoredObject
         );
     }
@@ -102,6 +106,9 @@ class GeneratorTest extends TestCase
         $template = (new DocGeneratorTemplate())->setFile($templateStoredObject = (new StoredObject())
             ->setType('application/test'));
         $destinationStoredObject = (new StoredObject())->setStatus(StoredObject::STATUS_PENDING);
+        $reflection = new \ReflectionClass($destinationStoredObject);
+        $reflection->getProperty('id')->setAccessible(true);
+        $reflection->getProperty('id')->setValue($destinationStoredObject, 1);
 
         $context = $this->prophesize(DocGeneratorContextInterface::class);
         $context->getName()->willReturn('dummy_context');
@@ -126,8 +133,8 @@ class GeneratorTest extends TestCase
 
         $generator->generateDocFromTemplate(
             $template,
-            'DummyEntity',
             1,
+            [],
             $destinationStoredObject
         );
     }
diff --git a/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml b/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml
index bf37ff838..d0950482e 100644
--- a/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml
@@ -10,6 +10,16 @@ docgen:
     test generate: Tester la génération
     With context %name%: 'Avec le contexte "%name%"'
 
+    Doc generation failed: La génération de ce document a échoué
+    Doc generation is pending: La génération de ce document est en cours
+    Come back later: Revenir plus tard
+
+    failure_email:
+        The generation of a document failed: La génération d'un document a échoué
+        The generation of the document {template_name} failed: La génération d'un document à partir du modèle {{ template_name }} a échoué.
+        The following errors were encoutered: Les erreurs suivantes ont été rencontrées
+        Forward this email to your administrator for solving: Faites suivre ce message vers votre administrateur pour la résolution du problème.
+        References: Références
 
 crud:
     docgen_template:
@@ -19,4 +29,4 @@ crud:
 
 
 Show data instead of generating: Montrer les données au lieu de générer le document
-Template file: Fichier modèle
\ No newline at end of file
+Template file: Fichier modèle
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectApiController.php b/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectApiController.php
new file mode 100644
index 000000000..29b978ffb
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectApiController.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Chill\DocStoreBundle\Controller;
+
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Security;
+
+class StoredObjectApiController
+{
+    private Security $security;
+
+    public function __construct(Security $security)
+    {
+        $this->security = $security;
+    }
+
+    /**
+     * @Route("/api/1.0/doc-store/stored-object/{uuid}/is-ready")
+     */
+    public function isDocumentReady(StoredObject $storedObject): Response
+    {
+        if (!$this->security->isGranted('ROLE_USER')) {
+            throw new AccessDeniedHttpException();
+        }
+
+        return new JsonResponse(
+            [
+                'id' => $storedObject->getId(),
+                'filename' => $storedObject->getFilename(),
+                'status' => $storedObject->getStatus(),
+                'type' => $storedObject->getType(),
+            ]
+        );
+    }
+}
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
index 21abc1f56..8821ead7c 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
@@ -41,12 +41,6 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
 
     use TrackCreationTrait;
 
-    /**
-     * @ORM\Column(type="datetime", name="creation_date")
-     * @Serializer\Groups({"read", "write"})
-     */
-    private DateTimeInterface $creationDate;
-
     /**
      * @ORM\Column(type="json", name="datas")
      * @Serializer\Groups({"read", "write"})
@@ -87,7 +81,7 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
     private string $title = '';
 
     /**
-     * @ORM\Column(type="text", name="type")
+     * @ORM\Column(type="text", name="type", options={"default": ""})
      * @Serializer\Groups({"read", "write"})
      */
     private string $type = '';
@@ -105,9 +99,20 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
 
     /**
      * @ORM\Column(type="text", options={"default": "ready"})
+     * @Serializer\Groups({"read"})
      */
     private string $status;
 
+    /**
+     * Store the number of times a generation has been tryied for this StoredObject.
+     *
+     * This is a workaround, as generation consume lot of memory, and out-of-memory errors
+     * are not handled by messenger.
+     *
+     * @ORM\Column(type="integer", options={"default": 0})
+     */
+    private int $generationTrialsCounter = 0;
+
     /**
      * @param StoredObject::STATUS_* $status
      */
@@ -117,8 +122,16 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
         $this->status = $status;
     }
 
+    public function addGenerationTrial(): self
+    {
+        $this->generationTrialsCounter++;
+
+        return $this;
+    }
+
     /**
      * @Serializer\Groups({"read", "write"})
+     * @deprecated
      */
     public function getCreationDate(): DateTime
     {
@@ -135,6 +148,11 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
         return $this->filename;
     }
 
+    public function getGenerationTrialsCounter(): int
+    {
+        return $this->generationTrialsCounter;
+    }
+
     public function getId(): ?int
     {
         return $this->id;
@@ -158,6 +176,9 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
         return $this->getFilename();
     }
 
+    /**
+     * @return StoredObject::STATUS_*
+     */
     public function getStatus(): string
     {
         return $this->status;
@@ -185,6 +206,7 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
 
     /**
      * @Serializer\Groups({"write"})
+     * @deprecated
      */
     public function setCreationDate(DateTime $creationDate): self
     {
@@ -244,4 +266,30 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
 
         return $this;
     }
+
+    public function getTemplate(): ?DocGeneratorTemplate
+    {
+        return $this->template;
+    }
+
+    public function hasTemplate(): bool
+    {
+        return null !== $this->template;
+    }
+
+    public function setTemplate(?DocGeneratorTemplate $template): StoredObject
+    {
+        $this->template = $template;
+        return $this;
+    }
+
+    public function isPending(): bool
+    {
+        return self::STATUS_PENDING === $this->getStatus();
+    }
+
+    public function isFailure(): bool
+    {
+        return self::STATUS_FAILURE === $this->getStatus();
+    }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/module/document_action_buttons_group/index.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/module/document_action_buttons_group/index.ts
index ec1d50a86..e5912d38a 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/module/document_action_buttons_group/index.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/module/document_action_buttons_group/index.ts
@@ -1,7 +1,8 @@
 import {_createI18n} from "../../../../../ChillMainBundle/Resources/public/vuejs/_js/i18n";
 import DocumentActionButtonsGroup from "../../vuejs/DocumentActionButtonsGroup.vue";
 import {createApp} from "vue";
-import {StoredObject} from "../../types";
+import {StoredObject, StoredObjectStatusChange} from "../../types";
+import {is_object_ready} from "../../vuejs/StoredObjectButton/helpers";
 
 const i18n = _createI18n({});
 
@@ -19,7 +20,7 @@ window.addEventListener('DOMContentLoaded', function (e) {
          };
 
          const
-           storedObject = JSON.parse(datasets.storedObject),
+           storedObject = JSON.parse(datasets.storedObject) as StoredObject,
            filename = datasets.filename,
            canEdit = datasets.canEdit === '1',
            small = datasets.small === '1'
@@ -27,7 +28,20 @@ window.addEventListener('DOMContentLoaded', function (e) {
 
          return { storedObject, filename, canEdit, small };
        },
-       template: '<document-action-buttons-group :can-edit="canEdit" :filename="filename" :stored-object="storedObject" :small="small"></document-action-buttons-group>',
+       template: '<document-action-buttons-group :can-edit="canEdit" :filename="filename" :stored-object="storedObject" :small="small" @on-stored-object-status-change="onStoredObjectStatusChange"></document-action-buttons-group>',
+       methods: {
+         onStoredObjectStatusChange: function(newStatus: StoredObjectStatusChange): void {
+           this.$data.storedObject.status = newStatus.status;
+           this.$data.storedObject.filename = newStatus.filename;
+           this.$data.storedObject.type = newStatus.type;
+
+           // remove eventual div which inform pending status
+           document.querySelectorAll(`[data-docgen-is-pending="${this.$data.storedObject.id}"]`)
+             .forEach(function(el) {
+               el.remove();
+             });
+         }
+       }
      });
 
      app.use(i18n).mount(el);
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/types.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/types.ts
index 918526117..825055973 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/types.ts
@@ -1,5 +1,7 @@
 import {DateTime} from "../../../ChillMainBundle/Resources/public/types";
 
+export type StoredObjectStatus = "ready"|"failure"|"pending";
+
 export interface StoredObject {
   id: number,
 
@@ -13,7 +15,15 @@ export interface StoredObject {
   keyInfos: object,
   title: string,
   type: string,
-  uuid: string
+  uuid: string,
+  status: StoredObjectStatus,
+}
+
+export interface StoredObjectStatusChange {
+  id: number,
+  filename: string,
+  status: StoredObjectStatus,
+  type: string,
 }
 
 /**
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue
index 60b368cd3..ac841f5cf 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="dropdown">
+  <div v-if="'ready' === props.storedObject.status" class="dropdown">
     <button :class="Object.assign({'btn': true, 'btn-outline-primary': true, 'dropdown-toggle': true, small: props.small})" type="button" data-bs-toggle="dropdown" aria-expanded="false">
       Actions
     </button>
@@ -15,16 +15,27 @@
       </li>
     </ul>
   </div>
+  <div v-else-if="'pending' === props.storedObject.status">
+    <div class="btn btn-outline-info">Génération en cours</div>
+  </div>
+  <div v-else-if="'failure' === props.storedObject.status">
+    <div class="btn btn-outline-danger">La génération a échoué</div>
+  </div>
 
 </template>
 
 <script lang="ts" setup>
 
+import {onMounted} from "vue";
 import ConvertButton from "./StoredObjectButton/ConvertButton.vue";
 import DownloadButton from "./StoredObjectButton/DownloadButton.vue";
 import WopiEditButton from "./StoredObjectButton/WopiEditButton.vue";
-import {is_extension_editable, is_extension_viewable} from "./StoredObjectButton/helpers";
-import {StoredObject, WopiEditButtonExecutableBeforeLeaveFunction} from "../types";
+import {is_extension_editable, is_extension_viewable, is_object_ready} from "./StoredObjectButton/helpers";
+import {
+  StoredObject,
+  StoredObjectStatusChange,
+  WopiEditButtonExecutableBeforeLeaveFunction
+} from "../types";
 
 interface DocumentActionButtonsGroupConfig {
   storedObject: StoredObject,
@@ -48,6 +59,10 @@ interface DocumentActionButtonsGroupConfig {
   executeBeforeLeave?: WopiEditButtonExecutableBeforeLeaveFunction,
 }
 
+const emit = defineEmits<{
+  (e: 'onStoredObjectStatusChange', newStatus: StoredObjectStatusChange): void
+}>();
+
 const props = withDefaults(defineProps<DocumentActionButtonsGroupConfig>(), {
   small: false,
   canEdit: true,
@@ -56,6 +71,51 @@ const props = withDefaults(defineProps<DocumentActionButtonsGroupConfig>(), {
   returnPath: window.location.pathname + window.location.search + window.location.hash,
 });
 
+/**
+ * counter for the number of times that we check for a new status
+ */
+let tryiesForReady = 0;
+
+/**
+ * how many times we may check for a new status, once loaded
+ */
+const maxTryiesForReady = 120;
+
+const checkForReady = function(): void {
+  if (
+    'ready' === props.storedObject.status
+    || 'failure' === props.storedObject.status
+    // stop reloading if the page stays opened for a long time
+    || tryiesForReady > maxTryiesForReady
+  ) {
+    return;
+  }
+
+  tryiesForReady = tryiesForReady + 1;
+
+  setTimeout(onObjectNewStatusCallback, 5000);
+};
+
+const onObjectNewStatusCallback = async function(): Promise<void> {
+  const new_status = await is_object_ready(props.storedObject);
+  if (props.storedObject.status !== new_status.status) {
+    emit('onStoredObjectStatusChange', new_status);
+    return Promise.resolve();
+  } else if ('failure' === new_status.status) {
+    return Promise.resolve();
+  }
+
+  if ('ready' !== new_status.status) {
+    // we check for new status, unless it is ready
+    checkForReady();
+  }
+
+  return Promise.resolve();
+};
+
+onMounted(() => {
+  checkForReady();
+})
 </script>
 
 <style scoped>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts
index d82efb111..5b61a108d 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts
@@ -1,3 +1,4 @@
+import {StoredObject, StoredObjectStatus, StoredObjectStatusChange} from "../../types";
 
 const MIMES_EDIT = new Set([
   'application/vnd.ms-powerpoint',
@@ -168,6 +169,18 @@ async function download_and_decrypt_doc(urlGenerator: string, keyData: JsonWebKe
    }
 }
 
+async function is_object_ready(storedObject: StoredObject): Promise<StoredObjectStatusChange>
+{
+    const new_status_response = await window
+      .fetch( `/api/1.0/doc-store/stored-object/${storedObject.uuid}/is-ready`);
+
+    if (!new_status_response.ok) {
+      throw new Error("could not fetch the new status");
+    }
+
+    return await new_status_response.json();
+}
+
 export {
   build_convert_link,
   build_download_info_link,
@@ -176,4 +189,5 @@ export {
   download_doc,
   is_extension_editable,
   is_extension_viewable,
+  is_object_ready,
 };
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/delete.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/delete.html.twig
index a6679829b..c9bb608cf 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/delete.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/delete.html.twig
@@ -9,11 +9,6 @@
         <dt>{{ 'Title'|trans }}</dt>
         <dd>{{ document.title }}</dd>
 
-        {% if document.scope is not null %}
-            <dt>{{ 'Scope' | trans }}</dt>
-            <dd>{{ document.scope.name | localize_translatable_string }}</dd>
-        {% endif %}
-
         <dt>{{ 'Category'|trans }}</dt>
         <dd>{{ document.category.name|localize_translatable_string }}</dd>
 
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
index 4cbcb7bef..dffff01aa 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
@@ -5,18 +5,25 @@
 <div class="item-bloc">
     <div class="item-row">
         <div class="item-col" style="width: unset">
+            {% if document.object.isPending %}
+                <div class="badge text-bg-info" data-docgen-is-pending="{{ document.object.id }}">{{ 'docgen.Doc generation is pending'|trans }}</div>
+            {% elseif document.object.isFailure %}
+                <div class="badge text-bg-warning">{{ 'docgen.Doc generation failed'|trans }}</div>
+            {% endif %}
             <div class="denomination h2">
                 {{ document.title }}
             </div>
-            <div>
-                {{ mm.mimeIcon(document.object.type) }}
-            </div>
+            {% if document.object.type is not empty %}
+                <div>
+                    {{ mm.mimeIcon(document.object.type) }}
+                </div>
+            {% endif %}
             <div>
                 <p>{{ document.category.name|localize_translatable_string }}</p>
             </div>
-            {% if document.template is not null %}
+            {% if document.object.hasTemplate %}
                 <div>
-                    <p>{{ document.template.name.fr }}</p>
+                    <p>{{ document.object.template.name|localize_translatable_string }}</p>
                 </div>
             {% endif %}
         </div>
diff --git a/src/Bundle/ChillDocStoreBundle/migrations/Version20230227161327.php b/src/Bundle/ChillDocStoreBundle/migrations/Version20230227161327.php
new file mode 100644
index 000000000..f3b29b8b1
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/migrations/Version20230227161327.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\DocStore;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20230227161327 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add a generation counter on doc store';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_doc.stored_object ADD generationTrialsCounter INT DEFAULT 0 NOT NULL;');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_doc.stored_object DROP generationTrialsCounter');
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
index 5b52f6819..94a09cafb 100644
--- a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
+++ b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
@@ -118,7 +118,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
      * Return true if the phonenumber is a landline or voip phone.  Return always true
      * if the validation is not configured.
      *
-     * @param string $phonenumber
+     * @param string|PhoneNumber $phonenumber
      */
     public function isValidPhonenumberAny($phonenumber): bool
     {
@@ -138,7 +138,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
      * Return true if the phonenumber is a landline or voip phone.  Return always true
      * if the validation is not configured.
      *
-     * @param string $phonenumber
+     * @param string|PhoneNumber $phonenumber
      */
     public function isValidPhonenumberLandOrVoip($phonenumber): bool
     {
@@ -159,7 +159,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
      * REturn true if the phonenumber is a mobile phone. Return always true
      * if the validation is not configured.
      *
-     * @param string $phonenumber
+     * @param string|PhoneNumber $phonenumber
      */
     public function isValidPhonenumberMobile($phonenumber): bool
     {
@@ -182,6 +182,10 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
             return null;
         }
 
+        if ($phonenumber instanceof PhoneNumber) {
+            $phonenumber = (string) $phonenumber;
+        }
+
         // filter only number
         $filtered = preg_replace('/[^0-9]/', '', $phonenumber);
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
index 4bf9e1a8a..d6e42f743 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -116,6 +116,7 @@
                          :filename="d.title"
                          :can-edit="true"
                          :execute-before-leave="submitBeforeLeaveToEditor"
+                         @on-stored-object-status-change="onStatusDocumentChanged"
                      ></document-action-buttons-group>
                    </li>
                    <li v-if="d.workflows.length === 0">
@@ -338,6 +339,10 @@ export default {
             this.$store.commit('removeDocument', {key: this.evaluation.key, document: document});
          }
       },
+      onStatusDocumentChanged(newStatus) {
+        console.log('onStatusDocumentChanged', newStatus);
+        this.$store.commit('statusDocumentChanged', {key: this.evaluation.key, newStatus: newStatus});
+      },
       goToGenerateWorkflowEvaluationDocument({event, link, workflowName, payload}) {
          const callback = (data) => {
             let evaluation = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key);
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
index acbe51981..d9f317b4c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
@@ -360,7 +360,22 @@ const store = createStore({
         state.evaluationsPicked.find(e => e.key === payload.evaluationKey)
           .documents.find(d => d.id === payload.id).title = payload.title;
       }
-    }
+    },
+    statusDocumentChanged(state, {newStatus, key}) {
+      const e = state.evaluationsPicked.find(e => e.key === key);
+      if (typeof e === 'undefined') {
+        console.error('evaluation not found for given key', {key});
+      }
+
+      const doc = e.documents.find(d => d.storedObject?.id === newStatus.id);
+      if (typeof doc === 'undefined') {
+        console.error('document not found', {newStatus});
+      }
+
+      doc.storedObject.status = newStatus.status;
+      doc.storedObject.type = newStatus.type;
+      doc.storedObject.filename = newStatus.filename;
+    },
   },
   actions: {
     updateThirdParty({ commit }, payload) {
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
index 23bfac56f..9ab733d87 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
@@ -24,6 +24,7 @@ use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
 use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
@@ -51,6 +52,8 @@ class AccompanyingPeriodContext implements
 
     private PersonRenderInterface $personRender;
 
+    private PersonRepository $personRepository;
+
     private TranslatableStringHelperInterface $translatableStringHelper;
 
     private TranslatorInterface $translator;
@@ -61,6 +64,7 @@ class AccompanyingPeriodContext implements
         TranslatableStringHelperInterface $translatableStringHelper,
         EntityManagerInterface $em,
         PersonRenderInterface $personRender,
+        PersonRepository $personRepository,
         TranslatorInterface $translator,
         BaseContextData $baseContextData
     ) {
@@ -69,6 +73,7 @@ class AccompanyingPeriodContext implements
         $this->translatableStringHelper = $translatableStringHelper;
         $this->em = $em;
         $this->personRender = $personRender;
+        $this->personRepository = $personRepository;
         $this->translator = $translator;
         $this->baseContextData = $baseContextData;
     }
@@ -256,6 +261,31 @@ class AccompanyingPeriodContext implements
         return $options['mainPerson'] || $options['person1'] || $options['person2'];
     }
 
+    public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        $normalized = [];
+        foreach (['mainPerson', 'person1', 'person2'] as $k) {
+            $normalized[$k] = null !== ($data[$k] ?? null) ? $data[$k]->getId() : null;
+        }
+
+        return $normalized;
+    }
+
+    public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        $denormalized = [];
+
+        foreach (['mainPerson', 'person1', 'person2'] as $k) {
+            if (null !== ($id = ($data[$k] ?? null))) {
+                $denormalized[$k] = $this->personRepository->find($id);
+            } else {
+                $denormalized[$k] = null;
+            }
+        }
+
+        return $denormalized;
+    }
+
     /**
      * @param AccompanyingPeriod $entity
      */
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php
index 7e9280e5d..59f5fdb0c 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Service\DocGenerator;
 
+use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithPublicFormInterface;
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
@@ -18,7 +19,13 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
-class AccompanyingPeriodWorkContext
+/**
+ * Generate a context for an @link{AccompanyingPeriodWork}.
+ *
+ * Although there isn't any document associated to AccompanyingPeriodWork, this context
+ * is use by @link{AccompanyingPeriodWorkEvaluationContext}.
+ */
+class AccompanyingPeriodWorkContext implements DocGeneratorContextWithPublicFormInterface
 {
     private NormalizerInterface $normalizer;
 
@@ -109,8 +116,18 @@ class AccompanyingPeriodWorkContext
         return $this->periodContext->hasPublicForm($template, $entity);
     }
 
+    public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        return $this->periodContext->contextGenerationDataNormalize($template, $entity, $data);
+    }
+
+    public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        return $this->periodContext->contextGenerationDataDenormalize($template, $entity, $data);
+    }
+
     public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
     {
-        // TODO: Implement storeGenerated() method.
+        // currently, no document associated with a AccompanyingPeriodWork
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
index 4dd14faab..978aac066 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
@@ -174,6 +174,18 @@ class AccompanyingPeriodWorkEvaluationContext implements
             ->hasPublicForm($template, $entity->getAccompanyingPeriodWork());
     }
 
+    public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        return $this->accompanyingPeriodWorkContext
+            ->contextGenerationDataNormalize($template, $entity, $data);
+    }
+
+    public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        return $this->accompanyingPeriodWorkContext
+            ->contextGenerationDataDenormalize($template, $entity, $data);
+    }
+
     public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
     {
         $doc = new AccompanyingPeriodWorkEvaluationDocument();
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
index af6c6e114..988c50829 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
@@ -21,11 +21,13 @@ use Chill\DocStoreBundle\Repository\DocumentCategoryRepository;
 use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Form\Type\ScopePickerType;
+use Chill\MainBundle\Repository\ScopeRepositoryInterface;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\PersonRepository;
 use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
@@ -55,6 +57,8 @@ final class PersonContext implements PersonContextInterface
 
     private NormalizerInterface $normalizer;
 
+    private ScopeRepositoryInterface $scopeRepository;
+
     private Security $security;
 
     private bool $showScopes;
@@ -71,6 +75,7 @@ final class PersonContext implements PersonContextInterface
         EntityManagerInterface $em,
         NormalizerInterface $normalizer,
         ParameterBagInterface $parameterBag,
+        ScopeRepositoryInterface $scopeRepository,
         Security $security,
         TranslatorInterface $translator,
         TranslatableStringHelperInterface $translatableStringHelper
@@ -81,6 +86,7 @@ final class PersonContext implements PersonContextInterface
         $this->documentCategoryRepository = $documentCategoryRepository;
         $this->em = $em;
         $this->normalizer = $normalizer;
+        $this->scopeRepository = $scopeRepository;
         $this->security = $security;
         $this->showScopes = $parameterBag->get('chill_main')['acl']['form_show_scopes'];
         $this->translator = $translator;
@@ -211,6 +217,38 @@ final class PersonContext implements PersonContextInterface
         return true;
     }
 
+    /**
+     * @param Person $entity
+     */
+    public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        $scope = $data['scope'] ?? null;
+
+        return [
+            'title' => $data['title'] ?? '',
+            'scope_id' => $scope instanceof Scope ? $scope->getId() : null,
+        ];
+    }
+
+    /**
+     * @param Person $entity
+     */
+    public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        if (!isset($data['scope'])) {
+            $scope = null;
+        } else {
+            if (null === $scope = $this->scopeRepository->find($data['scope'])) {
+                throw new \UnexpectedValueException('scope not found');
+            }
+        }
+
+        return [
+            'title' => $data['title'] ?? '',
+            'scope' => $scope,
+        ];
+    }
+
     /**
      * @param Person $entity
      */
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextInterface.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextInterface.php
index 58a6b5863..ab50655a0 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextInterface.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextInterface.php
@@ -48,6 +48,10 @@ interface PersonContextInterface extends DocGeneratorContextWithAdminFormInterfa
      */
     public function hasPublicForm(DocGeneratorTemplate $template, $entity): bool;
 
+    public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array;
+
+    public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array;
+
     /**
      * @param Person $entity
      */
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextWithThirdParty.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextWithThirdParty.php
index 23d57c431..53f8064a3 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextWithThirdParty.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextWithThirdParty.php
@@ -17,6 +17,7 @@ use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\ThirdPartyBundle\Form\Type\PickThirdpartyDynamicType;
+use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
@@ -30,12 +31,16 @@ class PersonContextWithThirdParty implements DocGeneratorContextWithAdminFormInt
 
     private PersonContextInterface $personContext;
 
+    private ThirdPartyRepository $thirdPartyRepository;
+
     public function __construct(
         PersonContextInterface $personContext,
-        NormalizerInterface $normalizer
+        NormalizerInterface $normalizer,
+        ThirdPartyRepository $thirdPartyRepository
     ) {
         $this->personContext = $personContext;
         $this->normalizer = $normalizer;
+        $this->thirdPartyRepository = $thirdPartyRepository;
     }
 
     public function adminFormReverseTransform(array $data): array
@@ -123,6 +128,26 @@ class PersonContextWithThirdParty implements DocGeneratorContextWithAdminFormInt
         return true;
     }
 
+    public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        return array_merge(
+            [
+                'thirdParty' => null === $data['thirdParty'] ? null : $data['thirdParty']->getId(),
+            ],
+            $this->personContext->contextGenerationDataNormalize($template, $entity, $data),
+        );
+    }
+
+    public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        return array_merge(
+            [
+                'thirdParty' => null === $data['thirdParty'] ? null : $this->thirdPartyRepository->find($data['thirdParty']),
+            ],
+            $this->personContext->contextGenerationDataDenormalize($template, $entity, $data),
+        );
+    }
+
     public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
     {
         $this->personContext->storeGenerated($template, $storedObject, $entity, $contextGenerationData);
diff --git a/src/Bundle/ChillWopiBundle/chill.webpack.config.js b/src/Bundle/ChillWopiBundle/chill.webpack.config.js
index 1c4b53fe1..bf0ebb665 100644
--- a/src/Bundle/ChillWopiBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillWopiBundle/chill.webpack.config.js
@@ -1,6 +1,5 @@
 // this file loads all assets from the Chill person bundle
-module.exports = function(encore, entries)
-{
+module.exports = function(encore, entries) {
     encore.addEntry('page_wopi_editor', __dirname + '/src/Resources/public/page/editor/index.js');
-    //home/julien/dev/département-vendee/chill/vendor/chill-project/chill-bundles/src/Bundle/ChillWopiBundle/src/Resources/public/page/editor/index.js
+    encore.addEntry('mod_reload_page', __dirname + '/src/Resources/public/module/pending/index');
 };
diff --git a/src/Bundle/ChillWopiBundle/src/Controller/Editor.php b/src/Bundle/ChillWopiBundle/src/Controller/Editor.php
index 4be848489..d19a98052 100644
--- a/src/Bundle/ChillWopiBundle/src/Controller/Editor.php
+++ b/src/Bundle/ChillWopiBundle/src/Controller/Editor.php
@@ -26,6 +26,10 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use Symfony\Component\Templating\EngineInterface;
+use Twig\Environment;
 
 /**
  * @internal
@@ -35,6 +39,8 @@ final class Editor
 {
     private DocumentManagerInterface $documentManager;
 
+    private EngineInterface $engine;
+
     private JWTTokenManagerInterface $JWTTokenManager;
 
     private Psr17Interface $psr17;
@@ -49,18 +55,24 @@ final class Editor
 
     private DiscoveryInterface $wopiDiscovery;
 
+    private NormalizerInterface $normalizer;
+
     public function __construct(
         ConfigurationInterface $wopiConfiguration,
         DiscoveryInterface $wopiDiscovery,
         DocumentManagerInterface $documentManager,
+        EngineInterface $engine,
         JWTTokenManagerInterface $JWTTokenManager,
+        NormalizerInterface $normalizer,
         ResponderInterface $responder,
         Security $security,
         Psr17Interface $psr17,
         RouterInterface $router
     ) {
         $this->documentManager = $documentManager;
+        $this->engine = $engine;
         $this->JWTTokenManager = $JWTTokenManager;
+        $this->normalizer = $normalizer;
         $this->wopiConfiguration = $wopiConfiguration;
         $this->wopiDiscovery = $wopiDiscovery;
         $this->responder = $responder;
@@ -87,6 +99,22 @@ final class Editor
             throw new NotFoundHttpException(sprintf('Unable to find object %s', $fileId));
         }
 
+        if (StoredObject::STATUS_FAILURE === $storedObject->getStatus()) {
+            return new Response(
+                $this->engine
+                    ->render('@ChillWopi/Editor/stored_object_failure.html.twig')
+            );
+        } elseif (StoredObject::STATUS_PENDING === $storedObject->getStatus()) {
+            return new Response(
+                $this->engine
+                    ->render('@ChillWopi/Editor/stored_object_pending.html.twig', [
+                        'storedObject' => $this->normalizer->normalize($storedObject, 'json', [
+                            AbstractNormalizer::GROUPS => ['read']
+                        ])
+                    ])
+            );
+        }
+
         if ([] === $discoverExtension = $this->wopiDiscovery->discoverMimeType($storedObject->getType())) {
             throw new Exception(sprintf('Unable to find mime type %s', $storedObject->getType()));
         }
diff --git a/src/Bundle/ChillWopiBundle/src/Resources/public/module/pending/index.ts b/src/Bundle/ChillWopiBundle/src/Resources/public/module/pending/index.ts
new file mode 100644
index 000000000..27879be67
--- /dev/null
+++ b/src/Bundle/ChillWopiBundle/src/Resources/public/module/pending/index.ts
@@ -0,0 +1,40 @@
+import {is_object_ready} from "../../../../../../ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers";
+import {
+    StoredObject,
+    StoredObjectStatus,
+    StoredObjectStatusChange
+} from "../../../../../../ChillDocStoreBundle/Resources/public/types";
+
+async function reload_if_needed(stored_object: StoredObject, i: number): Promise<void> {
+    let current_status = await is_object_ready(stored_object);
+
+    if (stored_object.status !== current_status.status) {
+        window.location.reload();
+    }
+    wait_before_reload(stored_object, i + 1);
+    return Promise.resolve();
+}
+
+function wait_before_reload(stored_object: StoredObject, i: number): void {
+    /**
+     * value of the timeout. Set to 5 sec during the first 10 minutes, then every 1 minute
+     */
+    let timeout = i < 1200 ? 5000 : 60000;
+
+    setTimeout(
+       reload_if_needed,
+       timeout,
+       stored_object,
+       i
+   );
+}
+
+window.addEventListener('DOMContentLoaded', async function (e) {
+    if (undefined === (<any>window).stored_object) {
+        console.error('window.stored_object is undefined');
+        throw Error('window.stored_object is undefined');
+    }
+
+    let stored_object = JSON.parse((<any>window).stored_object) as StoredObject;
+    reload_if_needed(stored_object, 0);
+});
diff --git a/src/Bundle/ChillWopiBundle/src/Resources/views/Editor/stored_object_failure.html.twig b/src/Bundle/ChillWopiBundle/src/Resources/views/Editor/stored_object_failure.html.twig
new file mode 100644
index 000000000..145b58b8b
--- /dev/null
+++ b/src/Bundle/ChillWopiBundle/src/Resources/views/Editor/stored_object_failure.html.twig
@@ -0,0 +1,15 @@
+{% extends 'ChillMainBundle::layout.html.twig' %}
+
+{% block content %}
+    <div class="alert alert-danger">
+        {{ 'docgen.Doc generation failed'|trans }}
+    </div>
+
+    <ul class="sticky-form-buttons record_actions">
+        <li class="cancel">
+            <a href="{{ chill_return_path_or('chill_main_homepage') }}" class="btn btn-cancel">
+                {{ 'Cancel'|trans|chill_return_path_label }}
+            </a>
+        </li>
+    </ul>
+{% endblock %}
diff --git a/src/Bundle/ChillWopiBundle/src/Resources/views/Editor/stored_object_pending.html.twig b/src/Bundle/ChillWopiBundle/src/Resources/views/Editor/stored_object_pending.html.twig
new file mode 100644
index 000000000..ec90b6cd8
--- /dev/null
+++ b/src/Bundle/ChillWopiBundle/src/Resources/views/Editor/stored_object_pending.html.twig
@@ -0,0 +1,36 @@
+{% extends '@ChillMain/layout.html.twig' %}
+
+{% block js %}
+    <script type="application/javascript">
+        window.stored_object = '{{ storedObject|json_encode|escape('js') }}'
+    </script>
+    {{ encore_entry_script_tags('mod_reload_page') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('mod_reload_page') }}
+{% endblock %}
+
+{% block content %}
+    <div class="alert alert-danger text-center">
+        <div>
+            <p>
+                {{ 'docgen.Doc generation is pending'|trans }}
+            </p>
+        </div>
+
+        <div>
+            <i class="fa fa-cog fa-spin fa-3x fa-fw"></i>
+            <span class="sr-only">Loading...</span>
+        </div>
+
+    </div>
+
+    <ul class="sticky-form-buttons record_actions">
+        <li class="cancel">
+            <a href="{{ chill_return_path_or('chill_main_homepage') }}" class="btn btn-cancel">
+                {{ 'docgen.Come back later'|trans|chill_return_path_label }}
+            </a>
+        </li>
+    </ul>
+{% endblock content %}

From 77c545344c877f60d479b86ec8f6c488ccab0d16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 28 Feb 2023 16:44:37 +0100
Subject: [PATCH 13/14] DX: adapt to php 7.4

---
 .../Service/Messenger/RequestGenerationHandler.php              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php
index 981a3dde7..0cfdecd0a 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php
@@ -29,7 +29,7 @@ class RequestGenerationHandler implements MessageHandlerInterface
         DocGeneratorTemplateRepository $docGeneratorTemplateRepository,
         EntityManagerInterface $entityManager,
         Generator $generator,
-        StoredObjectRepository $storedObjectRepository,
+        StoredObjectRepository $storedObjectRepository
     ) {
         $this->docGeneratorTemplateRepository = $docGeneratorTemplateRepository;
         $this->entityManager = $entityManager;

From dbcc425f5f1340e8d5190b987ec418e12c2365b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 28 Feb 2023 17:22:54 +0100
Subject: [PATCH 14/14] DX: improve performance for counting feature linked to
 person

---
 src/Bundle/ChillPersonBundle/Entity/Person.php  | 17 +++++++++++++++++
 .../Menu/PersonMenuBuilder.php                  | 15 ++++++++++++---
 .../Repository/ResidentialAddressRepository.php | 10 ++++++++++
 .../Resources/views/menu.html.twig              |  8 ++++----
 4 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index 4e2bd4e89..d107ff4bd 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -680,6 +680,11 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         $this->proxyAccompanyingPeriodOpenState = false;
     }
 
+    public function countResources(): int
+    {
+        return $this->resources->count();
+    }
+
     /**
      * This public function is the same but return only true or false.
      */
@@ -764,6 +769,18 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $result;
     }
 
+    public function countAccompanyingPeriodInvolved(
+        bool $asParticipantOpen = true,
+        bool $asRequestor = true
+    ): int {
+        // TODO should be optimized to avoid loading accompanying period ?
+        return $this->getAccompanyingPeriodInvolved($asParticipantOpen, $asRequestor)
+            ->filter(function (AccompanyingPeriod $p) {
+                return $p->getStep() !== AccompanyingPeriod::STEP_DRAFT;
+            })
+            ->count();
+    }
+
     /**
      * Get AccompanyingPeriodParticipations Collection.
      *
diff --git a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
index bf11a6c01..8c46b571e 100644
--- a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\ResidentialAddressRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Knp\Menu\MenuItem;
@@ -53,6 +54,12 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
         $this->residentialAddressRepo = $residentialAddressRepo;
     }
 
+    /**
+     * @param $menuId
+     * @param MenuItem $menu
+     * @param array{person: Person} $parameters
+     * @return void
+     */
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
         $menu->addChild($this->translator->trans('Person details'), [
@@ -73,8 +80,8 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
         ])
             ->setExtras([
                 'order' => 60,
-                'counter' => count($this->residentialAddressRepo->findBy(['person' => $parameters['person']])) > 0 ?
-                    count($this->residentialAddressRepo->findBy(['person' => $parameters['person']])) : null,
+                'counter' => 0 < ($nbResidentials = $this->residentialAddressRepo->countByPerson($parameters['person'])) ?
+                    $nbResidentials : null,
             ]);
 
         $menu->addChild($this->translator->trans('person_resources_menu'), [
@@ -85,7 +92,7 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
         ])
             ->setExtras([
                 'order' => 70,
-                'counter' => count($parameters['person']->getResources()) > 0 ? count($parameters['person']->getResources()) : null,
+                'counter' => 0 < ($nbResources = $parameters['person']->countResources()) ? $nbResources : null,
             ]);
 
         $menu->addChild($this->translator->trans('household.person history'), [
@@ -120,6 +127,8 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
             ])
                 ->setExtras([
                     'order' => 100,
+                    'counter' => 0 < ($nbAccompanyingPeriod = $parameters['person']->countAccompanyingPeriodInvolved())
+                        ? $nbAccompanyingPeriod : null,
                 ]);
         }
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php b/src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php
index 96eb872cd..424411a72 100644
--- a/src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php
@@ -32,6 +32,16 @@ class ResidentialAddressRepository extends ServiceEntityRepository
         parent::__construct($registry, ResidentialAddress::class);
     }
 
+    public function countByPerson(Person $person): int
+    {
+        return $this->createQueryBuilder('ra')
+            ->select('COUNT(ra)')
+            ->where('ra.person = :person')
+            ->setParameter('person', $person)
+            ->getQuery()
+            ->getSingleScalarResult();
+    }
+
     public function buildQueryFindCurrentResidentialAddresses(Person $person, ?DateTimeImmutable $at = null): QueryBuilder
     {
         $date = null === $at ? new DateTimeImmutable('today') : $at;
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig
index cf60e31b7..931c84699 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig
@@ -18,12 +18,12 @@
 <div class="list-group vertical-menu {{ 'menu-' ~ menus.name }}">
     {% for menu in menus %}
 
-        <a class="list-group-item list-group-item-action"
+        <a class="list-group-item list-group-item-action d-flex justify-content-between align-items-center"
             href="{{ menu.uri }}">
-            {% if menu.extras.counter is defined and menu.extras.counter is not null %}
-                <span class="badge rounded-pill bg-danger notification-counter">{{ menu.extras.counter }}</span>
-            {% endif %}
             {{ menu.label|upper }}
+            {% if menu.extras.counter is defined and menu.extras.counter is not null %}
+                <span class="badge rounded-pill bg-secondary notification-counter">{{ menu.extras.counter }}</span>
+            {% endif %}
         </a>
     {% endfor %}
 </div>