Revert "Feature: [docgen][stored object] handler for request generator and required fixes"

This reverts commit 91d21ba939.
This commit is contained in:
2023-02-16 14:08:11 +01:00
parent 7c4bc8f46a
commit 9676975cd8
18 changed files with 111 additions and 308 deletions

View File

@@ -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;

View File

@@ -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;
}