Use correct locale to resolve links (#130)

* Use correct locale to resolve links * Add review suggestions * Add try catch * Fix tests
sulu · Sep 11, 2023 · 2513db3 · 2513db3
1 parent 03a19bf
commit 2513db3
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/Content/ContentTypeResolver/SnippetSelectionResolver.php b/Content/ContentTypeResolver/SnippetSelectionResolver.php
@@ -15,11 +15,13 @@
 
 use Sulu\Bundle\HeadlessBundle\Content\ContentView;
 use Sulu\Bundle\HeadlessBundle\Content\StructureResolverInterface;
+use Sulu\Bundle\SnippetBundle\Document\SnippetDocument;
 use Sulu\Bundle\SnippetBundle\Snippet\DefaultSnippetManagerInterface;
 use Sulu\Component\Content\Compat\PropertyInterface;
 use Sulu\Component\Content\Compat\Structure\SnippetBridge;
 use Sulu\Component\Content\Compat\Structure\StructureBridge;
 use Sulu\Component\Content\Mapper\ContentMapperInterface;
+use Sulu\Component\DocumentManager\Exception\DocumentNotFoundException;
 
 class SnippetSelectionResolver implements ContentTypeResolverInterface
 {
@@ -74,12 +76,20 @@ public function resolve($data, PropertyInterface $property, string $locale, arra
 
         $snippets = [];
         foreach ($snippetIds as $snippetId) {
-            /** @var SnippetBridge $snippet */
-            $snippet = $this->contentMapper->load($snippetId, $webspaceKey, $locale);
+            try {
+                /** @var SnippetBridge $snippet */
+                $snippet = $this->contentMapper->load($snippetId, $webspaceKey, $locale);
+            } catch (DocumentNotFoundException $e) {
+                continue;
+            }
 
             if (!$snippet->getHasTranslation() && null !== $shadowLocale) {
                 /** @var SnippetBridge $snippet */
                 $snippet = $this->contentMapper->load($snippetId, $webspaceKey, $shadowLocale);
+                /** @var SnippetDocument $document */
+                $document = $snippet->getDocument();
+                $document->setLocale($shadowLocale);
+                $document->setOriginalLocale($locale);
             }
 
             $snippet->setIsShadow(null !== $shadowLocale);

diff --git a/Tests/Unit/Content/ContentTypeResolver/SingleSnippetSelectionResolverTest.php b/Tests/Unit/Content/ContentTypeResolver/SingleSnippetSelectionResolverTest.php
@@ -19,6 +19,7 @@
 use Sulu\Bundle\HeadlessBundle\Content\ContentTypeResolver\SnippetSelectionResolver;
 use Sulu\Bundle\HeadlessBundle\Content\ContentView;
 use Sulu\Bundle\HeadlessBundle\Content\StructureResolverInterface;
+use Sulu\Bundle\SnippetBundle\Document\SnippetDocument;
 use Sulu\Bundle\SnippetBundle\Snippet\DefaultSnippetManagerInterface;
 use Sulu\Component\Content\Compat\PropertyInterface;
 use Sulu\Component\Content\Compat\PropertyParameter;
@@ -178,6 +179,12 @@ public function testResolveShadowLocaleNoTranslation(): void
         $snippet1de->setIsShadow(true)->shouldBeCalled();
         $snippet1de->setShadowBaseLanguage('de')->shouldBeCalled();
 
+        /** @var SnippetDocument|ObjectProphecy $snippet1DeDocument */
+        $snippet1DeDocument = $this->prophesize(SnippetDocument::class);
+        $snippet1de->getDocument()->willReturn($snippet1DeDocument->reveal());
+        $snippet1DeDocument->setLocale('de')->shouldBeCalled();
+        $snippet1DeDocument->setOriginalLocale('en')->shouldBeCalled();
+
         $this->contentMapper->load('snippet-1', 'webspace-key', 'en')->willReturn($snippet1en->reveal());
         $this->contentMapper->load('snippet-1', 'webspace-key', 'de')->willReturn($snippet1de->reveal());
         $this->structureResolver->resolve($snippet1de->reveal(), 'en', false)->willReturn([

diff --git a/Tests/Unit/Content/ContentTypeResolver/SnippetSelectionResolverTest.php b/Tests/Unit/Content/ContentTypeResolver/SnippetSelectionResolverTest.php
@@ -18,6 +18,7 @@
 use Sulu\Bundle\HeadlessBundle\Content\ContentTypeResolver\SnippetSelectionResolver;
 use Sulu\Bundle\HeadlessBundle\Content\ContentView;
 use Sulu\Bundle\HeadlessBundle\Content\StructureResolverInterface;
+use Sulu\Bundle\SnippetBundle\Document\SnippetDocument;
 use Sulu\Bundle\SnippetBundle\Snippet\DefaultSnippetManagerInterface;
 use Sulu\Component\Content\Compat\PropertyInterface;
 use Sulu\Component\Content\Compat\PropertyParameter;
@@ -234,6 +235,12 @@ public function testResolveShadowLocaleNoTranslation(): void
         $snippet1de->setIsShadow(true)->shouldBeCalled();
         $snippet1de->setShadowBaseLanguage('de')->shouldBeCalled();
 
+        /** @var SnippetDocument|ObjectProphecy $snippet1DeDocument */
+        $snippet1DeDocument = $this->prophesize(SnippetDocument::class);
+        $snippet1de->getDocument()->willReturn($snippet1DeDocument->reveal());
+        $snippet1DeDocument->setLocale('de')->shouldBeCalled();
+        $snippet1DeDocument->setOriginalLocale('en')->shouldBeCalled();
+
         $this->contentMapper->load('snippet-1', 'webspace-key', 'en')->willReturn($snippet1en->reveal());
         $this->contentMapper->load('snippet-1', 'webspace-key', 'de')->willReturn($snippet1de->reveal());
         $this->structureResolver->resolve($snippet1de->reveal(), 'en', false)->willReturn([