Fixed metadata for article to sync remove (sulu#155)

* fixed metadata for article * fixed routable-subscriber to remove all routes (locales)
wachterjohannes · Apr 25, 2017 · 0bedd55 · 0bedd55
1 parent da4246d
commit 0bedd55
Show file tree

Hide file tree

Showing 4 changed files with 91 additions and 40 deletions.
diff --git a/Document/Subscriber/ArticlePageSubscriber.php b/Document/Subscriber/ArticlePageSubscriber.php
@@ -250,7 +250,7 @@ public function setStructureTypeToParent(PersistEvent $event)
      */
     public function handleMetadataLoad(MetadataLoadEvent $event)
     {
-        if (!$event->getMetadata()->getReflectionClass()->implementsInterface(ArticleInterface::class)) {
+        if ($event->getMetadata()->getClass() !== ArticlePageDocument::class) {
             return;
         }
 

diff --git a/Document/Subscriber/ArticleSubscriber.php b/Document/Subscriber/ArticleSubscriber.php
@@ -24,6 +24,7 @@
 use Sulu\Component\DocumentManager\Event\CopyEvent;
 use Sulu\Component\DocumentManager\Event\FlushEvent;
 use Sulu\Component\DocumentManager\Event\HydrateEvent;
+use Sulu\Component\DocumentManager\Event\MetadataLoadEvent;
 use Sulu\Component\DocumentManager\Event\PersistEvent;
 use Sulu\Component\DocumentManager\Event\PublishEvent;
 use Sulu\Component\DocumentManager\Event\RemoveDraftEvent;
@@ -126,6 +127,7 @@ public static function getSubscribedEvents()
             Events::REMOVE_DRAFT => [['handleScheduleIndex', -1024], ['removeDraftChildren', 0]],
             Events::FLUSH => [['handleFlush', -2048], ['handleFlushLive', -2048]],
             Events::COPY => ['handleCopy'],
+            Events::METADATA_LOAD => ['handleMetadataLoad'],
         ];
     }
 
@@ -491,4 +493,24 @@ public function setChildrenStructureType(PersistEvent $event)
             }
         }
     }
+
+    /**
+     * Extend metadata for article-page.
+     *
+     * @param MetadataLoadEvent $event
+     */
+    public function handleMetadataLoad(MetadataLoadEvent $event)
+    {
+        if ($event->getMetadata()->getClass() !== ArticleDocument::class) {
+            return;
+        }
+
+        $event->getMetadata()->addFieldMapping(
+            'pageTitle',
+            [
+                'encoding' => 'system_localized',
+                'property' => 'suluPageTitle',
+            ]
+        );
+    }
 }
diff --git a/Document/Subscriber/RoutableSubscriber.php b/Document/Subscriber/RoutableSubscriber.php
@@ -331,15 +331,24 @@ public function handleRemove(RemoveEvent $event)
             return;
         }
 
