changed structure: Controller doesn`t store/delete routes anymore. This is done now by Model. Reason: have to explicitely call flush after routes are persisted.

Author: Manuel Bertrams

src/Content/EventDataItem.php

@@ -4,18 +4,15 @@
 
 namespace Manuxi\SuluEventBundle\Content;
 
-use Doctrine\ORM\EntityManagerInterface;
 use JMS\Serializer\Annotation as Serializer;
 use Manuxi\SuluEventBundle\Entity\Event;
-use Sulu\Bundle\MediaBundle\Entity\Media;
 use Sulu\Component\SmartContent\ItemInterface;
 
 #[Serializer\ExclusionPolicy("all")]
 class EventDataItem implements ItemInterface
 {
     public function __construct(
-        private Event $entity,
-        private ?EntityManagerInterface $entityManager = null
+        private Event $entity
     ) {}
 
     #[Serializer\VirtualProperty]
@@ -33,14 +30,7 @@ public function getTitle(): string
     #[Serializer\VirtualProperty]
     public function getImage(): ?int
     {
-        $imageId = $this->entity->getImages()['ids'][0];
-        $image = $this->entityManager->getRepository(Media::class)->findById($imageId);;
-
-        if (!\array_key_exists('sulu-50x50', $thumbnails = $image->getThumbnails())) {
-            return null;
-        }
-
-        return $thumbnails['sulu-50x50'];
+        return null;
     }
 
     public function getResource(): Event

src/Controller/Admin/EventController.php

@@ -15,10 +15,6 @@
 use FOS\RestBundle\Controller\Annotations\RouteResource;
 use FOS\RestBundle\Routing\ClassResourceInterface;
 use FOS\RestBundle\View\ViewHandlerInterface;
-//use HandcraftedInTheAlps\RestRoutingBundle\Controller\Annotations\RouteResource;
-//use HandcraftedInTheAlps\RestRoutingBundle\Routing\ClassResourceInterface;
-use Sulu\Bundle\RouteBundle\Entity\RouteRepositoryInterface;
-use Sulu\Bundle\RouteBundle\Manager\RouteManagerInterface;
 use Sulu\Bundle\TrashBundle\Application\TrashManager\TrashManagerInterface;
 use Sulu\Component\Rest\AbstractRestController;
 use Sulu\Component\Rest\Exception\EntityNotFoundException;
@@ -44,8 +40,6 @@ public function __construct(
         private EventModel $eventModel,
         private EventSeoModel $eventSeoModel,
         private EventExcerptModel $eventExcerptModel,
-        private RouteManagerInterface $routeManager,
-        private RouteRepositoryInterface $routeRepository,
         private DoctrineListRepresentationFactory $doctrineListRepresentationFactory,
         private SecurityCheckerInterface $securityChecker,
         private TrashManagerInterface $trashManager,
@@ -85,8 +79,6 @@ public function getAction(int $id, Request $request): Response
     public function postAction(Request $request): Response
     {
         $event = $this->eventModel->createEvent($request);
-        $this->updateRoutesForEntity($event);
-
         return $this->handleView($this->view($event, 201));
     }
 
@@ -143,7 +135,6 @@ public function postTriggerAction(int $id, Request $request): Response
     public function putAction(int $id, Request $request): Response
     {
         $event = $this->eventModel->updateEvent($id, $request);
-        $this->updateRoutesForEntity($event);
 
         $this->eventSeoModel->updateEventSeo($event->getEventSeo(), $request);
         $this->eventExcerptModel->updateEventExcerpt($event->getEventExcerpt(), $request);
@@ -160,13 +151,10 @@ public function putAction(int $id, Request $request): Response
     public function deleteAction(int $id, Request $request): Response
     {
         $entity = $this->eventModel->getEvent($id, $request);
-        $title = $entity->getTitle() ?? 'n.a.';
 
         $this->trashManager->store(Event::RESOURCE_KEY, $entity);
 
-        $this->removeRoutesForEntity($entity);
-
-        $this->eventModel->deleteEvent($id, $title);
+        $this->eventModel->deleteEvent($entity);
         return $this->handleView($this->view(null, 204));
     }
 
@@ -175,26 +163,4 @@ public function getSecurityContext(): string
         return Event::SECURITY_CONTEXT;
     }
 
-    protected function updateRoutesForEntity(Event $entity): void
-    {
-        $this->routeManager->createOrUpdateByAttributes(
-            Event::class,
-            (string) $entity->getId(),
-            $entity->getLocale(),
-            $entity->getRoutePath()
-        );
-    }
-
-    protected function removeRoutesForEntity(Event $entity): void
-    {
-        $routes = $this->routeRepository->findAllByEntity(
-            Event::class,
-            (string) $entity->getId(),
-            $entity->getLocale()
-        );
-
-        foreach ($routes as $route) {
-            $this->routeRepository->remove($route);
-        }
-    }
 }

src/Entity/Interfaces/EventModelInterface.php

@@ -9,6 +9,8 @@
 
 interface EventModelInterface
 {
+    public function getEvent(int $id, Request $request = null): Event;
+    public function deleteEvent(Event $entity): void;
     public function createEvent(Request $request): Event;
     public function updateEvent(int $id, Request $request): Event;
     public function enableEvent(int $id, Request $request): Event;

src/Entity/Models/EventModel.php

@@ -4,6 +4,7 @@
 
 namespace Manuxi\SuluEventBundle\Entity\Models;
 
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\OptimisticLockException;
 use Doctrine\ORM\ORMException;
 use Manuxi\SuluEventBundle\Domain\Event\Event\CopiedLanguageEvent;
@@ -20,6 +21,8 @@
 use Sulu\Bundle\ActivityBundle\Application\Collector\DomainEventCollectorInterface;
 use Sulu\Bundle\ContactBundle\Entity\ContactRepository;
 use Sulu\Bundle\MediaBundle\Entity\MediaRepositoryInterface;
+use Sulu\Bundle\RouteBundle\Entity\RouteRepositoryInterface;
+use Sulu\Bundle\RouteBundle\Manager\RouteManagerInterface;
 use Sulu\Component\Rest\Exception\EntityNotFoundException;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -32,6 +35,9 @@ public function __construct(
         private LocationRepository $locationRepository,
         private MediaRepositoryInterface $mediaRepository,
         private ContactRepository $contactRepository,
+        private RouteManagerInterface $routeManager,
+        private RouteRepositoryInterface $routeRepository,
+        private EntityManagerInterface $entityManager,
         private DomainEventCollectorInterface $domainEventCollector
     ) {}
 
@@ -50,12 +56,13 @@ public function getEvent(int $id, Request $request = null): Event
      * @param int $id
      * @param string $title
      */
-    public function deleteEvent(int $id, string $title): void
+    public function deleteEvent(Event $entity): void
     {
         $this->domainEventCollector->collect(
-            new RemovedEvent($id, $title)
+            new RemovedEvent($entity->getId(), $entity->getTitle() ?? '')
         );
-        $this->eventRepository->remove($id);
+        $this->removeRoutesForEntity($entity);
+        $this->eventRepository->remove($entity->getId());
     }
 
     /**
@@ -70,7 +77,15 @@ public function createEvent(Request $request): Event
             new CreatedEvent($entity, $request->request->all())
         );
 
-        return $this->eventRepository->save($entity);
+        //need the id for updateRoutesForEntity(), so we have to persist and flush here
+        $entity = $this->eventRepository->save($entity);
+
+        $this->updateRoutesForEntity($entity);
+
+        //explicit flush to save routes persisted by updateRoutesForEntity()
+        $this->entityManager->flush();
+
+        return $entity;
     }
 
     /**
@@ -86,6 +101,7 @@ public function updateEvent(int $id, Request $request): Event
         $entity = $this->findEventByIdAndLocale($id, $request);
         $entity = $this->mapDataToEvent($entity, $request->request->all());
         $entity = $this->mapSettingsToEvent($entity, $request->request->all());
+        $this->updateRoutesForEntity($entity);
 
         $this->domainEventCollector->collect(
             new ModifiedEvent($entity, $request->request->all())
@@ -291,4 +307,27 @@ private function mapSettingsToEvent(Event $entity, array $data): Event
         }
         return $entity;
     }
+
+    private function updateRoutesForEntity(Event $entity): void
+    {
+        $this->routeManager->createOrUpdateByAttributes(
+            Event::class,
+            (string) $entity->getId(),
+            $entity->getLocale(),
+            $entity->getRoutePath()
+        );
+    }
+
+    private function removeRoutesForEntity(Event $entity): void
+    {
+        $routes = $this->routeRepository->findAllByEntity(
+            Event::class,
+            (string) $entity->getId(),
+            $entity->getLocale()
+        );
+
+        foreach ($routes as $route) {
+            $this->routeRepository->remove($route);
+        }
+    }
 }

src/Resources/config/controller.xml

@@ -8,8 +8,6 @@
             <argument type="service" id="sulu_event.model.event"/>
             <argument type="service" id="sulu_event.model.event_seo"/>
             <argument type="service" id="sulu_event.model.event_excerpt"/>
-            <argument type="service" id="sulu_route.manager.route_manager"/>
-            <argument type="service" id="sulu.repository.route"/>
             <argument type="service" id="sulu_event.doctrine_list_representation_factory"/>
             <argument type="service" id="sulu_security.security_checker"/>
             <argument type="service" id="sulu_trash.trash_manager"/>

src/Resources/config/services.xml

@@ -131,6 +131,9 @@
             <argument type="service" id="sulu_event.repository.location"/>
             <argument type="service" id="sulu.repository.media"/>
             <argument type="service" id="sulu.repository.contact"/>
+            <argument type="service" id="sulu_route.manager.route_manager"/>
+            <argument type="service" id="sulu.repository.route"/>
+            <argument type="service" id="doctrine.orm.entity_manager" />
             <argument type="service" id="sulu_activity.domain_event_collector"/>
         </service>