Implement logic to check if editing of document is blocked by workflow

Using the workflow handlers we return the workflow that is attached to an object
so that within the workflowDocumentService we can then check whether this workflow blocks
the edition of a document.
This commit is contained in:
Julie Lenaerts 2024-07-01 12:14:03 +02:00
parent e9d4b9e2ab
commit c9d2e37cee
7 changed files with 86 additions and 20 deletions

View File

@ -4,32 +4,36 @@ namespace Chill\DocStoreBundle\Service;
use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
use Chill\MainBundle\Workflow\EntityWorkflowManager;
use Symfony\Component\Security\Core\Security;
class WorkflowDocumentService
{
public function __construct(private readonly Security $security, private readonly EntityWorkflowRepository $repository)
public function __construct(private readonly Security $security, private readonly EntityWorkflowManager $entityWorkflowManager)
{
}
public function notBlockedByWorkflow($entity): bool
public function notBlockedByWorkflow(object $entity): bool
{
/**
* @var EntityWorkflow
*/
$workflow = $this->repository->findByRelatedEntity(get_class($entity), $entity->getId());
if ($workflow->isFinal()) {
return false;
}
$workflow = $this->entityWorkflowManager->findByRelatedEntity($entity);
$currentUser = $this->security->getUser();
if ($workflow->getCurrentStep()->getAllDestUser()->contains($currentUser)) {
return true;
if (null !== $workflow) {
if ($workflow->isFinal()) {
return false;
}
if ($workflow->getCurrentStep()->getAllDestUser()->contains($currentUser)) {
return true;
}
}
return false;
return true;
}
}

View File

@ -12,8 +12,10 @@ declare(strict_types=1);
namespace Chill\DocStoreBundle\Workflow;
use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
use Chill\DocStoreBundle\Repository\AccompanyingCourseDocumentRepository;
use Chill\DocStoreBundle\Security\Authorization\AccompanyingCourseDocumentVoter;
use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface;
use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
use Doctrine\ORM\EntityManagerInterface;
@ -22,16 +24,13 @@ use Symfony\Contracts\Translation\TranslatorInterface;
class AccompanyingCourseDocumentWorkflowHandler implements EntityWorkflowHandlerInterface
{
private readonly EntityRepository $repository;
/**
* TODO: injecter le repository directement.
*/
public function __construct(
EntityManagerInterface $em,
private readonly TranslatorInterface $translator
private readonly TranslatorInterface $translator,
private readonly EntityWorkflowRepository $workflowRepository,
private readonly AccompanyingCourseDocumentRepository $repository
) {
$this->repository = $em->getRepository(AccompanyingCourseDocument::class);
}
public function getDeletionRoles(): array
@ -126,4 +125,13 @@ class AccompanyingCourseDocumentWorkflowHandler implements EntityWorkflowHandler
{
return false;
}
public function findByRelatedEntity(object $object): ?EntityWorkflow
{
if(!$object instanceof AccompanyingCourseDocument) {
return null;
}
return $this->workflowRepository->findByRelatedEntity(AccompanyingCourseDocument::class, $object->getId());
}
}

View File

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

View File

@ -37,4 +37,13 @@ class EntityWorkflowManager
{
return $this->registry->all($entityWorkflow);
}
public function findByRelatedEntity(object $object): ?EntityWorkflow
{
foreach ($this->handlers as $handler) {
return $handler->findByRelatedEntity($object);
}
return null;
}
}

View File

@ -12,6 +12,7 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Workflow;
use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface;
use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
@ -21,7 +22,12 @@ use Symfony\Contracts\Translation\TranslatorInterface;
class AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler implements EntityWorkflowHandlerInterface
{
public function __construct(private readonly AccompanyingPeriodWorkEvaluationDocumentRepository $repository, private readonly TranslatableStringHelperInterface $translatableStringHelper, private readonly TranslatorInterface $translator) {}
public function __construct(
private readonly AccompanyingPeriodWorkEvaluationDocumentRepository $repository,
private readonly EntityWorkflowRepository $workflowRepository,
private readonly TranslatableStringHelperInterface $translatableStringHelper,
private readonly TranslatorInterface $translator
) {}
public function getDeletionRoles(): array
{
@ -128,4 +134,12 @@ class AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler implements EntityW
{
return false;
}
public function findByRelatedEntity(object $object): ?EntityWorkflow
{
if (!$object instanceof AccompanyingPeriodWorkEvaluationDocument) {
return null;
}
return $this->workflowRepository->findByRelatedEntity(AccompanyingPeriodWorkEvaluationDocument::class, $object->getId());
}
}

View File

@ -12,6 +12,7 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Workflow;
use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface;
use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
@ -22,7 +23,12 @@ use Symfony\Contracts\Translation\TranslatorInterface;
class AccompanyingPeriodWorkEvaluationWorkflowHandler implements EntityWorkflowHandlerInterface
{
public function __construct(private readonly AccompanyingPeriodWorkEvaluationRepository $repository, private readonly TranslatableStringHelperInterface $translatableStringHelper, private readonly TranslatorInterface $translator) {}
public function __construct(
private readonly AccompanyingPeriodWorkEvaluationRepository $repository,
private readonly EntityWorkflowRepository $workflowRepository,
private readonly TranslatableStringHelperInterface $translatableStringHelper,
private readonly TranslatorInterface $translator
) {}
public function getDeletionRoles(): array
{
@ -114,4 +120,13 @@ class AccompanyingPeriodWorkEvaluationWorkflowHandler implements EntityWorkflowH
{
return false;
}
public function findByRelatedEntity(object $object): ?EntityWorkflow
{
if (!$object instanceof AccompanyingPeriodWorkEvaluation) {
return null;
}
return $this->workflowRepository->findByRelatedEntity(AccompanyingPeriodWorkEvaluation::class, $object->getId());
}
}

View File

@ -12,6 +12,7 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Workflow;
use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface;
use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
@ -23,7 +24,12 @@ use Symfony\Contracts\Translation\TranslatorInterface;
class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInterface
{
public function __construct(private readonly AccompanyingPeriodWorkRepository $repository, private readonly TranslatableStringHelperInterface $translatableStringHelper, private readonly TranslatorInterface $translator) {}
public function __construct(
private readonly AccompanyingPeriodWorkRepository $repository,
private readonly EntityWorkflowRepository $workflowRepository,
private readonly TranslatableStringHelperInterface $translatableStringHelper,
private readonly TranslatorInterface $translator
) {}
public function getDeletionRoles(): array
{
@ -121,4 +127,12 @@ class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInte
{
return false;
}
public function findByRelatedEntity(object $object): ?EntityWorkflow
{
if (!$object instanceof AccompanyingPeriodWork) {
return null;
}
return $this->workflowRepository->findByRelatedEntity(AccompanyingPeriodWork::class, $object->getId());
}
}