-        $route = $this->routeRepository->findByPath($document->getRoutePath(), $document->getOriginalLocale());
-        if (!$route) {
-            return;
-        }
+        $locales = $this->documentInspector->getLocales($document);
+        foreach ($locales as $locale) {
+            $localizedDocument = $this->documentManager->find($document->getUuid(), $locale);
+
+            $route = $this->routeRepository->findByEntity(
+                $localizedDocument->getClass(),
+                $localizedDocument->getUuid(),
+                $locale
+            );
+            if (!$route) {
+                continue;
+            }
 
-        $this->entityManager->remove($route);
+            $this->entityManager->remove($route);
 
-        if ($document instanceof ChildrenBehavior) {
-            $this->removeChildRoutes($document);
+            if ($document instanceof ChildrenBehavior) {
+                $this->removeChildRoutes($document);
+            }
         }
 
         $this->entityManager->flush();

diff --git a/Tests/Unit/Document/Subscriber/RoutableSubscriberTest.php b/Tests/Unit/Document/Subscriber/RoutableSubscriberTest.php
@@ -281,15 +281,64 @@ public function testHandlePersistUpdate()
 
     public function testHandleRemove()
     {
+        $this->documentInspector->getLocales($this->document->reveal())->willReturn(['de', 'en']);
+
         $event = $this->prophesize(RemoveEvent::class);
         $event->getDocument()->willReturn($this->document->reveal());
 
-        $route = $this->prophesize(RouteInterface::class);
+        $this->document->getUuid()->willReturn('123-123-123');
         $this->document->getRoutePath()->willReturn('/test');
+        $this->document->getClass()->willReturn(ArticleDocument::class);
         $this->document->getOriginalLocale()->willReturn('de');
-        $this->routeRepository->findByPath('/test', 'de')->willReturn($route->reveal());
 
-        $this->entityManager->remove($route->reveal())->shouldBeCalled();
+        $this->documentManager->find('123-123-123', 'de')->willReturn($this->document->reveal());
+        $this->documentManager->find('123-123-123', 'en')->willReturn($this->document->reveal());
+
+        $routeDE = $this->prophesize(RouteInterface::class);
+        $routeEN = $this->prophesize(RouteInterface::class);
+        $this->routeRepository->findByEntity(ArticleDocument::class, '123-123-123', 'de')
+            ->willReturn($routeDE->reveal());
+        $this->routeRepository->findByEntity(ArticleDocument::class, '123-123-123', 'en')
+            ->willReturn($routeEN->reveal());
+
+        $this->entityManager->remove($routeDE->reveal())->shouldBeCalled();
+        $this->entityManager->remove($routeEN->reveal())->shouldBeCalled();
+        $this->entityManager->flush()->shouldBeCalled();
+
+        $this->routableSubscriber->handleRemove($event->reveal());
+    }
+
+    public function testHandleRemoveWithChildren()
+    {
+        $this->document->willImplement(ChildrenBehavior::class);
+
+        $this->documentInspector->getLocales($this->document->reveal())->willReturn(['de']);
+
+        $event = $this->prophesize(RemoveEvent::class);
+        $event->getDocument()->willReturn($this->document->reveal());
+
+        $this->document->getUuid()->willReturn('123-123-123');
+        $this->document->getRoutePath()->willReturn('/test');
+        $this->document->getOriginalLocale()->willReturn('de');
+        $this->document->getClass()->willReturn(ArticleDocument::class);
+        $route1 = $this->prophesize(RouteInterface::class);
+        $this->routeRepository->findByEntity(ArticleDocument::class, '123-123-123', 'de')
+            ->willReturn($route1->reveal());
+
+        $this->documentManager->find('123-123-123', 'de')->willReturn($this->document->reveal());
+
+        $child = $this->prophesize(RoutableBehavior::class);
+        $child->willImplement(ChildrenBehavior::class);
+        $child->getChildren()->willReturn([]);
+        $this->document->getChildren()->willReturn([$child->reveal()]);
+
+        $child->getRoutePath()->willReturn('/test/test-2');
+        $child->getOriginalLocale()->willReturn('de');
+        $route2 = $this->prophesize(RouteInterface::class);
+        $this->routeRepository->findByPath('/test/test-2', 'de')->willReturn($route2->reveal());
+
+        $this->entityManager->remove($route1->reveal())->shouldBeCalled();
+        $this->entityManager->remove($route2->reveal())->shouldBeCalled();
         $this->entityManager->flush()->shouldBeCalled();
 
         $this->routableSubscriber->handleRemove($event->reveal());
@@ -323,33 +372,4 @@ public function testHandleCopy()
 
         $this->routableSubscriber->handleCopy($event->reveal());
     }
-
-    public function testHandleRemoveWithChildren()
-    {
-        $this->document->willImplement(ChildrenBehavior::class);
-
-        $event = $this->prophesize(RemoveEvent::class);
-        $event->getDocument()->willReturn($this->document->reveal());
-
-        $this->document->getRoutePath()->willReturn('/test');
-        $this->document->getOriginalLocale()->willReturn('de');
-        $route1 = $this->prophesize(RouteInterface::class);
-        $this->routeRepository->findByPath('/test', 'de')->willReturn($route1->reveal());
-
-        $child = $this->prophesize(RoutableBehavior::class);
-        $child->willImplement(ChildrenBehavior::class);
-        $child->getChildren()->willReturn([]);
-        $this->document->getChildren()->willReturn([$child->reveal()]);
-
-        $child->getRoutePath()->willReturn('/test/test-2');
-        $child->getOriginalLocale()->willReturn('de');
-        $route2 = $this->prophesize(RouteInterface::class);
-        $this->routeRepository->findByPath('/test/test-2', 'de')->willReturn($route2->reveal());
-
-        $this->entityManager->remove($route1->reveal())->shouldBeCalled();
-        $this->entityManager->remove($route2->reveal())->shouldBeCalled();
-        $this->entityManager->flush()->shouldBeCalled();
-
-        $this->routableSubscriber->handleRemove($event->reveal());
-    }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
          */
         public function handleMetadataLoad(MetadataLoadEvent $event)
         {
-            if (!$event->getMetadata()->getReflectionClass()->implementsInterface(ArticleInterface::class)) {
+            if ($event->getMetadata()->getClass() !== ArticlePageDocument::class) {
                 return;
             }
@@ Expand Down @@